diff options
-rw-r--r-- | locale/FixMyStreet.po | 348 | ||||
-rw-r--r-- | locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 452 | ||||
-rw-r--r-- | locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po | 439 | ||||
-rw-r--r-- | locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 448 | ||||
-rw-r--r-- | locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 447 |
5 files changed, 1171 insertions, 963 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 69708b225..9ab0be2dc 100644 --- a/locale/FixMyStreet.po +++ b/locale/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-01-16 12:43+0000\n" +"POT-Creation-Date: 2013-01-24 15:23+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:567 perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr "" @@ -29,7 +29,7 @@ msgstr "" msgid " or " msgstr "" -#: templates/web/default/admin/bodies.html:14 +#: templates/web/default/admin/bodies.html:31 msgid "%d addresses" msgstr "" @@ -61,7 +61,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:621 msgid "%s ref: %s" msgstr "" @@ -69,11 +69,11 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:500 +#: perllib/FixMyStreet/DB/Result/Problem.pm:506 msgid "%s, reported anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:502 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "%s, reported by %s at %s" msgstr "" @@ -81,11 +81,11 @@ msgstr "" msgid "%s, within %s ward" msgstr "" -#: templates/web/default/email_sent.html:28 +#: templates/web/default/email_sent.html:31 msgid "(Don't worry — %s)" msgstr "" -#: templates/web/default/admin/report_blocks.html:11 templates/web/default/admin/users.html:23 +#: templates/web/default/admin/report_blocks.html:11 templates/web/default/admin/users.html:26 msgid "(Email in abuse table)" msgstr "" @@ -113,7 +113,7 @@ msgstr "" 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:114 +#: templates/web/default/report/new/fill_in_details_form.html:217 templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "(optional)" msgstr "" @@ -129,11 +129,11 @@ msgstr "" msgid "(we never show your email)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 perllib/FixMyStreet/App/Controller/Report/New.pm:663 perllib/FixMyStreet/DB/Result/Problem.pm:356 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 perllib/FixMyStreet/App/Controller/Report/New.pm:663 perllib/FixMyStreet/DB/Result/Problem.pm:362 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 perllib/FixMyStreet/DB/Result/Problem.pm:362 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 perllib/FixMyStreet/DB/Result/Problem.pm:368 msgid "-- Pick a property type --" msgstr "" @@ -245,14 +245,18 @@ msgstr "" msgid "About us" msgstr "" -#: templates/web/default/admin/bodies.html:27 templates/web/default/admin/body-form.html:77 templates/web/zurich/admin/body-form.html:47 +#: templates/web/default/admin/bodies.html:45 templates/web/default/admin/body-form.html:77 templates/web/zurich/admin/body-form.html:47 msgid "Add body" msgstr "" -#: templates/web/default/admin/body.html:69 templates/web/zurich/admin/body.html:29 +#: templates/web/default/admin/body.html:69 templates/web/zurich/admin/body.html:30 msgid "Add new category" msgstr "" +#: templates/web/default/admin/users.html:35 +msgid "Add user" +msgstr "" + #: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60 msgid "Added %s" msgstr "" @@ -277,7 +281,7 @@ msgstr "" msgid "All Reports" msgstr "" -#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21 templates/web/bromley/header.html:77 templates/web/default/footer.html:11 templates/web/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/admin/index-dm.html:12 templates/web/zurich/footer.html:12 +#: 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/admin/index-dm.html:12 templates/web/zurich/footer.html:19 templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "" @@ -297,7 +301,7 @@ msgstr "" msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system." msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:4 templates/web/bromley/report/new/fill_in_details_form.html:6 templates/web/default/report/new/councils_text_all.html:18 templates/web/default/report/new/councils_text_all.html:20 templates/web/default/report/new/fill_in_details_form.html:11 templates/web/default/report/new/fill_in_details_form.html:13 templates/web/fixmystreet/report/new/fill_in_details_form.html:6 templates/web/fixmystreet/report/new/fill_in_details_form.html:8 templates/web/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 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -305,10 +309,6 @@ 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 "" @@ -337,18 +337,22 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:98 +#: templates/web/zurich/admin/report_edit.html:97 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:107 +#: templates/web/zurich/admin/report_edit.html:106 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:139 templates/web/zurich/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:138 templates/web/zurich/admin/report_edit.html:85 msgid "Assign to subdivision:" msgstr "" +#: templates/web/zurich/report/updates.html:11 +msgid "Assigned to %s" +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 "" @@ -357,7 +361,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/zurich/report/_item.html:9 +#: perllib/FixMyStreet/DB/Result/Problem.pm:317 templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -373,7 +377,7 @@ msgstr "" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 perllib/FixMyStreet/Cobrand/Zurich.pm:62 templates/web/default/admin/bodies.html:1 templates/web/zurich/admin/header.html:24 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 perllib/FixMyStreet/Cobrand/Zurich.pm:127 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:63 msgid "Bodies" msgstr "" @@ -381,7 +385,7 @@ msgstr "" msgid "Body" msgstr "" -#: templates/web/default/admin/user_edit.html:12 +#: templates/web/default/admin/user-form.html:7 msgid "Body:" msgstr "" @@ -397,7 +401,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: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/body.html:12 templates/web/zurich/admin/index-dm.html:22 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports.html:14 templates/web/zurich/report/new/fill_in_details_form.html:64 +#: 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/bodies.html:11 templates/web/default/admin/body.html:35 templates/web/default/admin/flagged.html:14 templates/web/default/admin/index.html:36 templates/web/default/admin/reports.html:17 templates/web/fixmystreet/report/new/fill_in_details_form.html:74 templates/web/zurich/admin/body.html:13 templates/web/zurich/admin/index-dm.html:22 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports.html:14 templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "" @@ -405,7 +409,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/default/admin/body.html:75 templates/web/default/admin/body_edit.html:23 templates/web/default/admin/report_edit.html:26 templates/web/default/report/new/fill_in_details_form.html:67 templates/web/zurich/admin/body.html:35 templates/web/zurich/admin/report_edit-sdm.html:21 templates/web/zurich/admin/report_edit.html:97 +#: 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/body.html:36 templates/web/zurich/admin/report_edit-sdm.html:21 templates/web/zurich/admin/report_edit.html:96 msgid "Category:" msgstr "" @@ -417,15 +421,15 @@ msgstr "" msgid "Change Password" msgstr "" -#: templates/web/default/js/translation_strings.html:28 templates/web/fixmystreet/around/_report_banner.html:2 +#: templates/web/default/js/translation_strings.html:39 templates/web/fixmystreet/around/_report_banner.html:2 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: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 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:2 templates/web/zurich/admin/header.html:8 templates/web/zurich/admin/report_edit.html:74 templates/web/zurich/admin/report_edit.html:76 templates/web/zurich/report/banner.html:13 +#: 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 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:12 templates/web/zurich/admin/report_edit.html:73 templates/web/zurich/admin/report_edit.html:75 templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:714 msgid "Closed by council" msgstr "" @@ -441,7 +445,7 @@ msgstr "" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" -#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:19 templates/web/zurich/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:19 templates/web/zurich/admin/report_edit.html:37 msgid "Co-ordinates:" msgstr "" @@ -481,7 +485,7 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/default/admin/body.html:37 templates/web/default/admin/body.html:85 templates/web/default/admin/body_edit.html:31 templates/web/default/admin/body_edit.html:77 templates/web/zurich/admin/report_edit-sdm.html:24 templates/web/zurich/admin/report_edit.html:39 +#: 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:24 templates/web/zurich/admin/report_edit.html:41 msgid "Confirmed" msgstr "" @@ -509,10 +513,14 @@ msgstr "" msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1172 perllib/FixMyStreet/App/Controller/Admin.pm:1200 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1217 perllib/FixMyStreet/App/Controller/Admin.pm:1245 msgid "Could not find user" msgstr "" +#: templates/web/default/js/translation_strings.html:31 +msgid "Could not look up location" +msgstr "" + #: templates/web/default/admin/flagged.html:13 templates/web/default/admin/list_updates.html:12 msgid "Council" msgstr "" @@ -533,15 +541,15 @@ msgstr "" msgid "Create a report" msgstr "" -#: templates/web/default/admin/body.html:103 templates/web/zurich/admin/body.html:52 +#: templates/web/default/admin/body.html:103 templates/web/zurich/admin/body.html:53 msgid "Create category" msgstr "" -#: templates/web/default/admin/flagged.html:17 templates/web/default/admin/list_updates.html:9 templates/web/default/admin/reports.html:20 templates/web/zurich/admin/list_updates.html:6 templates/web/zurich/admin/reports.html:15 +#: templates/web/default/admin/flagged.html:17 templates/web/default/admin/list_updates.html:9 templates/web/default/admin/reports.html:20 templates/web/zurich/admin/list_updates.html:6 msgid "Created" msgstr "" -#: templates/web/default/admin/report_edit.html:34 templates/web/default/admin/update_edit.html:45 templates/web/zurich/admin/report_edit-sdm.html:26 templates/web/zurich/admin/report_edit.html:42 templates/web/zurich/admin/update_edit.html:29 +#: templates/web/default/admin/report_edit.html:34 templates/web/default/admin/update_edit.html:45 templates/web/zurich/admin/report_edit-sdm.html:26 templates/web/zurich/admin/report_edit.html:44 templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -557,15 +565,15 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/zurich/admin/index-dm.html:21 templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/index-dm.html:21 templates/web/zurich/admin/index-sdm.html:19 templates/web/zurich/admin/reports.html:13 msgid "Description" msgstr "" -#: 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 +#: templates/web/bromley/report/new/fill_in_details_form.html:54 templates/web/default/js/translation_strings.html:28 templates/web/fixmystreet/report/new/fill_in_details_form.html:66 templates/web/zurich/report/new/fill_in_details_form.html:42 msgid "Details" msgstr "" -#: templates/web/default/admin/report_edit.html:14 templates/web/default/report/new/fill_in_details_form.html:61 templates/web/zurich/admin/report_edit-sdm.html:14 templates/web/zurich/admin/report_edit.html:20 templates/web/zurich/admin/report_edit.html:27 +#: 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:14 templates/web/zurich/admin/report_edit.html:22 templates/web/zurich/admin/report_edit.html:29 msgid "Details:" msgstr "" @@ -589,15 +597,15 @@ msgstr "" msgid "Don’t know" msgstr "" -#: 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/problem_row.html:32 +#: templates/web/default/admin/list_updates.html:35 templates/web/default/admin/problem_row.html:31 templates/web/default/admin/users.html:28 templates/web/zurich/admin/problem_row.html:35 msgid "Edit" msgstr "" -#: templates/web/default/admin/body.html:112 templates/web/zurich/admin/body.html:63 +#: templates/web/default/admin/body.html:112 templates/web/zurich/admin/body.html:64 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 +#: templates/web/default/admin/report_edit.html:1 templates/web/zurich/admin/report_edit-sdm.html:1 templates/web/zurich/admin/report_edit.html:1 templates/web/zurich/admin/report_edit.html:4 msgid "Editing problem %d" msgstr "" @@ -613,15 +621,15 @@ msgstr "" msgid "Editor" msgstr "" -#: 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 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:13 +#: templates/web/bromley/report/display.html:126 templates/web/default/admin/bodies.html:9 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 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:14 msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1190 msgid "Email already in abuse list" msgstr "" @@ -633,7 +641,7 @@ msgstr "" msgid "Email me updates" msgstr "" -#: templates/web/default/admin/body.html:80 templates/web/default/admin/body_edit.html:26 templates/web/default/admin/report_edit.html: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/body.html:40 templates/web/zurich/admin/report_edit-sdm.html:23 templates/web/zurich/admin/report_edit.html:38 +#: 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-form.html:6 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:34 templates/web/zurich/admin/body.html:41 templates/web/zurich/admin/report_edit-sdm.html:23 templates/web/zurich/admin/report_edit.html:40 msgid "Email:" msgstr "" @@ -677,7 +685,7 @@ msgstr "" msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:12 msgid "Enter a Zürich street name" msgstr "" @@ -749,7 +757,7 @@ msgstr "" msgid "FixMyStreet" msgstr "" -#: templates/web/default/admin/header.html:10 templates/web/zurich/admin/header.html:21 +#: templates/web/default/admin/header.html:10 msgid "FixMyStreet admin:" msgstr "" @@ -794,11 +802,11 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1044 templates/web/default/admin/users.html:15 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:43 templates/web/default/admin/user_edit.html:18 +#: templates/web/default/admin/report_edit.html:43 templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "" @@ -814,7 +822,7 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: templates/web/default/faq/faq-en-gb.html:1 templates/web/emptyhomes/faq/faq-cy.html:1 templates/web/emptyhomes/faq/faq-en-gb.html:1 templates/web/fiksgatami/faq/faq-nb.html:1 templates/web/fiksgatami/nn/faq/faq-nn.html:1 templates/web/fixmybarangay/faq/faq-en-gb.html:1 templates/web/fixmystreet/faq/faq-en-gb.html:1 templates/web/fixmystreet/static/privacy.html:1 templates/web/zurich/faq/faq-de.html:1 +#: templates/web/default/faq/faq-en-gb.html:1 templates/web/emptyhomes/faq/faq-cy.html:1 templates/web/emptyhomes/faq/faq-en-gb.html:1 templates/web/fiksgatami/faq/faq-nb.html:1 templates/web/fiksgatami/nn/faq/faq-nn.html:1 templates/web/fixmybarangay/faq/faq-en-gb.html:1 templates/web/fixmystreet/faq/faq-en-gb.html:1 templates/web/fixmystreet/static/privacy.html:1 templates/web/zurich/faq/faq-de-ch.html:1 msgid "Frequently Asked Questions" msgstr "" @@ -866,7 +874,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 templates/web/bromley/header.html:81 templates/web/default/footer.html:15 templates/web/emptyhomes/header.html:28 templates/web/fiksgatami/footer.html:9 templates/web/fiksgatami/nn/footer.html:9 templates/web/fixmybarangay/footer.html:24 templates/web/fixmystreet/footer.html:53 templates/web/reading/footer.html:10 templates/web/stevenage/footer.html:47 templates/web/zurich/footer.html:14 +#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 templates/web/bromley/header.html:81 templates/web/default/footer.html:15 templates/web/emptyhomes/header.html:28 templates/web/fiksgatami/footer.html:9 templates/web/fiksgatami/nn/footer.html:9 templates/web/fixmybarangay/footer.html:24 templates/web/fixmystreet/footer.html:53 templates/web/reading/footer.html:10 templates/web/stevenage/footer.html:47 templates/web/zurich/footer.html:21 templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "" @@ -874,19 +882,19 @@ 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:49 +#: 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/footer.html:11 msgid "Hi %s" msgstr "" -#: 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/header.html:2 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/report_edit.html:65 templates/web/zurich/admin/report_edit.html:69 templates/web/zurich/admin/update_edit.html:18 +#: 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/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/report_edit.html:64 templates/web/zurich/admin/report_edit.html:68 templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" -#: templates/web/default/around/display_location.html:63 +#: templates/web/default/around/display_location.html:66 msgid "Hide old" msgstr "" -#: templates/web/default/around/display_location.html:58 +#: templates/web/default/around/display_location.html:61 msgid "Hide pins" msgstr "" @@ -906,7 +914,7 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:655 +#: perllib/FixMyStreet/App/Controller/Admin.pm:670 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -922,7 +930,7 @@ msgstr "" msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" msgstr "" -#: templates/web/default/admin/flagged.html:9 templates/web/default/admin/list_updates.html:5 templates/web/default/admin/reports.html:12 templates/web/zurich/admin/index-dm.html:20 templates/web/zurich/admin/index-sdm.html:18 templates/web/zurich/admin/list_updates.html:5 templates/web/zurich/admin/reports.html:11 +#: templates/web/default/admin/flagged.html:9 templates/web/default/admin/list_updates.html:5 templates/web/default/admin/reports.html:12 templates/web/zurich/admin/index-dm.html:20 templates/web/zurich/admin/index-sdm.html:18 templates/web/zurich/admin/list_updates.html:5 templates/web/zurich/admin/reports.html:12 msgid "ID" msgstr "" @@ -934,7 +942,7 @@ msgstr "" msgid "If you submit a report here it will be left on the site, but not reported to the council – please still leave your report, so that we can show to the council the activity in their area." msgstr "" -#: templates/web/default/auth/token.html:23 templates/web/default/email_sent.html:24 +#: templates/web/default/auth/token.html:23 templates/web/default/email_sent.html:26 msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." msgstr "" @@ -957,7 +965,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: 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/header.html:2 templates/web/zurich/admin/header.html:6 templates/web/zurich/admin/report_edit.html:78 templates/web/zurich/report/banner.html:15 +#: 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/header.html:1 templates/web/zurich/admin/header.html:8 templates/web/zurich/admin/report_edit.html:77 templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" @@ -969,7 +977,7 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:35 templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit-sdm.html:35 templates/web/zurich/admin/report_edit.html:59 msgid "Internal notes:" msgstr "" @@ -977,7 +985,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:959 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1004 msgid "Invalid end date" msgstr "" @@ -985,7 +993,7 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:949 +#: perllib/FixMyStreet/App/Controller/Admin.pm:994 msgid "Invalid start date" msgstr "" @@ -1005,7 +1013,7 @@ msgstr "" msgid "Last Name" msgstr "" -#: templates/web/default/admin/body.html:40 templates/web/zurich/admin/body.html:14 +#: templates/web/default/admin/body.html:40 templates/web/zurich/admin/body.html:15 msgid "Last editor" msgstr "" @@ -1021,7 +1029,7 @@ msgstr "" msgid "List all reported problems" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:69 templates/web/default/report/new/fill_in_details_form.html:68 templates/web/fixmystreet/report/new/fill_in_details_form.html:75 templates/web/zurich/report/new/fill_in_details_form.html:65 +#: 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:51 msgid "Loading..." msgstr "" @@ -1041,6 +1049,10 @@ msgstr "" msgid "Locate the problem on a map of the area" msgstr "" +#: templates/web/default/js/translation_strings.html:37 +msgid "MAP" +msgstr "" + #: perllib/FixMyStreet/Map/OSM.pm:44 msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "" @@ -1065,11 +1077,11 @@ msgstr "" msgid "More problems nearby" msgstr "" -#: 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 +#: templates/web/default/admin/bodies.html:7 templates/web/default/admin/body-form.html:4 templates/web/default/admin/flagged.html:11 templates/web/default/admin/flagged.html:34 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/reports.html:14 templates/web/default/admin/users.html:12 templates/web/default/reports/index.html:15 templates/web/emptyhomes/reports/index.html:10 templates/web/fiksgatami/nn/reports/index.html:9 templates/web/fiksgatami/reports/index.html:9 templates/web/fixmybarangay/reports/index.html: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:100 msgid "Name" msgstr "" -#: 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:22 templates/web/zurich/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:31 templates/web/default/admin/update_edit.html:26 templates/web/default/admin/user-form.html:5 templates/web/zurich/admin/report_edit-sdm.html:22 templates/web/zurich/admin/report_edit.html:39 msgid "Name:" msgstr "" @@ -1089,7 +1101,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:266 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1179,7 +1191,7 @@ msgstr "" msgid "No" msgstr "" -#: templates/web/default/admin/user_edit.html:13 +#: templates/web/default/admin/user-form.html:8 msgid "No body" msgstr "" @@ -1187,7 +1199,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:339 +#: perllib/FixMyStreet/DB/Result/Problem.pm:345 msgid "No council selected" msgstr "" @@ -1215,6 +1227,10 @@ msgstr "" msgid "No problems have been reported yet." msgstr "" +#: templates/web/default/js/translation_strings.html:32 +msgid "No result returned" +msgstr "" + #: templates/web/default/report/_support.html:3 msgid "No supporters" msgstr "" @@ -1223,7 +1239,7 @@ msgstr "" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:17 templates/web/zurich/admin/report_edit-sdm.html:25 templates/web/zurich/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:17 templates/web/zurich/admin/report_edit-sdm.html:25 templates/web/zurich/admin/report_edit.html:43 msgid "None" msgstr "" @@ -1239,7 +1255,7 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: templates/web/default/admin/body.html:41 templates/web/default/admin/body_edit.html:80 templates/web/zurich/admin/body.html:15 +#: templates/web/default/admin/body.html:41 templates/web/default/admin/body_edit.html:80 templates/web/zurich/admin/body.html:16 msgid "Note" msgstr "" @@ -1247,7 +1263,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/body.html:92 templates/web/default/admin/body_edit.html:37 templates/web/zurich/admin/body.html:46 +#: templates/web/default/admin/body.html:92 templates/web/default/admin/body_edit.html:37 templates/web/zurich/admin/body.html:47 msgid "Note:" msgstr "" @@ -1271,6 +1287,10 @@ msgstr "" msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "" +#: templates/web/default/js/translation_strings.html:36 +msgid "OK" +msgstr "" + #: templates/web/default/report/display.html:21 templates/web/default/report/update.html:16 msgid "Offensive? Unsuitable? Tell us" msgstr "" @@ -1303,7 +1323,7 @@ msgstr "" msgid "Older problems" msgstr "" -#: 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/header.html:2 templates/web/zurich/admin/header.html:5 templates/web/zurich/admin/report_edit.html:65 templates/web/zurich/admin/report_edit.html:67 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 +#: templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html: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/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/report_edit.html:64 templates/web/zurich/admin/report_edit.html:66 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 msgid "Open" msgstr "" @@ -1331,7 +1351,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: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: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:515 perllib/FixMyStreet/DB/Result/Problem.pm:525 perllib/FixMyStreet/DB/Result/Problem.pm:535 perllib/FixMyStreet/DB/Result/Problem.pm:547 perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" msgstr "" @@ -1363,15 +1383,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:120 +#: 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:106 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:263 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:25 templates/web/zurich/admin/report_edit.html:41 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:263 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:25 templates/web/zurich/admin/report_edit.html:43 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:82 +#: 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:68 msgid "Photo" msgstr "" @@ -1387,7 +1407,7 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: 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 templates/web/zurich/admin/header.html:2 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/index-dm.html:9 templates/web/zurich/admin/report_edit.html:65 templates/web/zurich/admin/report_edit.html:68 +#: 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 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 templates/web/zurich/admin/report_edit.html:64 templates/web/zurich/admin/report_edit.html:67 msgid "Planned" msgstr "" @@ -1395,7 +1415,7 @@ msgstr "" msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." msgstr "" -#: templates/web/default/report/new/notes.html:6 templates/web/fixmystreet/report/new/notes.html:5 +#: templates/web/default/report/new/notes.html:6 templates/web/fixmystreet/report/new/notes.html:6 msgid "Please be polite, concise and to the point." msgstr "" @@ -1411,11 +1431,11 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: 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/translation_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:364 templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:364 +#: perllib/FixMyStreet/DB/Result/Problem.pm:370 msgid "Please choose a property type" msgstr "" @@ -1430,7 +1450,7 @@ msgid "" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" -#: templates/web/default/report/new/notes.html:7 templates/web/fixmystreet/report/new/notes.html:6 +#: templates/web/default/report/new/notes.html:7 templates/web/fixmystreet/report/new/notes.html:7 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" @@ -1442,7 +1462,7 @@ msgstr "" msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:333 templates/web/default/js/translation_strings.html:3 +#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:339 templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" @@ -1454,7 +1474,7 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:336 templates/web/default/js/translation_strings.html:4 +#: perllib/FixMyStreet/DB/Result/Problem.pm:342 templates/web/default/js/translation_strings.html:4 msgid "Please enter some details" msgstr "" @@ -1462,7 +1482,7 @@ msgstr "" 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:106 +#: 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:92 msgid "Please enter your email address" msgstr "" @@ -1470,11 +1490,11 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:351 templates/web/default/js/translation_strings.html:7 +#: perllib/FixMyStreet/DB/Result/Problem.pm:357 templates/web/default/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm: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/translation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Contact.pm:95 perllib/FixMyStreet/DB/Result/Comment.pm:144 perllib/FixMyStreet/DB/Result/Problem.pm:350 perllib/FixMyStreet/DB/Result/User.pm:108 templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -1515,11 +1535,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:60 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 templates/web/zurich/report/new/fill_in_details_form.html:46 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:34 +#: templates/web/bromley/report/new/fill_in_details_form.html:28 templates/web/default/report/new/fill_in_details_form.html:27 templates/web/fixmystreet/report/new/fill_in_details_form.html:35 templates/web/zurich/report/new/fill_in_details_form.html:20 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 "" @@ -1539,7 +1559,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:25 +#: templates/web/bromley/report/new/fill_in_details_form.html:23 templates/web/default/report/new/fill_in_details_form.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:26 templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" @@ -1631,7 +1651,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:861 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 msgid "Problem marked as open." msgstr "" @@ -1707,15 +1727,15 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:149 +#: templates/web/zurich/admin/report_edit.html:148 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:53 +#: templates/web/zurich/admin/report_edit.html:55 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:162 +#: templates/web/zurich/admin/report_edit.html:158 msgid "Publish the response" msgstr "" @@ -1799,7 +1819,7 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/default/report/new/notes.html:9 templates/web/fixmystreet/report/new/notes.html:8 +#: templates/web/default/report/new/notes.html:9 templates/web/fixmystreet/report/new/notes.html:10 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website." msgstr "" @@ -1819,7 +1839,7 @@ msgstr "" msgid "Report Empty Homes" msgstr "" -#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17 templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:27 templates/web/fiksgatami/footer.html:5 templates/web/fiksgatami/nn/footer.html:5 templates/web/fixmystreet/footer.html:45 templates/web/reading/footer.html:6 templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:10 +#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17 templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:27 templates/web/fiksgatami/footer.html:5 templates/web/fiksgatami/nn/footer.html:5 templates/web/fixmystreet/footer.html:45 templates/web/reading/footer.html:6 templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:17 templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" @@ -1847,7 +1867,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:524 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:46 +#: perllib/FixMyStreet/DB/Result/Problem.pm:530 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" msgstr "" @@ -1855,23 +1875,23 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:516 +#: perllib/FixMyStreet/DB/Result/Problem.pm:522 msgid "Reported by %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:547 templates/web/default/contact/index.html:47 templates/web/fixmystreet/contact/index.html:48 +#: perllib/FixMyStreet/DB/Result/Problem.pm:553 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:538 +#: perllib/FixMyStreet/DB/Result/Problem.pm:544 msgid "Reported by %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:518 msgid "Reported by %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:532 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported by %s in the %s category by %s at %s" msgstr "" @@ -1879,19 +1899,19 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:526 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:542 +#: perllib/FixMyStreet/DB/Result/Problem.pm:548 msgid "Reported in the %s category by %s at %s" msgstr "" -#: templates/web/default/around/around_index.html:1 templates/web/default/report/new/fill_in_details.html:0 templates/web/default/report/new/fill_in_details.html:3 templates/web/default/report/new/fill_in_details_form.html:1 templates/web/fixmystreet/around/around_index.html:2 templates/web/fixmystreet/report/new/fill_in_details.html:0 templates/web/fixmystreet/report/new/fill_in_details.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:2 templates/web/zurich/report/new/fill_in_details_form.html:2 +#: templates/web/default/around/around_index.html:1 templates/web/default/js/translation_strings.html:35 templates/web/default/report/new/fill_in_details.html:0 templates/web/default/report/new/fill_in_details.html:3 templates/web/default/report/new/fill_in_details_form.html:1 templates/web/fixmystreet/around/around_index.html:2 templates/web/fixmystreet/report/new/fill_in_details.html:0 templates/web/fixmystreet/report/new/fill_in_details.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:2 templates/web/zurich/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1040 perllib/FixMyStreet/Cobrand/Zurich.pm:55 templates/web/zurich/admin/header.html:25 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 perllib/FixMyStreet/Cobrand/Zurich.pm:120 templates/web/zurich/header.html:59 msgid "Reports" msgstr "" @@ -1927,6 +1947,10 @@ msgstr "" msgid "Search Users" msgstr "" +#: templates/web/zurich/header.html:73 +msgid "Search reports" +msgstr "" + #: templates/web/default/admin/reports.html:5 templates/web/default/admin/users.html:5 templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "" @@ -1943,7 +1967,7 @@ msgstr "" msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Sent to %s %s later" msgstr "" @@ -1980,15 +2004,15 @@ msgstr "" msgid "Show my name publicly" msgstr "" -#: templates/web/default/around/display_location.html:65 +#: templates/web/default/around/display_location.html:68 msgid "Show old" msgstr "" -#: templates/web/default/around/display_location.html:56 +#: templates/web/default/around/display_location.html:59 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:53 +#: 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 msgid "Sign in" msgstr "" @@ -2000,7 +2024,7 @@ msgstr "" msgid "Sign in or create an account" msgstr "" -#: templates/web/bromley/auth/sign_out.html:1 templates/web/default/auth/sign_out.html:1 templates/web/default/header.html:30 templates/web/emptyhomes/header.html:41 templates/web/fiksgatami/header.html:22 templates/web/fiksgatami/nn/header.html:22 templates/web/fixmybarangay/auth/sign_out.html:1 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:33 +#: templates/web/bromley/auth/sign_out.html:1 templates/web/default/auth/sign_out.html:1 templates/web/default/header.html:30 templates/web/emptyhomes/header.html:41 templates/web/fiksgatami/header.html:22 templates/web/fiksgatami/nn/header.html:22 templates/web/fixmybarangay/auth/sign_out.html:1 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:33 templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "" @@ -2052,19 +2076,19 @@ msgstr "" msgid "Start month:" msgstr "" -#: templates/web/bromley/report/display.html:78 templates/web/default/admin/flagged.html:18 templates/web/default/admin/list_updates.html:6 templates/web/default/admin/reports.html:21 templates/web/fixmystreet/report/update-form.html:26 templates/web/zurich/admin/reports.html:13 +#: 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:18 templates/web/default/admin/update_edit.html:21 templates/web/default/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:33 templates/web/zurich/admin/report_edit.html:63 templates/web/zurich/admin/update_edit.html:17 +#: 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-sdm.html:33 templates/web/zurich/admin/report_edit.html:62 templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 templates/web/default/admin/stats.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "" -#: templates/web/zurich/admin/index-dm.html:25 templates/web/zurich/admin/index-sdm.html:23 +#: templates/web/zurich/admin/index-dm.html:25 templates/web/zurich/admin/index-sdm.html:23 templates/web/zurich/admin/reports.html:17 msgid "Status" msgstr "" @@ -2080,15 +2104,15 @@ msgstr "" msgid "Subject" msgstr "" -#: templates/web/default/admin/report_edit.html:13 templates/web/default/contact/index.html:83 templates/web/default/report/new/fill_in_details_form.html:52 templates/web/zurich/admin/report_edit.html:26 +#: 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:28 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:125 +#: 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:111 msgid "Submit" msgstr "" -#: 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:43 templates/web/zurich/admin/report_edit.html:164 templates/web/zurich/admin/update_edit.html:38 +#: templates/web/default/admin/report_edit.html:58 templates/web/default/admin/update_edit.html:54 templates/web/default/admin/user-form.html:17 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:160 templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -2096,7 +2120,7 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: templates/web/zurich/admin/header.html:2 templates/web/zurich/admin/header.html:4 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-dm.html:6 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/report_edit.html:65 templates/web/zurich/admin/report_edit.html:66 templates/web/zurich/report/banner.html:9 +#: templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:6 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-dm.html:6 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/report_edit.html:64 templates/web/zurich/admin/report_edit.html:65 templates/web/zurich/admin/reports.html:15 templates/web/zurich/report/banner.html:9 msgid "Submitted" msgstr "" @@ -2112,7 +2136,7 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 perllib/FixMyStreet/Cobrand/Zurich.pm:54 templates/web/default/admin/index.html:1 templates/web/zurich/admin/header.html:22 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 perllib/FixMyStreet/Cobrand/Zurich.pm:119 templates/web/default/admin/index.html:1 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/header.html:56 msgid "Summary" msgstr "" @@ -2120,7 +2144,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 msgid "Survey" msgstr "" @@ -2196,15 +2220,15 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:626 +#: perllib/FixMyStreet/App/Controller/Admin.pm:641 msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:98 +#: perllib/FixMyStreet/App/Controller/Report.pm:117 msgid "That report cannot be viewed on FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:92 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 msgid "That report has been removed from FixMyStreet." msgstr "" @@ -2227,7 +2251,7 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/default/auth/token.html:21 templates/web/default/email_sent.html:22 +#: templates/web/default/auth/token.html:21 templates/web/default/email_sent.html:23 msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" @@ -2243,7 +2267,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:50 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 perllib/FixMyStreet/App/Controller/Reports.pm:51 msgid "The error was: %s" msgstr "" @@ -2311,7 +2335,7 @@ msgstr "" msgid "The simplest alert is our geographic one:" msgstr "" -#: templates/web/barnet/report/new/councils_text_all.html:3 templates/web/default/report/new/councils_extra_text.html:1 templates/web/default/report/new/councils_text_some.html:10 templates/web/default/report/new/councils_text_some.html:11 templates/web/default/report/new/fill_in_details_form.html:17 templates/web/fixmystreet/report/new/fill_in_details_form.html:12 templates/web/zurich/report/new/fill_in_details_form.html:12 +#: templates/web/barnet/report/new/councils_text_all.html:3 templates/web/default/report/new/councils_extra_text.html:1 templates/web/default/report/new/councils_text_some.html:10 templates/web/default/report/new/councils_text_some.html:11 templates/web/default/report/new/fill_in_details_form.html:17 templates/web/fixmystreet/report/new/fill_in_details_form.html:12 msgid "The subject and details of the problem will be public, plus your name if you give us permission." msgstr "" @@ -2319,7 +2343,7 @@ msgstr "" 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:47 +#: perllib/FixMyStreet/App/Controller/Reports.pm:48 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -2403,7 +2427,7 @@ msgstr "" msgid "This problem is old and of unknown status." msgstr "" -#: templates/web/zurich/report/_main.html:15 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -2423,11 +2447,11 @@ msgstr "" msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 templates/web/default/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1086 templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" -#: templates/web/default/admin/flagged.html:10 templates/web/default/admin/reports.html:13 templates/web/zurich/admin/reports.html:12 +#: templates/web/default/admin/flagged.html:10 templates/web/default/admin/reports.html:13 msgid "Title" msgstr "" @@ -2467,7 +2491,11 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:87 +#: templates/web/default/js/translation_strings.html:33 +msgid "Unknown error" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report.pm:106 msgid "Unknown problem ID" msgstr "" @@ -2519,15 +2547,15 @@ msgstr "" msgid "Update:" msgstr "" -#: templates/web/zurich/admin/index-dm.html:24 templates/web/zurich/admin/index-sdm.html:22 +#: templates/web/zurich/admin/index-dm.html:24 templates/web/zurich/admin/index-sdm.html:22 templates/web/zurich/admin/reports.html:16 msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 perllib/FixMyStreet/App/Controller/Admin.pm:851 perllib/FixMyStreet/App/Controller/Admin.pm:910 perllib/FixMyStreet/Cobrand/Zurich.pm:239 perllib/FixMyStreet/Cobrand/Zurich.pm:294 +#: perllib/FixMyStreet/App/Controller/Admin.pm:733 perllib/FixMyStreet/App/Controller/Admin.pm:867 perllib/FixMyStreet/App/Controller/Admin.pm:918 perllib/FixMyStreet/App/Controller/Admin.pm:955 perllib/FixMyStreet/Cobrand/Zurich.pm:309 perllib/FixMyStreet/Cobrand/Zurich.pm:364 msgid "Updated!" msgstr "" -#: templates/web/default/admin/list_updates.html:1 templates/web/default/report/update.html:3 templates/web/fixmystreet/report/update.html:3 templates/web/zurich/admin/list_updates.html:1 templates/web/zurich/report/updates.html:3 +#: templates/web/default/admin/list_updates.html:1 templates/web/default/report/update.html:3 templates/web/fixmystreet/report/update.html:3 templates/web/zurich/admin/list_updates.html:1 templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" @@ -2539,15 +2567,15 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1204 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1249 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1176 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1221 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 perllib/FixMyStreet/Cobrand/Zurich.pm:69 templates/web/default/admin/flagged.html:30 templates/web/zurich/admin/header.html:28 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 perllib/FixMyStreet/Cobrand/Zurich.pm:134 templates/web/default/admin/flagged.html:30 templates/web/zurich/header.html:68 msgid "Users" msgstr "" @@ -2555,7 +2583,7 @@ msgstr "" msgid "Values updated" msgstr "" -#: templates/web/default/admin/report_edit.html:12 templates/web/default/admin/update_edit.html:12 templates/web/zurich/admin/report_edit-sdm.html:13 templates/web/zurich/admin/report_edit.html:17 templates/web/zurich/admin/update_edit.html:10 +#: templates/web/default/admin/report_edit.html:12 templates/web/default/admin/update_edit.html:12 templates/web/zurich/admin/report_edit-sdm.html:13 templates/web/zurich/admin/report_edit.html:19 templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "" @@ -2595,7 +2623,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:110 +#: 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:96 msgid "We never show your email address or phone number." msgstr "" @@ -2623,7 +2651,7 @@ 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/body.html:43 templates/web/default/admin/body_edit.html:75 templates/web/zurich/admin/body.html:16 +#: templates/web/default/admin/body.html:43 templates/web/default/admin/body_edit.html:75 templates/web/zurich/admin/body.html:17 msgid "When edited" msgstr "" @@ -2651,7 +2679,7 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" -#: templates/web/default/report/new/notes.html:8 templates/web/fixmybarangay/report/new/notes.html:8 templates/web/fixmystreet/report/new/notes.html:7 +#: templates/web/default/report/new/notes.html:8 templates/web/fixmybarangay/report/new/notes.html:8 templates/web/fixmystreet/report/new/notes.html:8 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" @@ -2659,7 +2687,7 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/default/admin/body.html:50 templates/web/default/admin/body.html:51 templates/web/default/admin/body.html:52 templates/web/default/admin/body_edit.html:5 templates/web/default/admin/list_updates.html: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 +#: 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:26 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 "" @@ -2691,11 +2719,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" +#: templates/web/default/js/translation_strings.html:30 +msgid "You declined; please fill in the box above" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/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 +#: 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:75 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "" @@ -2703,11 +2735,11 @@ msgstr "" msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" -#: templates/web/default/auth/sign_out.html:3 templates/web/fixmybarangay/auth/sign_out.html:3 +#: templates/web/default/auth/sign_out.html:3 templates/web/fixmybarangay/auth/sign_out.html:3 templates/web/zurich/auth/sign_out.html:3 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:27 +#: templates/web/bromley/report/new/fill_in_details_form.html:25 templates/web/default/report/new/fill_in_details_form.html:7 templates/web/fixmystreet/report/new/fill_in_details_form.html:28 templates/web/zurich/report/new/fill_in_details_form.html:13 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 "" @@ -2739,7 +2771,7 @@ msgstr "" msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" -#: templates/web/default/email_sent.html:26 +#: templates/web/default/email_sent.html:28 msgid "You must now click the link in the email we've just sent you — if you do not, %s." msgstr "" @@ -2751,7 +2783,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:55 templates/web/fixmystreet/report/display.html:57 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 +#: 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:55 templates/web/fixmystreet/report/display.html:57 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:88 msgid "Your email" msgstr "" @@ -2779,7 +2811,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:118 +#: 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:104 msgid "Your name" msgstr "" @@ -2795,7 +2827,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:121 +#: 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:107 msgid "Your phone number" msgstr "" @@ -2823,11 +2855,11 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:613 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:19 templates/web/zurich/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:19 templates/web/zurich/admin/report_edit.html:37 msgid "didn't use map" msgstr "" @@ -2863,7 +2895,7 @@ msgstr "" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:16 templates/web/zurich/admin/report_edit-sdm.html:19 templates/web/zurich/admin/report_edit.html:22 templates/web/zurich/admin/report_edit.html:30 templates/web/zurich/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:16 templates/web/zurich/admin/report_edit-sdm.html:19 templates/web/zurich/admin/report_edit.html:24 templates/web/zurich/admin/report_edit.html:32 templates/web/zurich/admin/report_edit.html:37 msgid "originally entered" msgstr "" @@ -2875,15 +2907,15 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 templates/web/bromley/header.html:65 templates/web/fixmybarangay/header.html:65 templates/web/fixmystreet/header.html:50 templates/web/stevenage/header.html:98 templates/web/zurich/header.html:50 +#: 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/footer.html:12 msgid "sign out" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:4 templates/web/bromley/report/new/fill_in_details_form.html:7 templates/web/default/report/new/fill_in_details_form.html:11 templates/web/default/report/new/fill_in_details_form.html:14 templates/web/fixmystreet/report/new/fill_in_details_form.html:6 templates/web/fixmystreet/report/new/fill_in_details_form.html:9 templates/web/zurich/report/new/fill_in_details_form.html:6 templates/web/zurich/report/new/fill_in_details_form.html:9 +#: templates/web/bromley/report/new/fill_in_details_form.html:4 templates/web/bromley/report/new/fill_in_details_form.html:7 templates/web/default/report/new/fill_in_details_form.html:11 templates/web/default/report/new/fill_in_details_form.html:14 templates/web/fixmystreet/report/new/fill_in_details_form.html:6 templates/web/fixmystreet/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" -#: templates/web/default/report/_main.html:6 templates/web/zurich/report/_main.html:6 +#: templates/web/default/report/_main.html:6 templates/web/zurich/report/_main.html:5 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -2895,7 +2927,7 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:19 templates/web/zurich/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:19 templates/web/zurich/admin/report_edit.html:37 msgid "used map" msgstr "" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 367f32095..4855a78e4 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-01-16 12:43+0000\n" +"POT-Creation-Date: 2013-01-24 15:23+0000\n" "PO-Revision-Date: 2009-07-10 14:20-0000\n" "Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n" "Language-Team: mySociety\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr "" @@ -43,7 +43,7 @@ msgstr " a <strong>byddwn nawr yn ei anfon at y cyngor</strong>" msgid " or " msgstr "neu" -#: templates/web/default/admin/bodies.html:14 +#: templates/web/default/admin/bodies.html:31 #, fuzzy msgid "%d addresses" msgstr "wythnos" @@ -80,7 +80,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s - Adroddiadau cryno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:621 msgid "%s ref: %s" msgstr "" @@ -88,11 +88,11 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:500 +#: perllib/FixMyStreet/DB/Result/Problem.pm:506 msgid "%s, reported anonymously at %s" msgstr "Rhoddodd %s wybod yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:502 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "%s, reported by %s at %s" msgstr "Adroddwyd am %s gan %s am %s" @@ -101,12 +101,12 @@ msgstr "Adroddwyd am %s gan %s am %s" msgid "%s, within %s ward" msgstr "Eiddo gwag yn ward %s" -#: templates/web/default/email_sent.html:28 +#: templates/web/default/email_sent.html:31 msgid "(Don't worry — %s)" msgstr "" #: templates/web/default/admin/report_blocks.html:11 -#: templates/web/default/admin/users.html:23 +#: templates/web/default/admin/users.html:26 msgid "(Email in abuse table)" msgstr "" @@ -147,7 +147,7 @@ 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:114 +#: templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "(optional)" msgstr "(dewisol)" @@ -169,13 +169,13 @@ msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" #: perllib/FixMyStreet/App/Controller/Report/New.pm:635 #: perllib/FixMyStreet/App/Controller/Report/New.pm:663 -#: perllib/FixMyStreet/DB/Result/Problem.pm:356 +#: perllib/FixMyStreet/DB/Result/Problem.pm:362 #, fuzzy msgid "-- Pick a category --" msgstr "-- Dewiswch fath o eiddo --" #: perllib/FixMyStreet/App/Controller/Report/New.pm:615 -#: perllib/FixMyStreet/DB/Result/Problem.pm:362 +#: perllib/FixMyStreet/DB/Result/Problem.pm:368 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -400,17 +400,21 @@ msgstr "Adrodd am eiddo gwag a gweld y rhain" msgid "About us" msgstr "Amdanom ni" -#: templates/web/default/admin/bodies.html:27 +#: templates/web/default/admin/bodies.html:45 #: templates/web/default/admin/body-form.html:77 #: templates/web/zurich/admin/body-form.html:47 msgid "Add body" msgstr "" #: templates/web/default/admin/body.html:69 -#: templates/web/zurich/admin/body.html:29 +#: templates/web/zurich/admin/body.html:30 msgid "Add new category" msgstr "" +#: templates/web/default/admin/users.html:35 +msgid "Add user" +msgstr "" + #: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60 msgid "Added %s" msgstr "" @@ -447,7 +451,8 @@ msgstr "Adroddiadau" #: templates/web/fixmystreet/footer.html:49 #: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/footer.html:12 +#: templates/web/zurich/footer.html:19 +#: templates/web/zurich/nav_over_content.html:6 #, fuzzy msgid "All reports" msgstr "Adroddiadau" @@ -494,8 +499,6 @@ msgstr "" #: 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 "" @@ -513,18 +516,6 @@ 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." @@ -566,19 +557,23 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:98 +#: templates/web/zurich/admin/report_edit.html:97 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:107 +#: templates/web/zurich/admin/report_edit.html:106 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:139 -#: templates/web/zurich/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:138 +#: templates/web/zurich/admin/report_edit.html:85 msgid "Assign to subdivision:" msgstr "" +#: templates/web/zurich/report/updates.html:11 +msgid "Assigned to %s" +msgstr "" + #: templates/web/default/open311/index.html:17 msgid "" "At most %d requests are returned in each query. The returned requests are " @@ -590,6 +585,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" +#: perllib/FixMyStreet/DB/Result/Problem.pm:317 #: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -609,10 +605,10 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:62 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:127 #: templates/web/default/admin/bodies.html:1 -#: templates/web/zurich/admin/header.html:24 +#: templates/web/zurich/header.html:63 msgid "Bodies" msgstr "" @@ -621,7 +617,7 @@ msgstr "" msgid "Body" msgstr "" -#: templates/web/default/admin/user_edit.html:12 +#: templates/web/default/admin/user-form.html:7 msgid "Body:" msgstr "" @@ -647,16 +643,17 @@ msgstr "" #: 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/bodies.html:11 #: templates/web/default/admin/body.html:35 #: templates/web/default/admin/flagged.html:14 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/reports.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 -#: templates/web/zurich/admin/body.html:12 +#: templates/web/zurich/admin/body.html:13 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:14 -#: templates/web/zurich/report/new/fill_in_details_form.html:64 +#: templates/web/zurich/report/new/fill_in_details_form.html:50 #, fuzzy msgid "Category" msgstr "Categori:" @@ -669,9 +666,9 @@ msgstr "" #: 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/body.html:35 +#: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit.html:96 msgid "Category:" msgstr "Categori:" @@ -686,7 +683,7 @@ msgstr "Categori:" msgid "Change Password" msgstr "" -#: templates/web/default/js/translation_strings.html:28 +#: templates/web/default/js/translation_strings.html:39 #: templates/web/fixmystreet/around/_report_banner.html:2 #, fuzzy msgid "Click map to report an empty property" @@ -703,16 +700,16 @@ msgstr "Sut i roi gwybod am eiddo gwag" #: 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/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 -#: templates/web/zurich/admin/header.html:2 -#: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:74 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/header.html:12 +#: templates/web/zurich/admin/report_edit.html:73 +#: templates/web/zurich/admin/report_edit.html:75 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:714 #, fuzzy msgid "Closed by council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -733,7 +730,7 @@ msgstr "Yr eiddo gwag cyfagos agosaf <small>(within %skm)</small>" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:37 msgid "Co-ordinates:" msgstr "" @@ -798,7 +795,7 @@ msgstr "Cadarnhau" #: templates/web/default/admin/body_edit.html:31 #: templates/web/default/admin/body_edit.html:77 #: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 #, fuzzy msgid "Confirmed" msgstr "Cadarnhau" @@ -840,11 +837,15 @@ msgstr "Cysylltwch â Ni" msgid "Contact the team" msgstr "Cysylltu â'r tîm" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1172 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1217 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1245 msgid "Could not find user" msgstr "" +#: templates/web/default/js/translation_strings.html:31 +msgid "Could not look up location" +msgstr "" + #: templates/web/default/admin/flagged.html:13 #: templates/web/default/admin/list_updates.html:12 #, fuzzy @@ -874,7 +875,7 @@ msgid "Create a report" msgstr "Categori:" #: templates/web/default/admin/body.html:103 -#: templates/web/zurich/admin/body.html:52 +#: templates/web/zurich/admin/body.html:53 #, fuzzy msgid "Create category" msgstr "Categori:" @@ -883,14 +884,13 @@ msgstr "Categori:" #: templates/web/default/admin/list_updates.html:9 #: templates/web/default/admin/reports.html:20 #: templates/web/zurich/admin/list_updates.html:6 -#: templates/web/zurich/admin/reports.html:15 msgid "Created" msgstr "" #: templates/web/default/admin/report_edit.html:34 #: templates/web/default/admin/update_edit.html:45 #: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit.html:42 +#: templates/web/zurich/admin/report_edit.html:44 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -913,12 +913,14 @@ msgstr "" #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/reports.html:13 msgid "Description" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:54 +#: templates/web/default/js/translation_strings.html:28 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/zurich/report/new/fill_in_details_form.html:56 +#: templates/web/zurich/report/new/fill_in_details_form.html:42 #, fuzzy msgid "Details" msgstr "Manylion:" @@ -926,8 +928,8 @@ msgstr "Manylion:" #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/zurich/admin/report_edit-sdm.html:14 -#: templates/web/zurich/admin/report_edit.html:20 -#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:29 msgid "Details:" msgstr "Manylion:" @@ -959,19 +961,20 @@ msgstr "Ddim yn gwybod" #: 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/problem_row.html:32 +#: templates/web/default/admin/users.html:28 +#: templates/web/zurich/admin/problem_row.html:35 msgid "Edit" msgstr "" #: templates/web/default/admin/body.html:112 -#: templates/web/zurich/admin/body.html:63 +#: templates/web/zurich/admin/body.html:64 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 +#: templates/web/zurich/admin/report_edit.html:4 #, fuzzy msgid "Editing empty property %d" msgstr "Gweld eiddo gwag" @@ -992,6 +995,7 @@ msgid "Editor" msgstr "" #: templates/web/bromley/report/display.html:126 +#: templates/web/default/admin/bodies.html:9 #: templates/web/default/admin/body.html:36 #: templates/web/default/admin/body_edit.html:76 #: templates/web/default/admin/flagged.html:12 @@ -1002,16 +1006,16 @@ msgstr "" #: templates/web/fixmystreet/auth/general.html:20 #: templates/web/fixmystreet/report/update-form.html:74 #: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:13 +#: templates/web/zurich/admin/body.html:14 #, fuzzy msgid "Email" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1190 msgid "Email already in abuse list" msgstr "" @@ -1027,12 +1031,12 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" #: 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/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:34 -#: templates/web/zurich/admin/body.html:40 +#: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:23 -#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 msgid "Email:" msgstr "E-bost:" @@ -1078,7 +1082,7 @@ msgstr "" msgid "Endpoint" msgstr "Cadarnhau" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:12 #, fuzzy msgid "Enter a Zürich street name" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" @@ -1189,7 +1193,6 @@ msgid "reportemptyhomes.com" msgstr "reportemptyhomes.com" #: templates/web/default/admin/header.html:10 -#: templates/web/zurich/admin/header.html:21 #, fuzzy msgid "reportemptyhomes.com admin:" msgstr "reportemptyhomes.com" @@ -1272,13 +1275,13 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1044 -#: templates/web/default/admin/users.html:15 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" #: templates/web/default/admin/report_edit.html:43 -#: templates/web/default/admin/user_edit.html:18 +#: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "" @@ -1307,7 +1310,7 @@ msgstr "Adroddiadau" #: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 -#: templates/web/zurich/faq/faq-de.html:1 +#: templates/web/zurich/faq/faq-de-ch.html:1 msgid "Frequently Asked Questions" msgstr "Cwestiynau Cyffredin" @@ -1386,7 +1389,8 @@ msgstr "" #: templates/web/fixmybarangay/footer.html:24 #: templates/web/fixmystreet/footer.html:53 #: templates/web/reading/footer.html:10 templates/web/stevenage/footer.html:47 -#: templates/web/zurich/footer.html:14 +#: templates/web/zurich/footer.html:21 +#: templates/web/zurich/nav_over_content.html:8 msgid "FAQs" msgstr "Cwestiynau Cyffredin" @@ -1400,27 +1404,27 @@ 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:49 +#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" #: 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/header.html:2 -#: templates/web/zurich/admin/header.html:9 -#: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:69 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:11 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/report_edit.html:68 #: templates/web/zurich/admin/update_edit.html:18 #, fuzzy msgid "Hidden" msgstr "Cuddio pinnau" -#: templates/web/default/around/display_location.html:63 +#: templates/web/default/around/display_location.html:66 msgid "Hide old" msgstr "" -#: templates/web/default/around/display_location.html:58 +#: templates/web/default/around/display_location.html:61 msgid "Hide pins" msgstr "Cuddio pinnau" @@ -1441,7 +1445,7 @@ msgstr "Sut i roi gwybod am eiddo gwag" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:655 +#: perllib/FixMyStreet/App/Controller/Admin.pm:670 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1473,7 +1477,7 @@ msgstr "" #: templates/web/zurich/admin/index-dm.html:20 #: templates/web/zurich/admin/index-sdm.html:18 #: templates/web/zurich/admin/list_updates.html:5 -#: templates/web/zurich/admin/reports.html:11 +#: templates/web/zurich/admin/reports.html:12 msgid "ID" msgstr "" @@ -1500,7 +1504,7 @@ msgstr "" "ddangos i'r cyngor y gweithgarwch yn ei ardal." #: templates/web/default/auth/token.html:23 -#: templates/web/default/email_sent.html:24 +#: templates/web/default/email_sent.html:26 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " "check your bulk/spam mail folders: sometimes, our messages are marked that " @@ -1548,9 +1552,9 @@ msgstr "" #: 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/header.html:2 -#: templates/web/zurich/admin/header.html:6 -#: templates/web/zurich/admin/report_edit.html:78 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:8 +#: templates/web/zurich/admin/report_edit.html:77 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" @@ -1565,7 +1569,7 @@ msgid "Incorrect has_photo value \"%s\"" msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:35 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:59 msgid "Internal notes:" msgstr "" @@ -1573,7 +1577,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:959 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1004 #, fuzzy msgid "Invalid end date" msgstr "Rhowch ddiweddariad" @@ -1582,7 +1586,7 @@ msgstr "Rhowch ddiweddariad" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:949 +#: perllib/FixMyStreet/App/Controller/Admin.pm:994 msgid "Invalid start date" msgstr "" @@ -1643,7 +1647,7 @@ msgid "Last Name" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" #: templates/web/default/admin/body.html:40 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/body.html:15 msgid "Last editor" msgstr "" @@ -1665,7 +1669,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:65 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Loading..." msgstr "" @@ -1709,6 +1713,10 @@ msgstr "Gweld adroddiadau lleol" msgid "Locate the empty property on a map of the area" msgstr "Chwiliwch am leoliad yr eiddo gwag ar fap o'r ardal" +#: templates/web/default/js/translation_strings.html:37 +msgid "MAP" +msgstr "" + #: perllib/FixMyStreet/Map/OSM.pm:44 msgid "" "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/" @@ -1738,6 +1746,7 @@ msgstr "Cysylltu" msgid "More empty properties nearby" msgstr "Mwy o eiddo gwag cyfagos" +#: templates/web/default/admin/bodies.html:7 #: templates/web/default/admin/body-form.html:4 #: templates/web/default/admin/flagged.html:11 #: templates/web/default/admin/flagged.html:34 @@ -1754,15 +1763,15 @@ msgstr "Mwy o eiddo gwag cyfagos" #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "Name" msgstr "Enw" #: 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/default/admin/user-form.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:37 +#: templates/web/zurich/admin/report_edit.html:39 msgid "Name:" msgstr "Enw:" @@ -1791,7 +1800,7 @@ msgid "" "Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:266 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1919,7 +1928,7 @@ msgstr "Newydd!" msgid "No" msgstr "Nac ydw" -#: templates/web/default/admin/user_edit.html:13 +#: templates/web/default/admin/user-form.html:8 msgid "No body" msgstr "" @@ -1928,7 +1937,7 @@ msgstr "" msgid "No council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:339 +#: perllib/FixMyStreet/DB/Result/Problem.pm:345 msgid "No council selected" msgstr "Ni ddewiswyd cyngor" @@ -1960,6 +1969,10 @@ msgstr "Ni ddaethpwyd o hyd i unrhyw eiddo gwag." msgid "No empty properties have been reported yet." msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag." +#: templates/web/default/js/translation_strings.html:32 +msgid "No result returned" +msgstr "" + #: templates/web/default/report/_support.html:3 msgid "No supporters" msgstr "" @@ -1970,7 +1983,7 @@ msgstr "" #: templates/web/default/admin/report_edit.html:17 #: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:43 #, fuzzy msgid "None" msgstr "Nac ydw" @@ -1991,7 +2004,7 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" #: templates/web/default/admin/body.html:41 #: templates/web/default/admin/body_edit.html:80 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/zurich/admin/body.html:16 #, fuzzy msgid "Note" msgstr "Nac ydw" @@ -2005,7 +2018,7 @@ msgstr "" #: templates/web/default/admin/body.html:92 #: templates/web/default/admin/body_edit.html:37 -#: templates/web/zurich/admin/body.html:46 +#: templates/web/zurich/admin/body.html:47 #, fuzzy msgid "Note:" msgstr "Nac ydw" @@ -2034,6 +2047,10 @@ msgid "" "password?" msgstr "" +#: templates/web/default/js/translation_strings.html:36 +msgid "OK" +msgstr "" + #: templates/web/default/report/display.html:21 #: templates/web/default/report/update.html:16 msgid "Offensive? Unsuitable? Tell us" @@ -2084,10 +2101,10 @@ msgstr "Adroddiadau hŷn o eiddo gwag" #: 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/header.html:2 -#: templates/web/zurich/admin/header.html:5 -#: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:67 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:7 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/report_edit.html:66 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2128,10 +2145,10 @@ msgstr "" #: 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/Result/Problem.pm:515 +#: perllib/FixMyStreet/DB/Result/Problem.pm:525 +#: perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: perllib/FixMyStreet/DB/Result/Problem.pm:547 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" @@ -2180,7 +2197,7 @@ 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:120 +#: templates/web/zurich/report/new/fill_in_details_form.html:106 #, fuzzy msgid "Phone number (optional)" msgstr "(dewisol)" @@ -2189,7 +2206,7 @@ msgstr "(dewisol)" #: 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:25 -#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:43 msgid "Phone:" msgstr "Rhif ffôn:" @@ -2197,7 +2214,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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 #, fuzzy msgid "Photo" msgstr "Ffotograff:" @@ -2227,11 +2244,11 @@ msgstr "" #: 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/zurich/admin/header.html:2 -#: templates/web/zurich/admin/header.html:7 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:68 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/report_edit.html:67 msgid "Planned" msgstr "" @@ -2243,7 +2260,7 @@ msgid "" msgstr "Ewch i fwrw golwg ar y diweddariadau sydd wedi cael eu gadael." #: templates/web/default/report/new/notes.html:6 -#: templates/web/fixmystreet/report/new/notes.html:5 +#: templates/web/fixmystreet/report/new/notes.html:6 msgid "Please be polite, concise and to the point." msgstr "" @@ -2269,12 +2286,12 @@ msgstr "Rhowch gyfeiriad e-bost dilys" #: 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 +#: perllib/FixMyStreet/DB/Result/Problem.pm:364 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Dewiswch gategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:364 +#: perllib/FixMyStreet/DB/Result/Problem.pm:370 msgid "Please choose a property type" msgstr "Dewiswch fath o eiddo" @@ -2300,7 +2317,7 @@ msgstr "" "dilynwch y cyfarwyddiadau." #: templates/web/default/report/new/notes.html:7 -#: templates/web/fixmystreet/report/new/notes.html:6 +#: templates/web/fixmystreet/report/new/notes.html:7 msgid "" "Please do not be abusive — abusing your council devalues the " "service for all users." @@ -2318,7 +2335,7 @@ msgid "Please enter a password" msgstr "Ychwanegwch neges" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:339 #: templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Rhowch enw'r pwnc" @@ -2334,7 +2351,7 @@ msgstr "Cofnodwch gyfeiriad e-bost dilys" msgid "Please enter a valid email address" msgstr "Cofnodwch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/DB/Result/Problem.pm:336 +#: perllib/FixMyStreet/DB/Result/Problem.pm:342 #: templates/web/default/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Cofnodwch fanylion" @@ -2352,7 +2369,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:106 +#: templates/web/zurich/report/new/fill_in_details_form.html:92 #, fuzzy msgid "Please enter your email address" msgstr "Cofnodwch eich cyfeiriad e-bost" @@ -2362,7 +2379,7 @@ msgstr "Cofnodwch eich cyfeiriad e-bost" msgid "Please enter your first name" msgstr "Cofnodwch eich enw" -#: perllib/FixMyStreet/DB/Result/Problem.pm:351 +#: perllib/FixMyStreet/DB/Result/Problem.pm:357 #: templates/web/default/js/translation_strings.html:7 #, fuzzy msgid "" @@ -2374,7 +2391,7 @@ msgstr "" #: 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/Problem.pm:350 #: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" @@ -2441,7 +2458,7 @@ msgid "" msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/report/new/fill_in_details_form.html:60 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 #, fuzzy msgid "Please fill in details of the empty property." msgstr "Llenwch fanylion yr eiddo gwag isod." @@ -2449,7 +2466,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:34 +#: templates/web/zurich/report/new/fill_in_details_form.html:20 #, fuzzy msgid "" "Please fill in the form below with details of the empty property, and " @@ -2483,7 +2500,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:25 +#: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." @@ -2605,7 +2622,7 @@ msgstr "Eiddo gwag yn %s" msgid "Empty property breakdown by state" msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:861 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #, fuzzy msgid "Empty property marked as open." msgstr "Ffurflen manylion eiddo gwag" @@ -2715,15 +2732,15 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:149 +#: templates/web/zurich/admin/report_edit.html:148 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:53 +#: templates/web/zurich/admin/report_edit.html:55 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:162 +#: templates/web/zurich/admin/report_edit.html:158 msgid "Publish the response" msgstr "" @@ -2855,7 +2872,7 @@ msgid "Recently reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" #: templates/web/default/report/new/notes.html:9 -#: templates/web/fixmystreet/report/new/notes.html:8 +#: templates/web/fixmystreet/report/new/notes.html:10 msgid "" "Remember that reportemptyhomes.com is primarily for reporting physical empty " "properties that can be returned to use. If your empty property is not " @@ -2889,7 +2906,8 @@ msgstr "Adrodd am Eiddo Gwag" #: templates/web/fiksgatami/nn/footer.html:5 #: templates/web/fixmystreet/footer.html:45 #: templates/web/reading/footer.html:6 templates/web/stevenage/footer.html:39 -#: templates/web/zurich/footer.html:10 +#: templates/web/zurich/footer.html:17 +#: templates/web/zurich/nav_over_content.html:4 msgid "Report a property" msgstr "Rhoi gwybod am eiddo" @@ -2926,7 +2944,7 @@ msgstr "Adroddiadau" msgid "Reported %s, to %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:524 +#: perllib/FixMyStreet/DB/Result/Problem.pm:530 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2938,25 +2956,25 @@ msgstr "Adroddwyd yn ddi-enw am %s" msgid "Reported before" msgstr "Wedi adrodd o'r blaen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:516 +#: perllib/FixMyStreet/DB/Result/Problem.pm:522 msgid "Reported by %s anonymously at %s" msgstr "Adroddwyd gan %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:547 +#: perllib/FixMyStreet/DB/Result/Problem.pm:553 #: 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:538 +#: perllib/FixMyStreet/DB/Result/Problem.pm:544 msgid "Reported by %s by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:518 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:532 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported by %s in the %s category by %s at %s" msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" @@ -2965,15 +2983,16 @@ msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:526 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:542 +#: perllib/FixMyStreet/DB/Result/Problem.pm:548 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s gan %s am %s" #: templates/web/default/around/around_index.html:1 +#: templates/web/default/js/translation_strings.html:35 #: templates/web/default/report/new/fill_in_details.html:0 #: templates/web/default/report/new/fill_in_details.html:3 #: templates/web/default/report/new/fill_in_details_form.html:1 @@ -2985,9 +3004,9 @@ 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:1040 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:55 -#: templates/web/zurich/admin/header.html:25 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:120 +#: templates/web/zurich/header.html:59 msgid "Reports" msgstr "Adroddiadau" @@ -3030,6 +3049,11 @@ msgstr "Adroddiadau cryno" msgid "Search Users" msgstr "Adroddiadau cryno" +#: templates/web/zurich/header.html:73 +#, fuzzy +msgid "Search reports" +msgstr "Adroddiadau cryno" + #: templates/web/default/admin/reports.html:5 #: templates/web/default/admin/users.html:5 #: templates/web/zurich/admin/reports.html:5 @@ -3057,7 +3081,7 @@ msgstr "" "porthiant RSS,\n" "neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" @@ -3125,11 +3149,11 @@ msgstr "" msgid "Show my name publicly" msgstr "" -#: templates/web/default/around/display_location.html:65 +#: templates/web/default/around/display_location.html:68 msgid "Show old" msgstr "" -#: templates/web/default/around/display_location.html:56 +#: templates/web/default/around/display_location.html:59 msgid "Show pins" msgstr "Dangos pinnau" @@ -3140,7 +3164,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:53 +#: templates/web/stevenage/header.html:101 msgid "Sign in" msgstr "" @@ -3162,6 +3186,7 @@ msgstr "" #: templates/web/fixmybarangay/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 +#: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "" @@ -3237,7 +3262,6 @@ msgstr "" #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/reports.html:21 #: templates/web/fixmystreet/report/update-form.html:26 -#: templates/web/zurich/admin/reports.html:13 #, fuzzy msgid "State" msgstr "Diweddariad:" @@ -3246,13 +3270,13 @@ msgstr "Diweddariad:" #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:63 +#: templates/web/zurich/admin/report_edit.html:62 #: templates/web/zurich/admin/update_edit.html:17 #, fuzzy msgid "State:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 #: templates/web/default/admin/stats.html:1 #, fuzzy msgid "Stats" @@ -3260,6 +3284,7 @@ msgstr "Diweddariad:" #: templates/web/zurich/admin/index-dm.html:25 #: templates/web/zurich/admin/index-sdm.html:23 +#: templates/web/zurich/admin/reports.html:17 #, fuzzy msgid "Status" msgstr "Diweddariad:" @@ -3283,7 +3308,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:26 +#: templates/web/zurich/admin/report_edit.html:28 msgid "Subject:" msgstr "Pwnc:" @@ -3297,15 +3322,15 @@ 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:125 +#: templates/web/zurich/report/new/fill_in_details_form.html:111 msgid "Submit" msgstr "Anfon" #: 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/default/admin/user-form.html:17 #: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:160 #: templates/web/zurich/admin/update_edit.html:38 #, fuzzy msgid "Submit changes" @@ -3316,13 +3341,14 @@ msgstr "Anfon" msgid "Submit questionnaire" msgstr "Anfon yr holiadur" -#: templates/web/zurich/admin/header.html:2 -#: templates/web/zurich/admin/header.html:4 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:64 #: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/zurich/admin/reports.html:15 #: templates/web/zurich/report/banner.html:9 #, fuzzy msgid "Submitted" @@ -3349,12 +3375,12 @@ msgstr "" "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " "byw ynddo:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:54 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:119 #: templates/web/default/admin/index.html:1 -#: templates/web/zurich/admin/header.html:22 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 +#: templates/web/zurich/header.html:56 #, fuzzy msgid "Summary" msgstr "Adroddiadau cryno" @@ -3367,7 +3393,7 @@ msgstr "Adroddiadau cryno" msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 msgid "Survey" msgstr "" @@ -3509,17 +3535,17 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/FixMyStreet/App/Controller/Admin.pm:626 +#: perllib/FixMyStreet/App/Controller/Admin.pm:641 #, fuzzy msgid "That empty property will now be resent." msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: perllib/FixMyStreet/App/Controller/Report.pm:98 +#: perllib/FixMyStreet/App/Controller/Report.pm:117 #, fuzzy msgid "That report cannot be viewed on reportemptyhomes.com." msgstr "Mae'r adroddiad hwnnw wedi cael ei dynnu oddi ar reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Report.pm:92 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 msgid "That report has been removed from reportemptyhomes.com." msgstr "Mae'r adroddiad hwnnw wedi cael ei dynnu oddi ar reportemptyhomes.com" @@ -3566,7 +3592,7 @@ msgid "" msgstr "" #: templates/web/default/auth/token.html:21 -#: templates/web/default/email_sent.html:22 +#: templates/web/default/email_sent.html:23 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." @@ -3594,7 +3620,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:50 +#: perllib/FixMyStreet/App/Controller/Reports.pm:51 #, fuzzy msgid "The error was: %s" msgstr "Testun y gwall oedd:" @@ -3703,7 +3729,6 @@ msgstr "Yr hysbysiad symlaf yw ein hysbysiad daearyddol:" #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 -#: templates/web/zurich/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the empty property will be public, plus your name " "if you give us permission." @@ -3717,7 +3742,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:47 +#: perllib/FixMyStreet/App/Controller/Reports.pm:48 msgid "" "There was an empty property showing the All Reports page. Please try again " "later." @@ -3847,7 +3872,7 @@ 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:15 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3873,14 +3898,13 @@ msgstr "" "Mae'r dudalen we hon hefyd yn cynnwys ffotograff o'r eiddo gwag, wedi'i " "ddarparu gan y defnyddiwr." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1086 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" #: templates/web/default/admin/flagged.html:10 #: templates/web/default/admin/reports.html:13 -#: templates/web/zurich/admin/reports.html:12 msgid "Title" msgstr "" @@ -3943,7 +3967,12 @@ msgstr "" msgid "Unknown alert type" msgstr "ID eiddo gwag anhysbys" -#: perllib/FixMyStreet/App/Controller/Report.pm:87 +#: templates/web/default/js/translation_strings.html:33 +#, fuzzy +msgid "Unknown error" +msgstr "ID eiddo gwag anhysbys" + +#: perllib/FixMyStreet/App/Controller/Report.pm:106 msgid "Unknown empty property ID" msgstr "ID eiddo gwag anhysbys" @@ -4014,15 +4043,17 @@ msgstr "Diweddariad:" #: templates/web/zurich/admin/index-dm.html:24 #: templates/web/zurich/admin/index-sdm.html:22 +#: templates/web/zurich/admin/reports.html:16 #, fuzzy msgid "Updated" msgstr "Diweddariadau" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 -#: perllib/FixMyStreet/App/Controller/Admin.pm:851 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:239 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 +#: perllib/FixMyStreet/App/Controller/Admin.pm:733 +#: perllib/FixMyStreet/App/Controller/Admin.pm:867 +#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:955 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:309 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:364 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" @@ -4031,7 +4062,7 @@ msgstr "Diweddariadau" #: templates/web/default/report/update.html:3 #: templates/web/fixmystreet/report/update.html:3 #: templates/web/zurich/admin/list_updates.html:1 -#: templates/web/zurich/report/updates.html:3 +#: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Diweddariadau" @@ -4048,18 +4079,18 @@ msgstr "Diweddariadau am {{title}}" msgid "Updates to this empty property, reportemptyhomes.com" msgstr "Diweddariadau i'r eiddo gwag hwn, reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1204 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1249 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1176 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1221 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 #: templates/web/default/admin/flagged.html:30 -#: templates/web/zurich/admin/header.html:28 +#: templates/web/zurich/header.html:68 msgid "Users" msgstr "" @@ -4072,7 +4103,7 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 #: templates/web/zurich/admin/report_edit-sdm.html:13 -#: templates/web/zurich/admin/report_edit.html:17 +#: templates/web/zurich/admin/report_edit.html:19 #: templates/web/zurich/admin/update_edit.html:10 #, fuzzy msgid "View report on site" @@ -4139,7 +4170,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:110 +#: templates/web/zurich/report/new/fill_in_details_form.html:96 #, 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)" @@ -4196,7 +4227,7 @@ msgstr "" #: templates/web/default/admin/body.html:43 #: templates/web/default/admin/body_edit.html:75 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/zurich/admin/body.html:17 msgid "When edited" msgstr "" @@ -4241,7 +4272,7 @@ msgstr "" #: templates/web/default/report/new/notes.html:8 #: templates/web/fixmybarangay/report/new/notes.html:8 -#: templates/web/fixmystreet/report/new/notes.html:7 +#: templates/web/fixmystreet/report/new/notes.html:8 msgid "" "Writing your message entirely in block capitals makes it hard to read, as " "does a lack of punctuation." @@ -4262,7 +4293,7 @@ msgstr "" #: 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/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:105 #: templates/web/default/questionnaire/index.html:66 @@ -4325,6 +4356,10 @@ msgid "" "properties for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" +#: templates/web/default/js/translation_strings.html:30 +msgid "You declined; please fill in the box above" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 msgid "" "You have already answered this questionnaire. If you have a question, please " @@ -4340,7 +4375,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:89 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -4356,13 +4391,14 @@ msgstr "" #: templates/web/default/auth/sign_out.html:3 #: templates/web/fixmybarangay/auth/sign_out.html:3 +#: templates/web/zurich/auth/sign_out.html:3 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:27 +#: templates/web/zurich/report/new/fill_in_details_form.html:13 #, fuzzy msgid "" "You have located the empty property at the point marked with a green pin on " @@ -4413,7 +4449,7 @@ msgid "" "accurate:" msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus." -#: templates/web/default/email_sent.html:26 +#: templates/web/default/email_sent.html:28 msgid "" "You must now click the link in the email we've just sent you — if you " "do not, %s." @@ -4442,7 +4478,7 @@ msgstr "Adroddiadau" #: templates/web/fixmystreet/report/display.html:57 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 #, fuzzy msgid "Your email" msgstr "Eich cyfeiriad e-bost:" @@ -4491,7 +4527,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:118 +#: templates/web/zurich/report/new/fill_in_details_form.html:104 #, fuzzy msgid "Your name" msgstr "Eich enw:" @@ -4520,7 +4556,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:121 +#: templates/web/zurich/report/new/fill_in_details_form.html:107 msgid "Your phone number" msgstr "" @@ -4559,13 +4595,13 @@ msgstr "" msgid "council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:613 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 msgid "council ref: %s" msgstr "" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:37 msgid "didn't use map" msgstr "" @@ -4609,9 +4645,9 @@ msgstr "" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit.html:30 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:24 +#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit.html:37 msgid "originally entered" msgstr "" @@ -4627,7 +4663,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:50 +#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12 msgid "sign out" msgstr "" @@ -4637,14 +4673,12 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:9 -#: templates/web/zurich/report/new/fill_in_details_form.html:6 -#: templates/web/zurich/report/new/fill_in_details_form.html:9 #, fuzzy 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:6 +#: templates/web/zurich/report/_main.html:5 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -4659,7 +4693,7 @@ msgstr "heddiw" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:37 msgid "used map" msgstr "" @@ -4788,6 +4822,16 @@ msgstr[0] "diwrnod" msgstr[1] "diwrnod" #, 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." + +#, fuzzy #~ msgid "Reported at %s" #~ msgstr "Adroddiadau" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index cf8e31315..be96220eb 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,16 +6,17 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-01-16 12:43+0000\n" +"POT-Creation-Date: 2013-01-24 15:23+0000\n" "PO-Revision-Date: 2013-01-24 15:20+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr "und" @@ -37,7 +38,7 @@ msgstr "" msgid " or " msgstr "oder" -#: templates/web/default/admin/bodies.html:14 +#: templates/web/default/admin/bodies.html:31 msgid "%d addresses" msgstr "%d Adressen" @@ -72,7 +73,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:621 msgid "%s ref: %s" msgstr "" @@ -80,11 +81,11 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:500 +#: perllib/FixMyStreet/DB/Result/Problem.pm:506 msgid "%s, reported anonymously at %s" msgstr "%s, gemeldet um %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:502 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "%s, reported by %s at %s" msgstr "" @@ -92,12 +93,12 @@ msgstr "" msgid "%s, within %s ward" msgstr "" -#: templates/web/default/email_sent.html:28 +#: templates/web/default/email_sent.html:31 msgid "(Don't worry — %s)" msgstr "" #: templates/web/default/admin/report_blocks.html:11 -#: templates/web/default/admin/users.html:23 +#: templates/web/default/admin/users.html:26 msgid "(Email in abuse table)" msgstr "" @@ -137,7 +138,7 @@ 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:114 +#: templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "(optional)" msgstr "(optional)" @@ -157,12 +158,12 @@ msgstr "(ihre E-Mail Adresse wird nie angezeigt)" #: perllib/FixMyStreet/App/Controller/Report/New.pm:635 #: perllib/FixMyStreet/App/Controller/Report/New.pm:663 -#: perllib/FixMyStreet/DB/Result/Problem.pm:356 +#: perllib/FixMyStreet/DB/Result/Problem.pm:362 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" #: perllib/FixMyStreet/App/Controller/Report/New.pm:615 -#: perllib/FixMyStreet/DB/Result/Problem.pm:362 +#: perllib/FixMyStreet/DB/Result/Problem.pm:368 msgid "-- Pick a property type --" msgstr "" @@ -309,17 +310,21 @@ msgstr "" msgid "About us" msgstr "Über uns" -#: templates/web/default/admin/bodies.html:27 +#: templates/web/default/admin/bodies.html:45 #: templates/web/default/admin/body-form.html:77 #: templates/web/zurich/admin/body-form.html:47 msgid "Add body" msgstr "Adresse hinzufügen" #: templates/web/default/admin/body.html:69 -#: templates/web/zurich/admin/body.html:29 +#: templates/web/zurich/admin/body.html:30 msgid "Add new category" msgstr "Füge neue Kategorie hinzu" +#: templates/web/default/admin/users.html:35 +msgid "Add user" +msgstr "" + #: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60 msgid "Added %s" msgstr "" @@ -355,7 +360,8 @@ msgstr "Alle Meldungen" #: templates/web/fixmystreet/footer.html:49 #: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/footer.html:12 +#: templates/web/zurich/footer.html:19 +#: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Alle Meldungen" @@ -390,8 +396,6 @@ msgstr "" #: 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 "" @@ -404,13 +408,6 @@ 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." @@ -448,19 +445,24 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:98 +#: templates/web/zurich/admin/report_edit.html:97 msgid "Assign to different category:" msgstr "Einer anderen Kategorie (DA) zuweisen:" -#: templates/web/zurich/admin/report_edit.html:107 +#: templates/web/zurich/admin/report_edit.html:106 msgid "Assign to external body:" msgstr "Einer externen Stelle zuweisen:" -#: templates/web/zurich/admin/report_edit.html:139 -#: templates/web/zurich/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:138 +#: templates/web/zurich/admin/report_edit.html:85 msgid "Assign to subdivision:" msgstr "An Fachbereich zuweisen:" +#: templates/web/zurich/report/updates.html:11 +#, fuzzy +msgid "Assigned to %s" +msgstr "An Fachbereich zuweisen:" + #: templates/web/default/open311/index.html:17 msgid "" "At most %d requests are returned in each query. The returned requests are " @@ -472,6 +474,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" +#: perllib/FixMyStreet/DB/Result/Problem.pm:317 #: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "Überprüfung ausstehend" @@ -490,10 +493,10 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:62 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:127 #: templates/web/default/admin/bodies.html:1 -#: templates/web/zurich/admin/header.html:24 +#: templates/web/zurich/header.html:63 msgid "Bodies" msgstr "Externe Adressen" @@ -502,7 +505,7 @@ msgstr "Externe Adressen" msgid "Body" msgstr "" -#: templates/web/default/admin/user_edit.html:12 +#: templates/web/default/admin/user-form.html:7 msgid "Body:" msgstr "" @@ -527,16 +530,17 @@ msgstr "" #: 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/bodies.html:11 #: templates/web/default/admin/body.html:35 #: templates/web/default/admin/flagged.html:14 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/reports.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 -#: templates/web/zurich/admin/body.html:12 +#: templates/web/zurich/admin/body.html:13 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:14 -#: templates/web/zurich/report/new/fill_in_details_form.html:64 +#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategorie" @@ -548,9 +552,9 @@ msgstr "" #: 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/body.html:35 +#: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit.html:96 msgid "Category:" msgstr "Kategorie:" @@ -564,7 +568,7 @@ msgstr "Kategorie: %s" msgid "Change Password" msgstr "Passwort ändern" -#: templates/web/default/js/translation_strings.html:28 +#: templates/web/default/js/translation_strings.html:39 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Mangel lokalisieren" @@ -580,16 +584,16 @@ msgstr "Mangel lokalisieren" #: 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/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 -#: templates/web/zurich/admin/header.html:2 -#: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:74 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/header.html:12 +#: templates/web/zurich/admin/report_edit.html:73 +#: templates/web/zurich/admin/report_edit.html:75 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "Erledigt" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:714 msgid "Closed by council" msgstr "" @@ -608,7 +612,7 @@ msgstr "" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:37 msgid "Co-ordinates:" msgstr "Koordinaten:" @@ -670,7 +674,7 @@ msgstr "Bestätigung" #: templates/web/default/admin/body_edit.html:31 #: templates/web/default/admin/body_edit.html:77 #: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 msgid "Confirmed" msgstr "Bestätigt" @@ -708,11 +712,15 @@ msgstr "" msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1172 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1217 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1245 msgid "Could not find user" msgstr "" +#: templates/web/default/js/translation_strings.html:31 +msgid "Could not look up location" +msgstr "" + #: templates/web/default/admin/flagged.html:13 #: templates/web/default/admin/list_updates.html:12 msgid "Council" @@ -738,7 +746,7 @@ msgid "Create a report" msgstr "Erfasse eine Meldung" #: templates/web/default/admin/body.html:103 -#: templates/web/zurich/admin/body.html:52 +#: templates/web/zurich/admin/body.html:53 msgid "Create category" msgstr "" @@ -746,14 +754,13 @@ msgstr "" #: templates/web/default/admin/list_updates.html:9 #: templates/web/default/admin/reports.html:20 #: templates/web/zurich/admin/list_updates.html:6 -#: templates/web/zurich/admin/reports.html:15 msgid "Created" msgstr "Erstellt" #: templates/web/default/admin/report_edit.html:34 #: templates/web/default/admin/update_edit.html:45 #: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit.html:42 +#: templates/web/zurich/admin/report_edit.html:44 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Erstellt:" @@ -776,20 +783,22 @@ msgstr "Gelöscht" #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/reports.html:13 msgid "Description" msgstr "Beschreibung" #: templates/web/bromley/report/new/fill_in_details_form.html:54 +#: templates/web/default/js/translation_strings.html:28 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/zurich/report/new/fill_in_details_form.html:56 +#: templates/web/zurich/report/new/fill_in_details_form.html:42 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:14 -#: templates/web/zurich/admin/report_edit.html:20 -#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:29 msgid "Details:" msgstr "Beschreibung:" @@ -819,19 +828,20 @@ msgstr "" #: 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/problem_row.html:32 +#: templates/web/default/admin/users.html:28 +#: templates/web/zurich/admin/problem_row.html:35 msgid "Edit" msgstr "" #: templates/web/default/admin/body.html:112 -#: templates/web/zurich/admin/body.html:63 +#: templates/web/zurich/admin/body.html:64 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 +#: templates/web/zurich/admin/report_edit.html:4 msgid "Editing problem %d" msgstr "Meldung %d bearbeiten" @@ -849,6 +859,7 @@ msgid "Editor" msgstr "" #: templates/web/bromley/report/display.html:126 +#: templates/web/default/admin/bodies.html:9 #: templates/web/default/admin/body.html:36 #: templates/web/default/admin/body_edit.html:76 #: templates/web/default/admin/flagged.html:12 @@ -859,15 +870,15 @@ msgstr "" #: templates/web/fixmystreet/auth/general.html:20 #: templates/web/fixmystreet/report/update-form.html:74 #: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:13 +#: templates/web/zurich/admin/body.html:14 msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1190 msgid "Email already in abuse list" msgstr "" @@ -883,12 +894,12 @@ msgstr "Schicken sie mir Aktualisierungen" #: 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/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:34 -#: templates/web/zurich/admin/body.html:40 +#: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:23 -#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 msgid "Email:" msgstr "E-mail:" @@ -932,7 +943,7 @@ msgstr "" msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:12 msgid "Enter a Zürich street name" msgstr "Ungefähre Adresse des Mangels" @@ -1031,7 +1042,6 @@ msgid "FixMyStreet" msgstr "" #: templates/web/default/admin/header.html:10 -#: templates/web/zurich/admin/header.html:21 msgid "FixMyStreet admin:" msgstr "" @@ -1096,13 +1106,13 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1044 -#: templates/web/default/admin/users.html:15 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" #: templates/web/default/admin/report_edit.html:43 -#: templates/web/default/admin/user_edit.html:18 +#: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "" @@ -1129,7 +1139,7 @@ msgstr "Ihr Passwort" #: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 -#: templates/web/zurich/faq/faq-de.html:1 +#: templates/web/zurich/faq/faq-de-ch.html:1 msgid "Frequently Asked Questions" msgstr "" @@ -1202,7 +1212,8 @@ msgstr "" #: templates/web/fixmybarangay/footer.html:24 #: templates/web/fixmystreet/footer.html:53 #: templates/web/reading/footer.html:10 templates/web/stevenage/footer.html:47 -#: templates/web/zurich/footer.html:14 +#: templates/web/zurich/footer.html:21 +#: templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "Hilfe" @@ -1215,26 +1226,26 @@ 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:49 +#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hallo %s" #: 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/header.html:2 -#: templates/web/zurich/admin/header.html:9 -#: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:69 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:11 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/report_edit.html:68 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Unsichtbar" -#: templates/web/default/around/display_location.html:63 +#: templates/web/default/around/display_location.html:66 msgid "Hide old" msgstr "Alte ausblenden" -#: templates/web/default/around/display_location.html:58 +#: templates/web/default/around/display_location.html:61 msgid "Hide pins" msgstr "Stecknadeln ausblenden" @@ -1255,7 +1266,7 @@ msgstr "Erfasse eine neue Meldung:" msgid "How to send successful reports" msgstr "Anleitung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:655 +#: perllib/FixMyStreet/App/Controller/Admin.pm:670 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1284,7 +1295,7 @@ msgstr "" #: templates/web/zurich/admin/index-dm.html:20 #: templates/web/zurich/admin/index-sdm.html:18 #: templates/web/zurich/admin/list_updates.html:5 -#: templates/web/zurich/admin/reports.html:11 +#: templates/web/zurich/admin/reports.html:12 msgid "ID" msgstr "ID" @@ -1303,7 +1314,7 @@ msgid "" msgstr "" #: templates/web/default/auth/token.html:23 -#: templates/web/default/email_sent.html:24 +#: templates/web/default/email_sent.html:26 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " "check your bulk/spam mail folders: sometimes, our messages are marked that " @@ -1347,9 +1358,9 @@ msgstr "" #: 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/header.html:2 -#: templates/web/zurich/admin/header.html:6 -#: templates/web/zurich/admin/report_edit.html:78 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:8 +#: templates/web/zurich/admin/report_edit.html:77 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "In Bearbeitung" @@ -1363,7 +1374,7 @@ msgid "Incorrect has_photo value \"%s\"" msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:35 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:59 msgid "Internal notes:" msgstr "Interne Notizen" @@ -1371,7 +1382,7 @@ msgstr "Interne Notizen" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:959 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1004 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" @@ -1379,7 +1390,7 @@ msgstr "Ung&ultiges Enddatum" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:949 +#: perllib/FixMyStreet/App/Controller/Admin.pm:994 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" @@ -1427,7 +1438,7 @@ msgid "Last Name" msgstr "Letzte Bearbeitung" #: templates/web/default/admin/body.html:40 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/body.html:15 msgid "Last editor" msgstr "Letzter Bearbeiter" @@ -1447,7 +1458,7 @@ msgstr "Liste aller Meldungen" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 -#: templates/web/zurich/report/new/fill_in_details_form.html:65 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Loading..." msgstr "" @@ -1490,6 +1501,10 @@ msgstr "RSS" msgid "Locate the problem on a map of the area" msgstr "Lokalisieren Sie den Mangel auf der Karte" +#: templates/web/default/js/translation_strings.html:37 +msgid "MAP" +msgstr "" + #: perllib/FixMyStreet/Map/OSM.pm:44 msgid "" "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/" @@ -1517,6 +1532,7 @@ msgstr "Monat" msgid "More problems nearby" msgstr "Meldungen in der Nähe" +#: templates/web/default/admin/bodies.html:7 #: templates/web/default/admin/body-form.html:4 #: templates/web/default/admin/flagged.html:11 #: templates/web/default/admin/flagged.html:34 @@ -1533,15 +1549,15 @@ msgstr "Meldungen in der Nähe" #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "Name" msgstr "Name" #: 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/default/admin/user-form.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:37 +#: templates/web/zurich/admin/report_edit.html:39 msgid "Name:" msgstr "Name:" @@ -1570,7 +1586,7 @@ msgid "" "Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:266 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1682,7 +1698,7 @@ msgstr "Neu!" msgid "No" msgstr "Nein" -#: templates/web/default/admin/user_edit.html:13 +#: templates/web/default/admin/user-form.html:8 msgid "No body" msgstr "" @@ -1690,7 +1706,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:339 +#: perllib/FixMyStreet/DB/Result/Problem.pm:345 msgid "No council selected" msgstr "" @@ -1720,6 +1736,10 @@ msgstr "Keine Meldungen gefunden." msgid "No problems have been reported yet." msgstr "Bisher wurden noch keine Meldungen erfasst." +#: templates/web/default/js/translation_strings.html:32 +msgid "No result returned" +msgstr "" + #: templates/web/default/report/_support.html:3 msgid "No supporters" msgstr "" @@ -1730,7 +1750,7 @@ msgstr "" #: templates/web/default/admin/report_edit.html:17 #: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:43 msgid "None" msgstr "Keine" @@ -1749,7 +1769,7 @@ msgstr "" #: templates/web/default/admin/body.html:41 #: templates/web/default/admin/body_edit.html:80 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/zurich/admin/body.html:16 msgid "Note" msgstr "" @@ -1762,7 +1782,7 @@ msgstr "" #: templates/web/default/admin/body.html:92 #: templates/web/default/admin/body_edit.html:37 -#: templates/web/zurich/admin/body.html:46 +#: templates/web/zurich/admin/body.html:47 msgid "Note:" msgstr "" @@ -1786,6 +1806,10 @@ msgstr "" msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "" +#: templates/web/default/js/translation_strings.html:36 +msgid "OK" +msgstr "" + #: templates/web/default/report/display.html:21 #: templates/web/default/report/update.html:16 msgid "Offensive? Unsuitable? Tell us" @@ -1833,10 +1857,10 @@ msgstr "" #: 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/header.html:2 -#: templates/web/zurich/admin/header.html:5 -#: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:67 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:7 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/report_edit.html:66 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -1873,10 +1897,10 @@ msgstr "" #: 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/Result/Problem.pm:515 +#: perllib/FixMyStreet/DB/Result/Problem.pm:525 +#: perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: perllib/FixMyStreet/DB/Result/Problem.pm:547 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" @@ -1923,7 +1947,7 @@ 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:120 +#: templates/web/zurich/report/new/fill_in_details_form.html:106 msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" @@ -1931,7 +1955,7 @@ msgstr "Telefonnummer (optional)" #: 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:25 -#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:43 msgid "Phone:" msgstr "Telefonnummer:" @@ -1939,7 +1963,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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" msgstr "Foto" @@ -1968,11 +1992,11 @@ msgstr "Pin auf der Karte absetzen" #: 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/zurich/admin/header.html:2 -#: templates/web/zurich/admin/header.html:7 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:68 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/report_edit.html:67 msgid "Planned" msgstr "Rückmeldung ausstehend" @@ -1983,7 +2007,7 @@ msgid "" msgstr "" #: templates/web/default/report/new/notes.html:6 -#: templates/web/fixmystreet/report/new/notes.html:5 +#: templates/web/fixmystreet/report/new/notes.html:6 msgid "Please be polite, concise and to the point." msgstr "Bitte seien Sie freundlich und prägnant." @@ -2007,12 +2031,12 @@ msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" #: 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 +#: perllib/FixMyStreet/DB/Result/Problem.pm:364 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Bitte wählen Sie eine Kategorie" -#: perllib/FixMyStreet/DB/Result/Problem.pm:364 +#: perllib/FixMyStreet/DB/Result/Problem.pm:370 msgid "Please choose a property type" msgstr "" @@ -2031,7 +2055,7 @@ msgid "" msgstr "" #: templates/web/default/report/new/notes.html:7 -#: templates/web/fixmystreet/report/new/notes.html:6 +#: templates/web/fixmystreet/report/new/notes.html:7 msgid "" "Please do not be abusive — abusing your council devalues the " "service for all users." @@ -2048,7 +2072,7 @@ msgid "Please enter a password" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:339 #: templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" @@ -2064,7 +2088,7 @@ 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:336 +#: perllib/FixMyStreet/DB/Result/Problem.pm:342 #: templates/web/default/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Bitte geben Sie einiges Details an" @@ -2082,7 +2106,7 @@ msgstr "Ihre E-Mail Adresse" #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Please enter your email address" msgstr "Ihre E-Mail Adresse" @@ -2090,7 +2114,7 @@ msgstr "Ihre E-Mail Adresse" msgid "Please enter your first name" msgstr "Bitte geben Sie Ihren Namen an" -#: perllib/FixMyStreet/DB/Result/Problem.pm:351 +#: perllib/FixMyStreet/DB/Result/Problem.pm:357 #: templates/web/default/js/translation_strings.html:7 msgid "" "Please enter your full name, councils need this information – if you do not " @@ -2099,7 +2123,7 @@ msgstr "" #: 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/Problem.pm:350 #: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" @@ -2166,14 +2190,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:60 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 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:34 +#: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "" "Please fill in the form below with details of the problem, and describe the " "location as precisely as possible in the details box." @@ -2208,7 +2232,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:25 +#: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." @@ -2319,7 +2343,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "Meldungen nach Status sortiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:861 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 msgid "Problem marked as open." msgstr "" @@ -2417,15 +2441,15 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:149 +#: templates/web/zurich/admin/report_edit.html:148 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:53 +#: templates/web/zurich/admin/report_edit.html:55 msgid "Publish photo" msgstr "Foto veröffentlichen" -#: templates/web/zurich/admin/report_edit.html:162 +#: templates/web/zurich/admin/report_edit.html:158 msgid "Publish the response" msgstr "" @@ -2547,7 +2571,7 @@ msgid "Recently reported problems" msgstr "Kürzlich erfasste Meldungen:" #: templates/web/default/report/new/notes.html:9 -#: templates/web/fixmystreet/report/new/notes.html:8 +#: templates/web/fixmystreet/report/new/notes.html:10 msgid "" "Remember that FixMyStreet is primarily for reporting physical problems that " "can be fixed. If your problem is not appropriate for submission via this " @@ -2586,7 +2610,8 @@ msgstr "" #: templates/web/fiksgatami/nn/footer.html:5 #: templates/web/fixmystreet/footer.html:45 #: templates/web/reading/footer.html:6 templates/web/stevenage/footer.html:39 -#: templates/web/zurich/footer.html:10 +#: templates/web/zurich/footer.html:17 +#: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Eine Meldung erfassen" @@ -2618,7 +2643,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:524 +#: perllib/FixMyStreet/DB/Result/Problem.pm:530 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2630,25 +2655,25 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:516 +#: perllib/FixMyStreet/DB/Result/Problem.pm:522 msgid "Reported by %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:547 +#: perllib/FixMyStreet/DB/Result/Problem.pm:553 #: 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:538 +#: perllib/FixMyStreet/DB/Result/Problem.pm:544 msgid "Reported by %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:518 msgid "Reported by %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:532 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported by %s in the %s category by %s at %s" msgstr "" @@ -2656,15 +2681,16 @@ msgstr "" msgid "Reported in the %s category" msgstr "In der Kategorie %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:526 msgid "Reported in the %s category anonymously at %s" msgstr "In der Kategorie %s um %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:542 +#: perllib/FixMyStreet/DB/Result/Problem.pm:548 msgid "Reported in the %s category by %s at %s" msgstr "Gemeldet in der Kategorie %s" #: templates/web/default/around/around_index.html:1 +#: templates/web/default/js/translation_strings.html:35 #: templates/web/default/report/new/fill_in_details.html:0 #: templates/web/default/report/new/fill_in_details.html:3 #: templates/web/default/report/new/fill_in_details_form.html:1 @@ -2676,9 +2702,9 @@ msgstr "Gemeldet in der Kategorie %s" msgid "Reporting a problem" msgstr "Ihre Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1040 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:55 -#: templates/web/zurich/admin/header.html:25 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:120 +#: templates/web/zurich/header.html:59 msgid "Reports" msgstr "Meldungen" @@ -2718,6 +2744,11 @@ msgstr "Meldungen suchen" msgid "Search Users" msgstr "" +#: templates/web/zurich/header.html:73 +#, fuzzy +msgid "Search reports" +msgstr "Meldungen suchen" + #: templates/web/default/admin/reports.html:5 #: templates/web/default/admin/users.html:5 #: templates/web/zurich/admin/reports.html:5 @@ -2741,7 +2772,7 @@ msgid "" "or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Sent to %s %s later" msgstr "" @@ -2789,11 +2820,11 @@ msgstr "" msgid "Show my name publicly" msgstr "" -#: templates/web/default/around/display_location.html:65 +#: templates/web/default/around/display_location.html:68 msgid "Show old" msgstr "" -#: templates/web/default/around/display_location.html:56 +#: templates/web/default/around/display_location.html:59 msgid "Show pins" msgstr "Zeige Stecknadeln" @@ -2804,7 +2835,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:53 +#: templates/web/stevenage/header.html:101 msgid "Sign in" msgstr "Anmelden" @@ -2826,6 +2857,7 @@ msgstr "" #: templates/web/fixmybarangay/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 +#: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "" @@ -2898,7 +2930,6 @@ msgstr "" #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/reports.html:21 #: templates/web/fixmystreet/report/update-form.html:26 -#: templates/web/zurich/admin/reports.html:13 msgid "State" msgstr "Status" @@ -2906,18 +2937,19 @@ msgstr "Status" #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:63 +#: templates/web/zurich/admin/report_edit.html:62 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "" #: templates/web/zurich/admin/index-dm.html:25 #: templates/web/zurich/admin/index-sdm.html:23 +#: templates/web/zurich/admin/reports.html:17 msgid "Status" msgstr "" @@ -2938,7 +2970,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:26 +#: templates/web/zurich/admin/report_edit.html:28 msgid "Subject:" msgstr "Titel:" @@ -2952,15 +2984,15 @@ 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:125 +#: templates/web/zurich/report/new/fill_in_details_form.html:111 msgid "Submit" msgstr "Abschicken" #: 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/default/admin/user-form.html:17 #: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:160 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Änderungen speichern" @@ -2970,13 +3002,14 @@ msgstr "Änderungen speichern" msgid "Submit questionnaire" msgstr "" -#: templates/web/zurich/admin/header.html:2 -#: templates/web/zurich/admin/header.html:4 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:64 #: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/zurich/admin/reports.html:15 #: templates/web/zurich/report/banner.html:9 msgid "Submitted" msgstr "Erfasst" @@ -2999,12 +3032,12 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:54 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:119 #: templates/web/default/admin/index.html:1 -#: templates/web/zurich/admin/header.html:22 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 +#: templates/web/zurich/header.html:56 msgid "Summary" msgstr "Zusammenfassung" @@ -3016,7 +3049,7 @@ msgstr "Zusammenfassung" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 msgid "Survey" msgstr "" @@ -3123,15 +3156,15 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:626 +#: perllib/FixMyStreet/App/Controller/Admin.pm:641 msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:98 +#: perllib/FixMyStreet/App/Controller/Report.pm:117 msgid "That report cannot be viewed on FixMyStreet." msgstr "Diese Meldung wurde von Fix My Zürich entfernt." -#: perllib/FixMyStreet/App/Controller/Report.pm:92 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 msgid "That report has been removed from FixMyStreet." msgstr "Diese Meldung wurde von Fix My Zürich entfernt." @@ -3163,7 +3196,7 @@ msgid "" msgstr "" #: templates/web/default/auth/token.html:21 -#: templates/web/default/email_sent.html:22 +#: templates/web/default/email_sent.html:23 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." @@ -3192,7 +3225,7 @@ msgid "" msgstr "" #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:50 +#: perllib/FixMyStreet/App/Controller/Reports.pm:51 msgid "The error was: %s" msgstr "" @@ -3278,7 +3311,6 @@ msgstr "" #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 -#: templates/web/zurich/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the problem will be public, plus your name if you " "give us permission." @@ -3290,7 +3322,7 @@ msgid "" "the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:47 +#: perllib/FixMyStreet/App/Controller/Reports.pm:48 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3409,7 +3441,7 @@ 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:15 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Überprüfung ausstehend" @@ -3430,14 +3462,13 @@ msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1086 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" #: templates/web/default/admin/flagged.html:10 #: templates/web/default/admin/reports.html:13 -#: templates/web/zurich/admin/reports.html:12 msgid "Title" msgstr "Titel" @@ -3489,7 +3520,12 @@ msgstr "Unbekannt" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:87 +#: templates/web/default/js/translation_strings.html:33 +#, fuzzy +msgid "Unknown error" +msgstr "Unbekannt" + +#: perllib/FixMyStreet/App/Controller/Report.pm:106 msgid "Unknown problem ID" msgstr "" @@ -3548,14 +3584,16 @@ msgstr "" #: templates/web/zurich/admin/index-dm.html:24 #: templates/web/zurich/admin/index-sdm.html:22 +#: templates/web/zurich/admin/reports.html:16 msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 -#: perllib/FixMyStreet/App/Controller/Admin.pm:851 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:239 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 +#: perllib/FixMyStreet/App/Controller/Admin.pm:733 +#: perllib/FixMyStreet/App/Controller/Admin.pm:867 +#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:955 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:309 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:364 msgid "Updated!" msgstr "Aktualisiert!" @@ -3563,7 +3601,7 @@ msgstr "Aktualisiert!" #: templates/web/default/report/update.html:3 #: templates/web/fixmystreet/report/update.html:3 #: templates/web/zurich/admin/list_updates.html:1 -#: templates/web/zurich/report/updates.html:3 +#: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Antwort" @@ -3580,18 +3618,18 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1204 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1249 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1176 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1221 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 #: templates/web/default/admin/flagged.html:30 -#: templates/web/zurich/admin/header.html:28 +#: templates/web/zurich/header.html:68 msgid "Users" msgstr "" @@ -3603,7 +3641,7 @@ msgstr "" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 #: templates/web/zurich/admin/report_edit-sdm.html:13 -#: templates/web/zurich/admin/report_edit.html:17 +#: templates/web/zurich/admin/report_edit.html:19 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Meldung auf der Webseite betrachten" @@ -3666,7 +3704,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:110 +#: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "We never show your email address or phone number." msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" @@ -3715,7 +3753,7 @@ msgstr "" #: templates/web/default/admin/body.html:43 #: templates/web/default/admin/body_edit.html:75 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/zurich/admin/body.html:17 msgid "When edited" msgstr "Wann editiert" @@ -3759,7 +3797,7 @@ msgstr "" #: templates/web/default/report/new/notes.html:8 #: templates/web/fixmybarangay/report/new/notes.html:8 -#: templates/web/fixmystreet/report/new/notes.html:7 +#: templates/web/fixmystreet/report/new/notes.html:8 msgid "" "Writing your message entirely in block capitals makes it hard to read, as " "does a lack of punctuation." @@ -3782,7 +3820,7 @@ msgstr "Jahr" #: 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/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:105 #: templates/web/default/questionnaire/index.html:66 @@ -3840,6 +3878,10 @@ msgid "" "and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" +#: templates/web/default/js/translation_strings.html:30 +msgid "You declined; please fill in the box above" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 msgid "" "You have already answered this questionnaire. If you have a question, please " @@ -3851,7 +3893,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:89 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -3867,13 +3909,14 @@ msgstr "" #: templates/web/default/auth/sign_out.html:3 #: templates/web/fixmybarangay/auth/sign_out.html:3 +#: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Sie haben sich abgemeldet" #: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 -#: templates/web/zurich/report/new/fill_in_details_form.html:27 +#: templates/web/zurich/report/new/fill_in_details_form.html:13 msgid "" "You have located the problem at the point marked with a green pin on the " "map. If this is not the correct location, simply click on the map again. " @@ -3917,7 +3960,7 @@ msgid "" "accurate:" msgstr "" -#: templates/web/default/email_sent.html:26 +#: templates/web/default/email_sent.html:28 msgid "" "You must now click the link in the email we've just sent you — if you " "do not, %s." @@ -3947,7 +3990,7 @@ msgstr "" #: templates/web/fixmystreet/report/display.html:57 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your email" msgstr "E-Mail Adresse" @@ -3993,7 +4036,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:118 +#: templates/web/zurich/report/new/fill_in_details_form.html:104 msgid "Your name" msgstr "Ihr Name" @@ -4020,7 +4063,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:121 +#: templates/web/zurich/report/new/fill_in_details_form.html:107 msgid "Your phone number" msgstr "Ihre Telefonnummer" @@ -4056,13 +4099,13 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:613 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 msgid "council ref: %s" msgstr "" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:37 msgid "didn't use map" msgstr "hat Karte nicht verwendet" @@ -4106,9 +4149,9 @@ msgstr "oder automatisch lokalisieren" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit.html:30 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:24 +#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit.html:37 msgid "originally entered" msgstr "ursprünglich eingegeben" @@ -4124,7 +4167,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:50 +#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12 msgid "sign out" msgstr "ausloggen" @@ -4134,13 +4177,11 @@ msgstr "ausloggen" #: templates/web/default/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:9 -#: templates/web/zurich/report/new/fill_in_details_form.html:6 -#: templates/web/zurich/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" #: templates/web/default/report/_main.html:6 -#: templates/web/zurich/report/_main.html:6 +#: templates/web/zurich/report/_main.html:5 msgid "there is no pin shown as the user did not use the map" msgstr "" "Es wird keine Stecknadel angezeigt, da der User die Karte nicht benützt " @@ -4156,7 +4197,7 @@ msgstr "heute" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:37 msgid "used map" msgstr "Karte verwendet" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 51904afaa..26702ae2b 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-01-16 12:43+0000\n" +"POT-Creation-Date: 2013-01-24 15:23+0000\n" "PO-Revision-Date: 2012-09-14 00:22+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -22,7 +22,7 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "X-Poedit-Basepath: ../../../\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr " og " @@ -44,7 +44,7 @@ msgstr " og <strong>vi sender det nå til administrasjonen</strong>" msgid " or " msgstr " eller " -#: templates/web/default/admin/bodies.html:14 +#: templates/web/default/admin/bodies.html:31 msgid "%d addresses" msgstr "%d adresser" @@ -79,7 +79,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s - oppsummeringsrapporter" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:621 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -87,11 +87,11 @@ msgstr "%s ref: %s" msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:500 +#: perllib/FixMyStreet/DB/Result/Problem.pm:506 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:502 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" @@ -99,12 +99,12 @@ msgstr "%s, rapportert av %s %s" msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" -#: templates/web/default/email_sent.html:28 +#: templates/web/default/email_sent.html:31 msgid "(Don't worry — %s)" msgstr "(Ingen grunn til bekymring — %s)" #: templates/web/default/admin/report_blocks.html:11 -#: templates/web/default/admin/users.html:23 +#: templates/web/default/admin/users.html:26 msgid "(Email in abuse table)" msgstr "(Epost i misbrukstabellen)" @@ -144,7 +144,7 @@ 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:114 +#: templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "(optional)" msgstr "(valgfritt)" @@ -165,12 +165,12 @@ msgstr "(vi viser aldri din e-postadresse)" #: perllib/FixMyStreet/App/Controller/Report/New.pm:635 #: perllib/FixMyStreet/App/Controller/Report/New.pm:663 -#: perllib/FixMyStreet/DB/Result/Problem.pm:356 +#: perllib/FixMyStreet/DB/Result/Problem.pm:362 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" #: perllib/FixMyStreet/App/Controller/Report/New.pm:615 -#: perllib/FixMyStreet/DB/Result/Problem.pm:362 +#: perllib/FixMyStreet/DB/Result/Problem.pm:368 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" @@ -342,17 +342,21 @@ msgstr "<strong>Ja</strong> Jeg har et passord" msgid "About us" msgstr "Om oss" -#: templates/web/default/admin/bodies.html:27 +#: templates/web/default/admin/bodies.html:45 #: templates/web/default/admin/body-form.html:77 #: templates/web/zurich/admin/body-form.html:47 msgid "Add body" msgstr "" #: templates/web/default/admin/body.html:69 -#: templates/web/zurich/admin/body.html:29 +#: templates/web/zurich/admin/body.html:30 msgid "Add new category" msgstr "Legg til ny kategori" +#: templates/web/default/admin/users.html:35 +msgid "Add user" +msgstr "" + #: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60 msgid "Added %s" msgstr "La til %s" @@ -388,7 +392,8 @@ msgstr "Alle rapporter" #: templates/web/fixmystreet/footer.html:49 #: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/footer.html:12 +#: templates/web/zurich/footer.html:19 +#: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Alle rapporter" @@ -428,8 +433,6 @@ msgstr "" #: 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 "" @@ -447,15 +450,6 @@ 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." @@ -495,19 +489,24 @@ msgstr "Der du fra den lokale administrasjonen?" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:98 +#: templates/web/zurich/admin/report_edit.html:97 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:107 +#: templates/web/zurich/admin/report_edit.html:106 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:139 -#: templates/web/zurich/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:138 +#: templates/web/zurich/admin/report_edit.html:85 msgid "Assign to subdivision:" msgstr "" +#: templates/web/zurich/report/updates.html:11 +#, fuzzy +msgid "Assigned to %s" +msgstr "Logget inn som %s" + #: templates/web/default/open311/index.html:17 msgid "" "At most %d requests are returned in each query. The returned requests are " @@ -522,6 +521,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "For øyeblikket er det kun søk etter og å se på rapporter som fungerer." +#: perllib/FixMyStreet/DB/Result/Problem.pm:317 #: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -540,10 +540,10 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:62 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:127 #: templates/web/default/admin/bodies.html:1 -#: templates/web/zurich/admin/header.html:24 +#: templates/web/zurich/header.html:63 msgid "Bodies" msgstr "" @@ -552,7 +552,7 @@ msgstr "" msgid "Body" msgstr "" -#: templates/web/default/admin/user_edit.html:12 +#: templates/web/default/admin/user-form.html:7 msgid "Body:" msgstr "" @@ -579,16 +579,17 @@ msgstr "" #: 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/bodies.html:11 #: templates/web/default/admin/body.html:35 #: templates/web/default/admin/flagged.html:14 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/reports.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 -#: templates/web/zurich/admin/body.html:12 +#: templates/web/zurich/admin/body.html:13 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:14 -#: templates/web/zurich/report/new/fill_in_details_form.html:64 +#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategori" @@ -600,9 +601,9 @@ msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" #: templates/web/default/admin/body_edit.html:23 #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/report/new/fill_in_details_form.html:67 -#: templates/web/zurich/admin/body.html:35 +#: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit.html:96 msgid "Category:" msgstr "Kategori:" @@ -616,7 +617,7 @@ msgstr "Kategori: %s" msgid "Change Password" msgstr "Bytt passord" -#: templates/web/default/js/translation_strings.html:28 +#: templates/web/default/js/translation_strings.html:39 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klikk i kartet for å rapportere et problem" @@ -632,16 +633,16 @@ msgstr "Klikk i kartet for å rapportere et problem" #: 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/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 -#: templates/web/zurich/admin/header.html:2 -#: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:74 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/header.html:12 +#: templates/web/zurich/admin/report_edit.html:73 +#: templates/web/zurich/admin/report_edit.html:75 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:714 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" @@ -660,7 +661,7 @@ msgstr "De nærmeste problemene <small>(innenfor %skm)</small>" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:37 msgid "Co-ordinates:" msgstr "Koordinater:" @@ -723,7 +724,7 @@ msgstr "Bekreftelse" #: templates/web/default/admin/body_edit.html:31 #: templates/web/default/admin/body_edit.html:77 #: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 msgid "Confirmed" msgstr "Bekreftet" @@ -762,11 +763,15 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1172 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1217 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1245 msgid "Could not find user" msgstr "Kunne ikke finne bruker" +#: templates/web/default/js/translation_strings.html:31 +msgid "Could not look up location" +msgstr "" + #: templates/web/default/admin/flagged.html:13 #: templates/web/default/admin/list_updates.html:12 msgid "Council" @@ -792,7 +797,7 @@ msgid "Create a report" msgstr "Lag en rapport" #: templates/web/default/admin/body.html:103 -#: templates/web/zurich/admin/body.html:52 +#: templates/web/zurich/admin/body.html:53 msgid "Create category" msgstr "Lag kategori" @@ -800,14 +805,13 @@ msgstr "Lag kategori" #: templates/web/default/admin/list_updates.html:9 #: templates/web/default/admin/reports.html:20 #: templates/web/zurich/admin/list_updates.html:6 -#: templates/web/zurich/admin/reports.html:15 msgid "Created" msgstr "Opprettet" #: templates/web/default/admin/report_edit.html:34 #: templates/web/default/admin/update_edit.html:45 #: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit.html:42 +#: templates/web/zurich/admin/report_edit.html:44 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Opprettet:" @@ -830,20 +834,22 @@ msgstr "Slettet" #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/reports.html:13 msgid "Description" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:54 +#: templates/web/default/js/translation_strings.html:28 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/zurich/report/new/fill_in_details_form.html:56 +#: templates/web/zurich/report/new/fill_in_details_form.html:42 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:14 -#: templates/web/zurich/admin/report_edit.html:20 -#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:29 msgid "Details:" msgstr "Detaljer:" @@ -874,19 +880,20 @@ msgstr "Vet ikke" #: 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/problem_row.html:32 +#: templates/web/default/admin/users.html:28 +#: templates/web/zurich/admin/problem_row.html:35 msgid "Edit" msgstr "Rediger" #: templates/web/default/admin/body.html:112 -#: templates/web/zurich/admin/body.html:63 +#: templates/web/zurich/admin/body.html:64 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 +#: templates/web/zurich/admin/report_edit.html:4 msgid "Editing problem %d" msgstr "Rediger problem %d" @@ -904,6 +911,7 @@ msgid "Editor" msgstr "Oppdatert av" #: templates/web/bromley/report/display.html:126 +#: templates/web/default/admin/bodies.html:9 #: templates/web/default/admin/body.html:36 #: templates/web/default/admin/body_edit.html:76 #: templates/web/default/admin/flagged.html:12 @@ -914,15 +922,15 @@ msgstr "Oppdatert av" #: templates/web/fixmystreet/auth/general.html:20 #: templates/web/fixmystreet/report/update-form.html:74 #: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:13 +#: templates/web/zurich/admin/body.html:14 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1190 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" @@ -938,12 +946,12 @@ msgstr "Send meg oppdateringer" #: 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/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:34 -#: templates/web/zurich/admin/body.html:40 +#: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:23 -#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 msgid "Email:" msgstr "E-post:" @@ -989,7 +997,7 @@ msgid "Endpoint" msgstr "Sett opp Open311" # Kan "Oppgi" være bedre? -#: perllib/FixMyStreet/Cobrand/Zurich.pm:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:12 #, fuzzy msgid "Enter a Zürich street name" msgstr "Skriv inn et veinavn og sted" @@ -1094,7 +1102,6 @@ msgid "FixMyStreet" msgstr "FiksGataMi" #: templates/web/default/admin/header.html:10 -#: templates/web/zurich/admin/header.html:21 msgid "FixMyStreet admin:" msgstr "FiksGataMi-administrator:" @@ -1166,13 +1173,13 @@ msgstr "Løst:" msgid "Flag user" msgstr "Flag bruker" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1044 -#: templates/web/default/admin/users.html:15 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Flagget:" #: templates/web/default/admin/report_edit.html:43 -#: templates/web/default/admin/user_edit.html:18 +#: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "Flagget:" @@ -1200,7 +1207,7 @@ msgstr "Ditt passord" #: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 -#: templates/web/zurich/faq/faq-de.html:1 +#: templates/web/zurich/faq/faq-de-ch.html:1 msgid "Frequently Asked Questions" msgstr "Ofte spurte spørsmål" @@ -1276,7 +1283,8 @@ msgstr "" #: templates/web/fixmybarangay/footer.html:24 #: templates/web/fixmystreet/footer.html:53 #: templates/web/reading/footer.html:10 templates/web/stevenage/footer.html:47 -#: templates/web/zurich/footer.html:14 +#: templates/web/zurich/footer.html:21 +#: templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "Hjelp" @@ -1290,26 +1298,26 @@ 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:49 +#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hei, %s" #: 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/header.html:2 -#: templates/web/zurich/admin/header.html:9 -#: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:69 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:11 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/report_edit.html:68 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skjul" -#: templates/web/default/around/display_location.html:63 +#: templates/web/default/around/display_location.html:66 msgid "Hide old" msgstr "Skjul gamle" -#: templates/web/default/around/display_location.html:58 +#: templates/web/default/around/display_location.html:61 msgid "Hide pins" msgstr "Skjul nåler" @@ -1330,7 +1338,7 @@ msgstr "Hvordan rapportere et problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:655 +#: perllib/FixMyStreet/App/Controller/Admin.pm:670 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." @@ -1360,7 +1368,7 @@ msgstr "" #: templates/web/zurich/admin/index-dm.html:20 #: templates/web/zurich/admin/index-sdm.html:18 #: templates/web/zurich/admin/list_updates.html:5 -#: templates/web/zurich/admin/reports.html:11 +#: templates/web/zurich/admin/reports.html:12 msgid "ID" msgstr "ID" @@ -1386,7 +1394,7 @@ msgstr "" "område." #: templates/web/default/auth/token.html:23 -#: templates/web/default/email_sent.html:24 +#: templates/web/default/email_sent.html:26 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " "check your bulk/spam mail folders: sometimes, our messages are marked that " @@ -1438,9 +1446,9 @@ msgstr "" #: 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/header.html:2 -#: templates/web/zurich/admin/header.html:6 -#: templates/web/zurich/admin/report_edit.html:78 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:8 +#: templates/web/zurich/admin/report_edit.html:77 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "Under arbeid" @@ -1454,7 +1462,7 @@ msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi \"%s\"" #: templates/web/zurich/admin/report_edit-sdm.html:35 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:59 msgid "Internal notes:" msgstr "" @@ -1462,7 +1470,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:959 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1004 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1470,7 +1478,7 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:949 +#: perllib/FixMyStreet/App/Controller/Admin.pm:994 msgid "Invalid start date" msgstr "Ugyldig startdato" @@ -1518,7 +1526,7 @@ msgid "Last Name" msgstr "Etternavn" #: templates/web/default/admin/body.html:40 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/body.html:15 msgid "Last editor" msgstr "Sist redigert av" @@ -1538,7 +1546,7 @@ msgstr "List alle rapporterte problemer" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 -#: templates/web/zurich/report/new/fill_in_details_form.html:65 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Loading..." msgstr "Laster..." @@ -1581,6 +1589,10 @@ msgstr "Lokale varsler" msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" +#: templates/web/default/js/translation_strings.html:37 +msgid "MAP" +msgstr "" + #: perllib/FixMyStreet/Map/OSM.pm:44 msgid "" "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/" @@ -1611,6 +1623,7 @@ msgstr "Måned" msgid "More problems nearby" msgstr "Flere problemer i nærheten" +#: templates/web/default/admin/bodies.html:7 #: templates/web/default/admin/body-form.html:4 #: templates/web/default/admin/flagged.html:11 #: templates/web/default/admin/flagged.html:34 @@ -1627,15 +1640,15 @@ msgstr "Flere problemer i nærheten" #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "Name" msgstr "Navn" #: 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/default/admin/user-form.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:37 +#: templates/web/zurich/admin/report_edit.html:39 msgid "Name:" msgstr "Navn:" @@ -1670,7 +1683,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:266 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1788,7 +1801,7 @@ msgstr "Ny!" msgid "No" msgstr "Nei" -#: templates/web/default/admin/user_edit.html:13 +#: templates/web/default/admin/user-form.html:8 msgid "No body" msgstr "" @@ -1796,7 +1809,7 @@ msgstr "" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:339 +#: perllib/FixMyStreet/DB/Result/Problem.pm:345 msgid "No council selected" msgstr "Ingen administrasjon er valgt" @@ -1827,6 +1840,10 @@ msgstr "Ingen problemer ble funnet." msgid "No problems have been reported yet." msgstr "Ingen problemer er rapportert" +#: templates/web/default/js/translation_strings.html:32 +msgid "No result returned" +msgstr "" + #: templates/web/default/report/_support.html:3 msgid "No supporters" msgstr "" @@ -1837,7 +1854,7 @@ msgstr "" #: templates/web/default/admin/report_edit.html:17 #: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:43 msgid "None" msgstr "Ingen" @@ -1856,7 +1873,7 @@ msgstr "Ikke rapportert til administrasjonen" #: templates/web/default/admin/body.html:41 #: templates/web/default/admin/body_edit.html:80 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/zurich/admin/body.html:16 msgid "Note" msgstr "Merk" @@ -1872,7 +1889,7 @@ msgstr "" #: templates/web/default/admin/body.html:92 #: templates/web/default/admin/body_edit.html:37 -#: templates/web/zurich/admin/body.html:46 +#: templates/web/zurich/admin/body.html:47 msgid "Note:" msgstr "Merk:" @@ -1897,6 +1914,10 @@ msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "" "På tide å registrere din oppdatering… har du et FiksGataMi-passord?" +#: templates/web/default/js/translation_strings.html:36 +msgid "OK" +msgstr "" + #: templates/web/default/report/display.html:21 #: templates/web/default/report/update.html:16 msgid "Offensive? Unsuitable? Tell us" @@ -1944,10 +1965,10 @@ msgstr "Eldre problemer" #: 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/header.html:2 -#: templates/web/zurich/admin/header.html:5 -#: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:67 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:7 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/report_edit.html:66 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -1986,10 +2007,10 @@ msgstr "" #: 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/Result/Problem.pm:515 +#: perllib/FixMyStreet/DB/Result/Problem.pm:525 +#: perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: perllib/FixMyStreet/DB/Result/Problem.pm:547 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" @@ -2038,7 +2059,7 @@ 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:120 +#: templates/web/zurich/report/new/fill_in_details_form.html:106 msgid "Phone number (optional)" msgstr "Telefonnummer (valgfritt)" @@ -2046,7 +2067,7 @@ msgstr "Telefonnummer (valgfritt)" #: 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:25 -#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:43 msgid "Phone:" msgstr "Telefon:" @@ -2054,7 +2075,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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" msgstr "Bilde" @@ -2083,11 +2104,11 @@ msgstr "" #: 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/zurich/admin/header.html:2 -#: templates/web/zurich/admin/header.html:7 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:68 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/report_edit.html:67 msgid "Planned" msgstr "Planlagt" @@ -2100,7 +2121,7 @@ msgstr "" "som har blitt lagt inn." #: templates/web/default/report/new/notes.html:6 -#: templates/web/fixmystreet/report/new/notes.html:5 +#: templates/web/fixmystreet/report/new/notes.html:6 msgid "Please be polite, concise and to the point." msgstr "Vær høflig, poengtert og kortfattet." @@ -2124,12 +2145,12 @@ msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" #: 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 +#: perllib/FixMyStreet/DB/Result/Problem.pm:364 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Velg en kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:364 +#: perllib/FixMyStreet/DB/Result/Problem.pm:370 msgid "Please choose a property type" msgstr "Velg en type egenskap" @@ -2155,7 +2176,7 @@ msgstr "" "vennligst <a href=\"/\">gå til forsiden</a> og følg instruksjonene." #: templates/web/default/report/new/notes.html:7 -#: templates/web/fixmystreet/report/new/notes.html:6 +#: templates/web/fixmystreet/report/new/notes.html:7 #, fuzzy msgid "" "Please do not be abusive — abusing your council devalues the " @@ -2175,7 +2196,7 @@ msgid "Please enter a password" msgstr "Skriv inn et passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:339 #: templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" @@ -2191,7 +2212,7 @@ msgstr "Legg til en gyldig e-post" msgid "Please enter a valid email address" msgstr "Legg inn din e-post" -#: perllib/FixMyStreet/DB/Result/Problem.pm:336 +#: perllib/FixMyStreet/DB/Result/Problem.pm:342 #: templates/web/default/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" @@ -2209,7 +2230,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:106 +#: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Please enter your email address" msgstr "Vennligst tast inn din e-postadresse" @@ -2217,7 +2238,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:351 +#: perllib/FixMyStreet/DB/Result/Problem.pm:357 #: templates/web/default/js/translation_strings.html:7 msgid "" "Please enter your full name, councils need this information – if you do not " @@ -2229,7 +2250,7 @@ msgstr "" #: 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/Problem.pm:350 #: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" @@ -2299,14 +2320,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:60 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 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:34 +#: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "" "Please fill in the form below with details of the problem, and describe the " "location as precisely as possible in the details box." @@ -2349,7 +2370,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:25 +#: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." @@ -2466,7 +2487,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:861 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 msgid "Problem marked as open." msgstr "Problem markert som åpent." @@ -2571,15 +2592,15 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:149 +#: templates/web/zurich/admin/report_edit.html:148 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:53 +#: templates/web/zurich/admin/report_edit.html:55 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:162 +#: templates/web/zurich/admin/report_edit.html:158 msgid "Publish the response" msgstr "" @@ -2701,7 +2722,7 @@ msgid "Recently reported problems" msgstr "Nylig meldte problemer" #: templates/web/default/report/new/notes.html:9 -#: templates/web/fixmystreet/report/new/notes.html:8 +#: templates/web/fixmystreet/report/new/notes.html:10 msgid "" "Remember that FixMyStreet is primarily for reporting physical problems that " "can be fixed. If your problem is not appropriate for submission via this " @@ -2739,7 +2760,8 @@ msgstr "Rapporter tomme hjem" #: templates/web/fiksgatami/nn/footer.html:5 #: templates/web/fixmystreet/footer.html:45 #: templates/web/reading/footer.html:6 templates/web/stevenage/footer.html:39 -#: templates/web/zurich/footer.html:10 +#: templates/web/zurich/footer.html:17 +#: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Rapporter et problem" @@ -2771,7 +2793,7 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:524 +#: perllib/FixMyStreet/DB/Result/Problem.pm:530 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2783,25 +2805,25 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:516 +#: perllib/FixMyStreet/DB/Result/Problem.pm:522 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:547 +#: perllib/FixMyStreet/DB/Result/Problem.pm:553 #: 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:538 +#: perllib/FixMyStreet/DB/Result/Problem.pm:544 msgid "Reported by %s by %s at %s" msgstr "Rapporter av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:518 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:532 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -2810,15 +2832,16 @@ msgstr "Rapportert av %s i kategorien %s av %s %s" msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:526 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:542 +#: perllib/FixMyStreet/DB/Result/Problem.pm:548 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" #: templates/web/default/around/around_index.html:1 +#: templates/web/default/js/translation_strings.html:35 #: templates/web/default/report/new/fill_in_details.html:0 #: templates/web/default/report/new/fill_in_details.html:3 #: templates/web/default/report/new/fill_in_details_form.html:1 @@ -2830,9 +2853,9 @@ msgstr "Rapportert i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1040 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:55 -#: templates/web/zurich/admin/header.html:25 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:120 +#: templates/web/zurich/header.html:59 #, fuzzy msgid "Reports" msgstr "Alle rapporter" @@ -2875,6 +2898,11 @@ msgstr "Søk i rapporter" msgid "Search Users" msgstr "Søk i brukere" +#: templates/web/zurich/header.html:73 +#, fuzzy +msgid "Search reports" +msgstr "Søk i rapporter" + #: templates/web/default/admin/reports.html:5 #: templates/web/default/admin/users.html:5 #: templates/web/zurich/admin/reports.html:5 @@ -2900,7 +2928,7 @@ msgstr "" "Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-kilde, " "eller skriv inn din e-postadresse for å abonnere på et e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -2948,11 +2976,11 @@ msgstr "" msgid "Show my name publicly" msgstr "Vis mitt navn offentlig" -#: templates/web/default/around/display_location.html:65 +#: templates/web/default/around/display_location.html:68 msgid "Show old" msgstr "Vis gamle" -#: templates/web/default/around/display_location.html:56 +#: templates/web/default/around/display_location.html:59 msgid "Show pins" msgstr "Vis nåler" @@ -2963,7 +2991,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:53 +#: templates/web/stevenage/header.html:101 msgid "Sign in" msgstr "Logg inn" @@ -2985,6 +3013,7 @@ msgstr "Logg inn eller opprett en konto" #: templates/web/fixmybarangay/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 +#: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Logg ut" @@ -3061,7 +3090,6 @@ msgstr "Startmåned:" #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/reports.html:21 #: templates/web/fixmystreet/report/update-form.html:26 -#: templates/web/zurich/admin/reports.html:13 msgid "State" msgstr "Tilstand" @@ -3069,18 +3097,19 @@ msgstr "Tilstand" #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:63 +#: templates/web/zurich/admin/report_edit.html:62 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" #: templates/web/zurich/admin/index-dm.html:25 #: templates/web/zurich/admin/index-sdm.html:23 +#: templates/web/zurich/admin/reports.html:17 #, fuzzy msgid "Status" msgstr "Statistikk" @@ -3102,7 +3131,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:26 +#: templates/web/zurich/admin/report_edit.html:28 msgid "Subject:" msgstr "Emne:" @@ -3116,15 +3145,15 @@ 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:125 +#: templates/web/zurich/report/new/fill_in_details_form.html:111 msgid "Submit" msgstr "Send inn" #: 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/default/admin/user-form.html:17 #: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:160 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Send inn endringer" @@ -3134,13 +3163,14 @@ msgstr "Send inn endringer" msgid "Submit questionnaire" msgstr "Send inn spørreskjema" -#: templates/web/zurich/admin/header.html:2 -#: templates/web/zurich/admin/header.html:4 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:64 #: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/zurich/admin/reports.html:15 #: templates/web/zurich/report/banner.html:9 #, fuzzy msgid "Submitted" @@ -3167,12 +3197,12 @@ msgstr "" "Eller du kan abonnere på varsel basert på bydel eller administrasjon du " "hører inn under:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:54 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:119 #: templates/web/default/admin/index.html:1 -#: templates/web/zurich/admin/header.html:22 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 +#: templates/web/zurich/header.html:56 msgid "Summary" msgstr "Oppsummering" @@ -3184,7 +3214,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 #, fuzzy msgid "Survey" msgstr "Resultater fra spørreundersøkelsen" @@ -3308,16 +3338,16 @@ msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen." msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:626 +#: perllib/FixMyStreet/App/Controller/Admin.pm:641 msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." -#: perllib/FixMyStreet/App/Controller/Report.pm:98 +#: perllib/FixMyStreet/App/Controller/Report.pm:117 #, fuzzy msgid "That report cannot be viewed on FixMyStreet." msgstr "Den rapporten har blitt fjernet fra FiksGataMi." -#: perllib/FixMyStreet/App/Controller/Report.pm:92 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har blitt fjernet fra FiksGataMi." @@ -3352,7 +3382,7 @@ msgstr "" "hvordan atributten er definert i Open311 v2-spesifikasjonen." #: templates/web/default/auth/token.html:21 -#: templates/web/default/email_sent.html:22 +#: templates/web/default/email_sent.html:23 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." @@ -3388,7 +3418,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:50 +#: perllib/FixMyStreet/App/Controller/Reports.pm:51 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -3484,7 +3514,6 @@ msgstr "Den enkleste meldingen er vår geografiske:" #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 -#: templates/web/zurich/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the problem will be public, plus your name if you " "give us permission." @@ -3500,7 +3529,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:47 +#: perllib/FixMyStreet/App/Controller/Reports.pm:48 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3642,7 +3671,7 @@ 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:15 +#: templates/web/zurich/report/_main.html:14 #, fuzzy msgid "This report is awaiting moderation." msgstr "Denne rapporten er for tiden markert som åpen." @@ -3665,14 +3694,13 @@ msgid "" msgstr "" "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1086 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" #: templates/web/default/admin/flagged.html:10 #: templates/web/default/admin/reports.html:13 -#: templates/web/zurich/admin/reports.html:12 msgid "Title" msgstr "Tittel" @@ -3727,7 +3755,12 @@ msgstr "Ukjent" msgid "Unknown alert type" msgstr "Ukjent varsel-type" -#: perllib/FixMyStreet/App/Controller/Report.pm:87 +#: templates/web/default/js/translation_strings.html:33 +#, fuzzy +msgid "Unknown error" +msgstr "Ukjent" + +#: perllib/FixMyStreet/App/Controller/Report.pm:106 msgid "Unknown problem ID" msgstr "Ukjent problem-Id" @@ -3787,15 +3820,17 @@ msgstr "Oppdatering:" #: templates/web/zurich/admin/index-dm.html:24 #: templates/web/zurich/admin/index-sdm.html:22 +#: templates/web/zurich/admin/reports.html:16 #, fuzzy msgid "Updated" msgstr "Oppdatert!" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 -#: perllib/FixMyStreet/App/Controller/Admin.pm:851 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:239 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 +#: perllib/FixMyStreet/App/Controller/Admin.pm:733 +#: perllib/FixMyStreet/App/Controller/Admin.pm:867 +#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:955 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:309 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:364 msgid "Updated!" msgstr "Oppdatert!" @@ -3803,7 +3838,7 @@ msgstr "Oppdatert!" #: templates/web/default/report/update.html:3 #: templates/web/fixmystreet/report/update.html:3 #: templates/web/zurich/admin/list_updates.html:1 -#: templates/web/zurich/report/updates.html:3 +#: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Oppdateringer" @@ -3820,18 +3855,18 @@ msgstr "Oppdateringer av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1204 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1249 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1176 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1221 msgid "User flagged" msgstr "Bruker flagget" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 #: templates/web/default/admin/flagged.html:30 -#: templates/web/zurich/admin/header.html:28 +#: templates/web/zurich/header.html:68 msgid "Users" msgstr "Brukere" @@ -3843,7 +3878,7 @@ msgstr "Verdier oppdatert" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 #: templates/web/zurich/admin/report_edit-sdm.html:13 -#: templates/web/zurich/admin/report_edit.html:17 +#: templates/web/zurich/admin/report_edit.html:19 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Se rapport på nettstedet" @@ -3909,7 +3944,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:110 +#: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "We never show your email address or phone number." msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" @@ -3967,7 +4002,7 @@ msgstr "" #: templates/web/default/admin/body.html:43 #: templates/web/default/admin/body_edit.html:75 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/zurich/admin/body.html:17 msgid "When edited" msgstr "Når redigert" @@ -4021,7 +4056,7 @@ msgstr "" #: templates/web/default/report/new/notes.html:8 #: templates/web/fixmybarangay/report/new/notes.html:8 -#: templates/web/fixmystreet/report/new/notes.html:7 +#: templates/web/fixmystreet/report/new/notes.html:8 msgid "" "Writing your message entirely in block capitals makes it hard to read, as " "does a lack of punctuation." @@ -4044,7 +4079,7 @@ msgstr "År" #: 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/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:105 #: templates/web/default/questionnaire/index.html:66 @@ -4109,6 +4144,10 @@ msgstr "" "Du kan hjelpe oss ved å finne en kontakt-e-post for lokale problemer i %s, " "og sende den via e-post til oss på <a href='mailto:%s'>%s</a>." +#: templates/web/default/js/translation_strings.html:30 +msgid "You declined; please fill in the box above" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 msgid "" "You have already answered this questionnaire. If you have a question, please " @@ -4123,7 +4162,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:89 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -4143,13 +4182,14 @@ msgstr "" #: templates/web/default/auth/sign_out.html:3 #: templates/web/fixmybarangay/auth/sign_out.html:3 +#: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" 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:27 +#: templates/web/zurich/report/new/fill_in_details_form.html:13 msgid "" "You have located the problem at the point marked with a green pin on the " "map. If this is not the correct location, simply click on the map again. " @@ -4199,7 +4239,7 @@ msgstr "" "Du har lykkes med å logge inn. Vennligst sjekk og bekreft at dine detaljer " "er korrekte:" -#: templates/web/default/email_sent.html:26 +#: templates/web/default/email_sent.html:28 msgid "" "You must now click the link in the email we've just sent you — if you " "do not, %s." @@ -4229,7 +4269,7 @@ msgstr "Dine rapporter" #: templates/web/fixmystreet/report/display.html:57 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your email" msgstr "Din e-post" @@ -4275,7 +4315,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:118 +#: templates/web/zurich/report/new/fill_in_details_form.html:104 msgid "Your name" msgstr "Ditt navn" @@ -4302,7 +4342,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:121 +#: templates/web/zurich/report/new/fill_in_details_form.html:107 msgid "Your phone number" msgstr "Ditt telefonnummer" @@ -4338,14 +4378,14 @@ msgstr "av %s" msgid "council" msgstr "administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:613 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 #, fuzzy msgid "council ref: %s" msgstr "%s ref: %s" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:37 msgid "didn't use map" msgstr "brukte ikke kart" @@ -4389,9 +4429,9 @@ msgstr "" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit.html:30 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:24 +#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit.html:37 msgid "originally entered" msgstr "søkte etter" @@ -4407,7 +4447,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:50 +#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12 msgid "sign out" msgstr "logg ut" @@ -4417,13 +4457,11 @@ msgstr "logg ut" #: templates/web/default/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:9 -#: templates/web/zurich/report/new/fill_in_details_form.html:6 -#: templates/web/zurich/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "den lokale administrasjonen" #: templates/web/default/report/_main.html:6 -#: templates/web/zurich/report/_main.html:6 +#: templates/web/zurich/report/_main.html:5 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -4437,7 +4475,7 @@ msgstr "idag" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:37 msgid "used map" msgstr "brukte kart" @@ -4568,6 +4606,14 @@ msgstr[0] "%d dag" msgstr[1] "%d dager" #, 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>." + +#, fuzzy #~ msgid "Reported at %s" #~ msgstr "Rapportert %s" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index faab632b4..22c494c60 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-01-16 12:43+0000\n" +"POT-Creation-Date: 2013-01-24 15:23+0000\n" "PO-Revision-Date: 2011-12-08 10:56+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr " og " @@ -43,7 +43,7 @@ msgstr " og <strong>vi sender det no til administrasjonen</strong>" msgid " or " msgstr " eller " -#: templates/web/default/admin/bodies.html:14 +#: templates/web/default/admin/bodies.html:31 msgid "%d addresses" msgstr "%d adresser" @@ -78,7 +78,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s – oppsummeringsrapportar" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:621 msgid "%s ref: %s" msgstr "" @@ -86,11 +86,11 @@ msgstr "" msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:500 +#: perllib/FixMyStreet/DB/Result/Problem.pm:506 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:502 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" @@ -98,12 +98,12 @@ msgstr "%s, rapportert av %s %s" msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" -#: templates/web/default/email_sent.html:28 +#: templates/web/default/email_sent.html:31 msgid "(Don't worry — %s)" msgstr "(Ingen grunn til å uroa seg — %s)" #: templates/web/default/admin/report_blocks.html:11 -#: templates/web/default/admin/users.html:23 +#: templates/web/default/admin/users.html:26 msgid "(Email in abuse table)" msgstr "(Epost i misbruktabellen)" @@ -144,7 +144,7 @@ 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:114 +#: templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "(optional)" msgstr "(valfritt)" @@ -164,12 +164,12 @@ msgstr "(vi viser aldri e-postadressa di)" #: perllib/FixMyStreet/App/Controller/Report/New.pm:635 #: perllib/FixMyStreet/App/Controller/Report/New.pm:663 -#: perllib/FixMyStreet/DB/Result/Problem.pm:356 +#: perllib/FixMyStreet/DB/Result/Problem.pm:362 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" #: perllib/FixMyStreet/App/Controller/Report/New.pm:615 -#: perllib/FixMyStreet/DB/Result/Problem.pm:362 +#: perllib/FixMyStreet/DB/Result/Problem.pm:368 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" @@ -346,17 +346,21 @@ msgstr "<strong>Ja</strong>, eg har eit passord:" msgid "About us" msgstr "Om oss" -#: templates/web/default/admin/bodies.html:27 +#: templates/web/default/admin/bodies.html:45 #: templates/web/default/admin/body-form.html:77 #: templates/web/zurich/admin/body-form.html:47 msgid "Add body" msgstr "" #: templates/web/default/admin/body.html:69 -#: templates/web/zurich/admin/body.html:29 +#: templates/web/zurich/admin/body.html:30 msgid "Add new category" msgstr "Legg til ny kategori" +#: templates/web/default/admin/users.html:35 +msgid "Add user" +msgstr "" + #: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60 msgid "Added %s" msgstr "La til %s" @@ -393,7 +397,8 @@ msgstr "Alle rapportar" #: templates/web/fixmystreet/footer.html:49 #: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/footer.html:12 +#: templates/web/zurich/footer.html:19 +#: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Alle rapportar" @@ -435,8 +440,6 @@ msgstr "" #: 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 "" @@ -453,15 +456,6 @@ 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." @@ -501,19 +495,24 @@ msgstr "den lokale administrasjonen" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:98 +#: templates/web/zurich/admin/report_edit.html:97 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:107 +#: templates/web/zurich/admin/report_edit.html:106 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:139 -#: templates/web/zurich/admin/report_edit.html:86 +#: templates/web/zurich/admin/report_edit.html:138 +#: templates/web/zurich/admin/report_edit.html:85 msgid "Assign to subdivision:" msgstr "" +#: templates/web/zurich/report/updates.html:11 +#, fuzzy +msgid "Assigned to %s" +msgstr "Logga inn som %s" + #: templates/web/default/open311/index.html:17 msgid "" "At most %d requests are returned in each query. The returned requests are " @@ -528,6 +527,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "For augneblunken går det berre an å søkja etter og å sjå på rapportar." +#: perllib/FixMyStreet/DB/Result/Problem.pm:317 #: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -546,10 +546,10 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:62 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:127 #: templates/web/default/admin/bodies.html:1 -#: templates/web/zurich/admin/header.html:24 +#: templates/web/zurich/header.html:63 msgid "Bodies" msgstr "" @@ -558,7 +558,7 @@ msgstr "" msgid "Body" msgstr "" -#: templates/web/default/admin/user_edit.html:12 +#: templates/web/default/admin/user-form.html:7 msgid "Body:" msgstr "" @@ -586,16 +586,17 @@ msgstr "" #: 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/bodies.html:11 #: templates/web/default/admin/body.html:35 #: templates/web/default/admin/flagged.html:14 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/reports.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 -#: templates/web/zurich/admin/body.html:12 +#: templates/web/zurich/admin/body.html:13 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:14 -#: templates/web/zurich/report/new/fill_in_details_form.html:64 +#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategori" @@ -607,9 +608,9 @@ msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" #: templates/web/default/admin/body_edit.html:23 #: templates/web/default/admin/report_edit.html:26 #: templates/web/default/report/new/fill_in_details_form.html:67 -#: templates/web/zurich/admin/body.html:35 +#: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit.html:96 msgid "Category:" msgstr "Kategori:" @@ -623,7 +624,7 @@ msgstr "Kategori: %s" msgid "Change Password" msgstr "Byt passord" -#: templates/web/default/js/translation_strings.html:28 +#: templates/web/default/js/translation_strings.html:39 #: templates/web/fixmystreet/around/_report_banner.html:2 #, fuzzy msgid "Click map to report a problem" @@ -640,17 +641,17 @@ msgstr "Korleis rapportera eit problem" #: 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/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 -#: templates/web/zurich/admin/header.html:2 -#: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:74 -#: templates/web/zurich/admin/report_edit.html:76 +#: templates/web/zurich/admin/header.html:12 +#: templates/web/zurich/admin/report_edit.html:73 +#: templates/web/zurich/admin/report_edit.html:75 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "Lukka" # skal det vera forskjellig tyding frå engelsken her? --KBU -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:714 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" @@ -669,7 +670,7 @@ msgstr "Dei næraste problema <small>(innanfor %skm)</small>" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:37 msgid "Co-ordinates:" msgstr "Koordinatar:" @@ -732,7 +733,7 @@ msgstr "Stadfesting" #: templates/web/default/admin/body_edit.html:31 #: templates/web/default/admin/body_edit.html:77 #: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:41 msgid "Confirmed" msgstr "Stadfesta" @@ -771,11 +772,15 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppa" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1172 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1217 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1245 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" +#: templates/web/default/js/translation_strings.html:31 +msgid "Could not look up location" +msgstr "" + #: templates/web/default/admin/flagged.html:13 #: templates/web/default/admin/list_updates.html:12 msgid "Council" @@ -801,7 +806,7 @@ msgid "Create a report" msgstr "Lag ein rapport" #: templates/web/default/admin/body.html:103 -#: templates/web/zurich/admin/body.html:52 +#: templates/web/zurich/admin/body.html:53 msgid "Create category" msgstr "Lag kategori" @@ -809,14 +814,13 @@ msgstr "Lag kategori" #: templates/web/default/admin/list_updates.html:9 #: templates/web/default/admin/reports.html:20 #: templates/web/zurich/admin/list_updates.html:6 -#: templates/web/zurich/admin/reports.html:15 msgid "Created" msgstr "Oppretta" #: templates/web/default/admin/report_edit.html:34 #: templates/web/default/admin/update_edit.html:45 #: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit.html:42 +#: templates/web/zurich/admin/report_edit.html:44 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Oppretta:" @@ -839,12 +843,14 @@ msgstr "Sletta" #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/reports.html:13 msgid "Description" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:54 +#: templates/web/default/js/translation_strings.html:28 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/zurich/report/new/fill_in_details_form.html:56 +#: templates/web/zurich/report/new/fill_in_details_form.html:42 #, fuzzy msgid "Details" msgstr "Detaljar:" @@ -852,8 +858,8 @@ msgstr "Detaljar:" #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/zurich/admin/report_edit-sdm.html:14 -#: templates/web/zurich/admin/report_edit.html:20 -#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:22 +#: templates/web/zurich/admin/report_edit.html:29 msgid "Details:" msgstr "Detaljar:" @@ -884,19 +890,20 @@ msgstr "Veit ikkje" #: 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/problem_row.html:32 +#: templates/web/default/admin/users.html:28 +#: templates/web/zurich/admin/problem_row.html:35 msgid "Edit" msgstr "Rediger" #: templates/web/default/admin/body.html:112 -#: templates/web/zurich/admin/body.html:63 +#: templates/web/zurich/admin/body.html:64 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 +#: templates/web/zurich/admin/report_edit.html:4 msgid "Editing problem %d" msgstr "Rediger problem %d" @@ -914,6 +921,7 @@ msgid "Editor" msgstr "Oppdatert av" #: templates/web/bromley/report/display.html:126 +#: templates/web/default/admin/bodies.html:9 #: templates/web/default/admin/body.html:36 #: templates/web/default/admin/body_edit.html:76 #: templates/web/default/admin/flagged.html:12 @@ -924,15 +932,15 @@ msgstr "Oppdatert av" #: templates/web/fixmystreet/auth/general.html:20 #: templates/web/fixmystreet/report/update-form.html:74 #: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:13 +#: templates/web/zurich/admin/body.html:14 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1190 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" @@ -948,12 +956,12 @@ msgstr "Send meg oppdateringar" #: 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/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:34 -#: templates/web/zurich/admin/body.html:40 +#: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:23 -#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 msgid "Email:" msgstr "E-post:" @@ -998,7 +1006,7 @@ msgstr "Sluttmånad:" msgid "Endpoint" msgstr "Sett opp Open311" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:12 #, fuzzy msgid "Enter a Zürich street name" msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" @@ -1108,7 +1116,6 @@ msgid "FixMyStreet" msgstr "FiksGataMi-administrator:" #: templates/web/default/admin/header.html:10 -#: templates/web/zurich/admin/header.html:21 msgid "FixMyStreet admin:" msgstr "FiksGataMi-administrator:" @@ -1180,13 +1187,13 @@ msgstr "Løyst:" msgid "Flag user" msgstr "Flagg brukar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1044 -#: templates/web/default/admin/users.html:15 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Flagga:" #: templates/web/default/admin/report_edit.html:43 -#: templates/web/default/admin/user_edit.html:18 +#: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "Flagga:" @@ -1214,7 +1221,7 @@ msgstr "Rapportane dine" #: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 -#: templates/web/zurich/faq/faq-de.html:1 +#: templates/web/zurich/faq/faq-de-ch.html:1 msgid "Frequently Asked Questions" msgstr "Ofte spurde spurnader" @@ -1293,7 +1300,8 @@ msgstr "" #: templates/web/fixmybarangay/footer.html:24 #: templates/web/fixmystreet/footer.html:53 #: templates/web/reading/footer.html:10 templates/web/stevenage/footer.html:47 -#: templates/web/zurich/footer.html:14 +#: templates/web/zurich/footer.html:21 +#: templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "Hjelp" @@ -1306,26 +1314,26 @@ 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:49 +#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" #: 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/header.html:2 -#: templates/web/zurich/admin/header.html:9 -#: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:69 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:11 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/report_edit.html:68 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skjult" -#: templates/web/default/around/display_location.html:63 +#: templates/web/default/around/display_location.html:66 msgid "Hide old" msgstr "" -#: templates/web/default/around/display_location.html:58 +#: templates/web/default/around/display_location.html:61 msgid "Hide pins" msgstr "Skjul nåler" @@ -1346,7 +1354,7 @@ msgstr "Korleis rapportera eit problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:655 +#: perllib/FixMyStreet/App/Controller/Admin.pm:670 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." @@ -1376,7 +1384,7 @@ msgstr "" #: templates/web/zurich/admin/index-dm.html:20 #: templates/web/zurich/admin/index-sdm.html:18 #: templates/web/zurich/admin/list_updates.html:5 -#: templates/web/zurich/admin/reports.html:11 +#: templates/web/zurich/admin/reports.html:12 msgid "ID" msgstr "ID" @@ -1402,7 +1410,7 @@ msgstr "" "området ditt." #: templates/web/default/auth/token.html:23 -#: templates/web/default/email_sent.html:24 +#: templates/web/default/email_sent.html:26 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " "check your bulk/spam mail folders: sometimes, our messages are marked that " @@ -1454,9 +1462,9 @@ msgstr "" #: 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/header.html:2 -#: templates/web/zurich/admin/header.html:6 -#: templates/web/zurich/admin/report_edit.html:78 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:8 +#: templates/web/zurich/admin/report_edit.html:77 #: templates/web/zurich/report/banner.html:15 #, fuzzy msgid "In progress" @@ -1471,7 +1479,7 @@ msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi «%s»" #: templates/web/zurich/admin/report_edit-sdm.html:35 -#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:59 msgid "Internal notes:" msgstr "" @@ -1479,7 +1487,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:959 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1004 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1487,7 +1495,7 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:949 +#: perllib/FixMyStreet/App/Controller/Admin.pm:994 msgid "Invalid start date" msgstr "Ugyldig startdato" @@ -1536,7 +1544,7 @@ msgid "Last Name" msgstr "Siste oppdatering:" #: templates/web/default/admin/body.html:40 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/body.html:15 msgid "Last editor" msgstr "Sist redigert av" @@ -1556,7 +1564,7 @@ msgstr "Vis alle rapporterte problem" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 -#: templates/web/zurich/report/new/fill_in_details_form.html:65 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Loading..." msgstr "Lastar …" @@ -1599,6 +1607,10 @@ msgstr "Lokale varsel" msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" +#: templates/web/default/js/translation_strings.html:37 +msgid "MAP" +msgstr "" + #: perllib/FixMyStreet/Map/OSM.pm:44 msgid "" "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/" @@ -1630,6 +1642,7 @@ msgstr "Månad" msgid "More problems nearby" msgstr "Fleire problem i nærleiken" +#: templates/web/default/admin/bodies.html:7 #: templates/web/default/admin/body-form.html:4 #: templates/web/default/admin/flagged.html:11 #: templates/web/default/admin/flagged.html:34 @@ -1646,15 +1659,15 @@ msgstr "Fleire problem i nærleiken" #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "Name" msgstr "Namn" #: 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/default/admin/user-form.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:37 +#: templates/web/zurich/admin/report_edit.html:39 msgid "Name:" msgstr "Namn:" @@ -1689,7 +1702,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:266 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 #, fuzzy msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " @@ -1808,7 +1821,7 @@ msgstr "Ny!" msgid "No" msgstr "Nei" -#: templates/web/default/admin/user_edit.html:13 +#: templates/web/default/admin/user-form.html:8 msgid "No body" msgstr "" @@ -1816,7 +1829,7 @@ msgstr "" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:339 +#: perllib/FixMyStreet/DB/Result/Problem.pm:345 msgid "No council selected" msgstr "Ingen administrasjon er vald" @@ -1847,6 +1860,10 @@ msgstr "Fann ingen problem." msgid "No problems have been reported yet." msgstr "Ingen problem er rapporterte" +#: templates/web/default/js/translation_strings.html:32 +msgid "No result returned" +msgstr "" + #: templates/web/default/report/_support.html:3 msgid "No supporters" msgstr "" @@ -1857,7 +1874,7 @@ msgstr "" #: templates/web/default/admin/report_edit.html:17 #: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:43 msgid "None" msgstr "Ingen" @@ -1876,7 +1893,7 @@ msgstr "Ikkje rapportert til administrasjonen" #: templates/web/default/admin/body.html:41 #: templates/web/default/admin/body_edit.html:80 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/zurich/admin/body.html:16 msgid "Note" msgstr "Merk" @@ -1892,7 +1909,7 @@ msgstr "" #: templates/web/default/admin/body.html:92 #: templates/web/default/admin/body_edit.html:37 -#: templates/web/zurich/admin/body.html:46 +#: templates/web/zurich/admin/body.html:47 msgid "Note:" msgstr "Merk:" @@ -1918,6 +1935,10 @@ msgstr "På tide å registrera oppdateringa di, har du eit FiksGataMi-passord?" msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "På tide å registrera oppdateringa di, har du eit FiksGataMi-passord?" +#: templates/web/default/js/translation_strings.html:36 +msgid "OK" +msgstr "" + #: templates/web/default/report/display.html:21 #: templates/web/default/report/update.html:16 msgid "Offensive? Unsuitable? Tell us" @@ -1968,10 +1989,10 @@ msgstr "Eldre problem" #: 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/header.html:2 -#: templates/web/zurich/admin/header.html:5 -#: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:67 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:7 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/report_edit.html:66 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2010,10 +2031,10 @@ msgstr "" #: 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/Result/Problem.pm:515 +#: perllib/FixMyStreet/DB/Result/Problem.pm:525 +#: perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: perllib/FixMyStreet/DB/Result/Problem.pm:547 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" @@ -2063,7 +2084,7 @@ 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:120 +#: templates/web/zurich/report/new/fill_in_details_form.html:106 #, fuzzy msgid "Phone number (optional)" msgstr "(valfritt)" @@ -2072,7 +2093,7 @@ msgstr "(valfritt)" #: 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:25 -#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit.html:43 msgid "Phone:" msgstr "Telefon:" @@ -2080,7 +2101,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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 #, fuzzy msgid "Photo" msgstr "Bilete:" @@ -2110,11 +2131,11 @@ msgstr "" #: 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/zurich/admin/header.html:2 -#: templates/web/zurich/admin/header.html:7 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:68 +#: templates/web/zurich/admin/report_edit.html:64 +#: templates/web/zurich/admin/report_edit.html:67 msgid "Planned" msgstr "Planlagt" @@ -2126,7 +2147,7 @@ msgid "" msgstr "Ver venleg og sjå over oppdateringane som er lagt inn." #: templates/web/default/report/new/notes.html:6 -#: templates/web/fixmystreet/report/new/notes.html:5 +#: templates/web/fixmystreet/report/new/notes.html:6 msgid "Please be polite, concise and to the point." msgstr "Ver høfleg, poengtert og kortfatta." @@ -2150,12 +2171,12 @@ msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" #: 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 +#: perllib/FixMyStreet/DB/Result/Problem.pm:364 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Vel ein kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:364 +#: perllib/FixMyStreet/DB/Result/Problem.pm:370 msgid "Please choose a property type" msgstr "Vel ein type eigenskap" @@ -2178,7 +2199,7 @@ msgstr "" "til forsida</a> og følg instruksjonane." #: templates/web/default/report/new/notes.html:7 -#: templates/web/fixmystreet/report/new/notes.html:6 +#: templates/web/fixmystreet/report/new/notes.html:7 #, fuzzy msgid "" "Please do not be abusive — abusing your council devalues the " @@ -2198,7 +2219,7 @@ msgid "Please enter a password" msgstr "Skriv inn eit passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:339 #: templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" @@ -2214,7 +2235,7 @@ msgstr "Ver venleg og legg til ein gyldig e-post" msgid "Please enter a valid email address" msgstr "Ver venleg og legg inn e-postadressa di" -#: perllib/FixMyStreet/DB/Result/Problem.pm:336 +#: perllib/FixMyStreet/DB/Result/Problem.pm:342 #: templates/web/default/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" @@ -2232,7 +2253,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:106 +#: templates/web/zurich/report/new/fill_in_details_form.html:92 #, fuzzy msgid "Please enter your email address" msgstr "Ver venleg og legg inn e-posten din" @@ -2242,7 +2263,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:351 +#: perllib/FixMyStreet/DB/Result/Problem.pm:357 #: templates/web/default/js/translation_strings.html:7 #, fuzzy msgid "" @@ -2255,7 +2276,7 @@ msgstr "" #: 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/Problem.pm:350 #: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" @@ -2325,7 +2346,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:60 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 #, fuzzy msgid "Please fill in details of the problem." msgstr "Ver venleg og fyll ut detaljar om problemet under." @@ -2333,7 +2354,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:34 +#: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "" "Please fill in the form below with details of the problem, and describe the " "location as precisely as possible in the details box." @@ -2375,7 +2396,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:25 +#: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." @@ -2494,7 +2515,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:861 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -2602,15 +2623,15 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:149 +#: templates/web/zurich/admin/report_edit.html:148 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:53 +#: templates/web/zurich/admin/report_edit.html:55 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:162 +#: templates/web/zurich/admin/report_edit.html:158 msgid "Publish the response" msgstr "" @@ -2733,7 +2754,7 @@ msgid "Recently reported problems" msgstr "Nyleg melde problem" #: templates/web/default/report/new/notes.html:9 -#: templates/web/fixmystreet/report/new/notes.html:8 +#: templates/web/fixmystreet/report/new/notes.html:10 msgid "" "Remember that FixMyStreet is primarily for reporting physical problems that " "can be fixed. If your problem is not appropriate for submission via this " @@ -2771,7 +2792,8 @@ msgstr "Rapporter tomme heimar" #: templates/web/fiksgatami/nn/footer.html:5 #: templates/web/fixmystreet/footer.html:45 #: templates/web/reading/footer.html:6 templates/web/stevenage/footer.html:39 -#: templates/web/zurich/footer.html:10 +#: templates/web/zurich/footer.html:17 +#: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Rapporter eit problem" @@ -2805,7 +2827,7 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:524 +#: perllib/FixMyStreet/DB/Result/Problem.pm:530 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2817,25 +2839,25 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:516 +#: perllib/FixMyStreet/DB/Result/Problem.pm:522 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:547 +#: perllib/FixMyStreet/DB/Result/Problem.pm:553 #: 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:538 +#: perllib/FixMyStreet/DB/Result/Problem.pm:544 msgid "Reported by %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:518 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:532 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -2844,15 +2866,16 @@ msgstr "Rapportert av %s i kategorien %s av %s %s" msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:526 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:542 +#: perllib/FixMyStreet/DB/Result/Problem.pm:548 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" #: templates/web/default/around/around_index.html:1 +#: templates/web/default/js/translation_strings.html:35 #: templates/web/default/report/new/fill_in_details.html:0 #: templates/web/default/report/new/fill_in_details.html:3 #: templates/web/default/report/new/fill_in_details_form.html:1 @@ -2864,9 +2887,9 @@ msgstr "Rapportert i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1040 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:55 -#: templates/web/zurich/admin/header.html:25 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:120 +#: templates/web/zurich/header.html:59 #, fuzzy msgid "Reports" msgstr "Alle rapportar" @@ -2909,6 +2932,11 @@ msgstr "Søk i rapportar" msgid "Search Users" msgstr "Søk i brukarar" +#: templates/web/zurich/header.html:73 +#, fuzzy +msgid "Search reports" +msgstr "Søk i rapportar" + #: templates/web/default/admin/reports.html:5 #: templates/web/default/admin/users.html:5 #: templates/web/zurich/admin/reports.html:5 @@ -2934,7 +2962,7 @@ msgstr "" "Vel kva for ein type varsel du ynskjer og klikk på knappen for ei RSS-" "kjelde, eller skriv inn e-postadressa di for å abonnera på eit e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" @@ -2982,11 +3010,11 @@ msgstr "" msgid "Show my name publicly" msgstr "Vis namnet mitt offentleg" -#: templates/web/default/around/display_location.html:65 +#: templates/web/default/around/display_location.html:68 msgid "Show old" msgstr "" -#: templates/web/default/around/display_location.html:56 +#: templates/web/default/around/display_location.html:59 msgid "Show pins" msgstr "Vis nåler" @@ -2997,7 +3025,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:53 +#: templates/web/stevenage/header.html:101 msgid "Sign in" msgstr "Logg inn" @@ -3019,6 +3047,7 @@ msgstr "Logg inn eller opprett ein konto" #: templates/web/fixmybarangay/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 +#: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Logg ut" @@ -3096,7 +3125,6 @@ msgstr "Startmånad:" #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/reports.html:21 #: templates/web/fixmystreet/report/update-form.html:26 -#: templates/web/zurich/admin/reports.html:13 msgid "State" msgstr "Tilstand" @@ -3104,18 +3132,19 @@ msgstr "Tilstand" #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:63 +#: templates/web/zurich/admin/report_edit.html:62 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" #: templates/web/zurich/admin/index-dm.html:25 #: templates/web/zurich/admin/index-sdm.html:23 +#: templates/web/zurich/admin/reports.html:17 #, fuzzy msgid "Status" msgstr "Statistikk" @@ -3139,7 +3168,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:26 +#: templates/web/zurich/admin/report_edit.html:28 msgid "Subject:" msgstr "Emne:" @@ -3153,15 +3182,15 @@ 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:125 +#: templates/web/zurich/report/new/fill_in_details_form.html:111 msgid "Submit" msgstr "Send inn" #: 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/default/admin/user-form.html:17 #: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:164 +#: templates/web/zurich/admin/report_edit.html:160 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Send inn endringar" @@ -3171,13 +3200,14 @@ msgstr "Send inn endringar" msgid "Submit questionnaire" msgstr "Send inn spørjeskjema" -#: templates/web/zurich/admin/header.html:2 -#: templates/web/zurich/admin/header.html:4 +#: templates/web/zurich/admin/header.html:1 +#: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:64 #: templates/web/zurich/admin/report_edit.html:65 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/zurich/admin/reports.html:15 #: templates/web/zurich/report/banner.html:9 #, fuzzy msgid "Submitted" @@ -3204,12 +3234,12 @@ msgstr "" "Eller du kan abonnera på varsel basert på bydel eller administrasjon du " "høyrer til under:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:54 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:119 #: templates/web/default/admin/index.html:1 -#: templates/web/zurich/admin/header.html:22 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 +#: templates/web/zurich/header.html:56 msgid "Summary" msgstr "Oppsummering" @@ -3221,7 +3251,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 #, fuzzy msgid "Survey" msgstr "Resultat frå spørjeundersøkinga" @@ -3350,16 +3380,16 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:626 +#: perllib/FixMyStreet/App/Controller/Admin.pm:641 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." -#: perllib/FixMyStreet/App/Controller/Report.pm:98 +#: perllib/FixMyStreet/App/Controller/Report.pm:117 #, fuzzy msgid "That report cannot be viewed on FixMyStreet." msgstr "Den rapporten har vorte fjerna frå FiksGataMi." -#: perllib/FixMyStreet/App/Controller/Report.pm:92 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har vorte fjerna frå FiksGataMi." @@ -3394,7 +3424,7 @@ msgstr "" "med korleis attributten er definert i Open311 v2-spesifikasjonen." #: templates/web/default/auth/token.html:21 -#: templates/web/default/email_sent.html:22 +#: templates/web/default/email_sent.html:23 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." @@ -3430,7 +3460,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:50 +#: perllib/FixMyStreet/App/Controller/Reports.pm:51 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -3527,7 +3557,6 @@ msgstr "Den enklaste meldinga er den geografiske:" #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 -#: templates/web/zurich/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the problem will be public, plus your name if you " "give us permission." @@ -3543,7 +3572,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:47 +#: perllib/FixMyStreet/App/Controller/Reports.pm:48 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3690,7 +3719,7 @@ 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:15 +#: templates/web/zurich/report/_main.html:14 #, fuzzy msgid "This report is awaiting moderation." msgstr "Denne rapporten er for tida markert som open." @@ -3713,14 +3742,13 @@ msgid "" msgstr "" "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1086 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" #: templates/web/default/admin/flagged.html:10 #: templates/web/default/admin/reports.html:13 -#: templates/web/zurich/admin/reports.html:12 msgid "Title" msgstr "Tittel" @@ -3780,7 +3808,12 @@ msgstr "*ukjent*" msgid "Unknown alert type" msgstr "Ukjend varsel-type" -#: perllib/FixMyStreet/App/Controller/Report.pm:87 +#: templates/web/default/js/translation_strings.html:33 +#, fuzzy +msgid "Unknown error" +msgstr "*ukjent*" + +#: perllib/FixMyStreet/App/Controller/Report.pm:106 msgid "Unknown problem ID" msgstr "Ukjend problem-ID" @@ -3841,15 +3874,17 @@ msgstr "Oppdatering:" #: templates/web/zurich/admin/index-dm.html:24 #: templates/web/zurich/admin/index-sdm.html:22 +#: templates/web/zurich/admin/reports.html:16 #, fuzzy msgid "Updated" msgstr "Oppdatert!" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 -#: perllib/FixMyStreet/App/Controller/Admin.pm:851 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:239 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 +#: perllib/FixMyStreet/App/Controller/Admin.pm:733 +#: perllib/FixMyStreet/App/Controller/Admin.pm:867 +#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:955 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:309 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:364 msgid "Updated!" msgstr "Oppdatert!" @@ -3857,7 +3892,7 @@ msgstr "Oppdatert!" #: templates/web/default/report/update.html:3 #: templates/web/fixmystreet/report/update.html:3 #: templates/web/zurich/admin/list_updates.html:1 -#: templates/web/zurich/report/updates.html:3 +#: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Oppdateringar" @@ -3874,18 +3909,18 @@ msgstr "Oppdateringar av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringar til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1204 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1249 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1176 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1221 msgid "User flagged" msgstr "Brukar flagga" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 #: templates/web/default/admin/flagged.html:30 -#: templates/web/zurich/admin/header.html:28 +#: templates/web/zurich/header.html:68 msgid "Users" msgstr "Brukarar" @@ -3897,7 +3932,7 @@ msgstr "Verdi oppdatert" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 #: templates/web/zurich/admin/report_edit-sdm.html:13 -#: templates/web/zurich/admin/report_edit.html:17 +#: templates/web/zurich/admin/report_edit.html:19 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Sjå rapport på nettstaden" @@ -3966,7 +4001,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:110 +#: templates/web/zurich/report/new/fill_in_details_form.html:96 #, fuzzy msgid "We never show your email address or phone number." msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" @@ -4026,7 +4061,7 @@ msgstr "" #: templates/web/default/admin/body.html:43 #: templates/web/default/admin/body_edit.html:75 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/zurich/admin/body.html:17 msgid "When edited" msgstr "Når redigert" @@ -4079,7 +4114,7 @@ msgstr "" #: templates/web/default/report/new/notes.html:8 #: templates/web/fixmybarangay/report/new/notes.html:8 -#: templates/web/fixmystreet/report/new/notes.html:7 +#: templates/web/fixmystreet/report/new/notes.html:8 msgid "" "Writing your message entirely in block capitals makes it hard to read, as " "does a lack of punctuation." @@ -4102,7 +4137,7 @@ msgstr "År" #: 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/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:105 #: templates/web/default/questionnaire/index.html:66 @@ -4168,6 +4203,10 @@ msgstr "" "Du kan hjelpa oss ved å finna ein kontakt-e-post for lokale problem i %s, og " "senda han via e-post til oss på <a href='mailto:%s'>%s</a>." +#: templates/web/default/js/translation_strings.html:30 +msgid "You declined; please fill in the box above" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 msgid "" "You have already answered this questionnaire. If you have a question, please " @@ -4182,7 +4221,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:89 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -4202,13 +4241,14 @@ msgstr "" #: templates/web/default/auth/sign_out.html:3 #: templates/web/fixmybarangay/auth/sign_out.html:3 +#: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" 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:27 +#: templates/web/zurich/report/new/fill_in_details_form.html:13 #, fuzzy msgid "" "You have located the problem at the point marked with a green pin on the " @@ -4258,7 +4298,7 @@ msgstr "" "Du har no logga inn. Ver venleg og sjekk og stadfest at detaljane dine er " "korrekte:" -#: templates/web/default/email_sent.html:26 +#: templates/web/default/email_sent.html:28 msgid "" "You must now click the link in the email we've just sent you — if you " "do not, %s." @@ -4288,7 +4328,7 @@ msgstr "Rapportane dine" #: templates/web/fixmystreet/report/display.html:57 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 #, fuzzy msgid "Your email" msgstr "E-posten din" @@ -4339,7 +4379,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:118 +#: templates/web/zurich/report/new/fill_in_details_form.html:104 #, fuzzy msgid "Your name" msgstr "Namnet ditt:" @@ -4368,7 +4408,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:121 +#: templates/web/zurich/report/new/fill_in_details_form.html:107 msgid "Your phone number" msgstr "" @@ -4405,13 +4445,13 @@ msgstr "av %s" msgid "council" msgstr "administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:613 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 msgid "council ref: %s" msgstr "" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:37 msgid "didn't use map" msgstr "brukte ikkje kart" @@ -4455,9 +4495,9 @@ msgstr "" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit.html:30 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:24 +#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit.html:37 msgid "originally entered" msgstr "søkte etter" @@ -4473,7 +4513,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:50 +#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12 #, fuzzy msgid "sign out" msgstr "Logg ut" @@ -4484,13 +4524,11 @@ msgstr "Logg ut" #: templates/web/default/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:9 -#: templates/web/zurich/report/new/fill_in_details_form.html:6 -#: templates/web/zurich/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "den lokale administrasjonen" #: templates/web/default/report/_main.html:6 -#: templates/web/zurich/report/_main.html:6 +#: templates/web/zurich/report/_main.html:5 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -4504,7 +4542,7 @@ msgstr "i dag" #: templates/web/default/admin/report_edit.html:16 #: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:35 +#: templates/web/zurich/admin/report_edit.html:37 msgid "used map" msgstr "brukte kart" @@ -4635,6 +4673,13 @@ msgstr[0] "%d dag" msgstr[1] "%d dager" #, 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>." + +#, fuzzy #~ msgid "Reported at %s" #~ msgstr "Rapportert %s" |