diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2016-03-02 14:58:23 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2016-03-02 14:58:23 +0000 |
| commit | 2fc65ef99e7591f4f570c5102f46583a0ce9a793 (patch) | |
| tree | c30c3c3da3adb22261ddadccc4f6f26d7ba1af37 /locale/he_IL.UTF-8 | |
| parent | 3ef78780e20e1ede6631a2243c7f337bea46b269 (diff) | |
Version 1.8.v1.8
Add things missing from README, pull from Transifex, merge in new
translations, bump version number.
Diffstat (limited to 'locale/he_IL.UTF-8')
| -rw-r--r-- | locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po | 1027 |
1 files changed, 438 insertions, 589 deletions
diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po index 6969b6ac1..53b96b578 100644 --- a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:37+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Hebrew (Israel) (http://www.transifex.com/mysociety/fixmystreet/language/he_IL/)\n" "Language: he_IL\n" @@ -19,45 +19,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "" #: templates/web/base/report/new/councils_text_all.html:2 -#: 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_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: 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 "או" -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "" @@ -72,6 +51,19 @@ msgstr "" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +msgid "%s bodies" +msgstr "" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 msgid "" @@ -88,7 +80,16 @@ msgid "" "within a certain distance of a particular location." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +#, fuzzy +msgid "%s live updates" +msgstr "שלח לי דואר אלקטרוני על עדכונים" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "" @@ -103,15 +104,15 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -119,7 +120,7 @@ msgstr "" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -147,13 +148,13 @@ msgstr "" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "" @@ -161,37 +162,28 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -210,52 +202,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:145 -msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "" - -#: templates/web/base/report/update-form.html:118 -msgid "<strong>No</strong>, let me confirm my update by email:" -msgstr "" - -#: templates/web/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "" @@ -286,7 +265,7 @@ msgstr "" msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "" @@ -306,8 +285,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "" @@ -339,10 +317,8 @@ msgstr "" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: 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 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -364,6 +340,10 @@ msgstr "" msgid "Are you a developer?" msgstr "" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -396,16 +376,16 @@ msgstr "" msgid "Assigned to %s" msgstr "" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "" -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -417,7 +397,7 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -447,7 +427,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -458,8 +438,8 @@ msgstr "" msgid "Category" msgstr "" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "" @@ -472,7 +452,7 @@ msgstr "" msgid "Category:" msgstr "קטגוריה" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "קטגוריה: %s" @@ -522,7 +502,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "" @@ -549,7 +529,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -557,7 +537,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "" @@ -583,7 +563,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "תצורה" @@ -596,13 +576,13 @@ msgstr "" msgid "Confirm" msgstr "אשר" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "אשר חשבון" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -632,24 +612,17 @@ msgid "Confirmed:" msgstr "אישר:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "צור קשר" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "צור קשר" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "" @@ -658,8 +631,8 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "" @@ -677,7 +650,7 @@ msgstr "עירייה" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "" @@ -692,7 +665,7 @@ msgstr "" msgid "Count" msgstr "ספירה" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "צור דו\"ח" @@ -702,9 +675,8 @@ msgid "Create category" msgstr "צור קטגוריה" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "צור דו\"ח" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -741,7 +713,7 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -754,7 +726,7 @@ msgstr "" msgid "Deleted" msgstr "נמחק" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -762,12 +734,11 @@ msgid "Description" msgstr "תיאור" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "פרטים" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -788,11 +759,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" msgstr "" @@ -800,16 +771,18 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "לא אוהב טפסים?" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "כפול" @@ -859,7 +832,7 @@ msgstr "עורך" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -867,7 +840,7 @@ msgstr "עורך" msgid "Email" msgstr "דואר אלקטרוני" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "דואר אלקטרוני הוסף לרשימת המשתמשים לרעה" @@ -883,7 +856,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "דואר אלקטרוני כבר ברשימת המשתמשים לרעה" @@ -891,41 +864,36 @@ msgstr "דואר אלקטרוני כבר ברשימת המשתמשים לרעה" msgid "Email me new local problems" msgstr "שלח לי דואר אלקטרוני על בעיות מקומיות חדשות" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "שלח לי דואר אלקטרוני על עדכונים" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "דואר אלקטרוני:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "דואר אלקטרוני: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -958,7 +926,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "" @@ -976,14 +944,9 @@ msgstr "" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "" @@ -993,11 +956,11 @@ msgid "Enter details of the problem" msgstr "" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "" @@ -1010,11 +973,11 @@ msgstr "" msgid "Example postcode %s" msgstr "" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1055,17 +1018,15 @@ msgstr "" msgid "FixMyStreet" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "" @@ -1092,7 +1053,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1123,8 +1084,8 @@ msgstr "" msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "" @@ -1136,21 +1097,18 @@ msgstr "" msgid "Forwarded wish to external body" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "" @@ -1183,7 +1141,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "" @@ -1200,7 +1158,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1251,7 +1209,7 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1269,10 +1227,6 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 -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/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1301,16 +1255,11 @@ msgstr "" 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 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "" -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -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 "" - #: templates/web/base/questionnaire/index.html:68 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" @@ -1354,10 +1303,8 @@ msgstr "" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "" @@ -1365,7 +1312,7 @@ msgstr "" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 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 "" @@ -1373,7 +1320,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1408,7 +1355,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "" @@ -1416,7 +1363,7 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "" @@ -1424,14 +1371,12 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1449,11 +1394,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "" @@ -1511,6 +1454,7 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" @@ -1530,7 +1474,7 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "" @@ -1542,10 +1486,6 @@ msgstr "" msgid "Message to external body:" msgstr "" -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1558,10 +1498,6 @@ msgstr "" msgid "Month" msgstr "" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1569,11 +1505,11 @@ msgstr "" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1587,7 +1523,7 @@ msgstr "" msgid "Name:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "" @@ -1596,25 +1532,21 @@ msgstr "" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "" - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 msgid "Nearly done! Now check your email…" msgstr "" @@ -1692,8 +1624,8 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "" @@ -1757,10 +1689,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: 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 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "" @@ -1799,7 +1729,7 @@ msgstr "" msgid "Note:" msgstr "" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "" @@ -1807,13 +1737,15 @@ msgstr "" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "" @@ -1821,11 +1753,6 @@ msgstr "" msgid "OK" msgstr "" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "" @@ -1842,7 +1769,7 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1853,8 +1780,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: 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/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1869,15 +1795,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "" @@ -1889,15 +1815,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "" @@ -1906,7 +1832,7 @@ msgid "Owner" msgstr "" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "" @@ -1920,16 +1846,16 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "" @@ -1941,29 +1867,29 @@ msgstr "" msgid "Phone number" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." msgstr "" @@ -1971,13 +1897,7 @@ msgstr "" msgid "Photo required" msgstr "" -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "" - -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "" @@ -2006,20 +1926,16 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2033,8 +1949,7 @@ msgstr "" msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" @@ -2046,11 +1961,16 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +msgid "Please enter a name" +msgstr "" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2063,10 +1983,10 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2083,9 +2003,9 @@ msgid "Please enter some details" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2093,7 +2013,7 @@ msgstr "" msgid "Please enter your email" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "" @@ -2102,15 +2022,15 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: 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:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -2137,12 +2057,11 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: 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 "" @@ -2151,20 +2070,23 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "" -#: templates/web/base/report/update-form.html:7 -msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" +#: templates/web/base/report/new/oauth_email_form.html:4 +msgid "Please note your report has <strong>not yet been sent</strong>." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: 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 "" +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2202,6 +2124,7 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "" @@ -2209,18 +2132,14 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -2248,12 +2167,9 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2281,12 +2197,12 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "" @@ -2302,11 +2218,11 @@ msgstr "" msgid "Problems in this area" msgstr "" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "" @@ -2318,15 +2234,15 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -2348,19 +2264,16 @@ msgstr "" msgid "Property type:" msgstr "" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2396,18 +2309,17 @@ msgstr "" #: templates/web/base/alert/_list.html:22 #: 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/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2415,11 +2327,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2431,15 +2343,15 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2448,25 +2360,22 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "שלח לי דואר אלקטרוני על בעיות מקומיות חדשות" +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2484,8 +2393,8 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2505,7 +2414,7 @@ msgstr "" msgid "Report a problem" msgstr "" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "" @@ -2514,7 +2423,8 @@ msgid "Report on %s" msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2523,9 +2433,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2534,9 +2443,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2549,27 +2457,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2590,13 +2498,13 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2633,15 +2541,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "" @@ -2651,7 +2561,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2711,7 +2620,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "" @@ -2724,15 +2633,13 @@ msgstr "" msgid "Service:" msgstr "" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "" @@ -2744,9 +2651,9 @@ msgstr "" msgid "Show pins" msgstr "" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2773,7 +2680,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "" @@ -2783,7 +2690,7 @@ msgstr "" msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2795,14 +2702,20 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "" + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." @@ -2812,6 +2725,10 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +msgid "Sorry, you can not log in with Facebook. Please try again later." +msgstr "" + #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2820,13 +2737,12 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2834,7 +2750,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2856,7 +2772,7 @@ msgstr "" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "" @@ -2864,30 +2780,25 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2895,7 +2806,7 @@ msgstr "" msgid "Submit changes" msgstr "" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "" @@ -2911,9 +2822,8 @@ msgid "Submitted" msgstr "" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "" @@ -2921,7 +2831,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2940,7 +2850,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "" @@ -2976,7 +2886,7 @@ msgstr "" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 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 "" @@ -3011,23 +2921,23 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "" @@ -3058,7 +2968,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 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 "" @@ -3079,12 +2989,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 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 "" @@ -3131,8 +3041,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -3142,12 +3051,11 @@ msgstr "" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3164,18 +3072,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3184,7 +3092,7 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3192,7 +3100,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "" @@ -3206,7 +3114,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -3228,18 +3136,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 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:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3251,56 +3159,37 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "" - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -3311,7 +3200,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3334,11 +3223,11 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3356,10 +3245,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: 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 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "" @@ -3372,7 +3259,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" @@ -3380,17 +3267,18 @@ msgstr "" msgid "Unknown alert type" msgstr "" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "" @@ -3398,13 +3286,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "" @@ -3413,7 +3299,7 @@ msgstr "" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "" @@ -3438,20 +3324,16 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3459,13 +3341,12 @@ msgid "Updated!" msgstr "" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3475,9 +3356,7 @@ msgstr "" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" msgstr "" @@ -3490,11 +3369,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "" @@ -3502,7 +3381,7 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3533,7 +3412,6 @@ msgid "Viewing a location" msgstr "" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "" @@ -3546,25 +3424,23 @@ msgstr "" msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." msgstr "" -#: templates/web/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "" - -#: templates/web/zurich/auth/token.html:17 -msgid "We have sent you an email containing a link to confirm your account." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +msgid "We need your email address, please give it below." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 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 "" @@ -3581,10 +3457,6 @@ msgstr "" 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 "" @@ -3593,7 +3465,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3606,7 +3478,11 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "" @@ -3621,7 +3497,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 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 "" @@ -3629,7 +3505,7 @@ msgstr "" 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 "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3638,7 +3514,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3661,27 +3536,24 @@ msgstr "" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -3694,7 +3566,7 @@ msgstr "" msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3705,8 +3577,8 @@ msgid "" " reports in the past." msgstr "" -#: 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_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: 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>." @@ -3724,19 +3596,14 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "" - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 +msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:61 -msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." msgstr "" #: templates/web/base/auth/sign_out.html:4 @@ -3753,9 +3620,8 @@ msgstr "" msgid "You have successfully confirmed your email address." 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 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -3784,53 +3650,42 @@ msgid "Your Reports" msgstr "" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "" @@ -3839,15 +3694,16 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "" +msgstr "צור דו\"ח" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3857,14 +3713,9 @@ msgstr "" msgid "Your updates" msgstr "" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "צור דו\"ח" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" @@ -3897,13 +3748,13 @@ msgstr "" msgid "fixed reports" msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "" @@ -3995,10 +3846,8 @@ msgstr "" msgid "sign out" msgstr "" -#: 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 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" @@ -4007,7 +3856,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "" @@ -4036,7 +3885,7 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4064,7 +3913,7 @@ msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4085,14 +3934,14 @@ msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" |