diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-02-03 15:02:33 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-02-03 15:02:33 +0000 |
| commit | ef93bf3f103c0ecddf0eb912d4d4f2159a7867b3 (patch) | |
| tree | 9522a5c46f0ff4b3f78ed1bb65a7350381cc1fa8 /locale/FixMyStreet.po | |
| parent | 8eb377e1fc9153f4ec05c37988502f764e1784fd (diff) | |
| parent | afb90c54e9bfbabf9adc5fe0c66db38b0f406781 (diff) | |
Merge branch 'version-2.0.2'v2.0.2
Diffstat (limited to 'locale/FixMyStreet.po')
| -rw-r--r-- | locale/FixMyStreet.po | 474 |
1 files changed, 265 insertions, 209 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 3e6b8215e..60c0e8fb7 100644 --- a/locale/FixMyStreet.po +++ b/locale/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-11-08 11:39+0000\n" +"POT-Creation-Date: 2017-02-02 10:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:639 perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/DB/Result/Problem.pm:648 perllib/FixMyStreet/Script/Reports.pm:199 msgid " and " msgstr "" @@ -101,7 +101,7 @@ msgstr "" msgid "%s, within %s ward" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" @@ -109,7 +109,7 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:41 templates/web/base/admin/users.html:32 +#: templates/web/base/admin/report_blocks.html:43 templates/web/base/admin/users.html:32 msgid "(Email in abuse table)" msgstr "" @@ -130,11 +130,11 @@ 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:19 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "" -#: templates/web/base/report/_item.html:25 templates/web/zurich/report/_item.html:17 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "" @@ -142,7 +142,7 @@ 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:60 msgid "(not sent to council)" msgstr "" @@ -150,19 +150,19 @@ msgstr "" msgid "(optional)" msgstr "" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:231 perllib/FixMyStreet/App/Controller/Report/New.pm:650 perllib/FixMyStreet/DB/Result/Problem.pm:438 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:239 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/DB/Result/Problem.pm:439 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "" @@ -199,11 +199,11 @@ msgstr "" msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/report/_inspect.html:133 +#: templates/web/base/report/_inspect.html:142 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:135 +#: templates/web/base/report/_inspect.html:144 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -211,7 +211,7 @@ msgstr "" msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:8 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:10 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42 msgid "Action Scheduled" msgstr "" @@ -234,23 +234,23 @@ msgstr "" msgid "Add new category" msgstr "" -#: templates/web/base/report/_main.html:132 templates/web/base/report/_main.html:19 templates/web/base/report/_main.html:27 +#: templates/web/base/report/_item.html:10 templates/web/base/report/_item.html:14 templates/web/base/report/_main.html:136 templates/web/base/report/_main.html:19 templates/web/base/report/_main.html:30 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 templates/web/base/admin/users.html:48 +#: templates/web/base/admin/user_edit.html:4 templates/web/base/admin/users.html:48 templates/web/base/admin/users.html:51 msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Add/edit response templates" msgstr "" @@ -258,7 +258,7 @@ msgstr "" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:145 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -306,7 +306,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: templates/web/base/admin/report_edit.html:140 templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/report_edit.html:134 templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "" @@ -354,7 +354,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Assign users to areas" msgstr "" @@ -378,7 +378,7 @@ msgstr "" msgid "Auto-response:" msgstr "" -#: templates/web/base/admin/report_edit.html:133 templates/web/base/report/_inspect.html:42 +#: templates/web/base/admin/report_edit.html:127 templates/web/base/report/_inspect.html:41 msgid "Available categories" msgstr "" @@ -386,7 +386,7 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 templates/web/zurich/report/_item.html:9 +#: perllib/FixMyStreet/DB/Result/Problem.pm:402 templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -398,11 +398,11 @@ msgstr "" msgid "Back to all reports" msgstr "" -#: templates/web/base/admin/report_blocks.html:41 +#: templates/web/base/admin/report_blocks.html:43 msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/Default.pm:729 perllib/FixMyStreet/Cobrand/Zurich.pm:391 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:55 templates/web/zurich/header.html:56 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/Default.pm:730 perllib/FixMyStreet/Cobrand/Zurich.pm:391 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:55 templates/web/zurich/header.html:56 msgid "Bodies" msgstr "" @@ -426,10 +426,6 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: templates/web/base/report/_inspect.html:141 -msgid "Cancel" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:650 templates/web/base/admin/responsepriorities/list.html:8 msgid "Categories" msgstr "" @@ -438,7 +434,7 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/contact-form.html:19 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/report/_inspect.html:33 templates/web/base/report/new/category.html:6 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/body.html:14 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50 +#: templates/web/base/admin/body.html:72 templates/web/base/admin/contact-form.html:19 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/report/_inspect.html:32 templates/web/base/report/_item.html:82 templates/web/base/report/new/category.html:6 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/body.html:14 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50 msgid "Category" msgstr "" @@ -450,7 +446,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/report_edit.html:125 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/contact-form.html:2 templates/web/zurich/admin/report_edit-sdm.html:72 templates/web/zurich/admin/report_edit.html:100 +#: templates/web/base/admin/report_edit.html:119 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/contact-form.html:2 templates/web/zurich/admin/report_edit-sdm.html:72 templates/web/zurich/admin/report_edit.html:100 msgid "Category:" msgstr "" @@ -503,6 +499,10 @@ msgid "" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" +#: templates/web/base/report/_inspect.html:76 +msgid "Choose another" +msgstr "" + #: templates/web/base/admin/stats.html:72 templates/web/base/admin/stats.html:78 msgid "Click here or enter as dd/mm/yyyy" msgstr "" @@ -527,7 +527,7 @@ msgstr "" msgid "Click the link in our confirmation email to sign in." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:189 perllib/FixMyStreet/Cobrand/Zurich.pm:960 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:15 templates/web/base/admin/report_blocks.html:25 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 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 templates/web/zurich/admin/stats.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:189 perllib/FixMyStreet/Cobrand/Zurich.pm:960 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:17 templates/web/base/admin/report_blocks.html:27 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/_item.html:43 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 templates/web/zurich/admin/stats.html:31 msgid "Closed" msgstr "" @@ -608,7 +608,7 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1649 perllib/FixMyStreet/App/Controller/Admin.pm:1677 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1651 perllib/FixMyStreet/App/Controller/Admin.pm:1679 msgid "Could not find user" msgstr "" @@ -656,7 +656,7 @@ msgstr "" msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:36 templates/web/zurich/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:46 templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" @@ -688,7 +688,7 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 templates/web/base/admin/template_edit.html:40 templates/web/zurich/admin/template_edit.html:33 +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 templates/web/base/admin/template_edit.html:50 templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -737,18 +737,30 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "" +#: templates/web/base/report/_item.html:25 +msgid "Down one" +msgstr "" + #: templates/web/base/js/translation_strings.html:52 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_update.html:41 templates/web/base/report/update/form_update.html:43 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:16 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:43 msgid "Duplicate" msgstr "" +#: templates/web/base/report/_inspect.html:71 +msgid "Duplicate of" +msgstr "" + +#: templates/web/base/report/_inspect.html:81 +msgid "Duplicates" +msgstr "" + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -757,7 +769,7 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:16 +#: templates/web/base/report/_inspect.html:15 templates/web/base/report/_item.html:73 msgid "Easting/Northing:" msgstr "" @@ -769,11 +781,11 @@ msgstr "" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Edit other users' permissions" msgstr "" @@ -809,7 +821,7 @@ msgstr "" msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "" @@ -825,11 +837,11 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1622 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1624 msgid "Email already in abuse list" msgstr "" -#: templates/web/base/admin/report_edit.html:147 templates/web/base/admin/update_edit.html:35 templates/web/base/admin/user-form.html:19 templates/web/zurich/admin/body.html:48 templates/web/zurich/admin/contact-form.html:6 +#: templates/web/base/admin/report_edit.html:141 templates/web/base/admin/update_edit.html:35 templates/web/base/admin/user-form.html:19 templates/web/zurich/admin/body.html:48 templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "" @@ -884,7 +896,7 @@ msgstr "" msgid "Enter details of the problem" msgstr "" -#: templates/web/base/errors/generic.html:1 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:5 +#: templates/web/base/errors/generic.html:1 templates/web/base/errors/generic.html:8 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:5 msgid "Error" msgstr "" @@ -900,7 +912,7 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/base/admin/report_edit.html:128 templates/web/base/report/_inspect.html:37 +#: templates/web/base/admin/report_edit.html:122 templates/web/base/report/_inspect.html:36 msgid "Existing category" msgstr "" @@ -932,7 +944,7 @@ msgstr "" msgid "Extra data:" msgstr "" -#: templates/web/base/report/_inspect.html:107 +#: templates/web/base/report/_inspect.html:116 templates/web/base/report/_item.html:98 msgid "Extra details" msgstr "" @@ -952,15 +964,15 @@ msgstr "" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: 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/admin/stats_fix_rate.html:4 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/banner.html:12 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:45 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:11 templates/web/base/admin/report_blocks.html:26 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/_item.html:41 templates/web/base/report/banner.html:12 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:45 msgid "Fixed" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:11 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:13 msgid "Fixed - Council" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:10 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:12 msgid "Fixed - User" msgstr "" @@ -976,7 +988,7 @@ msgstr "" msgid "Flag as deleted" msgstr "" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Flag user" msgstr "" @@ -996,7 +1008,7 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:153 templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:147 templates/web/base/admin/user-form.html:100 msgid "Flagged:" msgstr "" @@ -1028,7 +1040,7 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "" -#: templates/web/base/around/_updates.html:3 templates/web/base/report/display_tools.html:12 +#: templates/web/base/around/_updates.html:3 templates/web/base/report/display_tools.html:14 msgid "Get updates" msgstr "" @@ -1048,7 +1060,7 @@ msgstr "" msgid "Glad to hear it’s been fixed!" msgstr "" -#: templates/web/base/admin/index.html:45 templates/web/base/alert/index.html:34 templates/web/base/around/postcode_form.html:13 templates/web/base/reports/_list-filters.html:29 templates/web/base/reports/_list-filters.html:41 templates/web/zurich/admin/stats.html:26 +#: templates/web/base/admin/index.html:45 templates/web/base/alert/index.html:34 templates/web/base/around/postcode_form.html:13 templates/web/base/reports/_list-filters.html:29 templates/web/base/reports/_list-filters.html:44 templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "" @@ -1056,7 +1068,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "" @@ -1092,7 +1104,7 @@ msgstr "" msgid "Hi %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:906 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:17 templates/web/base/admin/report_blocks.html:26 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:906 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:19 templates/web/base/admin/report_blocks.html:28 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" @@ -1128,7 +1140,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1164,6 +1176,10 @@ msgstr "" msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council." msgstr "" +#: templates/web/base/admin/template_edit.html:36 +msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." +msgstr "" + #: templates/web/base/questionnaire/index.html:70 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" @@ -1214,7 +1230,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:192 perllib/FixMyStreet/Cobrand/Zurich.pm:954 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:7 templates/web/base/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:192 perllib/FixMyStreet/Cobrand/Zurich.pm:954 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:9 templates/web/base/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 msgid "In progress" msgstr "" @@ -1246,7 +1262,7 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:16 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:18 msgid "Internal referral" msgstr "" @@ -1254,7 +1270,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "" @@ -1262,15 +1278,15 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:361 +#: perllib/FixMyStreet/App/Controller/Report.pm:384 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1479 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1481 msgid "Invalid start date" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:5 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:7 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42 msgid "Investigating" msgstr "" @@ -1306,7 +1322,11 @@ msgstr "" msgid "Last update:" msgstr "" -#: templates/web/base/reports/_list-filters.html:38 +#: templates/web/base/report/_item.html:78 +msgid "Latitude/Longitude:" +msgstr "" + +#: templates/web/base/reports/_list-filters.html:41 msgid "Least recently updated" msgstr "" @@ -1346,6 +1366,10 @@ msgstr "" msgid "Manage shortlist" msgstr "" +#: templates/web/base/reports/_list-filters.html:36 +msgid "Manual order" +msgstr "" + #: templates/web/base/js/translation_strings.html:46 msgid "Map" msgstr "" @@ -1370,7 +1394,7 @@ msgstr "" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "" @@ -1390,7 +1414,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1398,7 +1422,7 @@ msgstr "" msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate this report" msgstr "" @@ -1410,7 +1434,7 @@ msgstr "" msgid "Month" msgstr "" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "" @@ -1418,7 +1442,7 @@ msgstr "" msgid "Name" msgstr "" -#: templates/web/base/admin/report_edit.html:145 templates/web/base/admin/responsepriorities/edit.html:13 templates/web/base/admin/update_edit.html:34 templates/web/base/admin/user-form.html:16 templates/web/zurich/admin/stats.html:41 +#: templates/web/base/admin/report_edit.html:139 templates/web/base/admin/responsepriorities/edit.html:13 templates/web/base/admin/update_edit.html:34 templates/web/base/admin/user-form.html:16 templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "" @@ -1426,7 +1450,7 @@ msgstr "" msgid "Name: %s" msgstr "" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1520,7 +1544,7 @@ msgstr "" msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "" @@ -1528,7 +1552,7 @@ msgstr "" msgid "Next" msgstr "" -#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:143 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:26 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:55 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:137 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:26 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:55 msgid "No" msgstr "" @@ -1544,7 +1568,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "" @@ -1560,6 +1584,10 @@ msgstr "" msgid "No flagged users found." msgstr "" +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44 +msgid "No further action" +msgstr "" + #: templates/web/zurich/admin/report_edit-sdm.html:125 templates/web/zurich/admin/report_edit.html:259 msgid "No further updates" msgstr "" @@ -1596,7 +1624,7 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:13 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:15 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44 msgid "Not Responsible" msgstr "" @@ -1664,11 +1692,11 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:36 +#: templates/web/base/reports/_list-filters.html:39 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:169 perllib/FixMyStreet/Cobrand/Zurich.pm:900 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:23 templates/web/base/admin/report_blocks.html:4 templates/web/base/admin/update_edit.html:30 templates/web/base/dashboard/index.html:140 templates/web/base/report/update/form_update.html:41 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:169 perllib/FixMyStreet/Cobrand/Zurich.pm:900 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:25 templates/web/base/admin/report_blocks.html:6 templates/web/base/admin/update_edit.html:30 templates/web/base/dashboard/index.html:140 templates/web/base/report/update/form_update.html:41 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18 msgid "Open" msgstr "" @@ -1708,7 +1736,7 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056 perllib/FixMyStreet/App/Controller/Report/New.pm:650 perllib/FixMyStreet/App/Controller/Report/New.pm:651 perllib/FixMyStreet/DB/Result/Problem.pm:594 perllib/FixMyStreet/DB/Result/Problem.pm:601 perllib/FixMyStreet/DB/Result/Problem.pm:608 perllib/FixMyStreet/DB/Result/Problem.pm:617 perllib/FixMyStreet/Script/Reports.pm:185 perllib/FixMyStreet/Script/Reports.pm:200 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/App/Controller/Report/New.pm:659 perllib/FixMyStreet/DB/Result/Problem.pm:595 perllib/FixMyStreet/DB/Result/Problem.pm:602 perllib/FixMyStreet/DB/Result/Problem.pm:617 perllib/FixMyStreet/DB/Result/Problem.pm:626 perllib/FixMyStreet/Script/Reports.pm:185 perllib/FixMyStreet/Script/Reports.pm:200 msgid "Other" msgstr "" @@ -1724,7 +1752,7 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:20 msgid "Partial" msgstr "" @@ -1752,7 +1780,7 @@ msgstr "" msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:87 templates/web/base/admin/report_edit.html:152 templates/web/base/admin/user-form.html:21 templates/web/zurich/admin/stats.html:39 +#: perllib/FixMyStreet/Script/Reports.pm:87 templates/web/base/admin/report_edit.html:146 templates/web/base/admin/user-form.html:21 templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "" @@ -1780,7 +1808,7 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:940 perllib/FixMyStreet/Cobrand/Zurich.pm:946 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:6 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:940 perllib/FixMyStreet/Cobrand/Zurich.pm:946 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:8 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 msgid "Planned" msgstr "" @@ -1796,11 +1824,11 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:350 perllib/FixMyStreet/App/Controller/Report/New.pm:837 perllib/FixMyStreet/App/Controller/Report/New.pm:860 perllib/FixMyStreet/DB/Result/Problem.pm:440 templates/web/base/js/translation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Admin.pm:350 perllib/FixMyStreet/App/Controller/Report/New.pm:845 perllib/FixMyStreet/App/Controller/Report/New.pm:868 perllib/FixMyStreet/DB/Result/Problem.pm:441 templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "" @@ -1819,11 +1847,11 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 perllib/FixMyStreet/DB/Result/Comment.pm:126 templates/web/base/js/translation_strings.html:2 +#: perllib/FixMyStreet/App/Controller/Admin.pm:351 perllib/FixMyStreet/DB/Result/Comment.pm:127 templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1204 perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1204 perllib/FixMyStreet/App/Controller/Admin.pm:1362 msgid "Please enter a name" msgstr "" @@ -1835,11 +1863,11 @@ msgstr "" msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:114 perllib/FixMyStreet/DB/Result/Problem.pm:423 templates/web/base/js/translation_strings.html:3 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 perllib/FixMyStreet/DB/Result/Problem.pm:424 templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 perllib/FixMyStreet/App/Controller/Admin.pm:1356 perllib/FixMyStreet/App/Controller/Admin.pm:363 perllib/FixMyStreet/DB/Result/User.pm:164 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 perllib/FixMyStreet/App/Controller/Admin.pm:1359 perllib/FixMyStreet/App/Controller/Admin.pm:363 perllib/FixMyStreet/DB/Result/User.pm:164 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" msgstr "" @@ -1847,7 +1875,7 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 templates/web/base/js/translation_strings.html:4 +#: perllib/FixMyStreet/DB/Result/Problem.pm:427 templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "" @@ -1867,7 +1895,7 @@ msgstr "" 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/Problem.pm:434 perllib/FixMyStreet/DB/Result/User.pm:157 templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 perllib/FixMyStreet/DB/Result/Comment.pm:124 perllib/FixMyStreet/DB/Result/Problem.pm:435 perllib/FixMyStreet/DB/Result/User.pm:157 templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -1899,7 +1927,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -1923,19 +1951,19 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:335 +#: perllib/FixMyStreet/App/Controller/Report.pm:354 msgid "Please provide a public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -1951,7 +1979,7 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -1967,20 +1995,24 @@ msgstr "" msgid "Please write your update here" msgstr "" -#: templates/web/base/contact/index.html:105 templates/web/base/report/update-form.html:25 templates/web/base/report/update/form_user_loggedout_by_email.html:14 templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/contact/index.html:103 templates/web/base/report/update-form.html:25 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 "" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "" -#: templates/web/base/report/updates.html:22 -msgid "Posted by %s (<strong>%s</strong>) at %s" +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +msgid "Posted by %s at %s" msgstr "" -#: templates/web/base/report/updates.html:24 -msgid "Posted by %s at %s" +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 +msgid "Posted by <strong>%s</strong> (%s) at %s" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 +msgid "Posted by <strong>%s</strong> at %s" msgstr "" #: templates/web/base/front/footer-marketing.html:12 @@ -1995,7 +2027,7 @@ msgstr "" msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:96 templates/web/base/report/_item.html:90 msgid "Priority" msgstr "" @@ -2007,10 +2039,14 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:91 templates/web/base/admin/contact-form.html:74 templates/web/base/admin/report_edit.html:155 +#: templates/web/base/admin/body.html:91 templates/web/base/admin/contact-form.html:74 templates/web/base/admin/report_edit.html:149 msgid "Private" msgstr "" +#: templates/web/base/report/new/form_user.html:1 +msgid "Private details" +msgstr "" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "" @@ -2043,11 +2079,11 @@ msgstr "" msgid "Problems" msgstr "" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "" @@ -2059,7 +2095,7 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:833 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 perllib/FixMyStreet/Cobrand/UK.pm:208 +#: perllib/FixMyStreet/Cobrand/Default.pm:834 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "" @@ -2080,7 +2116,7 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/update-form.html:6 +#: templates/web/base/report/duplicate-no-updates.html:2 templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" @@ -2096,11 +2132,15 @@ msgstr "" msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" +#: templates/web/base/report/new/form_report.html:10 +msgid "Public details" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:241 templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "" @@ -2120,11 +2160,11 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "" -#: templates/web/base/alert/_list.html:23 templates/web/base/alert/updates.html:9 templates/web/base/around/display_location.html:1 templates/web/base/around/display_location.html:3 templates/web/base/report/display_tools.html:40 +#: templates/web/base/alert/_list.html:23 templates/web/base/alert/updates.html:9 templates/web/base/around/display_location.html:1 templates/web/base/around/display_location.html:3 templates/web/base/report/display_tools.html:42 msgid "RSS feed" msgstr "" @@ -2148,7 +2188,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:834 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 perllib/FixMyStreet/Cobrand/UK.pm:215 +#: perllib/FixMyStreet/Cobrand/Default.pm:835 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" @@ -2160,11 +2200,11 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" -#: templates/web/base/alert/updates.html:9 templates/web/base/report/display_tools.html:40 +#: templates/web/base/alert/updates.html:9 templates/web/base/report/display_tools.html:42 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/alert/updates.html:14 templates/web/base/report/display_tools.html:42 +#: templates/web/base/alert/updates.html:14 templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." msgstr "" @@ -2185,7 +2225,7 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2193,11 +2233,11 @@ msgstr "" msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website." msgstr "" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "" -#: templates/web/base/report/_main.html:130 templates/web/base/report/_main.html:18 templates/web/base/report/_main.html:24 +#: templates/web/base/report/_item.html:12 templates/web/base/report/_item.html:9 templates/web/base/report/_main.html:134 templates/web/base/report/_main.html:18 templates/web/base/report/_main.html:26 msgid "Remove from shortlist" msgstr "" @@ -2205,7 +2245,7 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:172 templates/web/base/admin/update_edit.html:69 templates/web/zurich/admin/update_edit.html:35 +#: templates/web/base/admin/report_edit.html:166 templates/web/base/admin/update_edit.html:69 templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2217,7 +2257,7 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:11 +#: templates/web/base/report/_inspect.html:10 templates/web/base/report/_item.html:68 msgid "Report ID:" msgstr "" @@ -2225,7 +2265,7 @@ msgstr "" msgid "Report a problem" msgstr "" -#: templates/web/base/report/display_tools.html:9 +#: templates/web/base/report/display_tools.html:10 templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "" @@ -2245,7 +2285,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:606 templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "" @@ -2253,7 +2293,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:621 templates/web/base/contact/index.html:59 +#: perllib/FixMyStreet/DB/Result/Problem.pm:630 templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "" @@ -2265,27 +2305,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:610 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2381,11 +2421,11 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1724 perllib/FixMyStreet/App/Controller/Admin.pm:1728 templates/web/base/admin/report_edit.html:169 templates/web/base/admin/update_edit.html:66 templates/web/zurich/admin/report_edit.html:118 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1726 perllib/FixMyStreet/App/Controller/Admin.pm:1730 templates/web/base/admin/report_edit.html:163 templates/web/base/admin/update_edit.html:66 templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1724 templates/web/base/admin/report_edit.html:170 templates/web/base/admin/update_edit.html:67 templates/web/zurich/admin/report_edit.html:119 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1726 templates/web/base/admin/report_edit.html:164 templates/web/base/admin/update_edit.html:67 templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "" @@ -2393,15 +2433,19 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:47 templates/web/base/maps/google-ol.html:9 +#: templates/web/base/js/translation_strings.html:47 templates/web/base/maps/google-ol.html:11 msgid "Satellite" msgstr "" -#: templates/web/base/admin/contact-form.html:137 templates/web/base/admin/responsepriorities/edit.html:36 templates/web/base/admin/template_edit.html:36 templates/web/base/report/_inspect.html:142 templates/web/zurich/admin/body.html:62 templates/web/zurich/admin/contact-form.html:20 templates/web/zurich/admin/template_edit.html:29 +#: templates/web/base/report/_inspect.html:150 +msgid "Save + close as duplicate" +msgstr "" + +#: templates/web/base/admin/contact-form.html:137 templates/web/base/admin/responsepriorities/edit.html:36 templates/web/base/admin/template_edit.html:46 templates/web/base/report/_inspect.html:150 templates/web/zurich/admin/body.html:62 templates/web/zurich/admin/contact-form.html:20 templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -2433,6 +2477,10 @@ msgstr "" msgid "See our privacy policy" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:716 +msgid "See user detail for reports created as the council" +msgstr "" + #: templates/web/base/admin/body-form.html:39 templates/web/zurich/admin/body-form.html:16 msgid "Select a body" msgstr "" @@ -2473,23 +2521,23 @@ msgstr "" msgid "Service:" msgstr "" -#: templates/web/base/report/_inspect.html:26 +#: templates/web/base/report/_inspect.html:25 msgid "Set to my current location" msgstr "" -#: templates/web/base/report/display_tools.html:15 +#: templates/web/base/report/display_tools.html:17 msgid "Share" msgstr "" -#: templates/web/base/report/_main.html:132 templates/web/base/report/_main.html:21 templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:136 templates/web/base/report/_main.html:21 templates/web/base/report/_main.html:29 msgid "Shortlist" msgstr "" -#: templates/web/base/report/_main.html:130 templates/web/base/report/_main.html:20 templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:134 templates/web/base/report/_main.html:20 templates/web/base/report/_main.html:25 msgid "Shortlisted" msgstr "" -#: templates/web/base/report/_main.html:140 +#: templates/web/base/report/_main.html:144 msgid "Shortlisted by %s" msgstr "" @@ -2552,7 +2600,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:222 perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 perllib/FixMyStreet/Geocode/OSM.pm:48 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:230 perllib/FixMyStreet/Geocode.pm:37 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 "" @@ -2588,11 +2636,11 @@ msgstr "" msgid "Start Date:" msgstr "" -#: templates/web/base/admin/body.html:73 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:58 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:16 templates/web/base/report/_inspect.html:67 templates/web/base/report/update/form_update.html:39 +#: templates/web/base/admin/body.html:73 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:58 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:16 templates/web/base/admin/template_edit.html:40 templates/web/base/report/_inspect.html:66 templates/web/base/report/_item.html:86 templates/web/base/report/update/form_update.html:39 msgid "State" msgstr "" -#: templates/web/base/admin/report_edit.html:115 templates/web/base/admin/update_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:75 templates/web/zurich/admin/report_edit.html:103 templates/web/zurich/admin/report_edit.html:151 templates/web/zurich/admin/update_edit.html:17 +#: templates/web/base/admin/report_edit.html:116 templates/web/base/admin/update_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:75 templates/web/zurich/admin/report_edit.html:103 templates/web/zurich/admin/report_edit.html:151 templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" @@ -2620,7 +2668,7 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "" @@ -2632,7 +2680,7 @@ msgstr "" msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:180 templates/web/base/admin/report_edit.html:24 templates/web/base/admin/update_edit.html:77 templates/web/base/admin/user-form.html:177 templates/web/zurich/admin/report_edit-sdm.html:124 templates/web/zurich/admin/report_edit.html:264 templates/web/zurich/admin/update_edit.html:38 +#: templates/web/base/admin/report_edit.html:174 templates/web/base/admin/report_edit.html:24 templates/web/base/admin/update_edit.html:77 templates/web/base/admin/user-form.html:177 templates/web/zurich/admin/report_edit-sdm.html:124 templates/web/zurich/admin/report_edit.html:264 templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -2644,7 +2692,7 @@ msgstr "" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:23 templates/web/base/report/display_tools.html:49 +#: templates/web/base/alert/updates.html:23 templates/web/base/report/display_tools.html:51 msgid "Subscribe" msgstr "" @@ -2880,7 +2928,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 perllib/FixMyStreet/App/Controller/Report/Update.pm:152 templates/web/base/auth/general.html:53 templates/web/zurich/auth/general.html:28 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:759 perllib/FixMyStreet/App/Controller/Report/Update.pm:152 templates/web/base/auth/general.html:53 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 "" @@ -2954,7 +3002,7 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 perllib/FixMyStreet/App/Controller/Report/New.pm:918 perllib/FixMyStreet/App/Controller/Report/New.pm:964 perllib/FixMyStreet/Cobrand/UK.pm:44 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:882 perllib/FixMyStreet/App/Controller/Report/New.pm:926 perllib/FixMyStreet/App/Controller/Report/New.pm:972 perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -2978,6 +3026,10 @@ msgstr "" msgid "This problem has not been fixed" msgstr "" +#: templates/web/base/report/duplicate-no-updates.html:3 +msgid "This report is a duplicate. Please leave updates on the original report:" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 perllib/FixMyStreet/Cobrand/Zurich.pm:162 templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3038,7 +3090,7 @@ msgstr "" msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:107 templates/web/base/report/_item.html:94 msgid "Traffic management required?" msgstr "" @@ -3046,7 +3098,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -3062,11 +3114,7 @@ msgstr "" msgid "Try emailing us directly:" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:12 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44 -msgid "Unable to fix" -msgstr "" - -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:19 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/report_edit-sdm.html:66 templates/web/zurich/admin/report_edit.html:94 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:21 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/report_edit-sdm.html:66 templates/web/zurich/admin/report_edit.html:94 templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -3082,7 +3130,7 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:530 perllib/FixMyStreet/App/Controller/Photo.pm:109 templates/web/base/js/translation_strings.html:38 +#: perllib/FixMyStreet/App/Controller/Photo.pm:109 perllib/FixMyStreet/App/Controller/Root.pm:124 templates/web/base/js/translation_strings.html:38 msgid "Unknown error" msgstr "" @@ -3090,6 +3138,10 @@ msgstr "" msgid "Unknown problem ID" msgstr "" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "" @@ -3138,7 +3190,7 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1161 perllib/FixMyStreet/App/Controller/Admin.pm:1224 perllib/FixMyStreet/App/Controller/Admin.pm:1376 perllib/FixMyStreet/App/Controller/Admin.pm:824 perllib/FixMyStreet/Cobrand/Zurich.pm:762 perllib/FixMyStreet/Cobrand/Zurich.pm:787 perllib/FixMyStreet/Cobrand/Zurich.pm:857 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1161 perllib/FixMyStreet/App/Controller/Admin.pm:1223 perllib/FixMyStreet/App/Controller/Admin.pm:1376 perllib/FixMyStreet/App/Controller/Admin.pm:824 perllib/FixMyStreet/Cobrand/Zurich.pm:762 perllib/FixMyStreet/Cobrand/Zurich.pm:787 perllib/FixMyStreet/Cobrand/Zurich.pm:857 msgid "Updated!" msgstr "" @@ -3146,7 +3198,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:133 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3175,11 +3227,11 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1681 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1683 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "" @@ -3187,7 +3239,7 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 perllib/FixMyStreet/Cobrand/Default.pm:723 perllib/FixMyStreet/Cobrand/Zurich.pm:398 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: perllib/FixMyStreet/Cobrand/Default.pm:670 perllib/FixMyStreet/Cobrand/Default.pm:724 perllib/FixMyStreet/Cobrand/Zurich.pm:398 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 msgid "Users" msgstr "" @@ -3263,6 +3315,10 @@ msgstr "" msgid "When sent" msgstr "" +#: templates/web/base/report/_inspect.html:72 +msgid "Which report is it a duplicate of?" +msgstr "" + #: templates/web/base/js/translation_strings.html:51 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -3299,7 +3355,7 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/base/admin/bodies.html:70 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:142 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/users.html:32 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:104 templates/web/base/questionnaire/index.html:53 +#: templates/web/base/admin/bodies.html:70 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:136 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/users.html:32 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:104 templates/web/base/questionnaire/index.html:53 msgid "Yes" msgstr "" @@ -3307,11 +3363,11 @@ msgstr "" msgid "Yes I have a password" msgstr "" -#: templates/web/base/contact/index.html:46 +#: templates/web/base/contact/index.html:45 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/unsuitable-text.html:2 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" @@ -3327,7 +3383,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/base/contact/index.html:113 +#: templates/web/base/contact/index.html:111 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3405,7 +3461,7 @@ msgstr "" msgid "Your account" msgstr "" -#: templates/web/base/alert/_list.html:90 templates/web/base/alert/updates.html:19 templates/web/base/alert/updates.html:22 templates/web/base/contact/index.html:83 templates/web/base/report/display_tools.html:44 templates/web/base/report/display_tools.html:47 templates/web/base/report/new/form_user_loggedout_email.html:1 templates/web/base/report/update/form_user_loggedout_email.html:1 templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/base/alert/_list.html:90 templates/web/base/alert/updates.html:19 templates/web/base/alert/updates.html:22 templates/web/base/contact/index.html:81 templates/web/base/report/display_tools.html:46 templates/web/base/report/display_tools.html:49 templates/web/base/report/new/form_user_loggedout_email.html:1 templates/web/base/report/update/form_user_loggedout_email.html:1 templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -3417,7 +3473,7 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:107 templates/web/base/contact/index.html:76 templates/web/base/report/new/form_user_loggedout_by_email.html:17 templates/web/base/report/update/form_name.html:29 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:63 +#: templates/web/base/auth/general.html:107 templates/web/base/contact/index.html:74 templates/web/base/report/new/form_user_loggedout_by_email.html:17 templates/web/base/report/update/form_name.html:29 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Your name" msgstr "" @@ -3461,6 +3517,10 @@ msgstr "" msgid "by %s" msgstr "" +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 +msgid "closed as a duplicate report" +msgstr "" + #: templates/web/base/reports/body.html:6 templates/web/base/reports/body.html:7 msgid "council" msgstr "" @@ -3481,52 +3541,48 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:15 templates/web/zurich/report/_item.html:14 +#: templates/web/base/report/_item.html:54 templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "" -#: templates/web/base/report/updates.html:57 -msgid "marked as a duplicate report" -msgstr "" - -#: templates/web/base/report/updates.html:47 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as action scheduled" msgstr "" -#: templates/web/base/report/updates.html:59 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "marked as an internal referral" msgstr "" -#: templates/web/base/report/updates.html:49 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as closed" msgstr "" -#: templates/web/base/report/updates.html:28 templates/web/base/report/updates.html:51 +#: perllib/FixMyStreet/DB/Result/Comment.pm:261 perllib/FixMyStreet/DB/Result/Comment.pm:282 msgid "marked as fixed" msgstr "" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "" -#: templates/web/base/report/updates.html:55 -msgid "marked as not the council's responsibility" +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 +msgid "marked as no further action" msgstr "" -#: templates/web/base/report/updates.html:43 -msgid "marked as planned" +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 +msgid "marked as not the council's responsibility" msgstr "" -#: templates/web/base/report/updates.html:53 -msgid "marked as unable to fix" +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 +msgid "marked as planned" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:122 templates/web/base/admin/questionnaire.html:15 templates/web/base/admin/questionnaire.html:16 @@ -3557,7 +3613,7 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/base/report/updates.html:29 templates/web/base/report/updates.html:39 +#: perllib/FixMyStreet/DB/Result/Comment.pm:263 perllib/FixMyStreet/DB/Result/Comment.pm:269 msgid "reopened" msgstr "" @@ -3601,52 +3657,45 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/front/stats.html:13 +#: perllib/Utils.pm:223 #, perl-format -msgid "<big>%s</big> report recently" -msgid_plural "<big>%s</big> reports recently" +msgid "%d day" +msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "" -msgstr[1] "" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:25 +#: templates/web/base/report/_support.html:6 #, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" +msgid "%d supporter" +msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: templates/web/base/report/new/top_message_none.html:3 +#: perllib/Utils.pm:221 #, perl-format -msgid "We do not yet have details for the council that covers this location." -msgid_plural "We do not yet have details for the councils that cover this location." +msgid "%d week" +msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:220 +#: templates/web/base/front/stats.html:19 #, perl-format -msgid "%d week" -msgid_plural "%d weeks" +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "" msgstr[1] "" @@ -3657,17 +3706,17 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:19 +#: templates/web/base/front/stats.html:13 #, perl-format -msgid "<big>%s</big> fixed in past month" -msgid_plural "<big>%s</big> fixed in past month" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" msgstr[0] "" msgstr[1] "" @@ -3677,3 +3726,10 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "" msgstr[1] "" + +#: templates/web/base/report/new/top_message_none.html:3 +#, perl-format +msgid "We do not yet have details for the council that covers this location." +msgid_plural "We do not yet have details for the councils that cover this location." +msgstr[0] "" +msgstr[1] "" |