diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-02-02 10:23:30 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-02-02 16:32:41 +0000 |
| commit | 2fde5b1ee5df7f8a931908656a2563885adb141d (patch) | |
| tree | 24d6a1da81c39ee9bfda45511aeaf72982caec35 /locale/he_IL.UTF-8 | |
| parent | 63d4804973ae4bd26bf4af098f3ba57a14a0647f (diff) | |
Update translations with new source strings.
Diffstat (limited to 'locale/he_IL.UTF-8')
| -rw-r--r-- | locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po | 530 |
1 files changed, 300 insertions, 230 deletions
diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po index 9c3a39a93..efd539cfe 100644 --- a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/he_IL.UTF-8/LC_MESSAGES/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:22+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n" "Language-Team: Hebrew (Israel) (https://www.transifex.com/mysociety/teams/12067/he_IL/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:639 +#: perllib/FixMyStreet/DB/Result/Problem.pm:648 #: perllib/FixMyStreet/Script/Reports.pm:199 msgid " and " msgstr "" @@ -110,7 +110,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 "" @@ -118,7 +118,7 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:41 +#: templates/web/base/admin/report_blocks.html:43 #: templates/web/base/admin/users.html:32 msgid "(Email in abuse table)" msgstr "" @@ -142,12 +142,10 @@ 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 msgid "(closed)" msgstr "" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "" @@ -156,7 +154,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 "" @@ -164,21 +162,21 @@ 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 "" @@ -194,8 +192,8 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories') #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") +#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories') #: templates/web/base/reports/_list-filters.html:28 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s" msgstr "" @@ -218,11 +216,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 "" @@ -233,7 +231,7 @@ 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/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" @@ -262,26 +260,29 @@ msgstr "" msgid "Add new category" msgstr "" -#: templates/web/base/report/_main.html:132 +#: 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:27 +#: 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/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 "" @@ -289,7 +290,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 "" @@ -344,7 +345,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/report_edit.html:134 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "" @@ -399,7 +400,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 "" @@ -424,8 +425,8 @@ 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 "" @@ -433,7 +434,7 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:402 #: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -446,12 +447,12 @@ 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/Default.pm:730 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 @@ -482,10 +483,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" @@ -498,7 +495,8 @@ 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/_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 @@ -518,7 +516,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/report_edit.html:125 +#: 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 @@ -581,6 +579,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" @@ -609,10 +611,11 @@ 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/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 @@ -714,8 +717,8 @@ 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 "" @@ -769,7 +772,7 @@ msgstr "" msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" @@ -810,7 +813,7 @@ 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/base/admin/template_edit.html:50 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -876,21 +879,35 @@ 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/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 +#, fuzzy +msgid "Duplicate of" +msgstr "כפול" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +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" @@ -899,7 +916,8 @@ 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 "" @@ -918,11 +936,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 "" @@ -973,7 +991,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 "דואר אלקטרוני הוסף לרשימת המשתמשים לרעה" @@ -991,11 +1009,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/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 @@ -1062,7 +1080,7 @@ msgid "Enter details of the problem" msgstr "" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:4 +#: 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 @@ -1084,8 +1102,8 @@ 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 "" @@ -1121,7 +1139,8 @@ 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 "" @@ -1143,11 +1162,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod 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/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 @@ -1155,12 +1175,12 @@ 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: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:12 msgid "Fixed - User" msgstr "" @@ -1178,7 +1198,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 "" @@ -1199,7 +1219,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/report_edit.html:147 #: templates/web/base/admin/user-form.html:100 msgid "Flagged:" msgstr "" @@ -1237,7 +1257,7 @@ msgid "Frequently Asked Questions" msgstr "" #: templates/web/base/around/_updates.html:3 -#: templates/web/base/report/display_tools.html:12 +#: templates/web/base/report/display_tools.html:14 msgid "Get updates" msgstr "" @@ -1263,7 +1283,7 @@ msgstr "" #: 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/base/reports/_list-filters.html:44 #: templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "" @@ -1272,7 +1292,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 "" @@ -1314,8 +1334,8 @@ 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/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 @@ -1358,7 +1378,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 "" @@ -1404,6 +1424,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" @@ -1463,7 +1487,7 @@ 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/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 @@ -1499,7 +1523,7 @@ 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:18 msgid "Internal referral" msgstr "" @@ -1507,7 +1531,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 "" @@ -1515,16 +1539,16 @@ 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/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 @@ -1570,7 +1594,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 "" @@ -1615,6 +1643,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 "" @@ -1639,7 +1671,7 @@ msgstr "" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "" @@ -1659,7 +1691,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1667,7 +1699,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 "" @@ -1679,7 +1711,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 "" @@ -1703,7 +1735,7 @@ msgstr "" msgid "Name" msgstr "" -#: templates/web/base/admin/report_edit.html:145 +#: 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 @@ -1715,7 +1747,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 "" @@ -1815,7 +1847,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 "" @@ -1830,7 +1862,7 @@ msgstr "" #: 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: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 @@ -1851,7 +1883,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 "" @@ -1911,7 +1943,7 @@ msgid "" msgstr "" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:13 +#: 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" @@ -1989,15 +2021,15 @@ 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/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 @@ -2043,13 +2075,13 @@ 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/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" @@ -2070,7 +2102,7 @@ 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:20 msgid "Partial" msgstr "" @@ -2104,7 +2136,7 @@ msgid "Phone number (optional)" msgstr "" #: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:152 +#: 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:" @@ -2156,7 +2188,7 @@ 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/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 @@ -2184,14 +2216,14 @@ 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 +#: 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 "" @@ -2212,13 +2244,13 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: 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:1362 msgid "Please enter a name" msgstr "" @@ -2233,13 +2265,13 @@ msgid "Please enter a password" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/Problem.pm:423 +#: 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:1359 #: perllib/FixMyStreet/App/Controller/Admin.pm:363 #: perllib/FixMyStreet/DB/Result/User.pm:164 #: templates/web/base/js/translation_strings.html:12 @@ -2252,7 +2284,7 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:427 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "" @@ -2285,8 +2317,8 @@ msgid "Please enter your full name, councils need this information – if you do 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/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" @@ -2323,7 +2355,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 "" @@ -2349,20 +2381,20 @@ 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 "" @@ -2378,7 +2410,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 "" @@ -2397,22 +2429,22 @@ msgstr "" msgid "Please write your update here" msgstr "" -#: templates/web/base/contact/index.html:105 +#: 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 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "" @@ -2428,7 +2460,8 @@ 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 "" @@ -2444,10 +2477,15 @@ 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/report_edit.html:149 msgid "Private" msgstr "" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "ערוך פרטי גוף" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "" @@ -2483,11 +2521,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 "" @@ -2499,7 +2537,7 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:833 +#: perllib/FixMyStreet/Cobrand/Default.pm:834 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" @@ -2523,6 +2561,7 @@ msgstr "" msgid "Property address:" msgstr "" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" @@ -2540,12 +2579,16 @@ 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 "" @@ -2569,7 +2612,7 @@ 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 "" @@ -2577,7 +2620,7 @@ msgstr "" #: 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/report/display_tools.html:42 msgid "RSS feed" msgstr "" @@ -2605,7 +2648,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:834 +#: 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" @@ -2621,12 +2664,12 @@ 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/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/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." msgstr "" @@ -2648,7 +2691,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 "" @@ -2656,13 +2699,15 @@ 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/_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:24 +#: templates/web/base/report/_main.html:26 msgid "Remove from shortlist" msgstr "" @@ -2670,7 +2715,7 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:172 +#: 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!)" @@ -2684,7 +2729,8 @@ 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 "" @@ -2694,6 +2740,7 @@ msgstr "" msgid "Report a problem" msgstr "" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "" @@ -2717,8 +2764,8 @@ 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 "" @@ -2727,8 +2774,8 @@ 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 "" @@ -2741,27 +2788,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 "" @@ -2871,16 +2918,16 @@ 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 +#: 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 +#: 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" @@ -2891,21 +2938,25 @@ 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/maps/google-ol.html:11 msgid "Satellite" msgstr "" +#: 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:36 -#: templates/web/base/report/_inspect.html:142 +#: 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 "" @@ -2942,6 +2993,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" @@ -2985,27 +3040,27 @@ 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:136 #: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:29 msgid "Shortlist" msgstr "" -#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:134 #: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:23 +#: 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 "" @@ -3077,7 +3132,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:222 +#: 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 @@ -3125,12 +3180,14 @@ msgstr "" #: 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/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/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 @@ -3170,7 +3227,7 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "" @@ -3187,7 +3244,7 @@ msgstr "" msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:180 +#: 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 @@ -3213,7 +3270,7 @@ msgid "Submitted" msgstr "" #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:49 +#: templates/web/base/report/display_tools.html:51 msgid "Subscribe" msgstr "" @@ -3484,7 +3541,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/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 @@ -3566,9 +3623,9 @@ 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/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 "" @@ -3593,6 +3650,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 @@ -3667,7 +3728,8 @@ 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 "" @@ -3675,7 +3737,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 "" @@ -3692,14 +3754,14 @@ 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/admin/report_blocks.html:14 #: 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/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 @@ -3719,8 +3781,8 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:530 #: 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 "" @@ -3731,6 +3793,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 "" @@ -3784,7 +3850,7 @@ msgid "Updated" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:1161 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1224 +#: 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 @@ -3799,7 +3865,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 "" @@ -3830,11 +3896,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 "" @@ -3843,7 +3909,7 @@ 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/Default.pm:724 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 msgid "Users" @@ -3933,6 +3999,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 "" @@ -3981,7 +4051,7 @@ msgstr "" #: 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:136 #: templates/web/base/admin/report_edit.html:95 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/admin/users.html:32 @@ -3996,11 +4066,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 "" @@ -4017,7 +4087,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 "" @@ -4108,9 +4178,9 @@ 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/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 @@ -4130,7 +4200,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "" #: templates/web/base/auth/general.html:107 -#: templates/web/base/contact/index.html:76 +#: 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 @@ -4209,53 +4279,53 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:15 +#: 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 +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 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 +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 msgid "marked as not the council's responsibility" msgstr "" -#: templates/web/base/report/updates.html:43 +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 msgid "marked as planned" msgstr "" -#: templates/web/base/report/updates.html:53 +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as unable to fix" msgstr "" @@ -4301,8 +4371,8 @@ 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 "" @@ -4348,52 +4418,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] "" @@ -4404,17 +4467,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] "" @@ -4424,3 +4487,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] "" |