diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2015-02-20 16:58:05 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2015-03-18 16:14:16 +0000 |
| commit | afe94a2eff801b769e55d5527a1367406810958a (patch) | |
| tree | 6b55169228e6bdcfe00ce00731f7f72142888405 /locale/FixMyStreet.po | |
| parent | 3b724e751e6a9c9b0827db54226522f29dcc7f76 (diff) | |
Version 1.5.4.v1.5.4
Including updated translations.
Diffstat (limited to 'locale/FixMyStreet.po')
| -rw-r--r-- | locale/FixMyStreet.po | 394 |
1 files changed, 186 insertions, 208 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 3a16698e3..e87de15f6 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: 2015-01-20 16:59+0000\n" +"POT-Creation-Date: 2015-02-25 15:01+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,11 +17,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 msgid " and " msgstr "" -#: templates/web/base/report/new/councils_text_all.html:12 templates/web/base/report/new/councils_text_all.html:19 templates/web/base/report/new/councils_text_all.html:5 templates/web/base/report/new/councils_text_none.html:19 templates/web/base/report/new/councils_text_none.html:21 templates/web/base/report/new/councils_text_some.html:20 templates/web/base/report/new/councils_text_some.html:22 templates/web/base/report/new/councils_text_some.html:5 +#: templates/web/base/report/new/councils_text_all.html:11 templates/web/base/report/new/councils_text_all.html:18 templates/web/base/report/new/councils_text_all.html:4 templates/web/base/report/new/councils_text_none.html:11 templates/web/base/report/new/councils_text_none.html:2 templates/web/base/report/new/councils_text_some.html:19 templates/web/base/report/new/councils_text_some.html:22 templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "" @@ -53,7 +53,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:659 msgid "%s ref: %s" msgstr "" @@ -61,7 +61,7 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:546 msgid "%s, reported at %s" msgstr "" @@ -69,6 +69,10 @@ msgstr "" msgid "%s, within %s ward" msgstr "" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "" @@ -101,7 +105,7 @@ msgstr "" msgid "(fixed)" msgstr "" -#: templates/web/base/index.html:9 templates/web/fixmystreet/around/intro.html:2 +#: templates/web/base/index.html:8 templates/web/base/index.html:9 templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" @@ -129,11 +133,11 @@ msgstr "" msgid "(we never show your email)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 perllib/FixMyStreet/App/Controller/Report/New.pm:662 perllib/FixMyStreet/DB/Result/Problem.pm:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 perllib/FixMyStreet/App/Controller/Report/New.pm:662 perllib/FixMyStreet/DB/Result/Problem.pm:385 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 perllib/FixMyStreet/DB/Result/Problem.pm:391 msgid "-- Pick a property type --" msgstr "" @@ -144,37 +148,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try <a href=\"http://www.norge.no/styresmakter/\">writing\n" -"direct to your councillor(s)</a> or, if it’s a problem that could be\n" -"fixed by local people working together, why not\n" -"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" - -#: templates/web/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" - -#: templates/web/base/questionnaire/completed.html:9 -msgid "" -"<p>Thank you very much for filling in our questionnaire; if you\n" -"get some more information about the status of your problem, please come back to the\n" -"site and leave an update.</p>" -msgstr "" - -#: templates/web/base/around/_report_banner.html:4 templates/web/base/around/_report_banner.html:5 +#: templates/web/base/around/_report_banner.html:3 templates/web/base/around/_report_banner.html:5 msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" msgstr "" @@ -206,10 +180,6 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:19 templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 templates/web/base/report/new/fill_in_details_form.html:141 templates/web/base/report/update-form.html:95 templates/web/fixmystreet/auth/general.html:37 templates/web/fixmystreet/auth/general.html:39 templates/web/fixmystreet/report/new/form_user_loggedout.html:15 templates/web/fixmystreet/report/update-form.html:89 msgid "<strong>Yes</strong> I have a password" msgstr "" @@ -269,7 +239,7 @@ msgstr "" msgid "All Reports" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 templates/web/fiksgatami/nn/footer.html:23 templates/web/fixmystreet/footer.html:26 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:19 templates/web/zurich/nav_over_content.html:6 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:19 templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "" @@ -281,15 +251,15 @@ msgstr "" msgid "All the information you provide here will be sent to" msgstr "" -#: templates/web/base/report/new/councils_text_all.html:12 templates/web/base/report/new/councils_text_all.html:13 +#: templates/web/base/report/new/councils_text_all.html:11 templates/web/base/report/new/councils_text_all.html:13 msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>." msgstr "" -#: templates/web/base/report/new/councils_text_all.html:5 templates/web/base/report/new/councils_text_all.html:6 +#: templates/web/base/report/new/councils_text_all.html:4 templates/web/base/report/new/councils_text_all.html:6 msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system." msgstr "" -#: templates/web/base/report/new/councils_text_all.html:19 templates/web/base/report/new/councils_text_all.html:20 templates/web/base/report/new/fill_in_details_form.html:13 templates/web/base/report/new/fill_in_details_form.html:14 templates/web/fixmystreet/report/new/fill_in_details_form.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/councils_text_all.html:18 templates/web/base/report/new/councils_text_all.html:20 templates/web/base/report/new/fill_in_details_form.html:12 templates/web/base/report/new/fill_in_details_form.html:14 templates/web/fixmystreet/report/new/fill_in_details_form.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:11 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -309,7 +279,7 @@ msgstr "" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "" -#: templates/web/fiksgatami/front/footer-marketing.html:14 templates/web/fixmystreet/front/footer-marketing.html:16 +#: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "" @@ -345,7 +315,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 templates/web/zurich/report/_item.html:11 +#: perllib/FixMyStreet/DB/Result/Problem.pm:340 templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" @@ -389,7 +359,7 @@ msgstr "" msgid "Category:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:364 msgid "Category: %s" msgstr "" @@ -434,11 +404,11 @@ msgstr "" msgid "Click map to report a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:45 templates/web/base/admin/report_edit.html:47 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:144 templates/web/fixmystreet/report/banner.html:15 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:12 templates/web/zurich/admin/header.html:2 templates/web/zurich/admin/report_edit.html:95 templates/web/zurich/admin/report_edit.html:97 templates/web/zurich/admin/stats.html:31 templates/web/zurich/report/banner.html:13 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:45 templates/web/base/admin/report_edit.html:47 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:144 templates/web/fixmystreet/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:12 templates/web/zurich/admin/report_edit.html:95 templates/web/zurich/admin/report_edit.html:97 templates/web/zurich/admin/stats.html:31 templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:754 msgid "Closed by council" msgstr "" @@ -450,7 +420,7 @@ msgstr "" msgid "Closed:" msgstr "" -#: templates/web/base/around/tabbed_lists.html:11 templates/web/base/around/tabbed_lists.html:12 +#: templates/web/base/around/tabbed_lists.html:10 templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" @@ -514,7 +484,7 @@ msgstr "" msgid "Contact Us" msgstr "" -#: templates/web/base/contact/index.html:6 templates/web/base/contact/submit.html:3 templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:6 templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "" @@ -566,7 +536,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: templates/web/base/dashboard/index.html:6 templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:5 templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "" @@ -634,7 +604,7 @@ msgstr "" msgid "Edit body details" msgstr "" -#: templates/web/base/admin/report_edit.html:1 templates/web/zurich/admin/report_edit-sdm.html:2 templates/web/zurich/admin/report_edit-sdm.html:4 templates/web/zurich/admin/report_edit.html:2 templates/web/zurich/admin/report_edit.html:5 +#: templates/web/base/admin/report_edit.html:1 templates/web/zurich/admin/report_edit-sdm.html:1 templates/web/zurich/admin/report_edit-sdm.html:4 templates/web/zurich/admin/report_edit.html:1 templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "" @@ -662,6 +632,14 @@ msgstr "" msgid "Email address:" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Admin.pm:1300 msgid "Email already in abuse list" msgstr "" @@ -678,7 +656,7 @@ msgstr "" msgid "Email:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:309 msgid "Email: %s" msgstr "" @@ -737,7 +715,7 @@ msgstr "" msgid "Enter a nearby postcode, or street name and area" msgstr "" -#: templates/web/base/around/postcode_form.html:2 templates/web/fixmystreet/around/postcode_form.html:11 +#: templates/web/base/around/postcode_form.html:1 templates/web/base/around/postcode_form.html:2 templates/web/fixmystreet/around/postcode_form.html:10 templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "" @@ -777,8 +755,8 @@ msgstr "" msgid "Extra data:" msgstr "" -#: templates/web/base/contact/submit.html:15 -msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" msgstr "" #: templates/web/zurich/admin/index-dm.html:33 templates/web/zurich/admin/index-sdm.html:30 @@ -882,7 +860,7 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 templates/web/base/static/privacy.html:1 templates/web/base/static/privacy.html:2 templates/web/fiksgatami/faq/faq-nb.html:1 templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/base/faq/faq-en-gb.html:1 templates/web/base/static/privacy.html:1 templates/web/base/static/privacy.html:2 msgid "Frequently Asked Questions" msgstr "" @@ -894,11 +872,11 @@ msgstr "" msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:4 templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/fixmystreet/reports/_rss.html:3 templates/web/fixmystreet/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:11 templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:11 templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -906,6 +884,10 @@ msgstr "" msgid "Give me an RSS feed" msgstr "" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 templates/web/base/around/postcode_form.html:8 templates/web/fixmystreet/around/postcode_form.html:21 templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "" @@ -930,7 +912,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 templates/web/fiksgatami/nn/footer.html:27 templates/web/fixmystreet/footer.html:30 templates/web/zurich/faq/faq-de-ch.html:1 templates/web/zurich/footer.html:21 templates/web/zurich/nav_over_content.html:8 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 templates/web/zurich/faq/faq-de-ch.html:1 templates/web/zurich/footer.html:21 templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "" @@ -938,11 +920,11 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/fiksgatami/header.html:48 templates/web/fixmystreet/header.html:52 templates/web/zurich/footer.html:11 +#: templates/web/fixmystreet/header.html:52 templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" -#: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:50 templates/web/base/admin/report_edit.html:51 templates/web/base/admin/update_edit.html:28 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/header.html:2 templates/web/zurich/admin/report_edit.html:86 templates/web/zurich/admin/report_edit.html:90 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:50 templates/web/base/admin/report_edit.html:51 templates/web/base/admin/update_edit.html:28 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/report_edit.html:86 templates/web/zurich/admin/report_edit.html:90 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" @@ -974,15 +956,23 @@ msgstr "" msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89 +#: templates/web/base/tokens/confirm_problem.html:23 templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "" + +#: templates/web/base/tokens/confirm_update.html:19 templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:44 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:54 msgid "I'm afraid we couldn't validate that token, as the report was made too long ago." msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:284 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 "" @@ -1014,7 +1004,11 @@ msgstr "" msgid "If you do not, your update will not be posted." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 templates/web/base/report/new/councils_text_none.html:8 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "" @@ -1053,7 +1047,7 @@ msgid "" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "" @@ -1073,10 +1067,14 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:38 templates/web/fixmystreet/report/banner.html:19 templates/web/zurich/admin/header.html:2 templates/web/zurich/admin/header.html:8 templates/web/zurich/admin/report_edit.html:99 templates/web/zurich/report/banner.html:15 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:38 templates/web/fixmystreet/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 templates/web/zurich/admin/report_edit.html:99 templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "" @@ -1121,6 +1119,10 @@ msgstr "" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 templates/web/base/report/new/fill_in_details_form.html:150 templates/web/base/report/update-form.html:104 templates/web/fixmystreet/auth/general.html:47 templates/web/fixmystreet/report/new/form_user_loggedout.html:28 templates/web/fixmystreet/report/update-form.html:102 templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "" @@ -1149,15 +1151,15 @@ msgstr "" msgid "Loading..." msgstr "" -#: templates/web/base/alert/choose.html:1 templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 templates/web/base/tokens/confirm_alert.html:1 templates/web/base/tokens/confirm_alert.html:4 templates/web/fixmystreet/alert/updates.html:1 +#: templates/web/base/alert/choose.html:1 templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 templates/web/base/tokens/confirm_alert.html:1 templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 templates/web/fiksgatami/nn/footer.html:25 templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "" @@ -1173,10 +1175,6 @@ msgstr "" msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" -msgstr "" - #: templates/web/base/admin/user-form.html:43 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" @@ -1213,11 +1211,11 @@ msgstr "" msgid "Name:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 msgid "Name: %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" @@ -1225,11 +1223,11 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:421 perllib/FixMyStreet/Cobrand/Default.pm:461 +#: perllib/FixMyStreet/Cobrand/Default.pm:424 perllib/FixMyStreet/Cobrand/Default.pm:464 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:278 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1331,7 +1329,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:368 msgid "No council selected" msgstr "" @@ -1369,7 +1367,7 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 templates/web/base/report/_support.html:4 +#: templates/web/base/report/_support.html:2 templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "" @@ -1461,7 +1459,7 @@ msgstr "" msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:36 templates/web/base/admin/report_edit.html:37 templates/web/base/admin/update_edit.html:28 templates/web/base/dashboard/index.html:142 templates/web/base/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:7 templates/web/zurich/admin/report_edit.html:86 templates/web/zurich/admin/report_edit.html:88 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:36 templates/web/base/admin/report_edit.html:37 templates/web/base/admin/update_edit.html:28 templates/web/base/dashboard/index.html:142 templates/web/base/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:86 templates/web/zurich/admin/report_edit.html:88 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 msgid "Open" msgstr "" @@ -1489,7 +1487,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:1057 perllib/FixMyStreet/App/Controller/Report/New.pm:662 perllib/FixMyStreet/App/Controller/Report/New.pm:663 perllib/FixMyStreet/DB/Result/Problem.pm:560 perllib/FixMyStreet/DB/Result/Problem.pm:570 perllib/FixMyStreet/DB/Result/Problem.pm:580 perllib/FixMyStreet/DB/Result/Problem.pm:592 perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057 perllib/FixMyStreet/App/Controller/Report/New.pm:662 perllib/FixMyStreet/App/Controller/Report/New.pm:663 perllib/FixMyStreet/DB/Result/Problem.pm:552 perllib/FixMyStreet/DB/Result/Problem.pm:562 perllib/FixMyStreet/DB/Result/Problem.pm:572 perllib/FixMyStreet/DB/Result/Problem.pm:584 perllib/FixMyStreet/DB/ResultSet/Problem.pm:359 perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 msgid "Other" msgstr "" @@ -1553,7 +1551,7 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:38 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:143 templates/web/zurich/admin/header.html:2 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 templates/web/zurich/admin/report_edit.html:86 templates/web/zurich/admin/report_edit.html:89 +#: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:38 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:143 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 templates/web/zurich/admin/report_edit.html:86 templates/web/zurich/admin/report_edit.html:89 msgid "Planned" msgstr "" @@ -1577,11 +1575,11 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 perllib/FixMyStreet/App/Controller/Report/New.pm:859 perllib/FixMyStreet/App/Controller/Report/New.pm:878 perllib/FixMyStreet/App/Controller/Report/New.pm:921 perllib/FixMyStreet/DB/Result/Problem.pm:395 templates/web/base/js/translation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 perllib/FixMyStreet/App/Controller/Report/New.pm:859 perllib/FixMyStreet/App/Controller/Report/New.pm:878 perllib/FixMyStreet/App/Controller/Report/New.pm:921 perllib/FixMyStreet/DB/Result/Problem.pm:387 templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:393 msgid "Please choose a property type" msgstr "" @@ -1600,7 +1598,7 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 perllib/FixMyStreet/DB/Result/Comment.pm:133 templates/web/base/js/translation_strings.html:2 +#: perllib/FixMyStreet/App/Controller/Admin.pm:352 perllib/FixMyStreet/DB/Result/Comment.pm:125 templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -1608,7 +1606,7 @@ msgstr "" msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 perllib/FixMyStreet/DB/Result/Problem.pm:370 templates/web/base/js/translation_strings.html:3 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 perllib/FixMyStreet/DB/Result/Problem.pm:362 templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" @@ -1616,15 +1614,15 @@ msgstr "" msgid "Please enter a valid email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:346 perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Alert.pm:346 perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 templates/web/base/js/translation_strings.html:4 +#: perllib/FixMyStreet/DB/Result/Problem.pm:365 templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 perllib/FixMyStreet/DB/Result/User.pm:124 templates/web/base/auth/general.html:13 templates/web/base/auth/general.html:8 templates/web/base/js/translation_strings.html:11 templates/web/base/js/translation_strings.html:15 templates/web/fixmystreet/auth/general.html:10 templates/web/fixmystreet/auth/general.html:15 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:8 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 perllib/FixMyStreet/DB/Result/User.pm:124 templates/web/base/auth/general.html:13 templates/web/base/auth/general.html:8 templates/web/base/js/translation_strings.html:11 templates/web/base/js/translation_strings.html:15 templates/web/fixmystreet/auth/general.html:10 templates/web/fixmystreet/auth/general.html:15 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "" @@ -1636,11 +1634,11 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 templates/web/base/js/translation_strings.html:7 +#: perllib/FixMyStreet/DB/Result/Problem.pm:380 templates/web/base/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:106 perllib/FixMyStreet/DB/Result/Comment.pm:130 perllib/FixMyStreet/DB/Result/Problem.pm:381 perllib/FixMyStreet/DB/Result/User.pm:120 templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 perllib/FixMyStreet/DB/Result/Comment.pm:122 perllib/FixMyStreet/DB/Result/Problem.pm:373 perllib/FixMyStreet/DB/Result/User.pm:120 templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -1660,7 +1658,7 @@ msgstr "" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 templates/web/base/report/new/fill_in_details_text.html:8 +#: templates/web/base/report/new/fill_in_details_text.html:1 templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "" @@ -1672,7 +1670,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -1692,15 +1690,15 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -1712,7 +1710,7 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -1720,15 +1718,11 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 perllib/FixMyStreet/App/Controller/Photo.pm:187 perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "Please upload a JPEG image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 -msgid "Please upload a JPEG image only\n" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "" @@ -1816,7 +1810,7 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/Default.pm:632 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 perllib/FixMyStreet/Cobrand/UK.pm:217 msgid "Problems within %s" msgstr "" @@ -1868,7 +1862,7 @@ msgstr "" msgid "Publish the response" msgstr "" -#: templates/web/base/questionnaire/completed.html:2 templates/web/base/questionnaire/index.html:0 templates/web/base/questionnaire/index.html:14 templates/web/base/questionnaire/index.html:4 templates/web/fixmystreet/questionnaire/index.html:0 templates/web/fixmystreet/questionnaire/index.html:15 templates/web/fixmystreet/questionnaire/index.html:33 templates/web/fixmystreet/questionnaire/index.html:5 +#: templates/web/base/questionnaire/completed.html:1 templates/web/base/questionnaire/index.html:0 templates/web/base/questionnaire/index.html:14 templates/web/base/questionnaire/index.html:4 templates/web/fixmystreet/questionnaire/index.html:0 templates/web/fixmystreet/questionnaire/index.html:15 templates/web/fixmystreet/questionnaire/index.html:33 templates/web/fixmystreet/questionnaire/index.html:5 msgid "Questionnaire" msgstr "" @@ -1880,11 +1874,11 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "" -#: templates/web/base/alert/_list.html:21 templates/web/base/around/display_location.html:3 templates/web/base/report/display.html:50 templates/web/base/reports/_rss.html:1 templates/web/fixmystreet/alert/_list.html:22 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:58 +#: templates/web/base/alert/_list.html:21 templates/web/base/around/display_location.html:1 templates/web/base/around/display_location.html:3 templates/web/base/report/display.html:50 templates/web/base/reports/_rss.html:1 templates/web/fixmystreet/alert/_list.html:22 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "" @@ -1896,7 +1890,7 @@ msgstr "" msgid "RSS feed for %s ward, %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "RSS feed of %s" msgstr "" @@ -1912,7 +1906,7 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 perllib/FixMyStreet/Cobrand/UK.pm:224 msgid "RSS feed of problems within %s" msgstr "" @@ -1920,7 +1914,7 @@ msgstr "" msgid "RSS feed of problems within %s ward" msgstr "" -#: templates/web/base/around/display_location.html:3 templates/web/base/around/display_location.html:4 +#: templates/web/base/around/display_location.html:1 templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "" @@ -1956,7 +1950,7 @@ msgstr "" msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 templates/web/fiksgatami/nn/footer.html:19 templates/web/fixmystreet/footer.html:22 templates/web/zurich/footer.html:17 templates/web/zurich/nav_over_content.html:4 +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 templates/web/zurich/footer.html:17 templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" @@ -1964,10 +1958,6 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/report_created.html:1 templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "" @@ -1988,7 +1978,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 templates/web/base/contact/index.html:50 templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:567 templates/web/base/contact/index.html:50 templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" msgstr "" @@ -1996,7 +1986,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 templates/web/base/contact/index.html:52 templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 templates/web/base/contact/index.html:52 templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" msgstr "" @@ -2004,31 +1994,31 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:563 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:555 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 msgid "Reported via %s in the %s category by %s at %s" msgstr "" -#: templates/web/base/around/around_index.html:2 templates/web/base/around/around_index.html:3 templates/web/base/js/translation_strings.html:41 templates/web/base/report/new/fill_in_details.html:0 templates/web/base/report/new/fill_in_details.html:5 templates/web/fixmystreet/around/around_index.html:2 templates/web/zurich/report/new/fill_in_details_form.html:2 +#: templates/web/base/around/around_index.html:1 templates/web/base/around/around_index.html:3 templates/web/base/js/translation_strings.html:41 templates/web/base/report/new/fill_in_details.html:0 templates/web/base/report/new/fill_in_details.html:5 templates/web/fixmystreet/around/around_index.html:2 templates/web/zurich/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" msgstr "" @@ -2036,7 +2026,7 @@ msgstr "" msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 perllib/FixMyStreet/DB/Result/Problem.pm:405 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2060,11 +2050,11 @@ msgstr "" msgid "Right place?" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" @@ -2124,7 +2114,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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "Sent to %s %s later" msgstr "" @@ -2172,7 +2162,7 @@ msgstr "" msgid "Signed in as %s" msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" @@ -2186,7 +2176,7 @@ msgstr "" msgid "Some photos of recent reports" msgstr "" -#: perllib/FixMyStreet/App/View/Email.pm:32 perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Email.pm:32 perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "" @@ -2198,11 +2188,11 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 perllib/FixMyStreet/Geocode/Google.pm:72 perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 perllib/FixMyStreet/Geocode/Google.pm:47 perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:51 perllib/FixMyStreet/Geocode/Google.pm:67 perllib/FixMyStreet/Geocode/Zurich.pm:87 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 perllib/FixMyStreet/Geocode/Google.pm:44 perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -2230,7 +2220,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:368 msgid "Subcategory: %s" msgstr "" @@ -2258,7 +2248,7 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 templates/web/zurich/admin/header.html:2 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:86 templates/web/zurich/admin/report_edit.html:87 templates/web/zurich/admin/reports.html:13 templates/web/zurich/report/banner.html:9 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 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:86 templates/web/zurich/admin/report_edit.html:87 templates/web/zurich/admin/reports.html:13 templates/web/zurich/report/banner.html:9 msgid "Submitted" msgstr "" @@ -2298,39 +2288,39 @@ msgstr "" msgid "Text:" msgstr "" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "" - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/tokens/error.html:7 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" -#: templates/web/fixmystreet/around/around_index.html:28 -msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" msgstr "" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" +#: templates/web/base/contact/submit.html:6 templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + +#: templates/web/fixmystreet/around/around_index.html:28 +msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:124 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2388,7 +2378,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 templates/web/base/report/new/fill_in_details_text.html:3 +#: templates/web/base/report/new/fill_in_details_text.html:1 templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" @@ -2412,7 +2402,7 @@ msgstr "" msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:185 perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -2468,7 +2458,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:11 templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:10 templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -2494,7 +2484,7 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 perllib/FixMyStreet/App/Controller/Dashboard.pm:59 msgid "There was a problem showing this page. Please try again later." msgstr "" @@ -2510,7 +2500,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "" @@ -2548,11 +2538,11 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:375 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" @@ -2608,7 +2598,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 msgid "This report was submitted anonymously" msgstr "" @@ -2644,6 +2634,10 @@ msgstr "" msgid "Try again" msgstr "" +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + #: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:46 templates/web/base/report/update-form.html:30 templates/web/base/report/update-form.html:33 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:31 msgid "Unable to fix" msgstr "" @@ -2728,7 +2722,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -2808,7 +2802,7 @@ msgstr "" msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -2820,10 +2814,18 @@ msgstr "" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/contact/blurb.html:8 msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" msgstr "" +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + #: templates/web/fixmystreet/report/new/fill_in_details_form.html:41 msgid "What’s the issue, and where is it?" msgstr "" @@ -2840,11 +2842,15 @@ msgstr "" msgid "Whole block of empty flats" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" -#: templates/web/fiksgatami/front/footer-marketing.html:15 templates/web/fixmystreet/front/footer-marketing.html:17 +#: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -2884,7 +2890,7 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:25 templates/web/base/tokens/confirm_problem.html:26 templates/web/zurich/tokens/confirm_problem.html:6 templates/web/zurich/tokens/confirm_problem.html:8 +#: templates/web/zurich/tokens/confirm_problem.html:5 templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" @@ -2903,7 +2909,7 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 templates/web/base/report/new/councils_text_none.html:20 templates/web/base/report/new/councils_text_some.html:20 templates/web/base/report/new/councils_text_some.html:21 +#: templates/web/base/report/new/councils_text_none.html:10 templates/web/base/report/new/councils_text_none.html:2 templates/web/base/report/new/councils_text_some.html:19 templates/web/base/report/new/councils_text_some.html:21 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 "" @@ -2927,7 +2933,7 @@ msgstr "" msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" -#: templates/web/base/auth/sign_out.html:3 templates/web/zurich/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" @@ -2935,26 +2941,10 @@ msgstr "" 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 "" -#: templates/web/base/tokens/confirm_alert.html:8 -msgid "You have successfully confirmed your alert." -msgstr "" - -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "" -#: templates/web/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "" - #: templates/web/base/report/display.html:20 templates/web/base/report/new/fill_in_details.html:37 templates/web/fixmystreet/report/display.html:17 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -3026,26 +3016,14 @@ msgstr "" msgid "Your phone number" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 templates/web/fiksgatami/nn/footer.html:21 templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - #: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 msgid "Your updates" msgstr "" @@ -3062,7 +3040,7 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 +#: perllib/FixMyStreet/DB/Result/Problem.pm:657 msgid "council ref: %s" msgstr "" @@ -3086,7 +3064,7 @@ msgstr "" msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:264 msgid "less than a minute" msgstr "" @@ -3142,7 +3120,7 @@ msgstr "" msgid "or locate me automatically" msgstr "" -#: templates/web/base/admin/report_edit.html:25 templates/web/base/admin/report_edit.html:26 templates/web/zurich/admin/report_edit-sdm.html:28 templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/report_edit-sdm.html:37 templates/web/zurich/admin/report_edit-sdm.html:38 templates/web/zurich/admin/report_edit.html:28 templates/web/zurich/admin/report_edit.html:29 templates/web/zurich/admin/report_edit.html:39 templates/web/zurich/admin/report_edit.html:40 templates/web/zurich/admin/report_edit.html:51 templates/web/zurich/admin/report_edit.html:52 +#: templates/web/base/admin/report_edit.html:24 templates/web/base/admin/report_edit.html:26 templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/report_edit-sdm.html:36 templates/web/zurich/admin/report_edit-sdm.html:38 templates/web/zurich/admin/report_edit.html:27 templates/web/zurich/admin/report_edit.html:29 templates/web/zurich/admin/report_edit.html:38 templates/web/zurich/admin/report_edit.html:40 templates/web/zurich/admin/report_edit.html:50 templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" @@ -3154,11 +3132,11 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/fiksgatami/header.html:49 templates/web/fixmystreet/header.html:53 templates/web/zurich/footer.html:12 +#: templates/web/fixmystreet/header.html:53 templates/web/zurich/footer.html:12 msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:13 templates/web/base/report/new/fill_in_details_form.html:15 templates/web/fixmystreet/report/new/fill_in_details_form.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:12 templates/web/base/report/new/fill_in_details_form.html:15 templates/web/fixmystreet/report/new/fill_in_details_form.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:12 msgid "the local council" msgstr "" @@ -3166,11 +3144,11 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:236 msgid "today" msgstr "" @@ -3197,7 +3175,7 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:283 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -3211,7 +3189,7 @@ msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:285 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -3232,7 +3210,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:278 +#: perllib/Utils.pm:279 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -3253,7 +3231,7 @@ msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:281 #, perl-format msgid "%d day" msgid_plural "%d days" |