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 | |
| parent | 63d4804973ae4bd26bf4af098f3ba57a14a0647f (diff) | |
Update translations with new source strings.
29 files changed, 8995 insertions, 6925 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 3e6b8215e..b7ad92f5a 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:22+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 "" @@ -177,8 +177,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 "" @@ -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 "" @@ -1596,7 +1620,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 +1688,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 +1732,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 +1748,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 +1776,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 +1804,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 +1820,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 +1843,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 +1859,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 +1871,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 +1891,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 +1923,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 +1947,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 +1975,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,19 +1991,19 @@ 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 +#: 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 "" @@ -1995,7 +2019,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 +2031,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 +2071,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 +2087,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 +2108,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 +2124,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 +2152,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 +2180,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 +2192,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 +2217,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 +2225,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 +2237,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 +2249,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 +2257,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 +2277,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 +2285,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 +2297,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 +2413,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 +2425,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 +2469,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 +2513,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 +2592,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 +2628,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 +2660,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 +2672,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 +2684,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 +2920,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 +2994,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 +3018,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 +3082,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 +3090,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 +3106,11 @@ 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 +#: 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 "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 +3126,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 +3134,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 +3186,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 +3194,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 +3223,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 +3235,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 +3311,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 +3351,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 +3359,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 +3379,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 +3457,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 +3469,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 "" @@ -3481,51 +3533,51 @@ 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 +#: 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 "" @@ -3557,7 +3609,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 +3653,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 +3702,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 +3722,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] "" diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po index 620602b26..34b63e670 100644 --- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ar.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: Khaled Saleem Baleesh <Kbaleesh@gmail.com>, 2016\n" "Language-Team: Arabic (https://www.transifex.com/mysociety/teams/12067/ar/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:639 +#: perllib/FixMyStreet/DB/Result/Problem.pm:648 #: perllib/FixMyStreet/Script/Reports.pm:199 msgid " and " msgstr "و" @@ -122,7 +122,7 @@ msgstr "دائرة %s، %s" msgid "%s, within %s ward" msgstr "%s، ضمن دائرة %s" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> المساهمون" @@ -130,7 +130,7 @@ msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap< 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 "(البريد في لائحة المسيئين)" @@ -154,12 +154,10 @@ msgstr "(المسافة الإفتراضية التي تغطي مايقارب 20 msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "(يمكن بدلاً من ذلك تخصيص موجز RSS، ضمن %s)" -#: 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 "(تم الإصلاح)" @@ -168,7 +166,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 "(لم ترسل الى الجهة المسئولة)" @@ -176,21 +174,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 "-اختر قالب---" @@ -209,8 +207,8 @@ msgstr "" " هذا هو السبب المرجح وراء كون \"منطقة التغطية\" فارغة (أدناه).<br>\n" " هل تريد إضافة بعض <code>MAPIT_TYPES</code> إلى ملف التكوين؟" -#. ('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 "<label for=\"statuses\">إظهار</label> %s <label for=\"filter_categories\">عن</label> %s" @@ -233,11 +231,11 @@ msgstr "<strong>لا</strong> دعني أؤكّد تحديثي بالبريد" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>لا</strong> دعني أسجّل دخولي بالبريد" -#: 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 "" @@ -248,7 +246,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>نعم</strong> لدي كلمة المرور" #: 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" @@ -280,26 +278,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 "اضف/عدل قوالب الاستجابة" @@ -307,7 +308,7 @@ msgstr "اضف/عدل قوالب الاستجابة" msgid "Added %s" msgstr "أُضيف %s" -#: 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 "" @@ -362,7 +363,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 "مجهول:" @@ -417,7 +418,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 "" @@ -442,8 +443,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 "التصنيفات المتاحة" @@ -451,7 +452,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 "في إنتظار المشرفين" @@ -464,12 +465,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 @@ -500,10 +501,6 @@ msgstr "لا تستطيع العثور على رسالة البريد الإلك msgid "Can't see the map? <em>Skip this step</em>" msgstr "لا يمكنك رؤية الخريطة؟ <em>تجاوز هذه الخطوة</em>" -#: 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" @@ -516,7 +513,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 @@ -536,7 +534,7 @@ msgstr "تصنيف تغير من ‘%s’ إلى ‘%s’" msgid "Category fix rate for problems > 4 weeks old" msgstr "معدل إصلاحات الفئة للمشكلات التي مضى عليها أكثر من 4 أسابيع" -#: 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 @@ -610,6 +608,10 @@ msgstr "" "اختر اسم <strong>تصنيف</strong> يكون منطقيا لعامة الناس (مثل، \"أخدود\"، \"إنارة الطريق\") ومساعد.\n" "للجهات المسئولة أيضا. هذه سوف تظهر في القائمة المنسدلة من صفحة إبلاغ-عن-مشكلة." +#: 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" @@ -638,10 +640,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 @@ -743,8 +746,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 "لم يتمكن من إيجاد المستخدم" @@ -798,7 +801,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 "إنشاء قالب" @@ -839,7 +842,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "تم التعامل بواسطة القسم الفرعي في غضون 5 أيام عمل" #: 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 "حذف القالب" @@ -905,21 +908,35 @@ msgstr "هل لديك كلمة مرور %s؟" 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 "اسحب الصور واسقطها هنا أو <u>انقر للرفع</u>" #: 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" @@ -931,7 +948,8 @@ msgstr "" "يمكن للتصنيفات المختلفة أن <strong>تمتلك نفس عنوان الاتصال</strong> (عنوان بريد إلكتروني).\n" "هذا يعني أنه يمكنك إضافة ما تشاء من التصنيفات حتى ولو كنت تملك عنوان اتصال واحد للجهة المسئولة." -#: 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 "" @@ -950,11 +968,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 "عدل صلاحيات المستخدمين الآخرين" @@ -1005,7 +1023,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 "البريد أضيف إلى لائحة المسيئين" @@ -1023,11 +1041,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 @@ -1101,7 +1119,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 @@ -1123,8 +1141,8 @@ msgstr "مثال لصندوق البريد %s" 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 "تصنيف موجود" @@ -1160,7 +1178,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 "تفاصيل إضافية" @@ -1182,11 +1201,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "يمكن إصلاح ذلك عن طريق اختيار <strong>منطقة التغطية</strong> في نموذج <em>تحرير تفاصيل الهيئة</em> بالأسفل." #: 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 @@ -1194,12 +1214,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 "تم الإصلاح - المستخدم" @@ -1217,7 +1237,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 "مستخدم مشار إليه" @@ -1238,7 +1258,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 "مشار إليه:" @@ -1276,7 +1296,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 "احصل على التحديثات" @@ -1302,7 +1322,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 "اذهب" @@ -1311,7 +1331,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 "إعطاء تصريح للأدمن" @@ -1353,8 +1373,8 @@ msgstr "مرحبا %s" #: 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 @@ -1397,7 +1417,7 @@ msgstr "لقد أبلغت الآن عن مشكلة على @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "لقد حدثت الآن مشكلة على @fixmystreet" -#: 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 "نعتذر لك لم نستطع تحديد مشكلتك في قاعدة البيانات.\n" @@ -1447,6 +1467,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" @@ -1516,7 +1540,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 @@ -1552,7 +1576,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 "إحالة داخلية" @@ -1560,7 +1584,7 @@ msgstr "إحالة داخلية" msgid "Invalid agency_responsible value %s" msgstr "قيمة agency_responsible غير صالحة %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "تاريخ نهاية غير صالح" @@ -1568,16 +1592,16 @@ msgstr "تاريخ نهاية غير صالح" msgid "Invalid format %s specified." msgstr "التنسيق المحدد %s غير صالح." -#: 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 @@ -1623,7 +1647,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 "" @@ -1668,6 +1696,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 "الخريطة" @@ -1692,7 +1724,7 @@ msgstr "تحديد ما تم إصلاحه/إغلاقه منذ أكثر من ثم msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "الرسالة" @@ -1712,7 +1744,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr " jurisdiction_id غير موجود" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1720,7 +1752,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 "" @@ -1732,7 +1764,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 "الأكثر تعليقا" @@ -1756,7 +1788,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 @@ -1768,7 +1800,7 @@ msgstr "الاسم:" msgid "Name: %s" msgstr "الاسم: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1868,7 +1900,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 "الأحدث" @@ -1883,7 +1915,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 @@ -1904,7 +1936,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 "لم يتم تحديد مجلس" @@ -1970,7 +2002,7 @@ 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" @@ -2048,15 +2080,15 @@ msgstr "المشكلات القديمة التي تم <br>إصلاحها" msgid "Older <br>problems" msgstr "المشكلات <br>القديمة" -#: 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 @@ -2102,13 +2134,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" @@ -2129,7 +2161,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 "جزئي" @@ -2163,7 +2195,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:" @@ -2215,7 +2247,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 @@ -2243,14 +2275,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 "الرجاء اختيار نوع العقار" @@ -2274,13 +2306,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 "الرجاء إدخال اسمك" @@ -2295,13 +2327,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 @@ -2314,7 +2346,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 "الرجاء إدخال بعض التفاصيل" @@ -2347,8 +2379,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" @@ -2385,7 +2417,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 "الرجاء الإشارة إلى ما إذا كنت تريد المشاركة في استبيان آخر أم لا" @@ -2411,20 +2443,20 @@ msgstr "يرجى ملاحظة أن تحديثك <strong>لم يتم نشره ب 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 "الرجاء ذكر ما إذا كنت قد أبلغت عن مشكلة إلى المجلس من قبل أم لا" @@ -2440,7 +2472,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 "الرجاء تحديد ما إذا كانت المشكلة قد تم حلها أم لا" @@ -2459,22 +2491,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 "نشر بدون تحديد الهوية في %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "تم النشر بواسطة %s (<strong>%s</strong>) في %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "تم النشر بواسطة %s في %s" @@ -2490,7 +2522,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 "أولوية" @@ -2506,10 +2539,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 "مشكلة" @@ -2545,11 +2583,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 "المشكلات على الخريطة" @@ -2561,7 +2599,7 @@ msgstr "المشكلات المبلّغ عنها مؤخرًا على FixMyStreet msgid "Problems within %.1fkm of this location" msgstr "المشكلات الموجودة ضمن %.1f كم من هذا الموقع" -#: 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" @@ -2585,6 +2623,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 "قدّم تحديثًا" @@ -2602,12 +2641,17 @@ 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 +#, fuzzy +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 "" @@ -2631,7 +2675,7 @@ msgstr "تمت الإجابة عن الاستبيان %d للمشكلة %d، م msgid "Questionnaire %d sent for problem %d" msgstr "تم إرسال الاستبيان %d للمشكلة %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "تمت تعبئة الاستبيان بواسطة المبلّغ عن المشكلة" @@ -2639,7 +2683,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 "موجز RSS" @@ -2667,7 +2711,7 @@ msgstr "موجز RSS لـ %s، ضمن حدود دائرة %s" msgid "RSS feed of nearby problems" msgstr "موجز RSS للمشكلات القريبة" -#: 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" @@ -2683,12 +2727,12 @@ msgid "RSS feed of recent local problems" msgstr "موجز RSS للمشكلات المحلية الحديثة" #: 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 "موجز RSS للتحديثات على هذه المشكلة" #: 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 "استلام بريد إلكتروني عند ترك تحديثات لهذه المشكلة." @@ -2710,7 +2754,7 @@ msgstr "المشكلات التي تم <br>حلها مؤخرًا" 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 "المحدثة مؤخرا" @@ -2718,13 +2762,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 "تذكر أن FixMyStreet مخصص في الأساس للإبلاغ عن المشكلات الفعلية التي يمكن حلها. إذا كانت مشكلتك غير مناسبة للتقديم عبر هذا الموقع فتذكر أنه يمكنك التواصل مع المجلس مباشرةً باستخدام موقع الويب الخاص به." -#: 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 "" @@ -2732,7 +2778,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!)" @@ -2746,7 +2792,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 "معرف البلاغ:" @@ -2756,6 +2803,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 "الإبلاغ عن إساءة" @@ -2779,8 +2827,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 "تم الإبلاغ عنها بدون تحديد الهوية في %s" @@ -2789,8 +2837,8 @@ msgstr "تم الإبلاغ عنها بدون تحديد الهوية في %s" 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 "تم الإبلاغ عنها بواسطة %s في %s" @@ -2803,27 +2851,27 @@ msgstr "تم الإبلاغ عنها بواسطة:" msgid "Reported in the %s category" msgstr "تم الإبلاغ عنها في الفئة %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "تم الإبلاغ عنها في الفئة %s بدون تحديد الهوية في %s" -#: 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 "تم البلاغ في التصنيف %s بواسطة %s في %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "تم الإبلاغ عنها بواسطة %s بدون تحديد الهوية في %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "تم الإبلاغ عنها عبر %s بواسطة %s في %s" -#: 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 "تم الإبلاغ عنها عبر %s في الفئة %s بدون تحديد الهوية في %s" -#: 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 "تم الإبلاغ عنها عبر %s في الفئة %s بواسطة %s في %s" @@ -2933,16 +2981,16 @@ msgstr "مشغل الطرق لهذا الطريق المسمى (يتم اشتق msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "مشغل الطرق لهذا الطريق المسمى (من OpenStreetMap): %s" -#: 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" @@ -2953,21 +3001,26 @@ 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 +#, fuzzy +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 "" @@ -3004,6 +3057,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" @@ -3047,27 +3104,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 "" @@ -3141,7 +3198,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 @@ -3189,12 +3246,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 @@ -3234,7 +3293,7 @@ msgstr "الفئة الفرعية: %s" msgid "Subdivision/Body" msgstr "القسم الفرعي/الهيئة" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "الموضوع" @@ -3251,7 +3310,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 @@ -3277,7 +3336,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 "اشتراك" @@ -3560,7 +3619,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 @@ -3652,9 +3711,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 "هذه المعلومات مطلوبة" @@ -3679,6 +3738,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 @@ -3753,7 +3816,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 "هل يتطلب إدارة المرور؟" @@ -3761,7 +3825,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 "" @@ -3778,14 +3842,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 @@ -3805,8 +3869,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 "خطأ غير معروف" @@ -3817,6 +3881,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 "تحديث" @@ -3870,7 +3938,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 @@ -3885,7 +3953,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 "يقتصر طول التحديثات على %s من الأحرف. الرجاء تقصير نص التحديث" @@ -3916,11 +3984,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 "تم وضع إشارة للمستخدم" @@ -3929,7 +3997,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" @@ -4019,6 +4087,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 "" @@ -4067,7 +4139,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 @@ -4082,11 +4154,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 "أنت تبلغ عن تقرير المشكلة التالي بأنه يشتمل على إساءة أو يحتوي على معلومات شخصية أو شيء من هذا القبل:" @@ -4103,7 +4175,7 @@ msgstr "يمكنك <a href=\"%s%s\">عرض المشكلة على هذا المو 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 "يمكنك التواصل مع الدعم الفني عبر <a href='mailto:%s'>%s</a>" @@ -4200,9 +4272,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 @@ -4222,7 +4294,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "لن يتم استخدام معلوماتك إلا وفقًا <a href=\"/privacy\">لسياسة الخصوصية</a> الخاصة بنا" #: 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 @@ -4301,53 +4373,53 @@ msgstr "تحرير المستخدم" msgid "from %s different users" msgstr "من %s من المستخدمين المختلفين" -#: 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 "آخر تحديث %s" -#: 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 "عليه علامة يتعذر الإصلاح" @@ -4393,8 +4465,8 @@ msgstr "المُدخل في الأصل: “%s”" 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 "تمت إعادة الفتح" @@ -4440,18 +4512,18 @@ 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" -msgstr[0] "<big>%s</big> تقرير مؤخرًا" -msgstr[1] "<big>%s</big> تقرير مؤخرًا" -msgstr[2] "<big>%s</big> من التقارير مؤخرًا" -msgstr[3] "<big>%s</big> من التقارير مؤخرًا" -msgstr[4] "<big>%s</big> من التقارير مؤخرًا" -msgstr[5] "<big>%s</big> من التقارير مؤخرًا" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d يوم" +msgstr[1] "%d يوم" +msgstr[2] "%d من الأيام" +msgstr[3] "%d من الأيام" +msgstr[4] "%d من الأيام" +msgstr[5] "%d من الأيام" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4462,18 +4534,7 @@ msgstr[3] "%d من الساعات" msgstr[4] "%d من الساعات" msgstr[5] "%d من الساعات" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d من الداعمين" -msgstr[1] "%d داعم" -msgstr[2] "%d من الداعمين" -msgstr[3] "%d من الداعمين" -msgstr[4] "%d من الداعمين" -msgstr[5] "%d من الداعمين" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4484,29 +4545,18 @@ msgstr[3] "%d من الدقائق" msgstr[4] "%d من الدقائق" msgstr[5] "%d من الدقائق" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> تحديث على التقارير" -msgstr[1] "<big>%s</big> تحديث على التقارير" -msgstr[2] "<big>%s</big> من التحديثات على التقارير" -msgstr[3] "<big>%s</big> من التحديثات على التقارير" -msgstr[4] "<big>%s</big> من التحديثات على التقارير" -msgstr[5] "<big>%s</big> من التحديثات على التقارير" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "لا توجد لدينا تفاصيل عن المجلس الذي يغطي هذا الموقع حتى الآن." -msgstr[2] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن." -msgstr[3] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن." -msgstr[4] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن." -msgstr[5] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d من الداعمين" +msgstr[1] "%d داعم" +msgstr[2] "%d من الداعمين" +msgstr[3] "%d من الداعمين" +msgstr[4] "%d من الداعمين" +msgstr[5] "%d من الداعمين" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4517,6 +4567,17 @@ msgstr[3] "%d من الأسابيع" msgstr[4] "%d من الأسابيع" msgstr[5] "%d من الأسابيع" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> تقرير تم حله في الشهر الماضي" +msgstr[1] "<big>%s</big> تقرير تم حله في الشهر الماضي" +msgstr[2] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي" +msgstr[3] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي" +msgstr[4] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي" +msgstr[5] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4528,27 +4589,27 @@ msgstr[3] "<big>%s</big> من التقارير في الأسبوع الماضي" msgstr[4] "<big>%s</big> من التقارير في الأسبوع الماضي" msgstr[5] "<big>%s</big> من التقارير في الأسبوع الماضي" -#: 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" -msgstr[0] "<big>%s</big> تقرير تم حله في الشهر الماضي" -msgstr[1] "<big>%s</big> تقرير تم حله في الشهر الماضي" -msgstr[2] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي" -msgstr[3] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي" -msgstr[4] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي" -msgstr[5] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> تقرير مؤخرًا" +msgstr[1] "<big>%s</big> تقرير مؤخرًا" +msgstr[2] "<big>%s</big> من التقارير مؤخرًا" +msgstr[3] "<big>%s</big> من التقارير مؤخرًا" +msgstr[4] "<big>%s</big> من التقارير مؤخرًا" +msgstr[5] "<big>%s</big> من التقارير مؤخرًا" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d يوم" -msgstr[1] "%d يوم" -msgstr[2] "%d من الأيام" -msgstr[3] "%d من الأيام" -msgstr[4] "%d من الأيام" -msgstr[5] "%d من الأيام" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> تحديث على التقارير" +msgstr[1] "<big>%s</big> تحديث على التقارير" +msgstr[2] "<big>%s</big> من التحديثات على التقارير" +msgstr[3] "<big>%s</big> من التحديثات على التقارير" +msgstr[4] "<big>%s</big> من التحديثات على التقارير" +msgstr[5] "<big>%s</big> من التحديثات على التقارير" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4560,3 +4621,17 @@ msgstr[2] "<strong>لا</strong> توجد لدينا تفاصيل عن المج msgstr[3] "<strong>لا</strong> توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن." msgstr[4] "<strong>لا</strong> توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن." msgstr[5] "<strong>لا</strong> توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن." + +#: 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] "لا توجد لدينا تفاصيل عن المجلس الذي يغطي هذا الموقع حتى الآن." +msgstr[2] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن." +msgstr[3] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن." +msgstr[4] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن." +msgstr[5] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن." + +#~ msgid "Cancel" +#~ msgstr "إلغاء" diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po index 0725b23a6..f40e25084 100644 --- a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/bg_BG.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: Bulgarian (Bulgaria) (https://www.transifex.com/mysociety/teams/12067/bg_BG/)\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 "%s квартал, %s" msgid "%s, within %s ward" msgstr "%s, в %s квартал" -#: 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 "(разстояние, което покрива грубо 7 500 жит 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 "<strong>Не</strong> Нека потвърдя актуализация msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Не</strong> Нека да вляза в системата чрез имейл" -#: 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 "<strong>Да</strong> Имам парола" #: 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" @@ -265,26 +263,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 "" @@ -292,7 +293,7 @@ msgstr "" msgid "Added %s" msgstr "Добавено %s" -#: 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 "" @@ -347,7 +348,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 "Анонимен:" @@ -402,7 +403,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 "" @@ -427,8 +428,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 "" @@ -436,7 +437,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 "Очакващ преглед" @@ -449,12 +450,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 @@ -485,10 +486,6 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Не виждате картата? <em>Пропуснете тази стъпка</em>" -#: 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" @@ -501,7 +498,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 @@ -521,7 +519,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "Сигнали подадени преди повече от 4 седмици" -#: 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 @@ -593,6 +591,10 @@ msgid "" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "Изберете име на <strong>категорията</strong>, което е смислено едновременно, както за гражданите, така и за общината. Категориите се появяват като списък за избор при подаване на сигнал. " +#: 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" @@ -621,10 +623,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 @@ -726,8 +729,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 "Потребителят не е намерен" @@ -781,7 +784,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 "" @@ -822,7 +825,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 "" @@ -888,21 +891,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" @@ -915,7 +932,8 @@ msgstr "" "(имейл адрес). Това означава, че можете да добавяте различни категории, \n" "дори и да имате само един контакт." -#: 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 "" @@ -934,11 +952,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 "" @@ -989,7 +1007,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 "Имейлът е добавен в списъка със злоупотреби" @@ -1007,11 +1025,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 @@ -1078,7 +1096,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 @@ -1100,8 +1118,8 @@ msgstr "Примерен пощенски адрес %s" 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 "" @@ -1137,7 +1155,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 "" @@ -1159,11 +1178,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 @@ -1171,12 +1191,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 "Поправени - потребител" @@ -1194,7 +1214,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 "Означаване на потребител" @@ -1215,7 +1235,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 "Означен:" @@ -1253,7 +1273,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 "Изтегляне на актуализациите" @@ -1279,7 +1299,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 "Търси" @@ -1288,7 +1308,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 "" @@ -1332,8 +1352,8 @@ msgstr "Здравей %s" #: 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 @@ -1376,7 +1396,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 "Вашият сигнал не беше намерен.\n" @@ -1422,6 +1442,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" @@ -1481,7 +1505,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 @@ -1517,7 +1541,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 "Вътрешен номер" @@ -1525,7 +1549,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 "Невярна дата" @@ -1533,16 +1557,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 @@ -1588,7 +1612,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 "" @@ -1633,6 +1661,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 "" @@ -1657,7 +1689,7 @@ msgstr "" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Съобщение" @@ -1677,7 +1709,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Липсващо jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1685,7 +1717,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 "" @@ -1697,7 +1729,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 "" @@ -1721,7 +1753,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 @@ -1733,7 +1765,7 @@ msgstr "Име:" msgid "Name: %s" msgstr "Име: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1833,7 +1865,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 "" @@ -1848,7 +1880,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 @@ -1869,7 +1901,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 "Не е избрана община" @@ -1929,7 +1961,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" @@ -2007,15 +2039,15 @@ msgstr "Поправени преди<br>известно време" msgid "Older <br>problems" msgstr "Стари <br>сигнали" -#: 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 @@ -2061,13 +2093,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" @@ -2088,7 +2120,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 "Частичен" @@ -2122,7 +2154,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:" @@ -2174,7 +2206,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 @@ -2202,14 +2234,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 "" @@ -2230,13 +2262,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 "" @@ -2251,13 +2283,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 @@ -2270,7 +2302,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 "Моля въведете информация" @@ -2303,8 +2335,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" @@ -2341,7 +2373,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 "Моля отбележете дали бихте искали да участвате в друга анкета" @@ -2367,20 +2399,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 "Моля отговорете дали някога сте подавали сигнал към общината преди." @@ -2396,7 +2428,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 "Моля посочете дали проблемът е бил разрешен или не" @@ -2415,22 +2447,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 "Публикувано от анонимен потребител в %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Публикувано от %s (<strong>%s</strong>) в %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Публикувано от %s в %s" @@ -2446,7 +2478,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 "" @@ -2462,10 +2495,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 "Сигнал" @@ -2501,11 +2539,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 "Сигнали отбелязани върху картата" @@ -2517,7 +2555,7 @@ msgstr "Проблеми сигнализирани скоро в сайта" msgid "Problems within %.1fkm of this location" msgstr "Сигнали в радиус от %.1fкм от това местоположение" -#: 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" @@ -2541,6 +2579,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 "Въведете иформация за актуализиране" @@ -2558,12 +2597,17 @@ 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 +#, fuzzy +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 "" @@ -2587,7 +2631,7 @@ msgstr "Анкетата %d е попълнена за проблем %d, %s д msgid "Questionnaire %d sent for problem %d" msgstr "Анкетата %d за проблем %d е изпратена" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Анкетата е попълнена от потребителя, подал сигнала" @@ -2595,7 +2639,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 "RSS абонамент" @@ -2623,7 +2667,7 @@ msgstr "RSS абонамент за %s, в квартал %s" msgid "RSS feed of nearby problems" msgstr "RSS абонамент за последни проблеми наоколо" -#: 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" @@ -2639,12 +2683,12 @@ msgid "RSS feed of recent local problems" msgstr "RSS абонамент за последни проблеми наоколо" #: 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 "RSS абонамент за актуализации по този проблем" #: 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 "Получаване на имейл при актуализация на проблема." @@ -2666,7 +2710,7 @@ msgstr "Наскоро <br>поправени" 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 "" @@ -2674,13 +2718,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 "" @@ -2688,7 +2734,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!)" @@ -2702,7 +2748,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 "" @@ -2712,6 +2759,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 "Сигнализирай за неподходящо съдържание" @@ -2735,8 +2783,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 "" @@ -2745,8 +2793,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 "" @@ -2759,27 +2807,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Сигналът е подаден в категория %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Сигналът е подаден анонимно в категория %s в %s" -#: 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 "Сигналът е подаден в категория %s от %s в %s" -#: 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 "Сигналът е подаден анонимно чрез %s в категория %s в %s" -#: 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 "Сигналът е подаден чрез %s в категория %s от %s в %s" @@ -2889,16 +2937,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" @@ -2909,21 +2957,26 @@ 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 +#, fuzzy +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 "" @@ -2960,6 +3013,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" @@ -3003,27 +3060,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 "" @@ -3095,7 +3152,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 @@ -3143,12 +3200,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 @@ -3188,7 +3247,7 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Тема" @@ -3205,7 +3264,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 @@ -3231,7 +3290,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 "Абониране" @@ -3504,7 +3563,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 @@ -3586,9 +3645,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 "Тази информация е необходима" @@ -3613,6 +3672,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 @@ -3687,7 +3750,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 "" @@ -3695,7 +3759,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 "" @@ -3712,14 +3776,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 @@ -3739,8 +3803,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 "Непозната грешка" @@ -3751,6 +3815,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 "Актуализация" @@ -3804,7 +3872,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 @@ -3819,7 +3887,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 "" @@ -3850,11 +3918,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 "" @@ -3863,7 +3931,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" @@ -3953,6 +4021,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 "" @@ -4001,7 +4073,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 @@ -4016,11 +4088,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 "" @@ -4037,7 +4109,7 @@ msgstr "Можете да <a href=\"%s%s\">разгледате сигнала 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 "За техническа поддръжка моля пишете ни на <a href='mailto:%s'>%s</a>" @@ -4131,9 +4203,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 @@ -4153,7 +4225,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Вашата информация ще бъде използва само спрямо нашата <a href=\"/privacy\">Политика за поверителност</a>" #: 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 @@ -4232,53 +4304,53 @@ msgstr "редакция на потребителя" msgid "from %s different users" msgstr "от %s различни потребители" -#: 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 "Последно обновено %s" -#: 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 "марикарн като \"непоправим\"" @@ -4324,8 +4396,8 @@ msgstr "първоначално въведен: “%s”" 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 "отново отворен" @@ -4371,55 +4443,48 @@ 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" -msgstr[0] "<big>%s</big> подаден наскоро" -msgstr[1] "<big>%s</big> подадени наскоро" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d ден" +msgstr[1] "%d дни" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d час" msgstr[1] "%d часа" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d поддръжник" -msgstr[1] "%d поддръжници" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d минута" msgstr[1] "%d минути" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big>актуализиран сигнал" -msgstr[1] "<big>%s</big>актуализирани сигнала" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Все още нямаме информация за общините, които стопанисват тази територия." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d поддръжник" +msgstr[1] "%d поддръжници" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d седмица" msgstr[1] "%d седмици" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big>поправени през изминалия месец" +msgstr[1] "<big>%s</big>поправени през изминалия месец" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4427,19 +4492,19 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big>сигнал за изминалата седмица" msgstr[1] "<big>%s</big>сигнали за изминалата седмица" -#: 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" -msgstr[0] "<big>%s</big>поправени през изминалия месец" -msgstr[1] "<big>%s</big>поправени през изминалия месец" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> подаден наскоро" +msgstr[1] "<big>%s</big> подадени наскоро" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d ден" -msgstr[1] "%d дни" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big>актуализиран сигнал" +msgstr[1] "<big>%s</big>актуализирани сигнала" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4447,3 +4512,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] "Все още <strong>нямаме</strong> информация за общината, която стопанисва тази територия." msgstr[1] "Все още <strong>нямаме</strong> информация за общините, които стопанисват тази територия." + +#: 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] "Все още нямаме информация за общините, които стопанисват тази територия." diff --git a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po index ed75512c4..87e9d1b0e 100644 --- a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cs_CZ.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: Czech (Czech Republic) (https://www.transifex.com/mysociety/teams/12067/cs_CZ/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:639 +#: perllib/FixMyStreet/DB/Result/Problem.pm:648 #: perllib/FixMyStreet/Script/Reports.pm:199 msgid " and " msgstr " a " @@ -110,7 +110,7 @@ msgstr "%s, oddělení, %" msgid "%s, within %s ward" msgstr "% S, v% s oddělení" -#: 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 "(E-mailů v tabulce zneužívání)" @@ -142,12 +142,10 @@ msgstr "(Standardní vzdálenost, která pokrývá zhruba 10.000 lidí)" 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 "(uzavřené)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(vyřešeno)" @@ -156,7 +154,7 @@ msgstr "(vyřešeno)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(např. graffiti, rozbité pouliční osvětlení, díry v komunikacích a pod. )" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(není odesláno na úřad)" @@ -164,21 +162,21 @@ msgstr "(není odesláno na úřad)" msgid "(optional)" msgstr "(volitelně)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(odesláno dvoum??)" -#: 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 "-- Vyberte kategorii --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Vyberte typ nemovitosti --" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "" @@ -197,8 +195,8 @@ msgstr "" " To je pravděpodobně proč je \"area covered\" prázdná (níže).<br>\n" " Asi upravte <code>MAPIT_TYPES</code> ve vašem konfiguračním souboru." -#. ('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 "" @@ -221,11 +219,11 @@ msgstr "<strong>Ne</strong> Potvrdím aktualizaci e-mailem" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Ne</strong> přihlásím se pomocí e-mailu" -#: 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 "" @@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ano</strong> Mám heslo" #: 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" @@ -268,26 +266,29 @@ msgstr "Zadejte instituci" msgid "Add new category" msgstr "Přidat novou kategorii" -#: 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 "Přidat Uživatele" -#: 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 "" @@ -295,7 +296,7 @@ msgstr "" msgid "Added %s" msgstr "Přidáno %s" -#: 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 "" @@ -350,7 +351,7 @@ msgstr "Hlášení bylo označeno za vyřešené." msgid "Anonymous" msgstr "Anonimní" -#: 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 "Anonymní:" @@ -405,7 +406,7 @@ msgstr "Přiřaďte externí instituci:" msgid "Assign to subdivision:" msgstr "Přiřaďte oddělení:" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Assign users to areas" msgstr "" @@ -430,8 +431,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 "" @@ -439,7 +440,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 "Čeká se na moderování" @@ -452,12 +453,12 @@ msgstr "Zpět" 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 "Zakázat emailovou adresu" #: 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 @@ -488,10 +489,6 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Nevidíte mapu? <em>vynechte tento krok</em>" -#: 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" @@ -504,7 +501,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 @@ -524,7 +522,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "Category fix rate for problems > 4 týdny staré" -#: 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 @@ -599,6 +597,10 @@ msgstr "" "Jméno <strong> kategorie </strong> zvolte tak, aby dávalo smysl pro veřejnost (např, \"Díra v silnici \", \"Pouliční osvětlení \"), ale je užitečné \n" " i pro daný úřad. Názvy kategorií se objeví v rozbalovací nabídce na stránce Nahlásit problém." +#: 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" @@ -627,10 +629,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 @@ -732,8 +735,8 @@ msgstr "Kontaktujte nás!" 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 "Uživatele nelze najít" @@ -787,7 +790,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 "" @@ -828,7 +831,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Odbavované úřadem do 5 pracovních dnů" #: 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 "" @@ -894,21 +897,35 @@ msgstr "" msgid "Don’t know" msgstr "Není známo" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "Nechcete řešit formulářem?" +#: 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 "Duplicitní" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Duplicitní" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Duplicitní" + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -917,7 +934,8 @@ msgid "" " " msgstr "Každému kontaktu daného subjektu můžeme přidělit kategorii, která je zobrazena veřejně. Různé kategorie mohou mít společný kontakt (e-mail). To znamená, že můžete přidat mnoho kategorií, i když máte jen jednu kontaktní osobu pro daný subjekt." -#: 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 "" @@ -936,11 +954,11 @@ msgstr "Upravit" msgid "Edit body details" msgstr "Editace podrobností subjektu" -#: 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 "" @@ -991,7 +1009,7 @@ msgstr "Úprava" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "E-mail přidán do seznamu zneužívání" @@ -1009,11 +1027,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 "E-mail je již v seznamu zneužívání" -#: 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 @@ -1080,7 +1098,7 @@ msgid "Enter details of the problem" msgstr "Uveďte podrobnosti daného problému" #: 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 @@ -1102,8 +1120,8 @@ msgstr "Příklad PSČ %s" msgid "Examples:" msgstr "Příklady:" -#: 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 "" @@ -1139,7 +1157,8 @@ msgstr "" msgid "Extra data:" msgstr "Doplňující data:" -#: 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 "" @@ -1161,11 +1180,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "Pro opravu vyberte <strong>oblast pokrytí</strong> v části <em>Editace podrobností subjektu</em> ve formuláři níže." #: 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 @@ -1173,12 +1193,12 @@ msgid "Fixed" msgstr "Vyřešené" #: 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 "vyřešené - Úřad" #: 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 "Vyřešené - Uživatel" @@ -1196,7 +1216,7 @@ msgstr "Vyřešené:" msgid "Flag as deleted" msgstr "Označené za smazané" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Flag user" msgstr "Sledovat uživatele" @@ -1217,7 +1237,7 @@ msgstr "Takto označení uživatelé jsou v seznamu na této <a href='%s'>strán msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Označení uživatelé nejsou žádným způsobem omezováni. Je to jen seznam uživatelů, kteří byli označeni k Vaší pozornosti." -#: 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 "Sledováno:" @@ -1255,7 +1275,7 @@ msgid "Frequently Asked Questions" msgstr "Často kladené dotazy" #: 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 "Zasílání aktualizací" @@ -1281,7 +1301,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 "OK" @@ -1290,7 +1310,7 @@ msgstr "OK" msgid "Going to send questionnaire?" msgstr "Odeslat dotazník?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "" @@ -1332,8 +1352,8 @@ msgstr "Přihlášená osoba: %s" #: 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 @@ -1376,7 +1396,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 "Bohužel, nelze lokalizovat Vaše hlášení v databázi.\n" @@ -1426,6 +1446,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" @@ -1488,7 +1512,7 @@ msgstr "Kromě toho, tyto atributy, které nejsou součástí specifikace Open31 #: 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 @@ -1524,7 +1548,7 @@ msgid "Internal notes" msgstr "Interní poznámky" #: 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 "Interní postoupení" @@ -1532,7 +1556,7 @@ msgstr "Interní postoupení" msgid "Invalid agency_responsible value %s" msgstr "Chybná agency_responsible hodnota %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Chybný konečný datum" @@ -1540,16 +1564,16 @@ msgstr "Chybný konečný datum" msgid "Invalid format %s specified." msgstr "Chybný formát %s specified." -#: 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 "Chybné počáteční datum" #: 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 @@ -1595,7 +1619,11 @@ msgstr "Poslední úpravy:" msgid "Last update:" msgstr "Poslední úpravy:" -#: 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 "" @@ -1640,6 +1668,10 @@ msgstr "MAPA" 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 "Mapa" @@ -1664,7 +1696,7 @@ msgstr "" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Zpráva" @@ -1684,7 +1716,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Chybějící jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1692,7 +1724,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 "" @@ -1704,7 +1736,7 @@ msgstr "Moderováno oddělením během jednoho pracovního dne" msgid "Month" msgstr "Měsíc" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "" @@ -1728,7 +1760,7 @@ msgstr "" msgid "Name" msgstr "Jméno" -#: 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 @@ -1740,7 +1772,7 @@ msgstr "Jméno:" msgid "Name: %s" msgstr "Jméno: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1842,7 +1874,7 @@ msgstr "Nový stav" msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "" @@ -1857,7 +1889,7 @@ msgstr "Další" #: 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 @@ -1878,7 +1910,7 @@ msgstr "Žádný subjekt" msgid "No council" msgstr "Žádný Úřad" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Není vybrán žádný úřad" @@ -1944,7 +1976,7 @@ msgstr "" " aktivit jejich institucí), možnost smazat hlášení nebo nastavovat speciální stavy hlášení." #: 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" @@ -2022,15 +2054,15 @@ msgstr "Starší <br>vyřešené" msgid "Older <br>problems" msgstr "Starší <br>hlášení" -#: 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 @@ -2076,13 +2108,13 @@ msgstr "Nebo problémy hlášené subjektu:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Nebo se můžete přihlásit k odběru všech upozornění na hlášení, které jsou v následujících oblastech úřadu či částí:" -#: 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" @@ -2103,7 +2135,7 @@ msgid "Parent" msgstr "Nadřazený subjekt" #: 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 "Částečně" @@ -2137,7 +2169,7 @@ msgid "Phone number (optional)" msgstr "Telefonní číslo (volitelně)" #: 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:" @@ -2189,7 +2221,7 @@ msgstr "Umísti špendlík na mapu" #: 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 @@ -2217,14 +2249,14 @@ msgid "Please check your email address is correct" msgstr "Zkontrolujte, zda je vaše emailová adresa správná" #: 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 "Vyberte kategorii" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Zvolte typ nemovitosti" @@ -2245,13 +2277,13 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Nezneužívejte tento nástroj - zneužívání vašeho úřadu znehodnocuje službu pro všechny uživatele." #: 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 "prosím zadejte zprávu" #: 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 "" @@ -2266,13 +2298,13 @@ msgid "Please enter a password" msgstr "Prosím zadejte heslo" #: 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 "Prosím zadejte název" #: 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 @@ -2285,7 +2317,7 @@ msgstr "Prosím zadejte platný e-mail" msgid "Please enter a valid email address" msgstr "Prosím zadejte platnou emailovou adresu" -#: 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 "Prosím zadejte podrobnosti" @@ -2318,8 +2350,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Zadejte své celé jméno, úřad potřebuje tyto informace - jestliže si přejete, aby Vaše jméno nebylo na webu zobrazeno, odškrtněnte čvereček níže" #: 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" @@ -2356,7 +2388,7 @@ msgstr "Prosím, vyplňte údaje o hlášeném problému." 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 "Vyplňte prosím níže uvedený formulář s údaji o problému, a popište místo tak přesně, jak je to možné v poli podrobnosti." -#: 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 "Uveďte, zda chcete dostat další dotazník" @@ -2382,20 +2414,20 @@ msgstr "" msgid "Please note:" msgstr "Vezměte prosím na vědomí:" -#: 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 "Uveďte prosím nějaké vysvětlení, proč jste znovu otevřeli toto hlášení" -#: 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 "Uveďte prosím nějaký text, stejně jako fotografii" -#: 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 "Prosím, řekněte, jestli jste někdy předtím hlásili problémy na váš úřad" @@ -2411,7 +2443,7 @@ msgstr "Prosím, vyberte kanál, který chcete" msgid "Please select the type of alert you want" msgstr "Vyberte typ upozornění, které chcete" -#: 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 "Uveďte, prosím, zda byl či nebyl problém vyřešen" @@ -2430,22 +2462,22 @@ msgstr "Napište zprávu" msgid "Please write your update here" msgstr "Aktuální informace doplňte prosím zde" -#: 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 "Odeslat" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Nahlášeno anonymně v %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Odesláno uživatelem %s (<strong>%s</strong>) v %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Odesláno uživatelem %s v %s" @@ -2461,7 +2493,8 @@ msgstr "Předcházející" 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 "" @@ -2477,10 +2510,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 "Neveřejné" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Neveřejné" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Hlášení" @@ -2516,11 +2554,11 @@ msgstr "Stav hlášení byl změněn na základě výsledků šetření" msgid "Problems" msgstr "Hlášení" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Hlášení v okolí" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Hlášení na mapě" @@ -2532,7 +2570,7 @@ msgstr "Hlášení označená za vyřešená na serveru FixMyStreet" msgid "Problems within %.1fkm of this location" msgstr "Hlášení v okolí %.1fkm od tohoto místa" -#: 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" @@ -2556,6 +2594,7 @@ msgstr "Hlášení uvnitř oblasti:" msgid "Property address:" msgstr "Adresa nemovitosti:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Poskytněte aktuální informace" @@ -2573,12 +2612,17 @@ msgstr "Poskytnutí jména a hesla je volitelné, zato vám ale umožní snadně msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Poskytnutí hesla je volitelné, zato vám ale umožní snadněji nahlásit problémy, hlásit aktualizace a spravovat svá hlášení." +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "Veřejná reakce:" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Veřejná reakce:" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "" @@ -2602,7 +2646,7 @@ msgstr "Dotazník %d odpověděl na hlášení %d, %s to %s" msgid "Questionnaire %d sent for problem %d" msgstr "Dotazník %d poslal k hlášení %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Dotazník vyplňuje uživatel, který podal hlášení problému" @@ -2610,7 +2654,7 @@ msgstr "Dotazník vyplňuje uživatel, který podal hlášení problému" #: 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 "RSS kanál" @@ -2638,7 +2682,7 @@ msgstr "RSS kanál pro %s, v oblasti %s " msgid "RSS feed of nearby problems" msgstr "RSS kanál hlášení v okolí" -#: 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" @@ -2654,12 +2698,12 @@ msgid "RSS feed of recent local problems" msgstr "RSS kanál aktuálních lokálních hlášení" #: 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 "RSS kanál aktualizací tohoto hlášení" #: 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 "Dostávat e-mail, když je hlášení aktualizováno." @@ -2681,7 +2725,7 @@ msgstr "Aktuálně <br>vyřešené" msgid "Recently reported problems" msgstr "Nedávno nahlášené problémy" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2689,13 +2733,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 "Uvědomte si, že FixMyStreet je především pro hlášení fyzických problémů, které mohou být opraveny. Pokud váš problém není vhodný pro hlášení prostřednictvím tohoto webu, můžete se obrátit na váš úřad přímo pomocí jejich internetových stránek." -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "Odstranit příznak" -#: 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 "" @@ -2703,7 +2749,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!)" @@ -2717,7 +2763,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 "" @@ -2727,6 +2774,7 @@ msgstr "" msgid "Report a problem" msgstr "Nahlásit problém" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Nevhodný obsah" @@ -2750,8 +2798,8 @@ msgstr "Nahlášení problému" msgid "Report, view, or discuss local problems" msgstr "Hlášení, zobrazení a diskuse nad lokálními problémy" -#: 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 "Nahlášeno anonymně v %s" @@ -2760,8 +2808,8 @@ msgstr "Nahlášeno anonymně v %s" msgid "Reported before" msgstr "Hlásil(a) jsem již dříve" -#: 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 "Nahlášeno uživatelem %s, určeno pro %s" @@ -2774,27 +2822,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Nahlášeno v kategorii %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Nahlášeno anonymně v %s v kategorii %s" -#: 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 "Nahlášeno v kategorii %s uživatelem %s v %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Nahlášeno prostřednictvím %s anonymně v %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Nahlášeno prostřednictvím %s uživatelem %s v %s" -#: 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 "Nahlášeno prostřednictvím %s v kategorii %s anonymně v %s" -#: 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 "Nahlášeno prostřednictvím %s v kategorii %s uživatelem %s v %s" @@ -2904,16 +2952,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 "Otočit doleva" -#: 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" @@ -2924,21 +2972,26 @@ 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 "Satelitní" +#: templates/web/base/report/_inspect.html:150 +#, fuzzy +msgid "Save + close as duplicate" +msgstr "označené jako duplicitní hlášení" + #: 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 "Uložit změny" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -2975,6 +3028,10 @@ msgstr "Nebyli nalezeni žádní sledovaní uživatelé." 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" @@ -3018,27 +3075,27 @@ msgstr "Odeslat:" msgid "Service:" msgstr "Služba:" -#: 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 "Sdílet" -#: 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 "" @@ -3110,7 +3167,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Omlouváme se, došlo k chybě potvrzující váš problém." -#: 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 @@ -3158,12 +3215,14 @@ msgstr "Počáteční datum:" #: 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 "Stav" -#: 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 @@ -3203,7 +3262,7 @@ msgstr "Podkategorie: %s" msgid "Subdivision/Body" msgstr "Oddělení/Instituce" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Předmět" @@ -3220,7 +3279,7 @@ msgstr "Předmět:" msgid "Submit" msgstr "Odeslat" -#: 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 @@ -3246,7 +3305,7 @@ msgid "Submitted" msgstr "Odesláno" #: 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 "Přihlásit se k odběru" @@ -3525,7 +3584,7 @@ msgstr "Nastal problém v zobrazení stránky Všechna hlášení. Prosím, zkus msgid "There was a problem showing this page. Please try again later." msgstr "Nastal problém v zobrazení této stránky. Prosím, zkuste později." -#: 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 @@ -3617,9 +3676,9 @@ msgstr "Tento e-mail byl odeslán na oba úřady působící v dané lokalitě, 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 "Tento e-mail byl odeslán na několik úřadů působících v dané lokalitě, protože zvolená kategorie hlášení je uvedena pro všechny z nich. Prosím ignorujte, pokud nejste oprávněný úřad kompetentní řešit nahlášený problém." -#: 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 "Tato informace je vyžadována" @@ -3644,6 +3703,10 @@ msgstr "Hlášení bylo vyřešeno" msgid "This problem has not been fixed" msgstr "Hlášení nemohlo být vyřešeno" +#: 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 @@ -3718,7 +3781,8 @@ msgstr "Pro zobrazení mapy přesného umístění tohoto problému" msgid "Total" msgstr "Celkem" -#: 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 "" @@ -3726,7 +3790,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 "" @@ -3743,14 +3807,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 "Nelze opravit" #: 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 @@ -3770,8 +3834,8 @@ msgstr "Neznámé" msgid "Unknown alert type" msgstr "Neznámý typ upozornění" -#: 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 "Neznámá chyba" @@ -3782,6 +3846,10 @@ msgstr "Neznámá chyba" msgid "Unknown problem ID" msgstr "Neznámé ID hlášení" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "Aktualizovat" @@ -3835,7 +3903,7 @@ msgid "Updated" msgstr "Aktualizováno" #: 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 @@ -3850,7 +3918,7 @@ msgstr "Aktualizováno!" msgid "Updates" msgstr "Aktualizace" -#: 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 "Aktualizace je omezena na %s znaků její délky. Prosím, zkraťte ji" @@ -3881,11 +3949,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 "Uživatel vyjmut ze sledování" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "Uživatel sledován" @@ -3894,7 +3962,7 @@ msgid "User search finds matches in users' names and email addresses." msgstr "Při vyhledávání byly nalezeny shody v uživatelských jménech nebo e-mailových adresách." #: 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" @@ -3984,6 +4052,10 @@ msgstr "Editováno:" msgid "When sent" msgstr "Odesláno:" +#: 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 "" @@ -4032,7 +4104,7 @@ msgstr "Rok" #: 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 @@ -4047,11 +4119,11 @@ msgstr "Ano" msgid "Yes I have a password" msgstr "Ano mám heslo" -#: 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 "Stěžujete si, že toto hlášení bylo bezdůvodně moderováno:" -#: 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 "Upozornění na níže uvedené hlášení, které může být urážlivé, obsahující osobní údaje či jiné nevhodné vyjádření." @@ -4068,7 +4140,7 @@ msgstr "Můžete <a href=\"%s%s\">zobrazit hlášení na tomto webu</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Můžete přidat e-mail zneužívajícího uživatele do seznamu zneužívání a hlášení těchto uživatelů budou skryty (nikdy nebudou odesílány)." -#: 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 "Můžete kontaktovat technickou podporu <a href='mailto:%s'>%s</a>" @@ -4164,9 +4236,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 @@ -4186,7 +4258,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Vámi poskytnuté informace budou použity pouze v souladu se <a href=\"/privacy\">zásadami ochrany osobních údajů</a>" #: 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 @@ -4265,53 +4337,53 @@ msgstr "editace uživatele" msgid "from %s different users" msgstr "od %s různých uživatelů" -#: 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 "naposledy upravené %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "méně než minutou" -#: templates/web/base/report/updates.html:57 +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 msgid "marked as a duplicate report" msgstr "označené jako duplicitní hlášení" -#: templates/web/base/report/updates.html:47 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as action scheduled" msgstr "označené jako plánované" -#: templates/web/base/report/updates.html:59 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "marked as an internal referral" msgstr "Označené jako interní postoupení" -#: templates/web/base/report/updates.html:49 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as closed" msgstr "označeno za uzavřené" -#: 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 "Označené jako vyřešené" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "označené jako probíhající" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "označené jako zkoumání" -#: templates/web/base/report/updates.html:55 +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 msgid "marked as not the council's responsibility" msgstr "označené za nespadající do kompetencí úřadu" -#: templates/web/base/report/updates.html:43 +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 msgid "marked as planned" msgstr "označené za naplánované" -#: templates/web/base/report/updates.html:53 +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as unable to fix" msgstr "označené za nemožné spravit" @@ -4357,8 +4429,8 @@ msgstr "původně zadáno: “%s”" msgid "other areas:" msgstr "ostatní oblasti:" -#: 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 "znovu otevřeno" @@ -4404,15 +4476,15 @@ msgstr "uživatel je vlastníkem hlášení" msgid "ward" msgstr "okrsek" -#: 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" -msgstr[0] "<big>%s</big> aktuální hlášení" -msgstr[1] "<big>%s</big> aktuální hlášení" -msgstr[2] "<big>%s</big> aktuální hlášení" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d den" +msgstr[1] "%d dny" +msgstr[2] "%d dní" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4420,15 +4492,7 @@ msgstr[0] "%d hodina" msgstr[1] "%d hodiny" msgstr[2] "%d hodin" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d podporovatel" -msgstr[1] "%d podporovatelé" -msgstr[2] "%d podporovatelů" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4436,23 +4500,15 @@ msgstr[0] "%d minuta" msgstr[1] "%d minuty" msgstr[2] "%d minut" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big>aktualizované hlášení" -msgstr[1] "<big>%s</big> aktalizovan hlášení" -msgstr[2] "<big>%s</big> aktualizovaných hlášení" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Doposud nemáme podrobnosti o úřadu pokrývající tuto lokalitu." -msgstr[1] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu." -msgstr[2] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d podporovatel" +msgstr[1] "%d podporovatelé" +msgstr[2] "%d podporovatelů" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4460,6 +4516,14 @@ msgstr[0] "%d týden" msgstr[1] "%d týdny" msgstr[2] "%d týdnů" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> vyřešeno poslední měsíc" +msgstr[1] "<big>%s</big> vyřešeno poslední měsíc" +msgstr[2] "<big>%s</big> vyřešeno poslední měsíc" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4468,21 +4532,21 @@ msgstr[0] "<big>%s</big> hlášení minulý týden" msgstr[1] "<big>%s</big> hlášení minulý týden" msgstr[2] "<big>%s</big> hlášení minulý týden" -#: 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" -msgstr[0] "<big>%s</big> vyřešeno poslední měsíc" -msgstr[1] "<big>%s</big> vyřešeno poslední měsíc" -msgstr[2] "<big>%s</big> vyřešeno poslední měsíc" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> aktuální hlášení" +msgstr[1] "<big>%s</big> aktuální hlášení" +msgstr[2] "<big>%s</big> aktuální hlášení" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d den" -msgstr[1] "%d dny" -msgstr[2] "%d dní" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big>aktualizované hlášení" +msgstr[1] "<big>%s</big> aktalizovan hlášení" +msgstr[2] "<big>%s</big> aktualizovaných hlášení" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4491,3 +4555,11 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Doposud <strong>nemáme</strong> podrobnosti o dalším úřadě, který je za tuto oblast zodpovědný." msgstr[1] "Doposud <strong>nemáme</strong> podrobnosti o dalších úřadech, které jsou za tuto oblast zodpovědné." msgstr[2] "Doposud <strong>nemáme</strong> podrobnosti o dalších úřadech, které jsou za tuto oblast zodpovědné." + +#: 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] "Doposud nemáme podrobnosti o úřadu pokrývající tuto lokalitu." +msgstr[1] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu." +msgstr[2] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu." diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index 3c58dcb88..54e1dbbf6 100644 --- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cy.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: Welsh (https://www.transifex.com/mysociety/teams/12067/cy/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:639 +#: perllib/FixMyStreet/DB/Result/Problem.pm:648 #: perllib/FixMyStreet/Script/Reports.pm:199 msgid " and " msgstr "a" @@ -110,7 +110,7 @@ msgstr "ward %s, %s" msgid "%s, within %s ward" msgstr "%s, o fewn ward %s" -#: 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 "(ar gau)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(wedi trwsio)" @@ -156,7 +154,7 @@ msgstr "(wedi trwsio)" 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 "(heb ei anfon at y cyngor)" @@ -164,21 +162,21 @@ msgstr "(heb ei anfon at y cyngor)" msgid "(optional)" msgstr "(dewisol)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(anfonwyd i'r ddau)" -#: 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 "-- Dewiswch gategori --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" -#: 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 "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bo msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost" -#: 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 "<strong>Oes</strong>, mae gen i gyfrinair" #: 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 "Ychwanegu corff" msgid "Add new category" msgstr "Ychwanegu categori newydd" -#: 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 "Ychwanegu defnyddiwr" -#: 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 "Ychwanegwyd %s" -#: 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 "Mae diweddariad wedi nodi'r broblem wedi ei thrwsio." msgid "Anonymous" msgstr "Dienw" -#: 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 "Dienw:" @@ -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 "Yn ôl" 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 "Cysylltu â'r tîm" 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 "Methu dod o hyd i'r defnyddiwr" @@ -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 "Lluosogi" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Lluosogi" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Lluosogi" + #: 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 "Golygu" msgid "Edit body details" msgstr "Golygu manylion y corff" -#: 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 "Golygydd" msgid "Email" msgstr "E-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" @@ -991,11 +1009,11 @@ msgstr "Crëwyd hysbysiad e-bost" msgid "Email alert deleted" msgstr "Dilëwyd hysbysiad e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1622 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1624 msgid "Email already in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: 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 "Rhowch fanylion am y broblem" #: 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 "Cod post enghreifftiol %s" msgid "Examples:" msgstr "Enghraifft:" -#: 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 "Data ychwanegol:" -#: 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 "Cwestiynau a ofynnir yn aml" #: 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 "Derbyn diweddariadau" @@ -1263,7 +1283,7 @@ msgstr "Mae'n dda gennym glywed y cafodd ei drwsio!" #: 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 "Helo %s" #: 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 "Dwi newydd adrodd problem ar @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Dwi newydd ddiweddaru problem ar @fixmystreet" -#: 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 "Nodiadau mewnol" #: 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 "Dyddiad dod i ben annilys" @@ -1515,16 +1539,16 @@ msgstr "Dyddiad dod i ben annilys" 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 "Dyddiad cychwyn annilys" #: 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 "Diweddariad diwethaf:" msgid "Last update:" msgstr "Diweddariad diwethaf:" -#: 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 "MAP" 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 "Map" @@ -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 "Neges" @@ -1659,7 +1691,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "jurisdiction_id coll" -#: 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 "Mis" -#: 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 "Enw" -#: 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 "Enw:" msgid "Name: %s" msgstr "Enw: %s" -#: 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 "Nesaf" #: 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 "Dim corff" msgid "No council" msgstr "Dim cyngor" -#: 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 "Trwsiwyd <br>o'r blaen" msgid "Older <br>problems" msgstr "Problemau <br>hŷn" -#: 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 "Neu gallwch danysgrifio i hysbysiad yn seiliedig ar eich ward neu etholaeth:" -#: 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 "Rhiant" #: 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 "Rhannol" @@ -2104,7 +2136,7 @@ msgid "Phone number (optional)" msgstr "Rhif ffôn (dewisol)" #: 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 "Peidiwch â bod yn sarhaus — byddai sarhau eich cyngor yn dibrisio'r gwasanaeth i bawb." #: 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 "Rhowch neges" #: 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 "Rhowch gyfrinair" #: 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 "Rhowch bwnc" #: 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 "Rhowch e-bost dilys" msgid "Please enter a valid email address" msgstr "Rhowch gyfeiriad e-bost dilys" -#: 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 "Rhowch fanylion" @@ -2285,8 +2317,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Rhowch eich enw llawn, mae angen y wybodaeth hon ar y cyngor – os na hoffech ddatgelu eich enw ar y wefan, dad-diciwch y blwch isod" #: 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 "Rhowch fanylion am y broblem." 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 "Noder:" -#: 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 "Rhowch destun yn ogystal â llun" -#: 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 "Dywedwch wrthym a ydych wedi adrodd problem i'ch cyngor o'r blaen" @@ -2378,7 +2410,7 @@ msgstr "Dewiswch y ffrwd hoffech chi ei chael" msgid "Please select the type of alert you want" msgstr "Dewiswch pa fath o hysbysiad hoffech chi ei gael" -#: 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 "Dywedwch a gafodd y broblem ei thrwsio" @@ -2397,22 +2429,22 @@ msgstr "Ysgrifennwch neges" msgid "Please write your update here" msgstr "Ysgrifennwch eich diweddariad yma" -#: 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 "Postiwyd yn ddienw am %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Postiwyd gan %s (<strong>%s</strong>) am %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Postiwyd gan %s am %s" @@ -2428,7 +2460,8 @@ msgstr "Blaenorol" 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 "Preifat" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Preifat" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Problem" @@ -2483,11 +2521,11 @@ msgstr "" msgid "Problems" msgstr "Problemau" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Problemau gerllaw" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Problemau ar y map" @@ -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 "Problemau o fewn ffiniau:" msgid "Property address:" msgstr "Cyfeiriad yr eiddo:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Darparu diweddariad" @@ -2540,12 +2579,17 @@ msgstr "Mae darparu enw a chyfrinair yn ddewisol, ond bydd yn eich galluogi i ad msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Mae darparu cyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau." +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "Ymateb cyhoeddus:" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Ymateb cyhoeddus:" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "" @@ -2569,7 +2613,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 +2621,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 "Ffrwd RSS" @@ -2605,7 +2649,7 @@ msgstr "Ffrwd RSS %s, o fewn ward %s" msgid "RSS feed of nearby problems" msgstr "Ffrwd RSS o broblemau gerllaw" -#: 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 +2665,12 @@ msgid "RSS feed of recent local problems" msgstr "Ffrwd RSS o broblemau lleol diweddar" #: 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 "Ffrwd RSS o ddiweddariadau i'r broblem hon" #: 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 "Derbyn e-bost pan fydd diweddariadau i'r broblem hon." @@ -2648,7 +2692,7 @@ msgstr "Trwsiwyd yn <br>ddiweddar" msgid "Recently reported problems" msgstr "Problemau a adroddwyd yn ddiweddar" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2656,13 +2700,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 +2716,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 +2730,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 +2741,7 @@ msgstr "" msgid "Report a problem" msgstr "Adrodd problem" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Adrodd camddefnydd" @@ -2717,8 +2765,8 @@ msgstr "Adrodd eich problem" msgid "Report, view, or discuss local problems" msgstr "Adrodd, gweld, neu drafod problemau lleol" -#: 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 "Adroddwyd yn ddienw am %s" @@ -2727,8 +2775,8 @@ msgstr "Adroddwyd yn ddienw am %s" msgid "Reported before" msgstr "Adroddwyd eisoes" -#: 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 "Adroddwyd gan %s am %s" @@ -2741,27 +2789,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddwyd yn y categori %s yn ddienw am %s" -#: 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 "Adroddwyd yn y categori %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Adroddwyd drwy %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Adroddwyd drwy %s gan %s am %s" -#: 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 "Adroddwyd drwy %s yn y categori %s yn ddienw am %s" -#: 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 "Adroddwyd drwy %s yn y categori %s am %s" @@ -2871,16 +2919,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 "Cylchdroi i'r chwith" -#: 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 +2939,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 "Cadw'r newidiadau" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -2942,6 +2994,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 +3041,27 @@ msgstr "Anfonwyd:" msgid "Service:" msgstr "Gwasanaeth:" -#: 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 "Rhannu" -#: 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 +3133,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Mae'n ddrwg gennym, bu gwall tra'n cadarnhau eich problem." -#: 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 +3181,14 @@ msgstr "Dyddiad cychwyn:" #: 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 "Cyflwr" -#: 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 +3228,7 @@ msgstr "Is-gategori: %s" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Pwnc" @@ -3187,7 +3245,7 @@ msgstr "Pwnc:" msgid "Submit" msgstr "Cyflwyno" -#: 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 +3271,7 @@ msgid "Submitted" msgstr "Cyflwynwyd" #: 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 "Tanysgrifio" @@ -3484,7 +3542,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen." -#: 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 +3624,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 "Mae'r wybodaeth hon yn ofynnol" @@ -3593,6 +3651,10 @@ msgstr "Trwsiwyd y broblem hon" msgid "This problem has not been fixed" msgstr "Ni thrwsiwyd y broblem hon" +#: 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 +3729,8 @@ msgstr "" msgid "Total" msgstr "Cyfanswm" -#: 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 +3738,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 +3755,14 @@ msgid "Try emailing us directly:" msgstr "Ceisiwch anfon e-bost atom yn uniongyrchol:" #: 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 "Methu trwsio" #: 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 +3782,8 @@ msgstr "Anhysbys" 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 "Gwall anhysbys" @@ -3731,6 +3794,10 @@ msgstr "Gwall anhysbys" 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 +3851,7 @@ msgid "Updated" msgstr "Diweddarwyd" #: 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 +3866,7 @@ msgstr "Diweddarwyd!" msgid "Updates" msgstr "Diweddariadau" -#: 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 +3897,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 +3910,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 +4000,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 +4052,7 @@ msgstr "Blwyddyn" #: 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 +4067,11 @@ msgstr "" msgid "Yes I have a password" msgstr "Oes, mae gen i gyfrinair" -#: 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 +4088,7 @@ msgstr "Gallwch <a href=\"%s%s\">weld y broblem ar y wefan hon</a>." 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 "Gallwch gysylltu â'n tîm cymorth technegol drwy <a href='mailto:%s'>%s</a>" @@ -4108,9 +4179,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 +4201,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 +4280,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 "diweddarwyd ddiwethaf %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "llai na munud" -#: 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 +4372,8 @@ msgstr "" msgid "other areas:" msgstr "ardaloedd eraill:" -#: 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 "ailagorwyd" @@ -4348,16 +4419,16 @@ msgstr "" msgid "ward" msgstr "ward" -#: 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" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d diwrnod" +msgstr[1] "%d ddiwrnod" +msgstr[2] "%d o ddiwrnodau" +msgstr[3] "%d diwrnod" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4366,16 +4437,7 @@ msgstr[1] "%d awr" msgstr[2] "%d o oriau" msgstr[3] "%d awr" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d cefnogwr" -msgstr[1] "%d gefnogwr" -msgstr[2] "%d o gefnogwyr" -msgstr[3] "%d cefnogwr" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4384,25 +4446,16 @@ msgstr[1] "%d funud" msgstr[2] "%d o funudau" msgstr[3] "%d munud" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn." -msgstr[1] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn." -msgstr[2] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn." -msgstr[3] "Nid oes gennym fanylion am y cynghorau sy'n rheoli'r lleoliad hwn." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d cefnogwr" +msgstr[1] "%d gefnogwr" +msgstr[2] "%d o gefnogwyr" +msgstr[3] "%d cefnogwr" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4411,6 +4464,15 @@ msgstr[1] "%d wythnos" msgstr[2] "%d o wythnosau" msgstr[3] "%d wythnos" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4420,23 +4482,23 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: 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] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d diwrnod" -msgstr[1] "%d ddiwrnod" -msgstr[2] "%d o ddiwrnodau" -msgstr[3] "%d diwrnod" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4446,3 +4508,12 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" + +#: 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] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn." +msgstr[1] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn." +msgstr[2] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn." +msgstr[3] "Nid oes gennym fanylion am y cynghorau sy'n rheoli'r lleoliad hwn." diff --git a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po index 28eb67ce4..ae8bc539e 100644 --- a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/da_DK.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: Danish (Denmark) (https://www.transifex.com/mysociety/teams/12067/da_DK/)\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 " og " @@ -110,7 +110,7 @@ msgstr "%s bydel, %s" msgid "%s, within %s ward" msgstr "%s, indefor bydel %s" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> -bidragsydere" @@ -118,7 +118,7 @@ msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap< 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 "(Epost i misbrugstabellen)" @@ -142,12 +142,10 @@ msgstr "(en standardafstand som dækker en befolkning på omtrent 200.000)" 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 "(lukket)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(løst)" @@ -156,7 +154,7 @@ msgstr "(løst)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som graffite, affald, hul i vejen, eller ødelagt gadelys)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(ikke rapporteret til myndigheden)" @@ -164,21 +162,21 @@ msgstr "(ikke rapporteret til myndigheden)" msgid "(optional)" msgstr "(valgfrit)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(sendt til begge)" -#: 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 "-- Vælg en kategori --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Vælg en ejendomsstype --" -#: 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 "<code>MAPIT_URL</code> er sat, (<code>%s</code>) men ingen <code>MAPIT_TYPES</code>.<br>Dette er nok grunden til at \"dækket område\" er tom (nedenfor).<br>Måske skal du tilføje nogen <code>MAPIT_TYPES</code> i konfigurationsfilen?" -#. ('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 "<strong>Nej</strong> Lad mig bekræfte min opdatering med e-post" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nej</strong>, lad mig logge ind med e-post:" -#: 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 "<strong>Ja</strong>, jeg har en adgangskode" #: 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 "Tilføj myndighed" msgid "Add new category" msgstr "Tilføj ny kategori" -#: 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 "Tilføj bruger" -#: 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 "Tilføjede %s" -#: 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 "En opdatering markerede dette problem som ordnet." msgid "Anonymous" msgstr "Anonym" -#: 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 "Anonym:" @@ -399,7 +400,7 @@ msgstr "Tildel til ekstern myndighed:" msgid "Assign to subdivision:" msgstr "Tildelt underafdeling:" -#: 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 "Afventer moderation" @@ -446,12 +447,12 @@ msgstr "Tilbage" 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 "Bandlys epostadresse" #: 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 "Hvis du ikke kan se kortet, <em>så overspring dette trin</em>." -#: 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 "Løsningsrate fordelt på kategori for problemer > 4 uger gamle" -#: 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 @@ -590,6 +588,10 @@ msgid "" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "Vælg et <strong>kategorinavn</strong> som giver mening for indbyggerne (f.eks. \"Hul i vejen\", \"Gadebelysning\") men som også er nyttigt for myndigheden. Disse vil dukke op i rullegardinmenuen på rapportér-et-problem-siden." +#: 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" @@ -618,10 +620,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 @@ -723,8 +726,8 @@ msgstr "Kontakt projektgruppen" 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 "Kunne ikke finde bruger" @@ -778,7 +781,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 "" @@ -819,7 +822,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Behandlet af underafdeling inden 5 arbejdsdage" #: 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 "" @@ -885,21 +888,35 @@ msgstr "" msgid "Don’t know" msgstr "Véd ikke" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "Kan du ikke lide skemaer?" +#: 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 "Duplikat" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Duplikat" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Duplikat" + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -911,7 +928,8 @@ msgstr "" "Forskellige kategorier kan have same kontakt</strong> (e-postadresse).\n" "Dette betyder at du kan tilføje mange grupper/kategorier selv om du bare har <strong>én<strong> kontakt for myndigheden." -#: 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 "" @@ -930,11 +948,11 @@ msgstr "Redigér" msgid "Edit body details" msgstr "Redigér detaljer for myndighed" -#: 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 "" @@ -985,7 +1003,7 @@ msgstr "Opdateret af" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "Epost lagt til misbrugsliste" @@ -1003,11 +1021,11 @@ msgstr "Epostvarsel laget" msgid "Email alert deleted" msgstr "Epostvarsel slettet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1622 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1624 msgid "Email already in abuse list" msgstr "Epost allerede i misbrugslisten" -#: 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 @@ -1080,7 +1098,7 @@ msgid "Enter details of the problem" msgstr "Indtast detaljer om problemet" #: 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 @@ -1102,8 +1120,8 @@ msgstr "Eksempel-postnummer %s" msgid "Examples:" msgstr "Eksempler:" -#: 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 "" @@ -1139,7 +1157,8 @@ msgstr "" msgid "Extra data:" msgstr "Ekstra data:" -#: 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 "" @@ -1161,11 +1180,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "Fiks dette ved at vælge en <strong>area covered</strong> i <em> Edit body details</em>-skemaet nedenfor." #: 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 @@ -1173,12 +1193,12 @@ msgid "Fixed" msgstr "Løst" #: 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 "Løst - Administration" #: 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 "Løst - Bruger" @@ -1196,7 +1216,7 @@ msgstr "Løst:" msgid "Flag as deleted" msgstr "Markér som slettet" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Flag user" msgstr "Markér bruger" @@ -1217,7 +1237,7 @@ msgstr "Markerede brugere er listet op på <a href='%s'>Markerede</a>-siden." msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Markerede brugere er ikke begrænset på noget måde. Dette er bare en liste med brugere som er blevet markeret for at give dem opmærksomhed." -#: 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 "Markeret:" @@ -1255,7 +1275,7 @@ msgid "Frequently Asked Questions" msgstr "Ofte spurgte spørgsmål" #: 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 "Få opdateringer" @@ -1281,7 +1301,7 @@ msgstr "Glad for at høre at det er i orden!" #: 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 "Søg" @@ -1290,7 +1310,7 @@ msgstr "Søg" msgid "Going to send questionnaire?" msgstr "Skal der sendes spørgeskema?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "" @@ -1332,8 +1352,8 @@ msgstr "Hej, %s" #: 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 @@ -1376,7 +1396,7 @@ msgstr "Jeg rapporterede netop et problem på @fixminvej" msgid "I just updated a problem on @fixmystreet" msgstr "Jeg opdaterede netop et problem på @fixminvej" -#: 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 "Jeg er bange for at vi ikke kunne finde dit problem i databasen.\n" @@ -1422,6 +1442,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" @@ -1488,7 +1512,7 @@ msgstr "Yderligere bliver følgende attributter, som ikke er del af Open311 v2-s #: 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 @@ -1524,7 +1548,7 @@ msgid "Internal notes" msgstr "Interne notater" #: 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 "Intern reference" @@ -1532,7 +1556,7 @@ msgstr "Intern reference" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-værdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Ugyldig slut-dato" @@ -1540,16 +1564,16 @@ msgstr "Ugyldig slut-dato" msgid "Invalid format %s specified." msgstr "Ugyldigt format %s angivet." -#: 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 "Ugyldig startdato" #: 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 @@ -1595,7 +1619,11 @@ msgstr "Sidste opdatering:" msgid "Last update:" msgstr "Sidste opdatering:" -#: 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 "" @@ -1640,6 +1668,10 @@ msgstr "KORT" 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 "Kort" @@ -1664,7 +1696,7 @@ msgstr "Markeret som løst/lukket for mere end otte uger siden" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Besked" @@ -1684,7 +1716,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1692,7 +1724,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 "" @@ -1704,7 +1736,7 @@ msgstr "Modereret af afdeling inden for en arbejdsdag" msgid "Month" msgstr "Måned" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "" @@ -1728,7 +1760,7 @@ msgstr "" msgid "Name" msgstr "Navn" -#: 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 @@ -1740,7 +1772,7 @@ msgstr "Navn:" msgid "Name: %s" msgstr "Navn: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1842,7 +1874,7 @@ msgstr "Ny tilstand" msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "" @@ -1857,7 +1889,7 @@ msgstr "Næste" #: 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 @@ -1878,7 +1910,7 @@ msgstr "Ingen myndighed" msgid "No council" msgstr "Ingen myndighed" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Ingen myndighed er valgt" @@ -1945,7 +1977,7 @@ msgstr "" "aktivitet for hele instansen), mulighed at skjule beskeder eller sætte status for specialrapporter." #: 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" @@ -2023,15 +2055,15 @@ msgstr "Ældre <br>løste" msgid "Older <br>problems" msgstr "Ældre <br>problemer" -#: 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 @@ -2077,13 +2109,13 @@ msgstr "Eller problemer meldt til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Eller du kan abonnere på varsel baseret på bydel eller myndighed du hører ind under:" -#: 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" @@ -2104,7 +2136,7 @@ msgid "Parent" msgstr "Forælder" #: 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 "Delvis" @@ -2138,7 +2170,7 @@ msgid "Phone number (optional)" msgstr "Telefonnummer (valgfrit)" #: 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:" @@ -2190,7 +2222,7 @@ msgstr "Placér tegnestiften på kortet" #: 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 @@ -2218,14 +2250,14 @@ msgid "Please check your email address is correct" msgstr "Venligst kontrollér at du har skrevet en gyldig e-postadresse" #: 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 "Vælg en kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Vælg en type egenskab" @@ -2246,13 +2278,13 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Vær ikke ufin — at skælde ud på din myndighed skader værdien af tjenesten for alle brugerne." #: 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 "Venligst indlæg en besked" #: 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 "" @@ -2267,13 +2299,13 @@ msgid "Please enter a password" msgstr "Indtast en adgangskode" #: 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 "Venligst angiv et emne" #: 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 @@ -2286,7 +2318,7 @@ msgstr "Tilføj en gyldig e-post" msgid "Please enter a valid email address" msgstr "Angiv din e-post" -#: 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 "Angiv oplysninger om problemet" @@ -2319,8 +2351,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Venligst angiv dit fulde navn, myndigheder som modtager dit problem har brug for dette - hvis du ikke ønsker at dit navn skal vises, så fjern hakket nedenfor" #: 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" @@ -2359,7 +2391,7 @@ msgstr "" "Venligst udfyld skemaet nedenfor med detaljerne om problemet,\n" "og beskriv placeringen så nøjagtigt som muligt i boksen for detaljer." -#: 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 "Venligst indikér om du ønsker at modtage et nyt spørgeskema" @@ -2385,20 +2417,20 @@ msgstr "" msgid "Please note:" msgstr "Venligst bemærk:" -#: 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 "Venligst bidrag med en forklaring på hvorfor du genåbner denne problemrapport" -#: 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 "Venligst bidrag med lidt tekst i tillæg til et billede" -#: 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 "Venligst oplys om du har rapporteret et problem til din myndighed tidligere" @@ -2414,7 +2446,7 @@ msgstr "Vælg den kilde du ønsker" msgid "Please select the type of alert you want" msgstr "Venligst vælg hvilken type varsel du ønsker" -#: 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 "Venligs angiv om dette problem er blevet fikset eller ikke" @@ -2433,22 +2465,22 @@ msgstr "Indtast en besked" msgid "Please write your update here" msgstr "Indtast venligst din opdatering her" -#: 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 "Indsend" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Publiceret anonymt %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Sendt ind af %s (<strong>%s</strong>) %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Sendt ind af %s %s" @@ -2464,7 +2496,8 @@ msgstr "Forrige" 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 "" @@ -2480,10 +2513,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 "Privat" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Privat" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Problem" @@ -2519,11 +2557,11 @@ msgstr "Problemtilstandsændring baseret på spørgeundersøgelsesresultater" msgid "Problems" msgstr "Problemer" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Problemer i nærheden" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Problemer på kortet" @@ -2535,7 +2573,7 @@ msgstr "Problemer nyligt rapporteret fikset på FixMinVej" msgid "Problems within %.1fkm of this location" msgstr "Problemer indenfor %.1fkm fra denne positionen" -#: 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" @@ -2559,6 +2597,7 @@ msgstr "Problemer indenfor grænserne af:" msgid "Property address:" msgstr "Ejendomsadresse:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Bidrag med en opdatering" @@ -2576,12 +2615,17 @@ msgstr "Det er valgfrit at angive navn og adgangskode, men hvis du gør det kan msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Det er valgfrit at angive en adgangskode, men hvis du gør det vil det blive nemmere for dig at rapportere problemer, lave opdateringer og håndtere dine rapporter" +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "Offentlig respons:" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Offentlig respons:" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "" @@ -2605,7 +2649,7 @@ msgstr "Spørgeskema %d udfyldt for problem %d, %s til %s" msgid "Questionnaire %d sent for problem %d" msgstr "Spørgeskema %d sendt for problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Spørgeskema udfyldt af fejlrapportøren" @@ -2613,7 +2657,7 @@ msgstr "Spørgeskema udfyldt af fejlrapportøren" #: 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 "RSS-strøm" @@ -2641,7 +2685,7 @@ msgstr "RSS-strøm af %s, indenfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-strøm med problemer i nærheden" -#: 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" @@ -2657,12 +2701,12 @@ msgid "RSS feed of recent local problems" msgstr "RSS-strøm med nylige lokale problemer" #: 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 "RSS-strøm med opdateringer for dette problem" #: 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 "Modtag e-post når der er opdateringer på dette problem" @@ -2684,7 +2728,7 @@ msgstr "Nyligt løste <br>problemer" msgid "Recently reported problems" msgstr "Nyligt meldte problemer" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2692,13 +2736,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 "Husk at FixMinVej primært er lavet for at rapportere fysiske problemer som kan blive fikset. Hvis dit problem ikke er egnet til at sende ind via denne tjeneste, så husk at du kan kontakte myndigheden direkte via deres egen netside." -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "Fjern markering" -#: 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 "" @@ -2706,7 +2752,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!)" @@ -2720,7 +2766,8 @@ msgstr "" msgid "Report" msgstr "Rapport" -#: 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 "" @@ -2730,6 +2777,7 @@ msgstr "" msgid "Report a problem" msgstr "Rapportér et problem" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Rapportér misbrug" @@ -2753,8 +2801,8 @@ msgstr "Rapportér dit problem" msgid "Report, view, or discuss local problems" msgstr "Rapportér, find eller diskutér lokale problemer" -#: 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 "Rapporteret anonymt %s" @@ -2763,8 +2811,8 @@ msgstr "Rapporteret anonymt %s" msgid "Reported before" msgstr "Rapporteret tidligere" -#: 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 "Publiceret af %s %s" @@ -2777,27 +2825,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Rapporteret i kategorien %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Rapporteret i kategorien %s anonymt %s" -#: 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 "Rapporteret i kategorien %s af %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Publiceret af %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Rapporteret af %s af %s %s" -#: 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 "Rapporteret af %s i kategorien %s anonymt %s" -#: 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 "Rapporteret af %s i kategorien %s af %s %s" @@ -2907,16 +2955,16 @@ msgstr "Vejoperatør for denne navngivne vej (udledt af vejens referencenummer o msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vejoperatør for denne navngivne vej (fra OpenStreetMap): %s" -#: 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 "Rotér til venstre" -#: 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" @@ -2927,21 +2975,26 @@ 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 "Satelit" +#: templates/web/base/report/_inspect.html:150 +#, fuzzy +msgid "Save + close as duplicate" +msgstr "markeret som duplikeret rapport" + #: 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 "Gem ændringer" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -2978,6 +3031,10 @@ msgstr "Søgningen fandt ingen brugere." 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" @@ -3021,27 +3078,27 @@ msgstr "Sendt:" msgid "Service:" msgstr "Tjeneste:" -#: 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 "Del" -#: 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 "" @@ -3116,7 +3173,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Beklager, men der opstod et problem når vi forsøgte at bekræfte din problemrapport" -#: 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 @@ -3164,12 +3221,14 @@ msgstr "Start-dato:" #: 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 "Tilstand" -#: 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 @@ -3209,7 +3268,7 @@ msgstr "Underkategori: %s" msgid "Subdivision/Body" msgstr "Underafdeling/myndighed" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Emne" @@ -3226,7 +3285,7 @@ msgstr "Emne:" msgid "Submit" msgstr "Send ind" -#: 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 @@ -3252,7 +3311,7 @@ msgid "Submitted" msgstr "Sendt ind" #: 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 "Abonnér" @@ -3539,7 +3598,7 @@ msgstr "Der var problemer med at vise 'Alle rapporter'-siden. Venligst prøv ig msgid "There was a problem showing this page. Please try again later." msgstr "Der var problemer med at vise denne side. Venligst prøv igen senere." -#: 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 @@ -3630,9 +3689,9 @@ msgstr "Denne e-post er blevet sendt til begge myndigheder som dækker stedet fo 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 "Denne e-post er blevet sendt til flere myndigheder som dækker stedet for problemet, da den valgte kategori er tilgængelig for disse. Vær sød at ignorere e-posten hvis I ikke er korrekt myndighed for at håndtere denne sag." -#: 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 "Denne information er påkrævet" @@ -3657,6 +3716,10 @@ msgstr "Dette problem er løst" msgid "This problem has not been fixed" msgstr "Dette problem er ikke blevet løst" +#: 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 @@ -3731,7 +3794,8 @@ msgstr "For at se et kort med en mere præsis placering for dette problem." msgid "Total" msgstr "Totalt" -#: 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 "" @@ -3739,7 +3803,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 "" @@ -3756,14 +3820,14 @@ msgid "Try emailing us directly:" msgstr "Forsøg at sende epost direkte til os:" #: 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 "Kan ikke fikses" #: 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 @@ -3783,8 +3847,8 @@ msgstr "Ukendt" msgid "Unknown alert type" msgstr "Ukendt varsel-type" -#: 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 "Ukendt fejl" @@ -3795,6 +3859,10 @@ msgstr "Ukendt fejl" msgid "Unknown problem ID" msgstr "Ukendt problem-Id" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "Opdatering" @@ -3848,7 +3916,7 @@ msgid "Updated" msgstr "Opdateret" #: 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 @@ -3863,7 +3931,7 @@ msgstr "Opdateret!" msgid "Updates" msgstr "Opdateringer" -#: 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 "Opdateringer er begrænset til %s tegn i længde. Venligst skriv en kortere tekst." @@ -3894,11 +3962,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 "Brugermarkering fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "Bruger markeret" @@ -3907,7 +3975,7 @@ msgid "User search finds matches in users' names and email addresses." msgstr "Brugersøgning finder træf på brugernavne og epostadresser. " #: 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" @@ -3997,6 +4065,10 @@ msgstr "Hvornår redigeret" msgid "When sent" msgstr "Hvornår sendt" +#: 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 "" @@ -4045,7 +4117,7 @@ msgstr "År" #: 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 @@ -4060,11 +4132,11 @@ msgstr "Ja" msgid "Yes I have a password" msgstr "Ja, jeg har en adgangskode" -#: 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 "Du klager over at denne problemrapport blev modereret uden grund:" -#: 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 "Du rapporterer at følgende problem er stødende, indeholder personlig information eller lignende:" @@ -4081,7 +4153,7 @@ msgstr "Du kan <a href=\"%s%s\">læse om problemet på denne side</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Du kan føje en misbrugers epostadresse til misbrugslisten, hvilket automatisk skjuler (og aldrig sender) rapporter vedkommende opretter." -#: 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 "Du kan kontakte teknisk support via <a href='mailto:%s'>%s</a>" @@ -4176,9 +4248,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 @@ -4198,7 +4270,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Vi vil kun bruge personlig information om dig i henhold til vores <a href=\"/faq#privacy\">privatlivsregler.</a>" #: 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 @@ -4277,53 +4349,53 @@ msgstr "redigér bruger" msgid "from %s different users" msgstr "fra %s forskellige brugere" -#: 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 "sidst opdateret %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "mindre end et minut" -#: templates/web/base/report/updates.html:57 +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 msgid "marked as a duplicate report" msgstr "markeret som duplikeret rapport" -#: templates/web/base/report/updates.html:47 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as action scheduled" msgstr "markeret som planlagt" -#: templates/web/base/report/updates.html:59 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "marked as an internal referral" msgstr "markeret som en intern henvisning" -#: templates/web/base/report/updates.html:49 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as closed" msgstr "markeret som lukket" -#: 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 "markeret som fikset" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "markeret som under udførelse" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "markeret som undersøges" -#: templates/web/base/report/updates.html:55 +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 msgid "marked as not the council's responsibility" msgstr "markeret som ikke myndighedens ansvar" -#: templates/web/base/report/updates.html:43 +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 msgid "marked as planned" msgstr "markeret som planlagt" -#: templates/web/base/report/updates.html:53 +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as unable to fix" msgstr "markeret som uløseligt" @@ -4369,8 +4441,8 @@ msgstr "oprinnelig lagt ind: “%s”" msgid "other areas:" msgstr "andre områder:" -#: 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 "åbnet igen" @@ -4416,55 +4488,48 @@ msgstr "bruger er ejer af problemet" msgid "ward" msgstr "bydel" -#: 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" -msgstr[0] "<big>%s</big> rapporteret<br>for nyligt" -msgstr[1] "<big>%s</big> rapporteret<br>for nyligt" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dag" +msgstr[1] "%d dage" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d time" msgstr[1] "%d timer" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d supporter" -msgstr[1] "%d supportere" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minut" msgstr[1] "%d minutter" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> rapport-<br>opdatering" -msgstr[1] "<big>%s</big> rapport-<br>opdateringer" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Vi har endnu ikke detaljer for myndigheden som dækker dette sted." -msgstr[1] "Vi har endnu ikke detaljer for myndighederne som dækker dette sted." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d supporter" +msgstr[1] "%d supportere" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d uge" msgstr[1] "%d uger" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> fikset sidste måned" +msgstr[1] "<big>%s</big> fikset sidste måned" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4472,19 +4537,19 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> rapport sidste uge" msgstr[1] "<big>%s</big> rapporter sidste uge" -#: 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" -msgstr[0] "<big>%s</big> fikset sidste måned" -msgstr[1] "<big>%s</big> fikset sidste måned" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> rapporteret<br>for nyligt" +msgstr[1] "<big>%s</big> rapporteret<br>for nyligt" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d dag" -msgstr[1] "%d dage" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> rapport-<br>opdatering" +msgstr[1] "<big>%s</big> rapport-<br>opdateringer" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4492,3 +4557,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] "Vi har endnu <strong>ikke</strong> detaljerne for den anden myndighed som dækker dette sted." msgstr[1] "Vi har endnu <strong>ikke</strong> detaljerne for de andre myndigheder som dækker dette sted." + +#: 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] "Vi har endnu ikke detaljer for myndigheden som dækker dette sted." +msgstr[1] "Vi har endnu ikke detaljer for myndighederne som dækker dette sted." diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index 30afe7f64..2c74eaf63 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.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: German (Switzerland) (https://www.transifex.com/mysociety/teams/12067/de_CH/)\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 "und" @@ -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 "(Schaden & Ort des Schadens)" -#: 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 "(beantwortet)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(beantwortet)" @@ -156,7 +154,7 @@ msgstr "(beantwortet)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" -#: 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 "(optional)" -#: 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 "-- Wählen Sie eine Kategorie --" -#: 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 "<label for=\"statuses\">Zeige</label> %s <label for=\"filter_categories\">über</label> %s" @@ -218,11 +216,11 @@ msgstr "" msgid "<strong>No</strong> let me sign in by email" msgstr "Neu Registrieren" -#: 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 "Passwort" #: 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 "Adresse hinzufügen" msgid "Add new category" msgstr "Füge neue Kategorie hinzu" -#: 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 "User hinzufügen" -#: 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 "Anonym" -#: 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 "Anonym" @@ -399,7 +400,7 @@ msgstr "Nachricht an zuständige Stelle" msgid "Assign to subdivision:" msgstr "An Fachbereich zuweisen" -#: 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 "Überprüfung ausstehend" @@ -446,12 +447,12 @@ msgstr "Zurück" 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 "Falls Sie kein E-Mail erhalten haben, überprüfen Sie bitte Ihr msgid "Can't see the map? <em>Skip this step</em>" msgstr "Karte nicht sichtbar? <em>Überspringen Sie diesen Schritt</em>" -#: 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 "Klicken Sie auf den Link im Bestätigungsemail um sich anzumelden." #: 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 "Koordinaten" -#: 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 "Vorlage erstellen" @@ -810,7 +813,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Innerhalb von fünf Arbeitstagen abgeschlossen" #: 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 "Vorlage löschen" @@ -876,21 +879,35 @@ msgstr "Haben Sie ein %s Passwort?" 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 "Fotos hierhin ziehen oder <u>hochladen</u>" #: 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 "Duplikat" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Duplikat" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Duplikat" + #: 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 "Anpassen" msgid "Edit body details" msgstr "Details editieren" -#: 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 "E-Mail" -#: 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 "E-Mail Benachrichtigung erstellt" msgid "Email alert deleted" msgstr "E-Mail Benachrichtigung gelöscht" -#: 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 "Beschreiben Sie den Schaden" #: 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 "Beispieladresse" msgid "Examples:" msgstr "Beispiele:" -#: 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 "Beantwortet" #: 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 "Als gelöscht markieren" -#: 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 "Hilfe" #: 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 "Los" @@ -1272,7 +1292,7 @@ msgstr "Los" 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 "Hallo %s" #: 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 "Interne Notizen" #: 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 "Ung&ultiges Enddatum" @@ -1515,16 +1539,16 @@ msgstr "Ung&ultiges Enddatum" 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 "Ung&ultiges Startdatum" #: 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 "Letzte Bearbeitung" msgid "Last update:" msgstr "Letzte Bearbeitung" -#: 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 "Nachricht" @@ -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 "Innerhalb eines Arbeitstages moderiert" msgid "Month" msgstr "Monat" -#: 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 "Name" -#: 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 "Name:" msgid "Name: %s" msgstr "Name: %s" -#: 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 "Neuer Status" msgid "New template" msgstr "Neue Vorlage" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "" @@ -1830,7 +1862,7 @@ msgstr "Weiter" #: 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 "Gehört zu" #: 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 "Telefonnummer (optional)" #: 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 "Pin auf der Karte absetzen" #: 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 "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" #: 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 "Bitte wählen Sie eine Kategorie" -#: 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 "Obligatorisches Feld" #: 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 "Bitte geben Sie eine gültige E-Mail Adresse an" msgid "Please enter a valid email address" msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:427 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Bitte geben Sie einige Details an" @@ -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 "Beschreiben Sie den Schaden." 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 "Füllen Sie das Formular mit den Details des Schadens aus und beschreiben Sie den Ort des Schadens möglichst genau." -#: 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 "Hinweise:" -#: 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 "Zurück" 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 "Details editieren" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Meldung" @@ -2483,11 +2521,11 @@ msgstr "" msgid "Problems" msgstr "Meldungen" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Meldungen in der Nähe" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Meldungen auf der Karte" @@ -2499,7 +2537,7 @@ msgstr "Meldungen, welche kürzlich beantwortet wurden" 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 "Meldung aktualisieren" @@ -2540,12 +2579,17 @@ 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 +#, fuzzy +msgid "Public details" +msgstr "Rückmeldung an User" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Rückmeldung an User" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "" @@ -2569,7 +2613,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 +2621,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 +2649,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 +2665,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 "Erhalten Sie Aktualisierungen dieser Meldung." @@ -2648,7 +2692,7 @@ msgstr "Kürzlich <br>beantwortet" msgid "Recently reported problems" msgstr "Kürzlich erfasste Meldungen:" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2656,13 +2700,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 "«Züri wie neu» dient dazu Schäden an der Infrastruktur zu melden. Meldungen und Wünsche bezüglich Verbesserungen an der Infrastruktur sowie Gestaltungsvorschläge können über «Züri wie neu» nicht berücksichtigt werden. Notfälle müssen der Polizei gemeldet werden via Telefon 117." -#: 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 +2716,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 +2730,8 @@ msgstr "Antwort an User" msgid "Report" msgstr "Meldung" -#: 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 +2741,7 @@ msgstr "" msgid "Report a problem" msgstr "Eine Meldung erfassen" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Missbrauch melden" @@ -2717,8 +2765,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Melden Sie Schäden an der Infrastruktur von Zürich" -#: 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 "Anonym gemeldet um" @@ -2727,8 +2775,8 @@ msgstr "Anonym gemeldet um" 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 "Gemeldet von %s um %s" @@ -2741,27 +2789,27 @@ msgstr "Gemeldet von" msgid "Reported in the %s category" msgstr "In der Kategorie %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "In der Kategorie %s um %s gemeldet" -#: 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 "Gemeldet in der Kategorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: 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 +2919,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 "Links drehen" -#: 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 +2939,25 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Durch das Drehen des Fotos gehen nicht gespeicherte Änderungen verloren." #: 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 "Speichern" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -2942,6 +2994,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 +3041,27 @@ msgstr "Gesendet:" msgid "Service:" msgstr "Gerät" -#: 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 +3133,7 @@ msgstr "Entschuldigung, dieser Link ist ungültig" 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 +3181,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 "Status" -#: 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 +3228,7 @@ msgstr "" msgid "Subdivision/Body" msgstr "FB/Externe" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Titel" @@ -3187,7 +3245,7 @@ msgstr "Titel" msgid "Submit" msgstr "Abschicken" -#: 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 +3271,7 @@ msgid "Submitted" msgstr "Erfasst" #: 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 +3542,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 +3624,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 "Diese Information wird benötigt" @@ -3593,6 +3651,10 @@ msgstr "Dieser Schaden wurde behoben" msgid "This problem has not been fixed" msgstr "Dieser Schaden wurde nicht behoben" +#: 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 +3729,8 @@ msgstr "" msgid "Total" msgstr "Total" -#: 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 +3738,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 +3755,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 +3782,8 @@ msgstr "Unbekannt" 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 "Unbekannter Fehler" @@ -3731,6 +3794,10 @@ msgstr "Unbekannter Fehler" 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 "Speichern" @@ -3784,7 +3851,7 @@ msgid "Updated" msgstr "Aktualisiert" #: 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 +3866,7 @@ msgstr "Aktualisiert!" msgid "Updates" msgstr "Antwort" -#: 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 +3897,11 @@ msgstr "Karte verwendet" 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 +3910,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 +4000,10 @@ msgstr "Wann editiert" msgid "When sent" msgstr "Wann gesendet" +#: 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 +4052,7 @@ msgstr "Jahr" #: 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 +4067,11 @@ msgstr "Ja" 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 +4088,7 @@ msgstr "Danke! Sie können Ihre aktualisierte Meldung <a href=\"%s%s\">auf d 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 +4179,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 +4201,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Wir verwenden Ihre persönlichen Daten nur entsprechend unserer <a href=\"/faq#privacy\">Datenschutzrichtlinien.</a>" #: 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 +4280,53 @@ msgstr "" msgid "from %s different users" msgstr "von %s verschiedenen Personen" -#: 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 "letzte Bearbeitung %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "weniger als einer Minute" -#: 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 "als beantwortet markiert" -#: 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 +4372,8 @@ msgstr "Originaltext: “%s”" 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,55 +4419,48 @@ msgstr "Der User ist der Eigner der Meldung" 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" -msgstr[0] "<big>%s</big> Meldung in letzter Zeit" -msgstr[1] "<big>%s</big> Meldungen in letzter Zeit" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d Tag" +msgstr[1] "%d Tage" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: 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] "%d Minute" msgstr[1] "%d Minuten" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> Meldung bearbeitet" -msgstr[1] "<big>%s</big> Meldungen bearbeitet" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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 supporter" +msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d Woche" msgstr[1] "%d Wochen" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> bearbeitete Meldung im letzten Monat" +msgstr[1] "<big>%s</big> bearbeitete Meldungen im letzten Monat" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4404,19 +4468,19 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> Meldung in der letzten Woche" msgstr[1] "<big>%s</big> Meldungen in der letzten Woche" -#: 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" -msgstr[0] "<big>%s</big> bearbeitete Meldung im letzten Monat" -msgstr[1] "<big>%s</big> bearbeitete Meldungen im letzten Monat" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> Meldung in letzter Zeit" +msgstr[1] "<big>%s</big> Meldungen in letzter Zeit" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d Tag" -msgstr[1] "%d Tage" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> Meldung bearbeitet" +msgstr[1] "<big>%s</big> Meldungen bearbeitet" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4424,3 +4488,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] "" diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po index f2de680b8..a76a894c3 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_DE.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: Ettore Atalan <atalanttore@googlemail.com>, 2016\n" "Language-Team: German (Germany) (https://www.transifex.com/mysociety/teams/12067/de_DE/)\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 "und" @@ -110,7 +110,7 @@ msgstr "%s Stadtteil, %s" 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 "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>-Beitragende" @@ -118,7 +118,7 @@ msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap< 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 "(geschlossen)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(gelöst)" @@ -156,7 +154,7 @@ msgstr "(gelöst)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" -#: 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 "(optional)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(gesendet an beide)" -#: 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 "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Wählen Sie eine Eigentumsart --" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "--Wählen Sie eine Vorlage aus--" @@ -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 "<strong>Ja</strong>, ich habe ein Passwort" #: 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 "Füge neue Kategorie hinzu" -#: 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 "Benutzer hinzufügen" -#: 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 "%s hinzugefügt" -#: 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 "Anonym" -#: 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 "Anonym:" @@ -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 "Wartet auf Moderation" @@ -446,12 +447,12 @@ msgstr "Zurück" 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 "Kontaktieren Sie das Team" msgid "Coordinates:" msgstr "Koordinaten:" -#: 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 "Benutzer konnte nicht gefunden werden" @@ -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 "Vorlage erstellen" @@ -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 "Vorlage löschen" @@ -876,21 +879,35 @@ msgstr "" msgid "Don’t know" msgstr "Weiß ich nicht" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "Sie mögen keine Formulare?" +#: 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 "Duplizieren" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Duplizieren" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Duplizieren" + #: 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 "Bearbeiten" 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 "Editor" msgid "Email" msgstr "E-Mail" -#: 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 "E-Mail-Benachrichtigung erstellt" msgid "Email alert deleted" msgstr "E-Mail-Benachrichtigung gelöscht" -#: 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 "Beschreiben sie den Mangel" #: 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 "Beispieladresse" msgid "Examples:" msgstr "Beispiele:" -#: 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 "Zusätzliche Daten:" -#: 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 "Gelöst" #: 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 "Häufig gestellte Fragen" #: 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 "Aktualisierungen holen" @@ -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 "Los" @@ -1272,7 +1292,7 @@ msgstr "Los" 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 "Hallo %s" #: 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 "Interne Hinweise" #: 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 "Ung&ultiges Enddatum" @@ -1515,16 +1539,16 @@ msgstr "Ung&ultiges Enddatum" msgid "Invalid format %s specified." msgstr "Ungültiges Format %s angegeben." -#: 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 "Ung&ultiges Startdatum" #: 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 "Letzte Bearbeitung" msgid "Last update:" msgstr "Letzte Aktualisierung:" -#: 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 "KARTE" 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 "Karte" @@ -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 "Nachricht" @@ -1659,7 +1691,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Fehlendes jurisdiction_id" -#: 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 "Monat" -#: 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 "Name" -#: 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 "Name:" msgid "Name: %s" msgstr "Name: %s" -#: 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 "Neuer Status" msgid "New template" msgstr "Neue Vorlage" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "" @@ -1830,7 +1862,7 @@ msgstr "Weiter" #: 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 "Kein Rat" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Kein Rat ausgewählt" @@ -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 "Ältere <br>Probleme" -#: 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 "Übergeordnet" #: 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 "Teilweise" @@ -2104,7 +2136,7 @@ msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" #: 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 "Stecknadel auf Karte platzieren" #: 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 "Bitte überprüfen Sie ob Ihre eMail-Adresse korrekt ist" #: 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 "Bitte wählen Sie eine Kategorie" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Bitte wählen Sie eine Eigentumsart" @@ -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 "Bitte geben Sie eine Nachricht ein" #: 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 "Bitte geben Sie Ihren Namen ein" @@ -2233,13 +2265,13 @@ msgid "Please enter a password" msgstr "Bitte geben Sie ein Passwort ein" #: 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 "Bitte geben Sie einen Betreff ein" #: 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 "Bitte geben Sie eine gültige eMail-Adresse an" msgid "Please enter a valid email address" msgstr "Bitte geben Sie eine gültige eMail-Adresse an" -#: 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 "Bitte geben Sie einiges Details an" @@ -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 "Hinweise:" -#: 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 "Bitte schreiben Sie eine Nachricht" msgid "Please write your update here" msgstr "Bitte schreiben Sie hier Ihre Aktualisierung" -#: 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 "Vorherige" 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 "Datenschutz und Cookies" #: 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 "Privat" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Privat" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Meldung" @@ -2483,11 +2521,11 @@ msgstr "" msgid "Problems" msgstr "Meldungen" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Meldungen in der Nähe" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Meldungen auf der Karte" @@ -2499,7 +2537,7 @@ msgstr "Meldungen, welche kürzlich gelöst wurden" 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 "Probleme innerhalb der Grenze von:" msgid "Property address:" msgstr "Immobilien-Adresse:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Meldung aktualisieren" @@ -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 "RSS-Feed" @@ -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 "Erhalten Sie Aktualisierungen dieser Meldung." @@ -2648,7 +2691,7 @@ msgstr "Kürzlich <br>repariert" msgid "Recently reported problems" msgstr "Kürzlich erfasste Meldungen" -#: 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 "Fix My Zürich wird primär dafür verwendet, physische Mängel zu melden, welche behoben werden können. Wenn Ihr Problem dafür nicht passend erscheint, können sie die entsprechende Dienststelle weiterhin telefonisch oder per eMail erreichen." -#: 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 "Bericht" -#: 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 "Eine Meldung erfassen" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Missbrauch melden" @@ -2717,8 +2764,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Melden sie Mängel an der Infrastruktur von Zürich" -#: 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 "Anonym gemeldet um" @@ -2727,8 +2774,8 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "Vorher berichtet" -#: 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 "Gemeldet von %s um %s" @@ -2741,27 +2788,27 @@ msgstr "Gemeldet von:" msgid "Reported in the %s category" msgstr "Gemeldet in der Kategorie %s" -#: 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 "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Gemeldet von %s um %s" -#: 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 "Anonym gemeldet von %s um %s " -#: 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 "Gemeldet von %s um %s" @@ -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 "Nach links drehen" -#: 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 "Satellit" +#: 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 "Änderungen speichern" -#: 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 "Gesendet:" msgid "Service:" msgstr "Dienst:" -#: 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 "Teilen" -#: 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 "Startdatum:" #: 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 "Status" -#: 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 "Unterkategorie: %s" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Titel" @@ -3187,7 +3244,7 @@ msgstr "Titel:" msgid "Submit" msgstr "Abschicken" -#: 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 "Gesendet" #: 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 "Abonnieren" @@ -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 "Diese Information wird benötigt" @@ -3593,6 +3650,10 @@ msgstr "Dieser Mangel wurde behoben" msgid "This problem has not been fixed" msgstr "Dieser Mangel wurde nicht behoben" +#: 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 "Total" -#: 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 "Kann nicht behoben werden" #: 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 "Unbekannt" msgid "Unknown alert type" msgstr "Unbekannter Benachrichtigungstyp" -#: 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 "Unbekannter Fehler" @@ -3731,6 +3793,10 @@ msgstr "Unbekannter Fehler" msgid "Unknown problem ID" msgstr "Unbekannte Problemkennung" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "Beschreibung" @@ -3784,7 +3850,7 @@ msgid "Updated" msgstr "Aktualisiert" #: 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 "Aktualisiert!" msgid "Updates" msgstr "Aktualisierungen" -#: 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 "Wann editiert" msgid "When sent" msgstr "Wann gesendet" +#: 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 "Jahr" #: 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 "Ja" msgid "Yes I have a password" msgstr "Ja, ich habe ein Passwort" -#: 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 "Benutzer bearbeiten" msgid "from %s different users" msgstr "von %s verschiedenen Benutzern" -#: 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 "zuletzt aktualisiert %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "weniger als einer Minute" -#: 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 "als Aktion geplant markiert" -#: 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 "als geschlossen markiert" -#: 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 "als gelöst markiert" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "als in Bearbeitung markiert" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "als untersuchend markiert" -#: 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 "als geplant markiert" -#: 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 "andere Gebiete:" -#: 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 "erneut geöffnet" @@ -4348,55 +4418,48 @@ msgstr "Benutzer ist Problemeigentümer" 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" -msgstr[0] "" -msgstr[1] "" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d Tag" +msgstr[1] "%d Tage" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d Unterstützer" -msgstr[1] "%d Unterstützer" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> Meldung bearbeitet" -msgstr[1] "<big>%s</big> Meldungen bearbeitet" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "" +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d Unterstützer" +msgstr[1] "%d Unterstützer" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d Woche" msgstr[1] "%d Wochen" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> im letzten Monat behoben" +msgstr[1] "<big>%s</big> im letzten Monat gehoben" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4404,19 +4467,19 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> Meldung in der letzten Woche" msgstr[1] "<big>%s</big> Meldungen in der letzten Woche" -#: 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" -msgstr[0] "<big>%s</big> im letzten Monat behoben" -msgstr[1] "<big>%s</big> im letzten Monat gehoben" +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" -msgstr[0] "%d Tag" -msgstr[1] "%d Tage" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> Meldung bearbeitet" +msgstr[1] "<big>%s</big> Meldungen bearbeitet" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -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] "" diff --git a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po index c98d5db3a..0e97e216c 100644 --- a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/el_GR.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: Greek (Greece) (https://www.transifex.com/mysociety/teams/12067/el_GR/)\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 "και" @@ -124,7 +124,7 @@ msgstr "%s περιοχή, %s" msgid "%s, within %s ward" msgstr "%s, στην περιοχή %quot;%s"" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> και συνεργάτες" @@ -132,7 +132,7 @@ msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap< 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 "(το email βρίσκεται στη μαύρη λίστα)" @@ -156,12 +156,10 @@ msgstr "(αντιστοιχεί σε περιοχή όπου κατοικούν msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "(εναλλακτικά, μπορείς να λαμβάνεις ειδοποιήσεις για ζητήματα σε ακτίνα %s)" -#: 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 "(διορθώθηκε)" @@ -170,7 +168,7 @@ msgstr "(διορθώθηκε)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(όπως graffiti, παρατημένα σκουπίδια, σπασμένες πλάκες πεζοδρομίου ή καμένα φώτα δρόμων)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(δεν αποστάλθηκε σε υπηρεσία)" @@ -178,21 +176,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 "" @@ -211,8 +209,8 @@ msgstr "" "Μάλλον γι'αυτό η κατηγορία \"περιοχή αρμοδιότητας\" είναι κενή (παρακάτω).<br>\n" "Μήπως να προσθέσετε μερικά <code>MAPIT_TYPES</code> στο αρχείο ρυθμίσεων;" -#. ('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 "<label for=\"statuses\">Προβολή</label> %s <label for=\"filter_categories\">σχετικά με</label> %s" @@ -235,11 +233,11 @@ msgstr "<strong>Όχι</strong> Να γίνει επιβεβαίωση της ε msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Όχι</strong> να συνδεθώ μέσω email" -#: 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 "" @@ -250,7 +248,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ναι</strong> έχω κωδικό πρόσβασης" #: 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" @@ -281,26 +279,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 "" @@ -308,7 +309,7 @@ msgstr "" msgid "Added %s" msgstr "Προστέθηκε %s" -#: 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 "" @@ -363,7 +364,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 "Ανώνυμος:" @@ -418,7 +419,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 "" @@ -443,8 +444,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 "" @@ -452,7 +453,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 "Σε αναμονή ελέγχου" @@ -465,12 +466,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 "Αποκλεισμός της διεύθυνσης email" #: 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 @@ -501,10 +502,6 @@ msgstr "Δεν μπορείς να βρεις το email μας; Έλεγξε τ msgid "Can't see the map? <em>Skip this step</em>" msgstr "Δεν μπορείς να δεις τον χάρτη; <em>Παράλειψη βήματος</em>" -#: 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" @@ -517,7 +514,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 @@ -537,7 +535,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "Μέσος όρος διόρθωσης προβλημάτων για την κατηγορία > 4 εβδομάδες" -#: 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 @@ -609,6 +607,10 @@ msgid "" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "Επίλεξε ένα όνομα <strong>κατηγορίας</strong> που να έχει νόημα για τους πολίτες (π.χ., \"Λακκούβες\", \"Φωτισμός δρόμων\") αλλά είναι χρήσιμο και για τον τομέα. Αυτά θα φαίνονται στο μενού της σελίδας \"Ανάφερε ένα πρόβλημα\"." +#: 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" @@ -637,10 +639,11 @@ msgstr "Κάνε κλικ στον σύνδεσμο του email επιβεβα #: 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 @@ -742,8 +745,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 "Δεν είναι δυνατή η εύρεση χρήστη" @@ -797,7 +800,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 "Δημιουργία προτύπου" @@ -838,7 +841,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Εξετάστηκε από το τμήμα μέσα σε 5 εργάσιμες ημέρες" #: 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 "Διαγραφή προτύπου" @@ -904,21 +907,35 @@ msgstr "Έχεις κωδικό πρόσβασης %s?" 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 "Σύρε φωτογραφίες εδώ ή <u>κάνε κλικ για ανέβασμα</u>" #: 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" @@ -930,7 +947,8 @@ msgstr "" "Διαφορετικές κατηγορίες <strong>μπορούν να ανήκουν στην ίδια επαφή</strong> (διεύθυνση email).\n" "Αυτό σημαίνει ότι μπορείς να προσθέσεις πολλές κατηγορίες ακόμη και αν έχεις μία επαφή στον τομέα." -#: 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 "" @@ -949,11 +967,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 "" @@ -1004,7 +1022,7 @@ msgstr "Επεξεργαστής" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "Το Email προστέθηκε στην μαύρη λίστα" @@ -1022,11 +1040,11 @@ msgstr "Η ειδοποίηση μέσω email δημιουργήθηκε" msgid "Email alert deleted" msgstr "Η ειδοποίηση μέσω email διεγράφη" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1622 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1624 msgid "Email already in abuse list" msgstr "Το Email είναι ήδη στην μαύρη λίστα" -#: 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 @@ -1100,7 +1118,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 @@ -1122,8 +1140,8 @@ msgstr "Παράδειγμα ταχυδρομικού κώδικα %s" 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 "" @@ -1159,7 +1177,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 "" @@ -1181,11 +1200,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "Διόρθωσέ το επιλέγοντας μία <strong>περιοχή αρμοδιότητας</strong> στη φόρμα <em>Επεξεργασία λεπτομερειών του σώματος</em> παρακάτω." #: 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 @@ -1193,12 +1213,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 "Διορθώθηκε - Χρήστης" @@ -1216,7 +1236,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 "Επισήμανση χρήστη" @@ -1237,7 +1257,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 "Επισημασμένοι:" @@ -1275,7 +1295,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 "Λήψη ενημερώσεων" @@ -1301,7 +1321,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 "Εμπρός" @@ -1310,7 +1330,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 "" @@ -1352,8 +1372,8 @@ msgstr "Γεια %s" #: 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 @@ -1396,7 +1416,7 @@ msgstr "Μόλις ανέφερα ένα πρόβλημα στο @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Μόλις ενημέρωσα ένα πρόβλημα στο @fixmystreet" -#: 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 "Δεν μπορέσαμε να εντοπίσουμε το πρόβλημά σου στην βάση δεδομένων.\n" @@ -1444,6 +1464,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" @@ -1505,7 +1529,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 @@ -1541,7 +1565,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 "Εσωτερική αναφορά" @@ -1549,7 +1573,7 @@ msgstr "Εσωτερική αναφορά" msgid "Invalid agency_responsible value %s" msgstr "Εσφαλμένη τιμή agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Λανθασμένη ημερομηνία λήξης" @@ -1557,16 +1581,16 @@ msgstr "Λανθασμένη ημερομηνία λήξης" msgid "Invalid format %s specified." msgstr "Λανθασμένη μορφοποίηση %s." -#: 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 @@ -1612,7 +1636,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 "" @@ -1657,6 +1685,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 "Χάρτης" @@ -1681,7 +1713,7 @@ msgstr "Σημείωση ως επιδιορθωμένο/κλειστό πιο msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Μήνυμα" @@ -1701,7 +1733,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Λείπει το jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1709,7 +1741,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 "" @@ -1721,7 +1753,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 "" @@ -1745,7 +1777,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 @@ -1757,7 +1789,7 @@ msgstr "Όνομα:" msgid "Name: %s" msgstr "Όνομα: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1859,7 +1891,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 "" @@ -1874,7 +1906,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 @@ -1895,7 +1927,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 "Δεν επιλέχθηκε κάποια υπηρεσία" @@ -1958,7 +1990,7 @@ 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" @@ -2036,15 +2068,15 @@ msgstr "Παλιά <br>διορθωμένα" msgid "Older <br>problems" msgstr "Παλιά <br>προβλήματα" -#: 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 @@ -2090,13 +2122,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" @@ -2117,7 +2149,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 "Εν μέρει" @@ -2151,7 +2183,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:" @@ -2203,7 +2235,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 @@ -2231,14 +2263,14 @@ msgid "Please check your email address is correct" msgstr "Παρακαλούμε έλεγξε αν η διεύθυνση email είναι σωστή" #: 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 "Παρακαλούμε επίλεξε ένα είδος ακινήτου" @@ -2262,13 +2294,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 "Παρακαλώ γράψτε ένα όνομα" @@ -2283,13 +2315,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 @@ -2302,7 +2334,7 @@ msgstr "Παρακαλούμε γράψε ένα έγκυρο email" msgid "Please enter a valid email address" msgstr "Παρακαλούμε γράψε μία έγκυρη διεύθυνση email" -#: 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 "Παρακαλούμε γράψε μερικές λεπτομέρειες" @@ -2335,8 +2367,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" @@ -2373,7 +2405,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 "Παρακαλούμε σήμανε αν θα ήθελες να λάβεις άλλο ερωτηματολόγιο" @@ -2399,20 +2431,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 "Παρακαλούμε πες αν έχεις ξαναναφέρει ένα πρόβλημα στην υπηρεσία στο παρελθόν" @@ -2428,7 +2460,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 "Παρακαλούμε δήλωσε αν το πρόβλημα έχει διορθωθεί ή όχι" @@ -2447,22 +2479,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 "Δημοσιεύθηκε ανώνυμα στις %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Δημοσιεύθηκε από %s (<strong>%s</strong>) στις %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Δημοσιεύθηκε από %s στις %s" @@ -2478,7 +2510,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 "" @@ -2494,10 +2527,15 @@ msgstr "Ιδιωτικότητα και cookies" #: 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 "Πρόβλημα" @@ -2533,11 +2571,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 "Προβλήματα στον χάρτη" @@ -2549,7 +2587,7 @@ msgstr "Προσφάτως αναφερθέντα προβλήματα διορ msgid "Problems within %.1fkm of this location" msgstr "Λήψη ειδοποιήσεων για προβλήματα σε ακτίνα %.1f χλμ από εδώ" -#: 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" @@ -2573,6 +2611,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 "Δώσε μια ενημέρωση" @@ -2590,12 +2629,17 @@ 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 +#, fuzzy +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 "" @@ -2619,7 +2663,7 @@ msgstr "Το ερωτηματολόγιο %d απαντήθηκε για το π msgid "Questionnaire %d sent for problem %d" msgstr "Το ερωτηματολόγιο %d στάλθηκε για το πρόβλημα %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Το ερωτηματολόγιο συμπληρώθηκε από τον υποβολέα του προβλήματος" @@ -2627,7 +2671,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 "Ροή RSS" @@ -2655,7 +2699,7 @@ msgstr "Ροή RSS από %s, στην περιοχή "%s"" msgid "RSS feed of nearby problems" msgstr "Ροή RSS για κοντινά προβλήματα" -#: 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" @@ -2671,12 +2715,12 @@ msgid "RSS feed of recent local problems" msgstr "Ροή RSS για πρόσφατα τοπικά προβλήματα" #: 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 "Ροή RSS για ενημερώσεις σε αυτό το πρόβλημα" #: 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 "Λήψη email όταν γίνονται ενημερώσεις για αυτό το πρόβλημα" @@ -2698,7 +2742,7 @@ msgstr "Πρόσφατα <br>διορθωμένα" 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 "" @@ -2706,13 +2750,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 "Θυμήσου ότι το FixMyStreet έχει ως πρωταρχικό σκοπό την αναφορά φυσικών προβλημάτων που μπορούν να διορθωθούν. Αν το πρόβλημα δεν είναι κατάλληλο για υποβολή μέσω αυτής της ιστοσελίδας μπορείς να επικοινωνήσεις με την υπηρεσία απευθείας μέσω της ιστοσελίδας της." -#: 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 "" @@ -2720,7 +2766,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!)" @@ -2734,7 +2780,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 "" @@ -2744,6 +2791,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 "Αναφορά κατάχρησης" @@ -2767,8 +2815,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 "Αναφέρθηκε ανώνυμα στις %s" @@ -2777,8 +2825,8 @@ msgstr "Αναφέρθηκε ανώνυμα στις %s" 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 "Αναφέρθηκε από %s στις %s" @@ -2791,27 +2839,27 @@ msgstr "Αναφέρθηκε από:" msgid "Reported in the %s category" msgstr "Αναφέρθηκε στην κατηγορία %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Αναφέρθηκε στην κατηγορία %s, ανώνυμα στις %s" -#: 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 "Αναφέρθηκε στην κατηγορία %s από τον %s στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Αναφέρθηκε μέσω %s ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Αναφέρθηκε μέσω %s από τον %s στις %s" -#: 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 "Αναφέρθηκε μέσω %s στην κατηγορία %s ανώνυμα στις %s" -#: 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 "Αναφέρθηκε μέσω %s στην κατηγορία %s από τον %s στις %s" @@ -2921,16 +2969,16 @@ msgstr "Χειριστής δρόμου για την ονομασμένη οδ msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Χειριστής δρόμου για την ονομασμένη οδο (από το OpenStreetMap): %s" -#: 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" @@ -2941,21 +2989,26 @@ 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 +#, fuzzy +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 "" @@ -2992,6 +3045,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" @@ -3035,27 +3092,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 "" @@ -3127,7 +3184,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 @@ -3175,12 +3232,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 @@ -3220,7 +3279,7 @@ msgstr "Υποκατηγορία: %s" msgid "Subdivision/Body" msgstr "Τμήμα/Σώμα" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Θέμα" @@ -3237,7 +3296,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 @@ -3263,7 +3322,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 "Γίνε συνδρομητής" @@ -3542,7 +3601,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 @@ -3632,9 +3691,9 @@ msgstr "Αυτό το email στάλθηκε και στις δύο υπηρεσ 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 "Αυτό το email στάλθηκε σε πολλές υπηρεσίες που είναι αρμόδιες για την τοποθεσία του προβλήματος, αφού η επιλεγμένη κατηγορία συμπεριλαμβάνεται σε κάθε μια από αυτές. Παρακαλούμε αγνόησέ το αν η υπηρεσία σου δεν είναι αρμόδια για την αντιμετώπιση του ζητήματος." -#: 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 "Αυτή η πληροφορία απαιτείται" @@ -3659,6 +3718,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 @@ -3733,7 +3796,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 "" @@ -3741,7 +3805,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 "" @@ -3758,14 +3822,14 @@ msgid "Try emailing us directly:" msgstr "Στείλε μας ένα email:" #: 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 @@ -3785,8 +3849,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 "Άγνωστο σφάλμα" @@ -3797,6 +3861,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 "Ενημέρωση" @@ -3850,7 +3918,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 @@ -3865,7 +3933,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 "Οι ενημερώσεις έχουν όριο χαρακτήρων %s. Παρακαλούμε συντόμευσε την ενημέρωσή σου" @@ -3896,11 +3964,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 "Ο χρήστης επισημάνθηκε" @@ -3909,7 +3977,7 @@ msgid "User search finds matches in users' names and email addresses." msgstr "Η αναζήτηση χρηστών βρίσκει αποτελέσματα για ονόματα χρηστών και διευθύνσεις email." #: 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" @@ -3999,6 +4067,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 "Ήρεμα ρε Τεστίνο! Τρεις φωτογραφίες είναι αρκετές." @@ -4047,7 +4119,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 @@ -4062,11 +4134,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 "Με το παρόν, δηλώνεις ότι η παρακάτω αναφορά προβλήματος είναι καταχρηστική, περιέχει προσωπικές πληροφορίες ή κάτι παρόμοιο:" @@ -4083,7 +4155,7 @@ msgstr "Μπορείς να <a href=\"%s%s\">δεις το πρόβλημα σε 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 "Μπορείς να επικοινωνήσεις για τεχνική υποστήριξη στο <a href='mailto:%s'>%s</a>" @@ -4180,9 +4252,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 @@ -4202,7 +4274,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Οι πληροφορίες σου θα χρησιμοποιηθούν μόνο σύμφωνα με την <a href=\"/privacy\">πολιτική απορρήτου</a>" #: 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 @@ -4281,53 +4353,53 @@ msgstr "επεξεργασία χρήστη" msgid "from %s different users" msgstr "από %s διαφορετικούς χρήστες" -#: 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 "τελευταία ενημέρωση %s" -#: 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 "σημειωμένο ως αδύνατο να διορθωθεί" @@ -4373,8 +4445,8 @@ msgstr "αναφέρθηκε αρχικά από: “%s”" 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 "άνοιξε ξανά" @@ -4420,55 +4492,48 @@ 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" -msgstr[0] "<big>%s</big> πρόσφατη αναφορά" -msgstr[1] "<big>%s</big> πρόσφατες αναφορές" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d ημέρα" +msgstr[1] "%d ημέρες" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d ώρα" msgstr[1] "%d ώρες" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d υποστηρικτής" -msgstr[1] "%d υποστηρικτές" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d λεπτό" msgstr[1] "%d λεπτά" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> ενημέρωση σε αναφορές" -msgstr[1] "<big>%s</big> ενημερώσεις σε αναφορές" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Δεν έχουμε ακόμη λεπτομέρειες για τις υπηρεσίες που είναι αρμόδιες σε αυτήν την τοποθεσία." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d υποστηρικτής" +msgstr[1] "%d υποστηρικτές" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d εβδομάδα" msgstr[1] "%d εβδομάδες" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> διορθώθηκε μέσα στον προηγούμενο μήνα" +msgstr[1] "<big>%s</big> διορθώθηκαν μέσα στον προηγούμενο μήνα" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4476,19 +4541,19 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> αναφορά μέσα στην προηγούμενη εβδομάδα" msgstr[1] "<big>%s</big> αναφορές μέσα στην προηγούμενη εβδομάδα" -#: 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" -msgstr[0] "<big>%s</big> διορθώθηκε μέσα στον προηγούμενο μήνα" -msgstr[1] "<big>%s</big> διορθώθηκαν μέσα στον προηγούμενο μήνα" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> πρόσφατη αναφορά" +msgstr[1] "<big>%s</big> πρόσφατες αναφορές" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d ημέρα" -msgstr[1] "%d ημέρες" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> ενημέρωση σε αναφορές" +msgstr[1] "<big>%s</big> ενημερώσεις σε αναφορές" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4496,3 +4561,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] "<strong>Δεν</strong> έχουμε ακόμη λεπτομέρειες για το άλλο συμβούλιο που είναι αρμόδια σε αυτήν την τοποθεσία." msgstr[1] "<strong>Δεν</strong> έχουμε ακόμη λεπτομέρειες για τις υπόλοιπες υπηρεσίες που είναι αρμόδιες για αυτήν την τοποθεσία." + +#: 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] "Δεν έχουμε ακόμη λεπτομέρειες για τις υπηρεσίες που είναι αρμόδιες σε αυτήν την τοποθεσία." diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po index 3f5b66e24..76d91112d 100644 --- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es.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: Spanish (Spain) (https://www.transifex.com/mysociety/teams/12067/es_ES/)\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 " y " @@ -110,7 +110,7 @@ msgstr "%s barrio, %s" msgid "%s, within %s ward" msgstr "%s, en %s barrio" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© colaboradores <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>" @@ -118,7 +118,7 @@ msgstr "© colaboradores <a href=\"http://www.openstreetmap.org/copyright\"> 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 "(email registrado en la tabla de abusos)" @@ -142,12 +142,10 @@ msgstr "(distancia que cubre aproximadamente 200.000 personas)" 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 "(cerrado)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(arreglado)" @@ -156,7 +154,7 @@ msgstr "(arreglado)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(como pintadas, basuras, pavimento o alumbrado rotos)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(no enviadas al ayuntamiento)" @@ -164,21 +162,21 @@ msgstr "(no enviadas al ayuntamiento)" msgid "(optional)" msgstr "(opcional)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(enviado a ambos)" -#: 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 "-- Escoja una categoría --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Escoja un tipo de propiedad --" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "" @@ -197,8 +195,8 @@ msgstr "" "Probablemente por eso el \"area cubierta\" está vacía (abajo).<br>\n" "Por favor añada <code>MAPIT_TYPES</code> en su archivo de configuración." -#. ('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 "" @@ -221,11 +219,11 @@ msgstr "<strong>No</strong>- confirmar mi actualización por email" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>No</strong>- permítanme registrarme por email" -#: 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 "" @@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Sí</strong>- tengo una contraseña" #: 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" @@ -268,26 +266,29 @@ msgstr "Agregue un órgano" msgid "Add new category" msgstr "Agregar nueva categoría" -#: 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 "Añadir un usuario" -#: 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 "" @@ -295,7 +296,7 @@ msgstr "" msgid "Added %s" msgstr "Añadido %s" -#: 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 "" @@ -350,7 +351,7 @@ msgstr "Una actualización marcó este problema como arreglado." msgid "Anonymous" msgstr "Anónimo" -#: 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 "Anónimo:" @@ -405,7 +406,7 @@ msgstr "Asignar a un órgano externo:" msgid "Assign to subdivision:" msgstr "Asigne a la subdivisión:" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Assign users to areas" msgstr "" @@ -430,8 +431,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 "" @@ -439,7 +440,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 "En espera de revisión" @@ -452,12 +453,12 @@ msgstr "Atras" 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 "Suspender este email" #: 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 @@ -488,10 +489,6 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "¿No puedes ver el mapa? <em>Salte este paso</em>" -#: 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" @@ -504,7 +501,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 @@ -524,7 +522,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "Ratio de arreglo de problemas > 4 semanas" -#: 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 @@ -600,6 +598,10 @@ msgstr "" "Elegir un nombre de <strong>categoria</strong> que tenga sentido para el público (por ejemplo, \"baches\", \"alumbrado público\") y que sea también útil\n" "para el organismo administrativo. Las categorías aparecerán en un menú desplegable al notificar un problema." +#: 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" @@ -628,10 +630,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 @@ -733,8 +736,8 @@ msgstr "Contactar con el equipo" 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 "No se pudo encontrar el usuario" @@ -788,7 +791,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 "" @@ -829,7 +832,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Tratado por el departamento dentro de los 5 días hábiles" #: 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 "" @@ -895,21 +898,35 @@ msgstr "" msgid "Don’t know" msgstr "No lo sé" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "¿No te gustan los formularios?" +#: 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 "Duplicado" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Duplicado" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Duplicado" + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -921,7 +938,8 @@ msgstr "" "Diferentes categorías <strong>pueden tener el mismo contacto</strong>.\n" "Esto significa que puede agregar muchas categorías incluso si tiene un solo contacto para el órgano." -#: 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 "" @@ -940,11 +958,11 @@ msgstr "Editar" msgid "Edit body details" msgstr "Editar los detalles del órgano administrativo" -#: 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 "" @@ -995,7 +1013,7 @@ msgstr "Editor" msgid "Email" msgstr "Email:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "Email añadido a lista de abusones" @@ -1013,11 +1031,11 @@ msgstr "Creada alerta de email" msgid "Email alert deleted" msgstr "Borrada alerta de email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1622 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1624 msgid "Email already in abuse list" msgstr "Email ya incluido en la lista de abusones" -#: 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 @@ -1091,7 +1109,7 @@ msgid "Enter details of the problem" msgstr "Introduzca detalles del problema" #: 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 @@ -1113,8 +1131,8 @@ msgstr "Ejemplo de código postal %s" msgid "Examples:" msgstr "Ejemplos:" -#: 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 "" @@ -1150,7 +1168,8 @@ msgstr "" msgid "Extra data:" msgstr "Datos adicionales:" -#: 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 "" @@ -1172,11 +1191,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "Arreglar esto eligiendo un <strong>área cubierta</ strong> en el formulario <em>Editar detalles del organismo</ em> a continuación." #: 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 @@ -1184,12 +1204,12 @@ msgid "Fixed" msgstr "Arreglado" #: 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 "Arreglado - Ayuntamiento" #: 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 "Arreglado - Usuario" @@ -1207,7 +1227,7 @@ msgstr "Arreglado:" msgid "Flag as deleted" msgstr "Marcar como borrado" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Flag user" msgstr "Marca usuario" @@ -1228,7 +1248,7 @@ msgstr "Los usuarios marcados se listan en página de<a href='%s'>marcados</a>" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Las capacidades de los \"usuarios marcados\" no se limitan de ninguna manera. Es solo una lista de usuarios que han sido marcado para observación." -#: 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 "Marcado:" @@ -1266,7 +1286,7 @@ msgid "Frequently Asked Questions" msgstr "Listado de Preguntas Frecuentes" #: 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 "Recibe actualizaciones" @@ -1292,7 +1312,7 @@ msgstr "¡Nos alegra saber que ha sido arreglado!" #: 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 "Ir" @@ -1301,7 +1321,7 @@ msgstr "Ir" msgid "Going to send questionnaire?" msgstr "¿Va a enviar cuestionario?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "" @@ -1343,8 +1363,8 @@ msgstr "%s" #: 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 @@ -1387,7 +1407,7 @@ msgstr "Acabo de informar de un problema en @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Acabo de actualizar un problema en @fixmystreet" -#: 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 "No se ha podido localizar su problema en la base de datos.\n" @@ -1437,6 +1457,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" @@ -1504,7 +1528,7 @@ msgstr "Los siguientes atributos, que no forman parte de la especificación Open #: 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 @@ -1540,7 +1564,7 @@ msgid "Internal notes" msgstr "Notas internas" #: 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 "Remisión interna" @@ -1548,7 +1572,7 @@ msgstr "Remisión interna" msgid "Invalid agency_responsible value %s" msgstr "Valor inválido para agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Fecha de fin inválida" @@ -1556,16 +1580,16 @@ msgstr "Fecha de fin inválida" msgid "Invalid format %s specified." msgstr "Especificado un formato no válido %s." -#: 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 "Fecha de inicio no válida" #: 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 @@ -1611,7 +1635,11 @@ msgstr "Última actualización:" msgid "Last update:" msgstr "Última actualización:" -#: 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 "" @@ -1656,6 +1684,10 @@ msgstr "MAPA" 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 " Mapa" @@ -1680,7 +1712,7 @@ msgstr "Marcado como resuelto/cerrado hace más de ocho semanas" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Mensaje:" @@ -1700,7 +1732,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Falta jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1708,7 +1740,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 "" @@ -1720,7 +1752,7 @@ msgstr "Moderado por el organismo durante el siguiente día laborable" msgid "Month" msgstr "Mes" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "" @@ -1744,7 +1776,7 @@ msgstr "" msgid "Name" msgstr "Nombre" -#: 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 @@ -1756,7 +1788,7 @@ msgstr "Nombre:" msgid "Name: %s" msgstr "Nombre: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1858,7 +1890,7 @@ msgstr "Nuevo estado" msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "" @@ -1873,7 +1905,7 @@ msgstr "Siguiente" #: 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 @@ -1894,7 +1926,7 @@ msgstr "Sin órgano administrativo" msgid "No council" msgstr "Sin ayuntamiento" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Ningún ayuntamiento seleccionado" @@ -1960,7 +1992,7 @@ msgstr "" "la actividad a través de su departamento), la capacidad de ocultar notificaciones, o establecer estados especiales para las notificaciones." #: 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" @@ -2038,15 +2070,15 @@ msgstr "Antiguo <br>arreglado" msgid "Older <br>problems" msgstr "Problemas <br>antiguos" -#: 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 @@ -2092,13 +2124,13 @@ msgstr "O problemas notificados a:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "O puede suscribirse a una alerta basada en el barrio o ayuntamiento en que te encuentras:" -#: 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" @@ -2119,7 +2151,7 @@ msgid "Parent" msgstr "Padre" #: 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 "Parcial" @@ -2153,7 +2185,7 @@ msgid "Phone number (optional)" msgstr "Número de teléfono (opcional)" #: 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:" @@ -2205,7 +2237,7 @@ msgstr "Coloque el marcador en el mapa" #: 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 @@ -2233,14 +2265,14 @@ msgid "Please check your email address is correct" msgstr "Por favor, compruebe que su dirección de email es correcta" #: 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 "Por favor, elija una categoría" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Por favor, elija un tipo de propiedad" @@ -2261,13 +2293,13 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Por favor notifique incidencias relevantes y no abuse; abusando de su ayuntamiento degrada su capacidad de servicio a toda la ciudadanía." #: 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 "Por favor escriba su mensaje." #: 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 "" @@ -2282,13 +2314,13 @@ msgid "Please enter a password" msgstr "Por favor, introduzca una contraseña" #: 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 "Por favor, introduzca un título" #: 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 @@ -2301,7 +2333,7 @@ msgstr "Por favor, introduce una dirección de email válida" msgid "Please enter a valid email address" msgstr "Por favor, introduce una dirección de email válida" -#: 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 "Por favor, describa los detalles más relevantes" @@ -2334,8 +2366,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Por favor escriba su nombre completo, ya que los ayuntamientos necesitan esta información. Si usted NO desea que su nombre aparecerá en la página, desactive la casilla de abajo" #: 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" @@ -2372,7 +2404,7 @@ msgstr "Por favor proporcione las informaciones sobre el problema." 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 "Por favor, complete el siguiente formulario con los detalles del problema y describa la ubicación con la mayor precisión posible en el cuadro de detalles." -#: 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 "Por favor, indique si le gustaría recibir algún otro cuestionario" @@ -2398,20 +2430,20 @@ msgstr "" msgid "Please note:" msgstr "Por favor, tenga en cuenta:" -#: 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 "Por favor, explique por qué está reabriendo esta notificación." -#: 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 "Proporcione un texto y una foto" -#: 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 "Por favor, indique si ha notificado un problema al ayuntamiento alguna vez." @@ -2427,7 +2459,7 @@ msgstr "Por favor, seleccione el tipo de listado que desea" msgid "Please select the type of alert you want" msgstr "Por favor, seleccione el tipo de alerta que desea" -#: 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 "Por favor, indique si el problema se ha solucionado" @@ -2446,22 +2478,22 @@ msgstr "Por favor, escriba un mensaje" msgid "Please write your update here" msgstr "Por favor, escriba su actualización aquí" -#: 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 "Publicar" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Publicado de forma anónima - %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Publicado por %s (<strong>%s</strong>) - %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Publicado por %s - %s" @@ -2477,7 +2509,8 @@ msgstr "Previo" 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 "" @@ -2493,10 +2526,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 "Privado" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Privado" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Problema" @@ -2532,11 +2570,11 @@ msgstr "El estado del problema cambió debido a los resultados de la encuesta" msgid "Problems" msgstr "Problemas" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Problemas cercanos" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Problemas en el mapa" @@ -2548,7 +2586,7 @@ msgstr "Problemas recientemente notificados como arreglados en FixMyStreet" msgid "Problems within %.1fkm of this location" msgstr "Problemas en %.1fkm alrededor" -#: 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" @@ -2572,6 +2610,7 @@ msgstr "Problemas en:" msgid "Property address:" msgstr "Dirección de la propiedad:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Proporcionar una actualización" @@ -2589,12 +2628,17 @@ msgstr "Proporcionar un nombre y una contraseña es opcional, pero hacerlo le pe msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Proporcionar una contraseña es opcional, pero hacerlo le permitirá notificar y actualizar los problemas más fácilmente, así como administrar sus informes." +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "Respuesta del público:" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Respuesta del público:" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "" @@ -2618,7 +2662,7 @@ msgstr "Cuestionario %d para el problema %d respondido, %s para %s" msgid "Questionnaire %d sent for problem %d" msgstr "Cuestionario %d enviado para el problema %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Cuestionario cumplimentado por el notificador problema" @@ -2626,7 +2670,7 @@ msgstr "Cuestionario cumplimentado por el notificador problema" #: 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 "Listado RSS" @@ -2654,7 +2698,7 @@ msgstr "Listado RSS para %s, en el barrio %s" msgid "RSS feed of nearby problems" msgstr "Listado RSS de los problemas cercanos" -#: 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" @@ -2670,12 +2714,12 @@ msgid "RSS feed of recent local problems" msgstr "Listado RSS de los problemas locales más recientes" #: 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 "Listado RSS de actualizaciones sobre este problema" #: 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 "Reciba un correo cuando se dejen actualizaciones sobre este problema." @@ -2697,7 +2741,7 @@ msgstr "Recientemente <br>arreglado" msgid "Recently reported problems" msgstr "Problemas recientemente notificados" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2705,13 +2749,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 "Recuerde que FixMyStreet es principalmente para informar sobre problemas físicos que pueden ser arreglados. Si su problema no es apropiado para ser presentado a través de este sitio recuerde que puede ponerse en contacto con su Ayuntamiento directamente mediante su página web." -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "Eliminar marca" -#: 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 "" @@ -2719,7 +2765,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!)" @@ -2733,7 +2779,8 @@ msgstr "" msgid "Report" msgstr "Notificar" -#: 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 "" @@ -2743,6 +2790,7 @@ msgstr "" msgid "Report a problem" msgstr "Notificar un problema" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Denunciar abuso" @@ -2766,8 +2814,8 @@ msgstr "Notifique su incidencia" msgid "Report, view, or discuss local problems" msgstr "Notifique, consulte o discuta problemas locales" -#: 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 "Notificado anónimamente en %s" @@ -2776,8 +2824,8 @@ msgstr "Notificado anónimamente en %s" msgid "Reported before" msgstr "Notificado con anterioridad" -#: 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 "Notificado por %s en %s" @@ -2790,27 +2838,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Notificado en la categoría %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Notificado anónimamente en la categoría %s en %s" -#: 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 "Notificado en la categoría %s por %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Notificado anónimamente vía %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Notificado vía %s por %s en %s" -#: 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 "Notificado anónimamente vía %s en la categoría %s en %s" -#: 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 "Notificado vía %s en la categoría %s por %s en %s" @@ -2920,16 +2968,16 @@ msgstr "Operador responsable de este camino (derivado del número de referencia msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operador responsable de este camino (de OpenStreetMap): %s" -#: 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 "Rotar a la izquierda" -#: 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" @@ -2940,21 +2988,26 @@ 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 "Satélite" +#: templates/web/base/report/_inspect.html:150 +#, fuzzy +msgid "Save + close as duplicate" +msgstr "marcado como un informe duplicado" + #: 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 "Guardar cambios" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -2991,6 +3044,10 @@ msgstr "La búsqueda no encontró usuarios." 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" @@ -3034,27 +3091,27 @@ msgstr "Enviado:" msgid "Service:" msgstr "Servicio:" -#: 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 "Compartir" -#: 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 "" @@ -3128,7 +3185,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Lo sentimos, hubo un error confirmando su notificación." -#: 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 @@ -3176,12 +3233,14 @@ msgstr "Fecha de inicio:" #: 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 "Estado" -#: 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 @@ -3221,7 +3280,7 @@ msgstr "Subcategoria: %s" msgid "Subdivision/Body" msgstr "Subdivisión/Órgano" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Título" @@ -3238,7 +3297,7 @@ msgstr "Título:" msgid "Submit" msgstr "Enviar" -#: 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 @@ -3264,7 +3323,7 @@ msgid "Submitted" msgstr "Enviado" #: 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 "Suscribirse" @@ -3545,7 +3604,7 @@ msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por f msgid "There was a problem showing this page. Please try again later." msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde." -#: 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 @@ -3636,9 +3695,9 @@ msgstr "Este correo electrónico ha sido enviado a los dos ayuntamientos que cub 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 "Este correo electrónico ha sido enviado a varios consejos que cubren la ubicación del problema, pues la categoría de problema seleccionada por el usuario se proporciona para todos ellos. Por favor, si usted no pertenece al órgano administrativo responsable de resolver esta incidencia haga caso omiso de este mensaje." -#: 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 "Esta información es necesaria" @@ -3663,6 +3722,10 @@ msgstr "Este problema se ha arreglado" msgid "This problem has not been fixed" msgstr "Este problema no se ha arreglado" +#: 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 @@ -3737,7 +3800,8 @@ msgstr "Para ver un mapa de la ubicación precisa de este problema" msgid "Total" msgstr "Total" -#: 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 "" @@ -3745,7 +3809,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 "" @@ -3762,14 +3826,14 @@ msgid "Try emailing us directly:" msgstr "Pruebe enviándonos un correo directamente:" #: 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 "Incapaz de arreglarlo" #: 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 @@ -3789,8 +3853,8 @@ msgstr "Desconocido" msgid "Unknown alert type" msgstr "Tipo de alerta desconocida" -#: 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 "Error desconocido" @@ -3801,6 +3865,10 @@ msgstr "Error desconocido" msgid "Unknown problem ID" msgstr "ID de problema desconocido" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "Actualizar" @@ -3854,7 +3922,7 @@ msgid "Updated" msgstr "Actualizado" #: 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 @@ -3869,7 +3937,7 @@ msgstr "¡Actualizado!" msgid "Updates" msgstr "Actualizaciones" -#: 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 "Las actualizaciones están limitadas a %s caracteres. Por favor acorte su actualización." @@ -3900,11 +3968,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 "Eliminada marca de usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "Usuario marcado" @@ -3913,7 +3981,7 @@ msgid "User search finds matches in users' names and email addresses." msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcciones de email." #: 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" @@ -4003,6 +4071,10 @@ msgstr "Una vez editada" msgid "When sent" msgstr "Una vez enviada" +#: 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 "" @@ -4051,7 +4123,7 @@ msgstr "Año" #: 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 @@ -4066,11 +4138,11 @@ msgstr "SÍ" msgid "Yes I have a password" msgstr "Sí, tengo una contraseña" -#: 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 "Usted se está quejando de que la notificación fue innecesariamente moderada:" -#: 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 "Estás denunciando la siguiente notificación por ser abusiva, contener información personal, o similar:" @@ -4087,7 +4159,7 @@ msgstr "Usted puede <a href=\"%s%s\">ver el problema en este sitio</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Puede agregar email del usuario abusivo a la lista de abusones, que oculta de forma automática (y nunca envía) los informes que crean." -#: 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 "Puede ponerse en contacto con el soporte técnico en <a href='mailto:%s'>%s</a>" @@ -4184,9 +4256,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 @@ -4206,7 +4278,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Su información sólo será usada de acuerdo con nuestra <a href=\"/privacy\">política de privacidad</a>" #: 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 @@ -4285,53 +4357,53 @@ msgstr "editar usuario" msgid "from %s different users" msgstr "de %s usuarios diferentes" -#: 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 "ultima actualización %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "menos de un minuto" -#: templates/web/base/report/updates.html:57 +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 msgid "marked as a duplicate report" msgstr "marcado como un informe duplicado" -#: templates/web/base/report/updates.html:47 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as action scheduled" msgstr "marcado como acción programada" -#: templates/web/base/report/updates.html:59 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "marked as an internal referral" msgstr "marcado como una referencia interna" -#: templates/web/base/report/updates.html:49 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as closed" msgstr "marcado como cerrado" -#: 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 "marcado como arreglado" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "marcado como en progreso" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "marcado como en investigación" -#: templates/web/base/report/updates.html:55 +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 msgid "marked as not the council's responsibility" msgstr "marcado como que el ayuntamiento no es responsable" -#: templates/web/base/report/updates.html:43 +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 msgid "marked as planned" msgstr "marcado como planificado" -#: templates/web/base/report/updates.html:53 +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as unable to fix" msgstr "marcado como que no se puede arreglar" @@ -4377,8 +4449,8 @@ msgstr "consignados inicialmente:" msgid "other areas:" msgstr "otras áreas:" -#: 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 "reabierto" @@ -4424,55 +4496,48 @@ msgstr "El usuario es el propietario del problema" msgid "ward" msgstr "barrio" -#: 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" -msgstr[0] "<big>%s</big> notificadas recientemente" -msgstr[1] "<big>%s</big> notificadas recientemente" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dia" +msgstr[1] "%d dias" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d simpatizante" -msgstr[1] "%d simpatizantes" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> notificaciones actualizadas" -msgstr[1] "<big>%s</big> notificaciones actualizadas" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona." -msgstr[1] "Todavía no tenemos información de qué ayuntamientos cubren este área." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d simpatizante" +msgstr[1] "%d simpatizantes" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> arregladas la semana pasada" +msgstr[1] "<big>%s</big> arregladas el mes pasado" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4480,19 +4545,19 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> notificadas la semana pasada" msgstr[1] "<big>%s</big> notificaciones la semana pasada" -#: 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" -msgstr[0] "<big>%s</big> arregladas la semana pasada" -msgstr[1] "<big>%s</big> arregladas el mes pasado" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> notificadas recientemente" +msgstr[1] "<big>%s</big> notificadas recientemente" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d dia" -msgstr[1] "%d dias" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> notificaciones actualizadas" +msgstr[1] "<big>%s</big> notificaciones actualizadas" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4500,3 +4565,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] "Todavía <strong>no</strong> tenemos detalles para el Ayuntamiento que cubre esta zona." msgstr[1] "Todavía <strong>no</strong> tenemos información sobre el ayuntamiento que cubre este área." + +#: 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] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona." +msgstr[1] "Todavía no tenemos información de qué ayuntamientos cubren este área." diff --git a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po index 2896d3eff..d01c119e7 100644 --- a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es_DO.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: Robert Lo Bue <rob@applingua.com>, 2017\n" "Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/mysociety/teams/12067/es_DO/)\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 " y " @@ -119,7 +119,7 @@ msgstr "%s barrio, %s" msgid "%s, within %s ward" msgstr "%s, en %s barrio" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> colaboradores" @@ -127,7 +127,7 @@ msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap< msgid "(Defect & location of defect)" msgstr "(Defecto & ubicación del defecto)" -#: 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 "(email registrado en la tabla de abusos)" @@ -151,12 +151,10 @@ msgstr "(distancia que cubre aproximadamente 200.000 personas)" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "(un listado RSS podría ser diseñado alternativamente, dentro de %es)" -#: templates/web/base/report/_item.html:27 #: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(cerrado)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(arreglado)" @@ -165,7 +163,7 @@ msgstr "(arreglado)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(como pintadas, basuras, pavimento o alumbrado rotos)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(no enviadas al ayuntamiento)" @@ -173,21 +171,21 @@ msgstr "(no enviadas al ayuntamiento)" msgid "(optional)" msgstr "(opcional)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(enviado a ambos)" -#: 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 "-- Escoja una categoría --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Escoja un tipo de propiedad --" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "--Elija una plantilla--" @@ -206,8 +204,8 @@ msgstr "" "Probablemente por eso el \"area cubierta\" está vacía (abajo).<br>\n" "Por favor añada <code>MAPIT_TYPES</code> en su archivo de configuración." -#. ('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 "<label for=\"statuses\">Mostrar</label> %s <label for=\"filter_categories\">sobre</label> %s" @@ -230,11 +228,11 @@ msgstr "<strong>No</strong>- confirmar mi actualización por email" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>No</strong>- permítanme registrarme por email" -#: 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 "<strong>Nota:</strong> Este informe ha sido enviado y espera una acción. Cualquier cambio realizado no será pasado." -#: 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 "<strong>Nota:</strong> Este informe aún no se ha sido enviado por una acción. Cualquier cambio realizado podría no pasar." @@ -245,7 +243,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Sí</strong>- tengo una contraseña" #: 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" @@ -277,26 +275,29 @@ msgstr "Agregue un órgano" msgid "Add new category" msgstr "Agregar nueva categoría" -#: 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 "Añadir a la lista de pre-seleccionados" #: 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 "Añadir un usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Add/edit problem categories" msgstr "Añadir/editar las categorias del problema" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Add/edit response priorities" msgstr "Añadir/Editar las prioridades de respuesta" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Add/edit response templates" msgstr "Añadir/Editar las plantillas de respuesta" @@ -304,7 +305,7 @@ msgstr "Añadir/Editar las plantillas de respuesta" msgid "Added %s" msgstr "Añadido %s" -#: 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 "Añadir este reporte a tu lista de pre-seleccionados lo sacará de %s's la lista de pre-seleccionados." @@ -359,7 +360,7 @@ msgstr "Una actualización marcó este problema como arreglado." msgid "Anonymous" msgstr "Anónimo" -#: 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 "Anónimo:" @@ -414,7 +415,7 @@ msgstr "Asignar a un órgano externo:" msgid "Assign to subdivision:" msgstr "Asigne a la subdivisión:" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Assign users to areas" msgstr "Asignar usuarios a las áreas" @@ -439,8 +440,8 @@ msgstr "Usuarios del personal autorizado pueden estar asociados a las categoría msgid "Auto-response:" msgstr "Respuesta automática:" -#: 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 "Categorías disponibles" @@ -448,7 +449,7 @@ msgstr "Categorías disponibles" msgid "Avoid personal information and vehicle number plates" msgstr "Evitar información personal y las placas de matrícula de los carros" -#: 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 "En espera de revisión" @@ -461,12 +462,12 @@ msgstr "Atras" msgid "Back to all reports" msgstr "Volver a todos los informes" -#: templates/web/base/admin/report_blocks.html:41 +#: templates/web/base/admin/report_blocks.html:43 msgid "Ban email address" msgstr "Suspender este email" #: 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 @@ -497,10 +498,6 @@ msgstr "¿No puede’t encontrar nuestro email? Busque en su folder de email msgid "Can't see the map? <em>Skip this step</em>" msgstr "¿No puedes ver el mapa? <em>Salte este paso</em>" -#: templates/web/base/report/_inspect.html:141 -msgid "Cancel" -msgstr "Cancelar" - #: perllib/FixMyStreet/Cobrand/Default.pm:650 #: templates/web/base/admin/responsepriorities/list.html:8 msgid "Categories" @@ -513,7 +510,8 @@ msgstr "Categorías:" #: 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 @@ -533,7 +531,7 @@ msgstr "Categoría cambiada de ‘%s’ a ‘%s’" msgid "Category fix rate for problems > 4 weeks old" msgstr "Ratio de arreglo de problemas > 4 semanas" -#: 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 @@ -609,6 +607,10 @@ msgstr "" "Elegir un nombre de <strong>categoria</strong> que tenga sentido para el público (por ejemplo, \"baches\", \"alumbrado público\") y que sea también útil\n" "para el organismo administrativo. Las categorías aparecerán en un menú desplegable al notificar un problema." +#: 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" @@ -637,10 +639,11 @@ msgstr "Haga un click en nuestro email de confirmación para iniciar sesión." #: 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 @@ -742,8 +745,8 @@ msgstr "Contactar con el equipo" msgid "Coordinates:" msgstr "Coordenadas:" -#: 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 "No se pudo encontrar el usuario" @@ -797,7 +800,7 @@ msgstr "Crear informes/actualizaciones como ayuntamiento" msgid "Create reports/updates on a user's behalf" msgstr "Crear informes/actualizaciones en nombre del usuario" -#: 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 "Crear plantillas" @@ -838,7 +841,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Tratado por el departamento dentro de los 5 días hábiles" #: 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 "Eliminar plantilla" @@ -904,21 +907,35 @@ msgstr "¿Tiene una contraseña %s?" msgid "Don’t know" msgstr "No lo sé" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "¿No te gustan los formularios?" +#: 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 "Deslice y deje las fotos aquí o <u>haga click para subir</u>" #: 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 "Duplicado" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Duplicado" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Duplicado" + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -930,7 +947,8 @@ msgstr "" "Diferentes categorías <strong>pueden tener el mismo contacto</strong>.\n" "Esto significa que puede agregar muchas categorías incluso si tiene un solo contacto para el órgano." -#: 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 "Falso este/Falso norte:" @@ -949,11 +967,11 @@ msgstr "Editar" msgid "Edit body details" msgstr "Editar los detalles del órgano administrativo" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Edit other users' details" msgstr "Editar los detalles de otros usuarios" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Edit other users' permissions" msgstr "Editar los permisos de otros usuarios" @@ -1004,7 +1022,7 @@ msgstr "Editor" msgid "Email" msgstr "Email:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "Email añadido a lista de abusones" @@ -1022,11 +1040,11 @@ msgstr "Creada alerta de email" msgid "Email alert deleted" msgstr "Borrada alerta de email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1622 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1624 msgid "Email already in abuse list" msgstr "Email ya incluido en la lista de abusones" -#: 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 @@ -1100,7 +1118,7 @@ msgid "Enter details of the problem" msgstr "Introduzca detalles del problema" #: 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 @@ -1122,8 +1140,8 @@ msgstr "Ejemplo de código postal %s" msgid "Examples:" msgstr "Ejemplos:" -#: 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 "Categoría existente" @@ -1159,7 +1177,8 @@ msgstr "Equipo externo" msgid "Extra data:" msgstr "Datos adicionales:" -#: 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 "Detalles adicionales" @@ -1181,11 +1200,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "Arreglar esto eligiendo un <strong>área cubierta</ strong> en el formulario <em>Editar detalles del organismo</ em> a continuación." #: 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 @@ -1193,12 +1213,12 @@ msgid "Fixed" msgstr "Arreglado" #: 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 "Arreglado - Ayuntamiento" #: 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 "Arreglado - Usuario" @@ -1216,7 +1236,7 @@ msgstr "Arreglado:" msgid "Flag as deleted" msgstr "Marcar como borrado" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Flag user" msgstr "Marca usuario" @@ -1237,7 +1257,7 @@ msgstr "Los usuarios marcados se listan en página de<a href='%s'>marcados</a>" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Las capacidades de los \"usuarios marcados\" no se limitan de ninguna manera. Es solo una lista de usuarios que han sido marcado para observación." -#: 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 "Marcado:" @@ -1275,7 +1295,7 @@ msgid "Frequently Asked Questions" msgstr "Listado de Preguntas Frecuentes" #: 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 "Recibe actualizaciones" @@ -1301,7 +1321,7 @@ msgstr "¡Nos alegra saber que ha sido arreglado!" #: 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 "Ir" @@ -1310,7 +1330,7 @@ msgstr "Ir" msgid "Going to send questionnaire?" msgstr "¿Va a enviar cuestionario?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "Permitir el acceso al administrador" @@ -1352,8 +1372,8 @@ msgstr "%s" #: 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 @@ -1396,7 +1416,7 @@ msgstr "Acabo de informar de un problema en @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Acabo de actualizar un problema en @fixmystreet" -#: 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 "No se ha podido localizar su problema en la base de datos.\n" @@ -1446,6 +1466,10 @@ msgstr "Si quiere que esta plantilla sea una opción para categorías específic msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council." msgstr "Si envía un problema aquí, éste será <strong>no</strong> reportado al ayuntamiento." +#: 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" @@ -1515,7 +1539,7 @@ msgstr "Los siguientes atributos, que no forman parte de la especificación Open #: 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 @@ -1551,7 +1575,7 @@ msgid "Internal notes" msgstr "Notas internas" #: 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 "Remisión interna" @@ -1559,7 +1583,7 @@ msgstr "Remisión interna" msgid "Invalid agency_responsible value %s" msgstr "Valor inválido para agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Fecha de fin inválida" @@ -1567,16 +1591,16 @@ msgstr "Fecha de fin inválida" msgid "Invalid format %s specified." msgstr "Especificado un formato no válido %s." -#: 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 "Ubicación equivocada. Una nueva ubicación debe estar bajo la protección del mismo ayuntamiento." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1479 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1481 msgid "Invalid start date" msgstr "Fecha de inicio no válida" #: 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 @@ -1622,7 +1646,11 @@ msgstr "Última actualización:" msgid "Last update:" msgstr "Última actualización:" -#: 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 "Menos recientemente actualizado" @@ -1667,6 +1695,10 @@ msgstr "MAPA" msgid "Manage shortlist" msgstr "Administrar los pre-seleccionados" +#: templates/web/base/reports/_list-filters.html:36 +msgid "Manual order" +msgstr "" + #: templates/web/base/js/translation_strings.html:46 msgid "Map" msgstr " Mapa" @@ -1691,7 +1723,7 @@ msgstr "Marcado como resuelto/cerrado hace más de ocho semanas" msgid "Markup problem details" msgstr "Marcar los detalles del problema" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Mensaje:" @@ -1711,7 +1743,7 @@ msgstr "Organismos administrativos perdidos:" msgid "Missing jurisdiction_id" msgstr "Falta jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "Moderar" @@ -1719,7 +1751,7 @@ msgstr "Moderar" msgid "Moderate report details" msgstr "Moderar los detalles del informe" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate this report" msgstr "Moderar este informe" @@ -1731,7 +1763,7 @@ msgstr "Moderado por el organismo durante el siguiente día laborable" msgid "Month" msgstr "Mes" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "Lo más comentado" @@ -1755,7 +1787,7 @@ msgstr "Lo más comentado" msgid "Name" msgstr "Nombre" -#: 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 @@ -1767,7 +1799,7 @@ msgstr "Nombre:" msgid "Name: %s" msgstr "Nombre: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "Navegue a este problema" @@ -1869,7 +1901,7 @@ msgstr "Nuevo estado" msgid "New template" msgstr "Plantilla nueva" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "Lo más reciente" @@ -1884,7 +1916,7 @@ msgstr "Siguiente" #: 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 @@ -1905,7 +1937,7 @@ msgstr "Sin órgano administrativo" msgid "No council" msgstr "Sin ayuntamiento" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Ningún ayuntamiento seleccionado" @@ -1973,7 +2005,7 @@ msgstr "" "la actividad a través de su departamento), la capacidad de ocultar notificaciones, o establecer estados especiales para las notificaciones." #: 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" @@ -2051,15 +2083,15 @@ msgstr "Antiguo <br>arreglado" msgid "Older <br>problems" msgstr "Problemas <br>antiguos" -#: templates/web/base/reports/_list-filters.html:36 +#: templates/web/base/reports/_list-filters.html:39 msgid "Oldest" msgstr "Lo más antiguo" #: 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 @@ -2105,13 +2137,13 @@ msgstr "O problemas notificados a:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "O puede suscribirse a una alerta basada en el barrio o ayuntamiento en que te encuentras:" -#: 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" @@ -2132,7 +2164,7 @@ msgid "Parent" msgstr "Padre" #: 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 "Parcial" @@ -2166,7 +2198,7 @@ msgid "Phone number (optional)" msgstr "Número de teléfono (opcional)" #: 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:" @@ -2218,7 +2250,7 @@ msgstr "Coloque el marcador en el mapa" #: 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 @@ -2246,14 +2278,14 @@ msgid "Please check your email address is correct" msgstr "Por favor, compruebe que su dirección de email es correcta" #: 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 "Por favor, elija una categoría" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Por favor, elija un tipo de propiedad" @@ -2274,13 +2306,13 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Por favor notifique incidencias relevantes y no abuse; abusando de su ayuntamiento degrada su capacidad de servicio a toda la ciudadanía." #: 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 "Por favor escriba su mensaje." #: 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 "Por favor, indique un nombre" @@ -2295,13 +2327,13 @@ msgid "Please enter a password" msgstr "Por favor, introduzca una contraseña" #: 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 "Por favor, introduzca un título" #: 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 @@ -2314,7 +2346,7 @@ msgstr "Por favor, introduce una dirección de email válida" msgid "Please enter a valid email address" msgstr "Por favor, introduce una dirección de email válida" -#: 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 "Por favor, describa los detalles más relevantes" @@ -2347,8 +2379,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Por favor escriba su nombre completo, ya que los ayuntamientos necesitan esta información. Si usted NO desea que su nombre aparecerá en la página, desactive la casilla de abajo" #: 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" @@ -2385,7 +2417,7 @@ msgstr "Por favor proporcione las informaciones sobre el problema." 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 "Por favor, complete el siguiente formulario con los detalles del problema y describa la ubicación con la mayor precisión posible en el cuadro de detalles." -#: 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 "Por favor, indique si le gustaría recibir algún otro cuestionario" @@ -2411,20 +2443,20 @@ msgstr "Por favor, tenga en cuenta que su actualización no ha <strong>sido aún msgid "Please note:" msgstr "Por favor, tenga en cuenta:" -#: perllib/FixMyStreet/App/Controller/Report.pm:335 +#: perllib/FixMyStreet/App/Controller/Report.pm:354 msgid "Please provide a public update for this report." msgstr "Por favor, proveer una actualización pública para este reporte." -#: 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 "Por favor, explique por qué está reabriendo esta notificación." -#: 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 "Proporcione un texto y una foto" -#: 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 "Por favor, indique si ha notificado un problema al ayuntamiento alguna vez." @@ -2440,7 +2472,7 @@ msgstr "Por favor, seleccione el tipo de listado que desea" msgid "Please select the type of alert you want" msgstr "Por favor, seleccione el tipo de alerta que desea" -#: 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 "Por favor, indique si el problema se ha solucionado" @@ -2459,22 +2491,22 @@ msgstr "Por favor, escriba un mensaje" msgid "Please write your update here" msgstr "Por favor, escriba su actualización aquí" -#: 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 "Publicar" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Publicado de forma anónima - %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Publicado por %s (<strong>%s</strong>) - %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Publicado por %s - %s" @@ -2490,7 +2522,8 @@ msgstr "Previo" msgid "Priorities" msgstr "Prioridades" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:96 +#: templates/web/base/report/_item.html:90 msgid "Priority" msgstr "Prioridad" @@ -2506,10 +2539,15 @@ msgstr "Privacidad y cookies" #: 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 "Privado" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Detalles adicionales" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Problema" @@ -2545,11 +2583,11 @@ msgstr "El estado del problema cambió debido a los resultados de la encuesta" msgid "Problems" msgstr "Problemas" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Problemas cercanos" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Problemas en el mapa" @@ -2561,7 +2599,7 @@ msgstr "Problemas recientemente notificados como arreglados en FixMyStreet" msgid "Problems within %.1fkm of this location" msgstr "Problemas en %.1fkm alrededor" -#: 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" @@ -2585,6 +2623,7 @@ msgstr "Problemas en:" msgid "Property address:" msgstr "Dirección de la propiedad:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Proporcionar una actualización" @@ -2602,12 +2641,17 @@ msgstr "Proporcionar un nombre y una contraseña es opcional, pero hacerlo le pe msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Proporcionar una contraseña es opcional, pero hacerlo le permitirá notificar y actualizar los problemas más fácilmente, así como administrar sus informes." +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "Actualización pública:" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Respuesta del público:" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "Actualización pública:" @@ -2631,7 +2675,7 @@ msgstr "Cuestionario %d para el problema %d respondido, %s para %s" msgid "Questionnaire %d sent for problem %d" msgstr "Cuestionario %d enviado para el problema %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Cuestionario cumplimentado por el notificador problema" @@ -2639,7 +2683,7 @@ msgstr "Cuestionario cumplimentado por el notificador problema" #: 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 "Listado RSS" @@ -2667,7 +2711,7 @@ msgstr "Listado RSS para %s, en el barrio %s" msgid "RSS feed of nearby problems" msgstr "Listado RSS de los problemas cercanos" -#: 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" @@ -2683,12 +2727,12 @@ msgid "RSS feed of recent local problems" msgstr "Listado RSS de los problemas locales más recientes" #: 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 "Listado RSS de actualizaciones sobre este problema" #: 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 "Reciba un correo cuando se dejen actualizaciones sobre este problema." @@ -2710,7 +2754,7 @@ msgstr "Recientemente <br>arreglado" msgid "Recently reported problems" msgstr "Problemas recientemente notificados" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "Recientemente actualizado" @@ -2718,13 +2762,15 @@ msgstr "Recientemente actualizado" 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 "Recuerde que FixMyStreet es principalmente para informar sobre problemas físicos que pueden ser arreglados. Si su problema no es apropiado para ser presentado a través de este sitio recuerde que puede ponerse en contacto con su Ayuntamiento directamente mediante su página web." -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "Eliminar marca" -#: 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 "Eliminar de los pre-seleccionados" @@ -2732,7 +2778,7 @@ msgstr "Eliminar de los pre-seleccionados" msgid "Remove from site" msgstr "Eliminar de la site" -#: 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!)" @@ -2746,7 +2792,8 @@ msgstr "Responder al usuario:" msgid "Report" msgstr "Notificar" -#: 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 "ID del informe:" @@ -2756,6 +2803,7 @@ msgstr "ID del informe:" msgid "Report a problem" msgstr "Notificar un problema" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Denunciar abuso" @@ -2779,8 +2827,8 @@ msgstr "Notifique su incidencia" msgid "Report, view, or discuss local problems" msgstr "Notifique, consulte o discuta problemas locales" -#: 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 "Notificado anónimamente en %s" @@ -2789,8 +2837,8 @@ msgstr "Notificado anónimamente en %s" msgid "Reported before" msgstr "Notificado con anterioridad" -#: 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 "Notificado por %s en %s" @@ -2803,27 +2851,27 @@ msgstr "Notificado por:" msgid "Reported in the %s category" msgstr "Notificado en la categoría %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Notificado anónimamente en la categoría %s en %s" -#: 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 "Notificado en la categoría %s por %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Notificado anónimamente vía %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Notificado vía %s por %s en %s" -#: 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 "Notificado anónimamente vía %s en la categoría %s en %s" -#: 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 "Notificado vía %s en la categoría %s por %s en %s" @@ -2933,16 +2981,16 @@ msgstr "Operador responsable de este camino (derivado del número de referencia msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operador responsable de este camino (de OpenStreetMap): %s" -#: 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 "Rotar a la izquierda" -#: 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" @@ -2953,21 +3001,26 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Rotar esta foto eliminará los cambios no guardados al informe." #: 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 "Satélite" +#: templates/web/base/report/_inspect.html:150 +#, fuzzy +msgid "Save + close as duplicate" +msgstr "marcado como un informe duplicado" + #: 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 "Guardar cambios" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "Guardar con una actualización pública" @@ -3004,6 +3057,11 @@ msgstr "La búsqueda no encontró usuarios." msgid "See our privacy policy" msgstr "Ver nuestra política de privacidad" +#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#, fuzzy +msgid "See user detail for reports created as the council" +msgstr "Crear informes/actualizaciones como ayuntamiento" + #: templates/web/base/admin/body-form.html:39 #: templates/web/zurich/admin/body-form.html:16 msgid "Select a body" @@ -3047,27 +3105,27 @@ msgstr "Enviado:" msgid "Service:" msgstr "Servicio:" -#: templates/web/base/report/_inspect.html:26 +#: templates/web/base/report/_inspect.html:25 msgid "Set to my current location" msgstr "Ajustar a mi ubicación actual" -#: templates/web/base/report/display_tools.html:15 +#: templates/web/base/report/display_tools.html:17 msgid "Share" msgstr "Compartir" -#: 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 "Pre-seleccionados" -#: 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 "Entre los pre-seleccionados" -#: templates/web/base/report/_main.html:140 +#: templates/web/base/report/_main.html:144 msgid "Shortlisted by %s" msgstr "Pre-seleecionados por %s" @@ -3141,7 +3199,7 @@ msgstr "Lo sentimos, este no fue’ un enlace válido" msgid "Sorry, there has been an error confirming your problem." msgstr "Lo sentimos, hubo un error confirmando su notificación." -#: 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 @@ -3189,12 +3247,14 @@ msgstr "Fecha de inicio:" #: 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 "Estado" -#: 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 @@ -3234,7 +3294,7 @@ msgstr "Subcategoria: %s" msgid "Subdivision/Body" msgstr "Subdivisión/Órgano" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Título" @@ -3251,7 +3311,7 @@ msgstr "Título:" msgid "Submit" msgstr "Enviar" -#: 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 @@ -3277,7 +3337,7 @@ msgid "Submitted" msgstr "Enviado" #: 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 "Suscribirse" @@ -3558,7 +3618,7 @@ msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por f msgid "There was a problem showing this page. Please try again later." msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde." -#: 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 @@ -3649,9 +3709,9 @@ msgstr "Este correo electrónico ha sido enviado a los dos ayuntamientos que cub 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 "Este correo electrónico ha sido enviado a varios consejos que cubren la ubicación del problema, pues la categoría de problema seleccionada por el usuario se proporciona para todos ellos. Por favor, si usted no pertenece al órgano administrativo responsable de resolver esta incidencia haga caso omiso de este mensaje." -#: 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 "Esta información es necesaria" @@ -3676,6 +3736,10 @@ msgstr "Este problema se ha arreglado" msgid "This problem has not been fixed" msgstr "Este problema no se ha arreglado" +#: 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 @@ -3750,7 +3814,8 @@ msgstr "Para ver un mapa de la ubicación precisa de este problema" msgid "Total" msgstr "Total" -#: 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 "¿Se necesita administración del tráfico?" @@ -3758,7 +3823,7 @@ msgstr "¿Se necesita administración del tráfico?" msgid "Trusted by bodies:" msgstr "Confiables por los organismos administrativos:" -#: 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 "Acreditado para hacer informes que no requieren inspección" @@ -3775,14 +3840,14 @@ msgid "Try emailing us directly:" msgstr "Pruebe enviándonos un correo directamente:" #: 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 "Incapaz de arreglarlo" #: 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 @@ -3802,8 +3867,8 @@ msgstr "Desconocido" msgid "Unknown alert type" msgstr "Tipo de alerta desconocida" -#: 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 "Error desconocido" @@ -3814,6 +3879,10 @@ msgstr "Error desconocido" msgid "Unknown problem ID" msgstr "ID de problema desconocido" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "Actualizar" @@ -3867,7 +3936,7 @@ msgid "Updated" msgstr "Actualizado" #: 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 @@ -3882,7 +3951,7 @@ msgstr "¡Actualizado!" msgid "Updates" msgstr "Actualizaciones" -#: 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 "Las actualizaciones están limitadas a %s caracteres. Por favor acorte su actualización." @@ -3913,11 +3982,11 @@ msgstr "Mapa usado" msgid "User ID to attribute fetched comments to" msgstr "ID de usuario a quien atribuir los comentarios obtenidos" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1681 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1683 msgid "User flag removed" msgstr "Eliminada marca de usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "Usuario marcado" @@ -3926,7 +3995,7 @@ msgid "User search finds matches in users' names and email addresses." msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcciones de email." #: 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" @@ -4016,6 +4085,10 @@ msgstr "Una vez editada" msgid "When sent" msgstr "Una vez enviada" +#: 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 "¡Espere! Tres fotos son suficientes." @@ -4064,7 +4137,7 @@ msgstr "Año" #: 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 @@ -4079,11 +4152,11 @@ msgstr "SÍ" msgid "Yes I have a password" msgstr "Sí, tengo una contraseña" -#: 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 "Usted se está quejando de que la notificación fue innecesariamente moderada:" -#: 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 "Estás denunciando la siguiente notificación por ser abusiva, contener información personal, o similar:" @@ -4100,7 +4173,7 @@ msgstr "Usted puede <a href=\"%s%s\">ver el problema en este sitio</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Puede agregar email del usuario abusivo a la lista de abusones, que oculta de forma automática (y nunca envía) los informes que crean." -#: 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 "Puede ponerse en contacto con el soporte técnico en <a href='mailto:%s'>%s</a>" @@ -4197,9 +4270,9 @@ msgstr "Su cuenta" #: 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 @@ -4219,7 +4292,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Su información sólo será usada de acuerdo con nuestra <a href=\"/privacy\">política de privacidad</a>" #: 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 @@ -4298,53 +4371,53 @@ msgstr "editar usuario" msgid "from %s different users" msgstr "de %s usuarios diferentes" -#: 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 "ultima actualización %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "menos de un minuto" -#: templates/web/base/report/updates.html:57 +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 msgid "marked as a duplicate report" msgstr "marcado como un informe duplicado" -#: templates/web/base/report/updates.html:47 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as action scheduled" msgstr "marcado como acción programada" -#: templates/web/base/report/updates.html:59 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "marked as an internal referral" msgstr "marcado como una referencia interna" -#: templates/web/base/report/updates.html:49 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as closed" msgstr "marcado como cerrado" -#: 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 "marcado como arreglado" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "marcado como en progreso" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "marcado como en investigación" -#: templates/web/base/report/updates.html:55 +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 msgid "marked as not the council's responsibility" msgstr "marcado como que el ayuntamiento no es responsable" -#: templates/web/base/report/updates.html:43 +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 msgid "marked as planned" msgstr "marcado como planificado" -#: templates/web/base/report/updates.html:53 +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as unable to fix" msgstr "marcado como que no se puede arreglar" @@ -4390,8 +4463,8 @@ msgstr "consignados inicialmente:" msgid "other areas:" msgstr "otras áreas:" -#: 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 "reabierto" @@ -4437,55 +4510,48 @@ msgstr "El usuario es el propietario del problema" msgid "ward" msgstr "barrio" -#: 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" -msgstr[0] "<big>%s</big> notificadas recientemente" -msgstr[1] "<big>%s</big> notificadas recientemente" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dia" +msgstr[1] "%d dias" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d simpatizante" -msgstr[1] "%d simpatizantes" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> notificaciones actualizadas" -msgstr[1] "<big>%s</big> notificaciones actualizadas" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona." -msgstr[1] "Todavía no tenemos información de qué ayuntamientos cubren este área." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d simpatizante" +msgstr[1] "%d simpatizantes" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> arregladas la semana pasada" +msgstr[1] "<big>%s</big> arregladas el mes pasado" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4493,19 +4559,19 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> notificadas la semana pasada" msgstr[1] "<big>%s</big> notificaciones la semana pasada" -#: 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" -msgstr[0] "<big>%s</big> arregladas la semana pasada" -msgstr[1] "<big>%s</big> arregladas el mes pasado" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> notificadas recientemente" +msgstr[1] "<big>%s</big> notificadas recientemente" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d dia" -msgstr[1] "%d dias" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> notificaciones actualizadas" +msgstr[1] "<big>%s</big> notificaciones actualizadas" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4513,3 +4579,13 @@ 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] "Todavía <strong>no</strong> tenemos detalles para el Ayuntamiento que cubre esta zona." msgstr[1] "Todavía <strong>no</strong> tenemos información sobre el ayuntamiento que cubre este área." + +#: 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] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona." +msgstr[1] "Todavía no tenemos información de qué ayuntamientos cubren este área." + +#~ msgid "Cancel" +#~ msgstr "Cancelar" diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po index efdaf61b4..01ae973e4 100644 --- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/fr_FR.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: fixmystreetfr <fixmystreet@fixmystreet.fr>, 2016\n" "Language-Team: French (France) (https://www.transifex.com/mysociety/teams/12067/fr_FR/)\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 " et " @@ -120,7 +120,7 @@ msgstr "Localité %s, %s" msgid "%s, within %s ward" msgstr "%s, dans la localité %s" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributeurs" @@ -128,7 +128,7 @@ msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap< msgid "(Defect & location of defect)" msgstr "(Défaut & amp; emplacement du défaut)" -#: 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 "(email dans la liste des abus)" @@ -152,12 +152,10 @@ msgstr "(une distance par défaut qui couvre environ 200 000 personnes)" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "(alternativement le flux RSS peut être personnalisé, dans %s)" -#: templates/web/base/report/_item.html:27 #: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(fermé)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(résolu)" @@ -166,7 +164,7 @@ msgstr "(résolu)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(comme des graffitis, immondices, trottoirs abimés ou éclairage public)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(non signalé à l’administration)" @@ -174,21 +172,21 @@ msgstr "(non signalé à l’administration)" msgid "(optional)" msgstr "(facultatif)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(envoyé aux deux)" -#: 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 "-- Choisissez une catégorie --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Choisissez un type de propriété --" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "--Choisissez un modèle--" @@ -207,8 +205,8 @@ msgstr "" " Cela est probablement la raison pour laquelle \"zone couverte\" est vide (dessous).<br>\n" " Peut etre ajouter un <code>MAPIT_TYPES</code> a votre fichier de config?" -#. ('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 "<label for=\"statuses\">Afficher</label> %s <label for=\"filter_categories\">à propos de</label> %s" @@ -231,11 +229,11 @@ msgstr "<strong>Non</strong>, laissez-moi confirmer ma mise à jour par email :" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Non</strong>, laissez-moi m'authentifier par email :" -#: 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 "<strong> Remarque: </strong> Ce rapport a été envoyé pour action. Toutes les modifications apportées ne seront pas transmises." -#: 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 "<strong> Remarque: </strong> Ce rapport n'a pas encore été envoyé pour action. Toutes les modifications apportées ne peuvent pas être transmises." @@ -246,7 +244,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Oui</strong>, j'ai un mot de passe :" #: 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" @@ -278,26 +276,29 @@ msgstr "Ajouter un interlocuteur" msgid "Add new category" msgstr "Ajouter une nouvelle catégorie" -#: 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 "Ajouter à la liste" #: 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 "Ajouter un utilisateur" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Add/edit problem categories" msgstr "Ajouter/modifier des catégories de problèmes" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Add/edit response priorities" msgstr "Ajouter/modifier les priorités de réponse" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Add/edit response templates" msgstr "Ajouter/modifier des modèles de réponse" @@ -305,7 +306,7 @@ msgstr "Ajouter/modifier des modèles de réponse" msgid "Added %s" msgstr "Ajouté %s" -#: 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 "L'ajout de ce rapport à votre liste va le supprimer de la liste %s’s." @@ -360,7 +361,7 @@ msgstr "Une mise à jour a marqué ce problème comme résolu" msgid "Anonymous" msgstr "Anonyme" -#: 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 "Anonyme :" @@ -415,7 +416,7 @@ msgstr "Affecté à un \"interlocuteur\" externe:" msgid "Assign to subdivision:" msgstr "Affecté à la subdivision:" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Assign users to areas" msgstr "Affecter des utilisateurs aux zones" @@ -440,8 +441,8 @@ msgstr "Les utilisateurs autorisés peuvent être associés aux catégories sur msgid "Auto-response:" msgstr "Réponse automatique:" -#: 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 "Catégories disponibles" @@ -449,7 +450,7 @@ msgstr "Catégories disponibles" msgid "Avoid personal information and vehicle number plates" msgstr "Évitez les renseignements personnels et les plaques d'immatriculation" -#: 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 "En attente de modération" @@ -462,12 +463,12 @@ msgstr "Retour" msgid "Back to all reports" msgstr "Retour vers tous les rapports" -#: templates/web/base/admin/report_blocks.html:41 +#: templates/web/base/admin/report_blocks.html:43 msgid "Ban email address" msgstr "Bannir l'adresse mail" #: 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 @@ -498,10 +499,6 @@ msgstr "Si vous ne trouvez pas notre e-mail? Vérifiez dans votre dossier spam." msgid "Can't see the map? <em>Skip this step</em>" msgstr "Vous ne pouvez pas voir le plan ? <em>Sautez cette étape</em>" -#: templates/web/base/report/_inspect.html:141 -msgid "Cancel" -msgstr "Annuler" - #: perllib/FixMyStreet/Cobrand/Default.pm:650 #: templates/web/base/admin/responsepriorities/list.html:8 msgid "Categories" @@ -514,7 +511,8 @@ msgstr "Catégories:" #: 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 @@ -534,7 +532,7 @@ msgstr "Changement de catégorie de ‘%s’ à ‘%s’" msgid "Category fix rate for problems > 4 weeks old" msgstr "Taux de résolution pour les problèmes > 4 semaines" -#: 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 @@ -611,6 +609,10 @@ msgstr "" "public (ex., \"nid de poule\", \"éclairage public\") mais est aussi utile pour l'interlocuteur.\n" " Elle apparaitra dans le menu déroulant sur la page \"Rapporter-un-problème\"." +#: 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" @@ -639,10 +641,11 @@ msgstr "Cliquez sur le lien dans notre courriel de confirmation pour vous connec #: 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 @@ -744,8 +747,8 @@ msgstr "Contacter l'équipe" msgid "Coordinates:" msgstr "Coordonnées:" -#: 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 "Impossible de trouver l'utilisateur" @@ -799,7 +802,7 @@ msgstr "Créer des rapports/mises à jour de l'administration" msgid "Create reports/updates on a user's behalf" msgstr "Créer des rapports/mises à jour pour le compte d'un utilisateur" -#: 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 "Créer un modèle" @@ -840,7 +843,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Traité par la subdivision dans les 5 jours ouvrables" #: 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 "Supprimer le modèle" @@ -906,21 +909,35 @@ msgstr "Avez-vous un mot de passe %s ?" msgid "Don’t know" msgstr "Je ne sais pas" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "Vous n'aimez pas les formulaires ?" +#: 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 "Glissez et déposez les photos ici ou <u> cliquer pour les envoyer </ u>" #: 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 "Dupliqué" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Dupliqué" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Dupliqué" + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -932,7 +949,8 @@ msgstr "" "Des catégories différents <strong>peuvent avoir le même contact</strong> (adresse email).\n" "Cela signifie que vous pouvez ajouter plusieurs catégories même si vous n'avez qu'un contact pour l'interlocuteur." -#: 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 "Abscisse/Ordonnée :" @@ -951,11 +969,11 @@ msgstr "Éditer" msgid "Edit body details" msgstr "Editer les détails de l'intelocuteur" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Edit other users' details" msgstr "Modifier les détails des autres utilisateurs" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Edit other users' permissions" msgstr "Modifier les autorisations des autres utilisateurs" @@ -1006,7 +1024,7 @@ msgstr "Éditeur" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "Email rajouté à la liste des abus" @@ -1024,11 +1042,11 @@ msgstr "Alerte E-mail créé" msgid "Email alert deleted" msgstr "Alerte E-mail supprimé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1622 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1624 msgid "Email already in abuse list" msgstr "Email déjà présent dans la liste des abus" -#: 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 @@ -1101,7 +1119,7 @@ msgid "Enter details of the problem" msgstr "Saisissez les détails du problème" #: 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 @@ -1123,8 +1141,8 @@ msgstr "Exemple de code postal %s" msgid "Examples:" msgstr "Exemples :" -#: 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 "Catégorie existante" @@ -1160,7 +1178,8 @@ msgstr "Équipe externe" msgid "Extra data:" msgstr "Donnée supplémentaire:" -#: 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 "Précisions supplémentaires" @@ -1182,11 +1201,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "Résoudre ceci en chosissant une <strong>zone couverte</strong> dans le formulaire <em>Saisie des détails interlocuteur</em> ci-dessous." #: 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 @@ -1194,12 +1214,12 @@ msgid "Fixed" msgstr "Résolu" #: 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 "Résolu - Administration" #: 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 "Résolu - Usager" @@ -1217,7 +1237,7 @@ msgstr "Résolu :" msgid "Flag as deleted" msgstr "Signaler comme supprimé" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Flag user" msgstr "Signaler l'usager" @@ -1238,7 +1258,7 @@ msgstr "Les utilisateurs signalés sont listés dans la page <a href='%s'>signal msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Les utilisateurs signalés ne sont pas restreints en aucune façon. il s'agit juste d'une liste d'utilisateurs qui ont été marqués pour attention." -#: 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 "Signalé :" @@ -1276,7 +1296,7 @@ msgid "Frequently Asked Questions" msgstr "Foire Aux Questions" #: 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 "Recevoir les mises à jour" @@ -1302,7 +1322,7 @@ msgstr "Heureux d'entendre qu'il a été résolu!" #: 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 "Ok" @@ -1311,7 +1331,7 @@ msgstr "Ok" msgid "Going to send questionnaire?" msgstr "Envoi du questionnaire ?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "Accorder l'accès à l'admin" @@ -1353,8 +1373,8 @@ msgstr "Bienvenue %s" #: 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 @@ -1397,7 +1417,7 @@ msgstr "Je viens de signaler un problème sur @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Je viens de mettre à jour un problème sur @fixmystreet" -#: 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 "Je suis désolé, nous n'avons pas trouvé votre problème dans notre base de données.\n" @@ -1443,6 +1463,10 @@ msgstr "Si vous voulez que seulement ce modèle soit une option pour des catégo msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council." msgstr "Si vous soumettez un problème ici, le problème <strong>ne sera pas </strong> signalé a l'administration." +#: 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" @@ -1511,7 +1535,7 @@ msgstr "En plus, les attributs suivants qui ne font pas partie de la spécificat #: 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 @@ -1547,7 +1571,7 @@ msgid "Internal notes" msgstr "Notes internes" #: 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 "Référence interne" @@ -1555,7 +1579,7 @@ msgstr "Référence interne" msgid "Invalid agency_responsible value %s" msgstr "Valeur agency_responsible invalide \"%s\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Date de fin invalide" @@ -1563,16 +1587,16 @@ msgstr "Date de fin invalide" msgid "Invalid format %s specified." msgstr "Format spécifié %s invalide" -#: 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 "Location invalide. Le nouvel emplacement doit être couvert par la même administration." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1479 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1481 msgid "Invalid start date" msgstr "Date de début invalide" #: 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 @@ -1618,7 +1642,11 @@ msgstr "Dernière actualisation :" msgid "Last update:" msgstr "Dernière actualisation :" -#: 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 "Moins récemment mis à jour" @@ -1663,6 +1691,10 @@ msgstr "CARTE" msgid "Manage shortlist" msgstr "Gérer la liste" +#: templates/web/base/reports/_list-filters.html:36 +msgid "Manual order" +msgstr "" + #: templates/web/base/js/translation_strings.html:46 msgid "Map" msgstr "Carte" @@ -1687,7 +1719,7 @@ msgstr "Marqué fixé / fermé depuis plus de huit semaines" msgid "Markup problem details" msgstr "Marquer les détails du problème" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Message" @@ -1707,7 +1739,7 @@ msgstr "Organismes disparus :" msgid "Missing jurisdiction_id" msgstr "jurisdiction_id manquant" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "Modérer" @@ -1715,7 +1747,7 @@ msgstr "Modérer" msgid "Moderate report details" msgstr "Modérer les détails du rapport" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate this report" msgstr "Modérer ce rapport" @@ -1727,7 +1759,7 @@ msgstr "Modéré par division dans le délai d'un jour ouvrable" msgid "Month" msgstr "Mois" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "Les plus commentés" @@ -1751,7 +1783,7 @@ msgstr "Les plus commentés" msgid "Name" msgstr "Nom" -#: 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 @@ -1763,7 +1795,7 @@ msgstr "Nom :" msgid "Name: %s" msgstr "Nom: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "Accédez à ce problème" @@ -1865,7 +1897,7 @@ msgstr "Nouvel état" msgid "New template" msgstr "Nouveau modèle" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "Plus récents" @@ -1880,7 +1912,7 @@ msgstr "Suivant" #: 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 @@ -1901,7 +1933,7 @@ msgstr "Aucun intelocuteur" msgid "No council" msgstr "Pas d'administration" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Aucune administration sélectionnée" @@ -1969,7 +2001,7 @@ msgstr "" "l'activité concernant leur interloculteur), et la faculté de cacher des rapports ou de définir des statuts spéciaux pour les rapports." #: 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" @@ -2047,15 +2079,15 @@ msgstr "Anciens <br />résolus" msgid "Older <br>problems" msgstr "Anciens <br />problèmes" -#: templates/web/base/reports/_list-filters.html:36 +#: templates/web/base/reports/_list-filters.html:39 msgid "Oldest" msgstr "Plus anciens" #: 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 @@ -2101,13 +2133,13 @@ msgstr "Ou problèmes signalés à :" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ou vous pouvez vous abonner à une alerte en fonction de la commune dans laquelle vous êtes :" -#: 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" @@ -2128,7 +2160,7 @@ msgid "Parent" msgstr "Parent" #: 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 "Partiel" @@ -2162,7 +2194,7 @@ msgid "Phone number (optional)" msgstr "Téléphone (facultatif)" #: 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:" @@ -2214,7 +2246,7 @@ msgstr "Placer l'épingle sur la carte" #: 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 @@ -2242,14 +2274,14 @@ msgid "Please check your email address is correct" msgstr "Merci de vérifier que votre adresse email est correcte" #: 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 "Merci de sélectionner une catégorie" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Merci de choisir un type de propriété" @@ -2273,13 +2305,13 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Merci de ne pas être injurieux — Calomnier l'administration dévalue le service pour tous les utilisateurs." #: 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 "Merci d'entrer un message" #: 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 "Merci d'entrer un nom" @@ -2294,13 +2326,13 @@ msgid "Please enter a password" msgstr "Merci d'entrer un mot de passe :" #: 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 "Merci d'enter un sujet" #: 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 @@ -2313,7 +2345,7 @@ msgstr "Merci d'entrer un email valide" msgid "Please enter a valid email address" msgstr "Merci d'entrer une adresse email valide" -#: 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 "Merci d'entrer quelques détails" @@ -2346,8 +2378,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Merci de saisir votre nom complet, les administrations ont besoin de cette information. Si vous ne souhaitez pas que votre nom soit affiché sur ce site, décochez la case ci-dessous" #: 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" @@ -2384,7 +2416,7 @@ msgstr "Merci d'entrer les détails du problème." 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 "Merci de remplir le formulaire ci-dessous avec les détails du problème, et de décrir l'emplacement aussi précisément que possible dans les détails." -#: 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 "Merci d'indiquer si vous souhaitez recevoir un autre questionnaire" @@ -2410,20 +2442,20 @@ msgstr "Veuillez noter que votre mise à jour n'a <strong> pas encore été post msgid "Please note:" msgstr "Quelques remarques :" -#: perllib/FixMyStreet/App/Controller/Report.pm:335 +#: perllib/FixMyStreet/App/Controller/Report.pm:354 msgid "Please provide a public update for this report." msgstr "Veuillez fournir une mise à jour publique de ce rapport." -#: 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 "Merci d'expliquer pourquoi vous ré-ouvrez ce rapport" -#: 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 "Merci de fournir du texte ainsi qu'une photo." -#: 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 "Merci de nous dire si vous avez signalé un problème à une administration auparavant." @@ -2439,7 +2471,7 @@ msgstr "Merci de sélectionner le type de flux que vous voulez" msgid "Please select the type of alert you want" msgstr "Merci de sélectionner le type d'alerte que vous voulez" -#: 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 "Merci de préciser si le problème a été réglé ou non." @@ -2458,22 +2490,22 @@ msgstr "Merci de saisir un message" msgid "Please write your update here" msgstr "Merci d'écrire votre mise à jour ici" -#: 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 "Envoyer" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Signalé anonymement à %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Envoyé par %s (<strong>%s</strong>) à %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Signalé par %s à %s" @@ -2489,7 +2521,8 @@ msgstr "Précédent" msgid "Priorities" msgstr "Priorités" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:96 +#: templates/web/base/report/_item.html:90 msgid "Priority" msgstr "Priorité" @@ -2505,10 +2538,15 @@ msgstr "Vie privée et cookies" #: 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 "Privé" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Précisions supplémentaires" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Problème" @@ -2544,11 +2582,11 @@ msgstr "Changement état des problèmes d'après résultats sondage" msgid "Problems" msgstr "Problèmes" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Problèmes aux alentours" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Problèmes sur la carte" @@ -2560,7 +2598,7 @@ msgstr "Problèmes récemment signalés sur FixMyStreet.fr" msgid "Problems within %.1fkm of this location" msgstr "Problèmes à moins de %.1fkm de ce lieu" -#: 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" @@ -2584,6 +2622,7 @@ msgstr "Problèmes à l'intérieur des limites de :" msgid "Property address:" msgstr "Adresse de propriété:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Apporter une mise à jour" @@ -2601,12 +2640,17 @@ msgstr "Fournir un nom et un mot de passe est optionnel, mais cela vous permettr msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Un mot de passe n'est pas obligatoire, mais vous permettra de créer, mettre à jour et administrer vos rapports plus facilement." +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "Mise à jour publique :" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Réponse publique:" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "Mise à jour publique :" @@ -2630,7 +2674,7 @@ msgstr "Questionnaire %d rempli pour le problème %d, %s à %s" msgid "Questionnaire %d sent for problem %d" msgstr "Questionnaire %d envoyé pour le problème %s" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Questionnaire rempli par le requérant" @@ -2638,7 +2682,7 @@ msgstr "Questionnaire rempli par le requérant" #: 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 "Flux RSS" @@ -2666,7 +2710,7 @@ msgstr "Flux RSS de %s, dans la localité %s" msgid "RSS feed of nearby problems" msgstr "Flux RSS de problèmes à proximité" -#: 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" @@ -2682,12 +2726,12 @@ msgid "RSS feed of recent local problems" msgstr "Flux RSS des problèmes locaux récents" #: 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 "Flux RSS des mises à jour pour ce problème" #: 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 "Etre informé par courriel lorsque ce problème est mis à jour." @@ -2709,7 +2753,7 @@ msgstr "Récemment<br />résolus" msgid "Recently reported problems" msgstr "Problèmes signalés récemment" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "Récemment mis à jour" @@ -2717,13 +2761,15 @@ msgstr "Récemment mis à jour" 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 "Rappelez-vous que FixMyStreet est principalement destiné au signalement de problèmes physiques qui peuvent être résolus. Si votre problème ne convient pas pour être soumis via ce site, n'oubliez pas que vous pouvez contacter votre administration directement à l'aide de leur propre site web." -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "Effacer le signalement" -#: 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 "Supprimer de votre liste" @@ -2731,7 +2777,7 @@ msgstr "Supprimer de votre liste" msgid "Remove from site" msgstr "Retirer du site" -#: 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!)" @@ -2745,7 +2791,8 @@ msgstr "Répondre à l'utilisateur:" msgid "Report" msgstr "Rapport" -#: 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 "Rapport ID :" @@ -2755,6 +2802,7 @@ msgstr "Rapport ID :" msgid "Report a problem" msgstr "Signaler un problème" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Signaler un abus" @@ -2778,8 +2826,8 @@ msgstr "Signaler votre problème" msgid "Report, view, or discuss local problems" msgstr "Signalez et suivez les problèmes locaux" -#: 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 "Signalé anonymement à %s" @@ -2788,8 +2836,8 @@ msgstr "Signalé anonymement à %s" msgid "Reported before" msgstr "Signalé avant" -#: 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 "Signalé par %s à %s" @@ -2802,27 +2850,27 @@ msgstr "Rapporté par:" msgid "Reported in the %s category" msgstr "Rapporté dans la catégorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Signalé dans la catégorie %s anonymement à %s" -#: 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 "Signalé dans la catégorie %s par %s à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Signalé par %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Signalé par %s par %s à %s" -#: 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 "Signalé par %s dans la catégorie %s anonymement à %s" -#: 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 "Signalé par %s dans la catégorie %s par %s" @@ -2932,16 +2980,16 @@ msgstr "L'opérateur pour cette route (déterminé à partir de la référence e msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "L'opérateur pour cette route (selon OpenStreetMAp): %s" -#: 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 "Pivoter à gauche" -#: 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" @@ -2952,21 +3000,26 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "La rotation de cette photo annulera les modifications non enregistrées dans le rapport." #: 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 "Satellite" +#: templates/web/base/report/_inspect.html:150 +#, fuzzy +msgid "Save + close as duplicate" +msgstr "rapport marqué comme dupliqué" + #: 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 "Enregistrer les modifications" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "Sauvegardez avec une mise à jour publique" @@ -3003,6 +3056,11 @@ msgstr "Aucun utilisateur trouvé lors de la recherche." msgid "See our privacy policy" msgstr "Voir notre politique de confidentialité" +#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#, fuzzy +msgid "See user detail for reports created as the council" +msgstr "Créer des rapports/mises à jour de l'administration" + #: templates/web/base/admin/body-form.html:39 #: templates/web/zurich/admin/body-form.html:16 msgid "Select a body" @@ -3046,27 +3104,27 @@ msgstr "Envoyé :" msgid "Service:" msgstr "Service:" -#: templates/web/base/report/_inspect.html:26 +#: templates/web/base/report/_inspect.html:25 msgid "Set to my current location" msgstr "Situé à mon emplacement actuel" -#: templates/web/base/report/display_tools.html:15 +#: templates/web/base/report/display_tools.html:17 msgid "Share" msgstr "Partagez" -#: 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 "Liste" -#: 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 "Shortlisté" -#: templates/web/base/report/_main.html:140 +#: templates/web/base/report/_main.html:144 msgid "Shortlisted by %s" msgstr "Shortlisté par %s" @@ -3140,7 +3198,7 @@ msgstr "Désolé, cela n'est pas un lien valide" msgid "Sorry, there has been an error confirming your problem." msgstr "Désolé, il n'y a eu une erreur lors de la confirmation de votre problème." -#: 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 @@ -3188,12 +3246,14 @@ msgstr "Date de début:" #: 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 "État actuel" -#: 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 @@ -3233,7 +3293,7 @@ msgstr "Sous-catégorie: %s" msgid "Subdivision/Body" msgstr "Subdivision/Interlocuteur" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Sujet" @@ -3250,7 +3310,7 @@ msgstr "Sujet :" msgid "Submit" msgstr "Envoyer" -#: 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 @@ -3276,7 +3336,7 @@ msgid "Submitted" msgstr "Soumis" #: 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 "S'abonner" @@ -3559,7 +3619,7 @@ msgstr "Il y a eu un problème pour montrer la page tous les rapports. Réessaye msgid "There was a problem showing this page. Please try again later." msgstr "Il y a eu un problème pour afficher cette page. Merci de réessayer ultérieurement." -#: 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 @@ -3649,9 +3709,9 @@ msgstr "Cet email a été envoyé aux deux administrations couvrant l'emplacemen 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 "Cet email a été envoyé à plus d'une administration couvrant l'emplacement du problème, la catégorie de problème choisie par l'utilisateur étant présente pour chacune d'entre elles ; ignorez-le s'il vous plaît si vous n'êtes pas l'administration responsable pour la question." -#: 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 "Ces renseignements sont nécessaires" @@ -3676,6 +3736,10 @@ msgstr "Ce problème a été résolu" msgid "This problem has not been fixed" msgstr "Ce problème n'a pas été résolu" +#: 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 @@ -3750,7 +3814,8 @@ msgstr "Pour voir une carte de l'emplacement précis de ce problème" msgid "Total" msgstr "Total" -#: 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 "La gestion du trafic est nécessaire ?" @@ -3758,7 +3823,7 @@ msgstr "La gestion du trafic est nécessaire ?" msgid "Trusted by bodies:" msgstr "Accrédité par les organismes:" -#: 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 "Accrédité pour faire des rapports sans être inspectés" @@ -3775,14 +3840,14 @@ msgid "Try emailing us directly:" msgstr "Essayez en nous envoyant un e-mail directement:" #: 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 "Ne peut être résolu" #: 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 @@ -3802,8 +3867,8 @@ msgstr "Inconnu" msgid "Unknown alert type" msgstr "Type d'alerte inconnu" -#: 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 "erreur inconnue" @@ -3814,6 +3879,10 @@ msgstr "erreur inconnue" msgid "Unknown problem ID" msgstr "ID de problème inconnu" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "Mise à jour" @@ -3867,7 +3936,7 @@ msgid "Updated" msgstr "Mis à jour" #: 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 @@ -3882,7 +3951,7 @@ msgstr "Mis à jour !" msgid "Updates" msgstr "Mises à jour" -#: 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 "Les mises à jour sont limitées à %s caractères de long. Merci de raccourcir votre texte" @@ -3913,11 +3982,11 @@ msgstr "Carte utilisée" msgid "User ID to attribute fetched comments to" msgstr "ID utilisateur de récupération des commentaires à" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1681 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1683 msgid "User flag removed" msgstr "Utilisateur dé–signalé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "Utilisateur signalé" @@ -3926,7 +3995,7 @@ msgid "User search finds matches in users' names and email addresses." msgstr "La recherche utilisateurs parcourt les noms et adresses courriel." #: 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" @@ -4016,6 +4085,10 @@ msgstr "Édité le" msgid "When sent" msgstr "Envoyé le" +#: 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 "Trois photos suffisent." @@ -4064,7 +4137,7 @@ msgstr "Année" #: 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 @@ -4079,11 +4152,11 @@ msgstr "Oui" msgid "Yes I have a password" msgstr "Oui j'ai un mot de passe" -#: 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 "Vous ne comprenez pas les raisons pour lesquelles ce rapport a été inutilement retiré:" -#: 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 "Vous signalez le rapport de problème suivant comme étant violent, contenant des renseignements personnels, ou similaires :" @@ -4100,7 +4173,7 @@ msgstr "Vous pouvez <a href=\"%s%s\">consulter le problème sur ce site</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Vous pouvez ajouter un courriel d'utilisateur abusif dans la liste des abus, qui cache automatiquement (et n'envoie jamais) les rapports qu'ils crèent." -#: 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 "Vous pouvez contacte le support technique par le courriel <a href='mailto:%s'>%s</a>" @@ -4194,9 +4267,9 @@ msgstr "Votre compte" #: 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 @@ -4216,7 +4289,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Votre information sera utilisée seulement en accord avec notre <a href=\"/privacy\">politique de confidentialité</a>" #: 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 @@ -4295,53 +4368,53 @@ msgstr "saisissez l'utilisateur" msgid "from %s different users" msgstr "de %s utilisateurs différents" -#: 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 "dernière mise à jour %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "moins d'une minute" -#: templates/web/base/report/updates.html:57 +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 msgid "marked as a duplicate report" msgstr "rapport marqué comme dupliqué" -#: templates/web/base/report/updates.html:47 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as action scheduled" msgstr "action marquée comme établie" -#: templates/web/base/report/updates.html:59 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "marked as an internal referral" msgstr "marqué comme une référence interne" -#: templates/web/base/report/updates.html:49 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as closed" msgstr "marqué comme terminé" -#: 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 "marqué(s) comme réglé(s)" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "marqué comme en cours" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "marqué comme en cours d'investigation" -#: templates/web/base/report/updates.html:55 +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 msgid "marked as not the council's responsibility" msgstr "marqué comme n'étant pas de la responsabilité de la commune" -#: templates/web/base/report/updates.html:43 +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 msgid "marked as planned" msgstr "marqué comme planifié" -#: templates/web/base/report/updates.html:53 +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as unable to fix" msgstr "marqué comme impossible à résoudre" @@ -4387,8 +4460,8 @@ msgstr "saisi initialement: “%s”" msgid "other areas:" msgstr "autres lieux:" -#: 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 "réouvert" @@ -4434,55 +4507,48 @@ msgstr "L'utilisateur est propriétaire du problème" msgid "ward" msgstr "localité" -#: 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" -msgstr[0] "<big>%s</big> rapport récemment" -msgstr[1] "<big>%s</big> rapports récemment" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d jour" +msgstr[1] "%d jours" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d supporter" -msgstr[1] "%d supporters" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> mise à jour de rapport" -msgstr[1] "<big>%s</big> mises à jour de rapports" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Nous n'avons pas encore de détails pour l'administration responsable de ce lieu." -msgstr[1] "Nous n'avons pas encore de détails pour les administrations responsables de ce lieu." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d supporter" +msgstr[1] "%d supporters" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semaine" msgstr[1] "%d semaines" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> résolu le mois passé" +msgstr[1] "<big>%s</big> résolus le mois passé" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4490,19 +4556,19 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> rapport la semaine passée" msgstr[1] "<big>%s</big> rapports la semaine passée" -#: 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" -msgstr[0] "<big>%s</big> résolu le mois passé" -msgstr[1] "<big>%s</big> résolus le mois passé" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> rapport récemment" +msgstr[1] "<big>%s</big> rapports récemment" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d jour" -msgstr[1] "%d jours" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> mise à jour de rapport" +msgstr[1] "<big>%s</big> mises à jour de rapports" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4510,3 +4576,13 @@ 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] "Nous n'avons pas encore de détails pour l'autre administration responsable de ce lieu." msgstr[1] "Nous n'avons pas encore de détails pour les autres administrations responsables de ce lieu." + +#: 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] "Nous n'avons pas encore de détails pour l'administration responsable de ce lieu." +msgstr[1] "Nous n'avons pas encore de détails pour les administrations responsables de ce lieu." + +#~ msgid "Cancel" +#~ msgstr "Annuler" 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] "" diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po index e56d48f6e..f76fc8c5d 100644 --- a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/hr.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: Croatian (https://www.transifex.com/mysociety/teams/12067/hr/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:639 +#: perllib/FixMyStreet/DB/Result/Problem.pm:648 #: perllib/FixMyStreet/Script/Reports.pm:199 msgid " and " msgstr "i" @@ -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 "(Email na crnoj listi)" @@ -142,12 +142,10 @@ msgstr "(zadana udaljenost koja obuhvaća približno 200,000 stanovnika)" 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 "(zatvoreno)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(popravljeno)" @@ -156,7 +154,7 @@ msgstr "(popravljeno)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(grafiti, ilegalno odlaganje otpada, oštećeni kolnici, klupe, lampe...)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(nije poslano odgovornom tijelu)" @@ -164,21 +162,21 @@ msgstr "(nije poslano odgovornom tijelu)" msgid "(optional)" msgstr "(nije obavezno)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(poslano na obje adrese)" -#: 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 "-- Izaberi kategoriju --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Izaberite vrstu posjeda --" -#: 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 "<strong>No</strong> Potvrdi moje ažuriranje e-mailom" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>No</strong> prijavi se e-mailom" -#: 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 "<strong>Da</strong> Imam password" #: 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 "Dodaj novu kategoriju" -#: 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 "Dodano %s" -#: 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 "Ažuriranjem je ovaj problem evidentiran kao popravljen." msgid "Anonymous" msgstr "Anonimno" -#: 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 "Anonimno:" @@ -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 "Onemogući e-mail adrese" #: 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 "Ne možete vidjeti mapu? <em>Preskoči ovaj korak</em>" -#: 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 " Postotak popravaka za kategoriju > staro 4 tjedna" -#: 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 "Kontaktiraj tim" 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 "Nepoznati korisnik" @@ -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,33 @@ msgstr "" msgid "Don’t know" msgstr "Ne’znam" -#: 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 +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" @@ -899,7 +914,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 +934,11 @@ msgstr "Uredi" 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 +989,7 @@ msgstr "Urednik" msgid "Email" msgstr "E-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "E-mail dodan na listu zloupotrebe" @@ -991,11 +1007,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 "E-mail je već na listi zloupotrebe" -#: 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 +1078,7 @@ msgid "Enter details of the problem" msgstr "Unesi detalje o problemu" #: 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 +1100,8 @@ msgstr "Primjer poštanskog broja %s" msgid "Examples:" msgstr "Primjeri:" -#: 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 +1137,8 @@ msgstr "" msgid "Extra data:" msgstr "Dodatni podaci:" -#: 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 +1160,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 +1173,12 @@ msgid "Fixed" msgstr "Popravljeno" #: 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 "Popravljeno - odgovorno tijelo" #: 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 "Popravljeno - Korisnik" @@ -1178,7 +1196,7 @@ msgstr "Popravljeno:" 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 "Označi korisnika" @@ -1199,7 +1217,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 "Označen:" @@ -1237,7 +1255,7 @@ msgid "Frequently Asked Questions" msgstr "Često postavljana pitanja" #: 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 "Primite ažuriranja" @@ -1263,7 +1281,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 "Idi" @@ -1272,7 +1290,7 @@ msgstr "Idi" msgid "Going to send questionnaire?" msgstr "Pošalji upitnik?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "" @@ -1314,8 +1332,8 @@ msgstr "Zdravo %s" #: 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 +1376,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 "Nažalost, ne možemo locirati tvoj problem u bazi podataka.⏎\n" @@ -1404,6 +1422,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 +1485,7 @@ msgstr "Nadalje, sljedeća svojstva koja nisu dio Open311 v2 specifikacija su vr #: 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 +1521,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 +1529,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Nevažeća odgovorna_vrijednost agencije %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Nevažeći datum završetka" @@ -1515,16 +1537,16 @@ msgstr "Nevažeći datum završetka" msgid "Invalid format %s specified." msgstr "Naveden nevažeći %s format." -#: 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 "Nevažeći datum početka" #: 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 +1592,11 @@ msgstr "Posljednje ažuriranje" msgid "Last update:" msgstr "Posljednje ažuriranje:" -#: 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 +1641,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 +1669,7 @@ msgstr "" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Poruka" @@ -1659,7 +1689,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Nedostaje nadležni_ID" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1667,7 +1697,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 +1709,7 @@ msgstr "" msgid "Month" msgstr "Mjesec" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "" @@ -1703,7 +1733,7 @@ msgstr "" msgid "Name" msgstr "Ime" -#: 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 +1745,7 @@ msgstr "Ime:" msgid "Name: %s" msgstr "" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1817,7 +1847,7 @@ msgstr "Novo stanje" msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "" @@ -1832,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 @@ -1853,7 +1883,7 @@ msgstr "" msgid "No council" msgstr "Nema odgovornog tijela" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Nije odabrano odgovorno tijelo" @@ -1913,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" @@ -1991,15 +2021,15 @@ msgstr "Starije <br>popravljeno" msgid "Older <br>problems" msgstr "Stariji <br>problemi" -#: 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 @@ -2045,13 +2075,13 @@ msgstr "Ili problemi prijavljeni:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ili se možete pretplatiti na upozorenja unutar vašeg vijeća ’:" -#: 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" @@ -2072,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 "Djelomično" @@ -2106,7 +2136,7 @@ msgid "Phone number (optional)" msgstr "Telefonski broj (neobavezan)" #: 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:" @@ -2158,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 @@ -2186,14 +2216,14 @@ msgid "Please check your email address is correct" msgstr "Provjerite je li vaša e-mail adresa točna" #: 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 "Izaberi kategoriju" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Izaberi tip imovine" @@ -2214,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 "Unesi poruku" #: 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 "" @@ -2235,13 +2265,13 @@ msgid "Please enter a password" msgstr "Unesi lozinku" #: 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 "Unesi predmet" #: 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 @@ -2254,7 +2284,7 @@ msgstr "Unesi valjani e-mail" msgid "Please enter a valid email address" msgstr "Unesi valjanu e-mail adresu" -#: 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 "Unesi detalje" @@ -2287,8 +2317,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Molimo unesite svoje puno ime, odgovorno tijelo treba ovu informaciju – ako ne želite da vaše ime bude prikazano na stranici, odznačite kvadratić ispod" #: 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" @@ -2325,7 +2355,7 @@ msgstr "Popunite detalje o problemu u nastavku." 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 "Popunite detalje o problemu u nastavku i opišite lokaciju što preciznije." -#: 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 "Molimo navedite želite li primiti novi upitnik" @@ -2351,20 +2381,20 @@ msgstr "" msgid "Please note:" msgstr "Napominjemo:" -#: 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 "Molimo navedite obrazloženje ponovnog otvaranja ove prijave" -#: 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 "Molimo unesite tekst i fotografiju " -#: 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 "Jeste li do sada ikada prijavljivali problem odgovoronom tijelu" @@ -2380,7 +2410,7 @@ msgstr "Izaberite izvor koji želite" msgid "Please select the type of alert you want" msgstr "Izaberite tip upozorenja koji želite" -#: 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 "Navedite je li problem rješen " @@ -2399,22 +2429,22 @@ msgstr "Napiši poruku" msgid "Please write your update here" msgstr "Ovdje ažurirajte" -#: 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 "Objavi" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Objavljeno anonimno na %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Objavio %s (<strong>%s</strong>) na %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Objavio %s na %s" @@ -2430,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 "" @@ -2446,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 "Privatno" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Privatno" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Problem" @@ -2485,11 +2521,11 @@ msgstr "Stanje problema izmijenjeno na temelju rezultata ankete" msgid "Problems" msgstr "Problemi" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Okolni problemi" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Problemi na mapi" @@ -2501,7 +2537,7 @@ msgstr "Problems nedavno prijavljeni kao popravljeni na Popravi.to" msgid "Problems within %.1fkm of this location" msgstr "Problemi unutar%.1fkm od ove lokacije" -#: 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" @@ -2525,6 +2561,7 @@ msgstr "Problemi unutar granice:" 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 "Ažuriranje" @@ -2542,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 "Lozinka nije obvezna, ali će vam omogućiti lakše prijavljivanje problema, ažuriranja i upravljanje vašim izvješćima." +#: 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 "" @@ -2571,7 +2612,7 @@ msgstr " Upitnik %d odgovren za problem %d, %s za %s" msgid "Questionnaire %d sent for problem %d" msgstr "Upitnik %d poslan za problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Upitnik popunila osoba koja je prijavila problem" @@ -2579,7 +2620,7 @@ msgstr "Upitnik popunila osoba koja je prijavila problem" #: 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 "RSS izvor" @@ -2607,7 +2648,7 @@ msgstr "RSS izvor za %s, unutar %s ward" msgid "RSS feed of nearby problems" msgstr "RSS izvor za okolne probleme" -#: 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" @@ -2623,12 +2664,12 @@ msgid "RSS feed of recent local problems" msgstr "RSS izvor za nedavne lokalne probleme" #: 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 "RSS izvor za ažuriranja ovog problema" #: 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 "Primite e-mail s ažuriranjima ovog problema" @@ -2650,7 +2691,7 @@ msgstr "Nedavno<br>popravljeno" msgid "Recently reported problems" msgstr "Nedavno prijavljeni problemi" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2658,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 "Popravi.to prvenstveno služi za izvještavanje fizičkih problema koji se mogu popraviti. Ako vaš problem nije prikladan za prijavljivanje preko ove stranice, uvijek se možete obratiti direktno svom vijeću preko njihove web stranice." -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "Ukloni oznaku" -#: 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 "" @@ -2672,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!)" @@ -2686,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 "" @@ -2696,6 +2740,7 @@ msgstr "" msgid "Report a problem" msgstr "Prijavi problem" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Prijavi zloupotrebu" @@ -2719,8 +2764,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Prijavi, pregledaj ili raspravljaj o lokalnim problemima" -#: 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 "Prijavljeno anonimno %s" @@ -2729,8 +2774,8 @@ msgstr "Prijavljeno anonimno %s" msgid "Reported before" msgstr "Prije prijavljeno" -#: 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 "Prijavio %s za %s" @@ -2743,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 "Prijavljeno %s u kategoriju anonimno u %s" -#: 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 "Prijavio %s u kategoriju %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Prijavio %s anonimno %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Prijavio %s %s u %s" -#: 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 "Prijavio %s u kategoriju %s anonimno u %s" -#: 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 "Prijavio %s u %s kategoriju %s u %s" @@ -2873,16 +2918,16 @@ msgstr "Cestovni operater za ovu imenovanu cestu (izveden iz cestovnog referentn msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Cestovni operater za ovu imenovanu cestu (sa OpenStreetMap): %s" -#: 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" @@ -2893,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 "Spremi promjene" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -2944,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" @@ -2987,27 +3040,27 @@ msgstr "Poslano:" msgid "Service:" msgstr "Servis:" -#: 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 "Podijeli" -#: 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 "" @@ -3079,7 +3132,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Žao nam je, došlo je do greške pri potvrđivanju problema." -#: 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 @@ -3127,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 "Stanje" -#: 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 @@ -3172,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 "Predmet" @@ -3189,7 +3244,7 @@ msgstr "Predmet:" msgid "Submit" msgstr "Pošalji" -#: 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 @@ -3215,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 "Pretplati se" @@ -3486,7 +3541,7 @@ msgstr "Došlo je do problema pri učitavanju svih prijava. Molimo pokušajte po msgid "There was a problem showing this page. Please try again later." msgstr "Došlo je do problema pri učitavanju ove stranice. Molimo pokušajte ponovno." -#: 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 @@ -3568,9 +3623,9 @@ msgstr "Kako korisnik nije kategorizirao problem ,ovaj e-mail poslan je oboma od 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 "Kako je odabrana kategorija predviđena za više odgovornih tijela, ovaj e-mail poslan je na adrese nekoliko ureda koje prekrivaju mjesto problema. Molimo vas da zanemarite e-mail ukoliko niste nadležni za ovaj problem." -#: 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 "Potrebna informacija" @@ -3595,6 +3650,10 @@ msgstr "Problem je riješen" msgid "This problem has not been fixed" msgstr "Problem još nije riješen" +#: 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 @@ -3669,7 +3728,8 @@ msgstr "Karta točne lokacije ovog problema" msgid "Total" msgstr "Ukupno" -#: 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 "" @@ -3677,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 "" @@ -3694,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 @@ -3721,8 +3781,8 @@ msgstr "Nepoznato" msgid "Unknown alert type" msgstr "Nepoznat tip upozorenja" -#: 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 "" @@ -3733,6 +3793,10 @@ msgstr "" msgid "Unknown problem ID" msgstr "Nepoznat IB problema" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "Ažuriranje" @@ -3786,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 @@ -3801,7 +3865,7 @@ msgstr "Ažurirano!" msgid "Updates" msgstr "Ažuriranja" -#: 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 "" @@ -3832,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 "Korisnička oznaka uklonjena" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "Korisnik označen" @@ -3845,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" @@ -3935,6 +3999,10 @@ msgstr "Prilikom ažuriranja" msgid "When sent" msgstr "Prilikom slanja" +#: 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 "" @@ -3983,7 +4051,7 @@ msgstr "Godina" #: 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 @@ -3998,11 +4066,11 @@ msgstr "Da" msgid "Yes I have a password" msgstr "Da, imam lozinku" -#: 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 "Sljedeće izvješće o problemu prijavljujete jer je uvredljivo, sadrži osobne podatke ili slično:" @@ -4019,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 "" @@ -4110,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 @@ -4132,7 +4200,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Vaše informacije će se koristiti isključivo u skladu s našim<a href=\"/privacy\">pravilima o privatnosti</a>" #: 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 @@ -4211,53 +4279,53 @@ msgstr "" msgid "from %s different users" msgstr "od %s različitih korisnika" -#: 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 "manje od minute" -#: 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 "označeno kao popravljeno" -#: 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 "" @@ -4303,8 +4371,8 @@ msgstr "" msgid "other areas:" msgstr "druga područja:" -#: 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 "ponovno otvoreno" @@ -4350,15 +4418,15 @@ msgstr "korisnik je vlasnik problema" 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" -msgstr[0] "<big>%s</big> novija prijava" -msgstr[1] "<big>%s</big> novije prijave" -msgstr[2] "<big>%s</big> novije prijave" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dan" +msgstr[1] "%d dani" +msgstr[2] "%d dani" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4366,15 +4434,7 @@ msgstr[0] "%d sat" msgstr[1] "%d sati" msgstr[2] "%d sati" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4382,23 +4442,15 @@ msgstr[0] "%d minuta" msgstr[1] "%d minute" msgstr[2] "%d minute" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> ažuriranje za prijavu" -msgstr[1] "<big>%s</big> ažuriranja za prijavu" -msgstr[2] "<big>%s</big> ažuriranja za prijavu" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Još uvijek nemamo podatke za odgovorno tijelo koja pokriva ovu lokaciju." -msgstr[1] "Još uvijek nemamo podatke za odgovorna tijela koja pokrivaju ovu lokaciju." -msgstr[2] "Još uvijek nemamo podatke za odgovorna tijela koja pokrivaju ovu lokaciju." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4406,6 +4458,14 @@ msgstr[0] "%d tjedan" msgstr[1] "%d tjedni" msgstr[2] "%d tjedni" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> popravljeno u posljednjih mjesec dana" +msgstr[1] "<big>%s</big> popravljeno u posljednjih mjesec dana" +msgstr[2] "<big>%s</big> popravljeno u posljednjih mjesec dana" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4414,21 +4474,21 @@ msgstr[0] "<big>%s</big> prijava u prošlom tjednu" msgstr[1] "<big>%s</big> prijave u prošlom tjednu" msgstr[2] "<big>%s</big> prijave u prošlom tjednu" -#: 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" -msgstr[0] "<big>%s</big> popravljeno u posljednjih mjesec dana" -msgstr[1] "<big>%s</big> popravljeno u posljednjih mjesec dana" -msgstr[2] "<big>%s</big> popravljeno u posljednjih mjesec dana" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> novija prijava" +msgstr[1] "<big>%s</big> novije prijave" +msgstr[2] "<big>%s</big> novije prijave" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d dan" -msgstr[1] "%d dani" -msgstr[2] "%d dani" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> ažuriranje za prijavu" +msgstr[1] "<big>%s</big> ažuriranja za prijavu" +msgstr[2] "<big>%s</big> ažuriranja za prijavu" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4437,3 +4497,11 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Još <strong>nemamo</strong> podatke za drugo odgovorno tijelo koje je odgovorno za ovu lokaciju." msgstr[1] "Još <strong>nemamo</strong> podatke za ostala odgovorna tijela koja su odgovorna za ovu lokaciju." msgstr[2] "Još <strong>nemamo</strong> podatke za ostala odgovorna tijela koja su odgovorna za ovu lokaciju." + +#: 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] "Još uvijek nemamo podatke za odgovorno tijelo koja pokriva ovu lokaciju." +msgstr[1] "Još uvijek nemamo podatke za odgovorna tijela koja pokrivaju ovu lokaciju." +msgstr[2] "Još uvijek nemamo podatke za odgovorna tijela koja pokrivaju ovu lokaciju." diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po index d743e11f9..d9c57a9be 100644 --- a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/it.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: Italian (https://www.transifex.com/mysociety/teams/12067/it/)\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 "e" @@ -110,7 +110,7 @@ msgstr "%s quartiere, %s" msgid "%s, within %s ward" msgstr "%s dentro al quartiere %s" -#: 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 "(Email nella tabella degli abusi)" @@ -142,12 +142,10 @@ msgstr "(una distanza predefinita che copre approssimativamente 200,000 persone) 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 "(chiuso)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(risolto)" @@ -156,7 +154,7 @@ msgstr "(risolto)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(come gli atti vandalici, le discariche abusive, la pavimentazione e l'illuminazione stradale rotta)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(non inviato al Comune)" @@ -164,21 +162,21 @@ msgstr "(non inviato al Comune)" msgid "(optional)" msgstr "(opzionale)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(inviato ad entrambi)" -#: 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 "-- Scegli una categoria --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Scegli un tipo di proprietà --" -#: 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 "<strong>No</strong> Lasciami confermare il mio aggiornamento via email" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>No</strong> lasciami entrare con l'email" -#: 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 "<strong>Si</strong> Ho già la password" #: 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 "Aggiungi un corpo" msgid "Add new category" msgstr "Aggiungi una nuova categoria" -#: 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 "Aggiungi un'utente" -#: 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 "Aggiunti %s" -#: 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 "Un aggiornamento ha riportato questo problema come risolto." msgid "Anonymous" msgstr "Anonimo" -#: 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 "Anonimo:" @@ -399,7 +400,7 @@ msgstr "Assegna ad un corpo esterno:" msgid "Assign to subdivision:" msgstr "Assegna ad una subdivisione:" -#: 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 "Indietro" 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 "Vietare l'indirizzo email" #: 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 "Non puoi vedere la mappa? <em>Salta questo passaggio</em>" -#: 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 "Contatta il team" 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 "Non posso trovare l'utente" @@ -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 "Non lo so" -#: 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 "Duplica" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Duplica" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Duplica" + #: 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 "Modifica" msgid "Edit body details" msgstr "Modifica dettagli corpo" -#: 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 "Editor" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "Email aggiunta alla lista abusi" @@ -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 "Email già presente nella lista abusi" -#: 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 "Inserisci i dettagli del problema" #: 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 "Esempio codice postale %s" msgid "Examples:" msgstr "Esempi:" -#: 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 "Dati extra:" -#: 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 "Risolto" #: 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 "Risolto - Comune" #: 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 "Risolto - Utente" @@ -1178,7 +1198,7 @@ msgstr "Risolto:" 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 "Utente segnalato" @@ -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 "Segnalato:" @@ -1237,7 +1257,7 @@ msgid "Frequently Asked Questions" msgstr "Domande Frequenti" #: 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 "Ottieni aggiornamenti " @@ -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 "Vai" @@ -1272,7 +1292,7 @@ msgstr "Vai" 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 "Ciao %s" #: 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 "Mi spiace non possiamo localizzare il tuo problema nel database.\n" @@ -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 "Ultimo aggiornamento:" msgid "Last update:" msgstr "Ultimo aggiornamento:" -#: 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 "MAPPA" 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 "Mappa" @@ -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 "Messaggio" @@ -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 "Mese" -#: 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 "Nome" -#: 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 "Nome:" msgid "Name: %s" msgstr "Nome: %s" -#: 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 "Nuovo stato" 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 "Prossimo" #: 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 "Nessun corpo" msgid "No council" msgstr "Nessuno comune" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Nessun comune selezionato" @@ -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 "Più vecchi <br> risolti" msgid "Older <br>problems" msgstr "Vecchi <br>problemi" -#: 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 "O puoi iscriverti agli avvisi basati sul tuo quartiere o comune di appartenenza:" -#: 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 "Parente" #: 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 "Parziale" @@ -2104,7 +2136,7 @@ msgid "Phone number (optional)" msgstr "Numero di telefono (opzionale)" #: 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 "Inserisci il cursore sulla mappa" #: 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 "Per favore controlla che il tuo indirizzo email è corretto" #: 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 "Per favore scegli una categoria" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Per favore scegli un tipo di proprietà" @@ -2212,13 +2244,13 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Per favore non abusarne — abusandone il comune svaluterà il servizio per tutti gli utenti." #: 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 "Per favore inserisci un messaggio" #: 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 "Per favore inserisci la password" #: 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 "Per favore inserisci il soggetto" #: 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 "Per favore inserire un email valida" msgid "Please enter a valid email address" msgstr "Per favore inserire un indirizzo email valido" -#: 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 "Per favore inserire qualche dettaglio " @@ -2285,8 +2317,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Per favore inserisci il tuo nome completo, i comuni hanno bisogno di questa informazione - Se non vuoi che il tuo nome venga mostrato sul sito, deseleziona il box qui sotto" #: 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 "SI prega di inserire i dettagli del problema" 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 "Si prega di compilare il modulo sottostante con i dettagli del problema, e descrivere la posizione nel modo più preciso possibile, nella casella dettagli." -#: 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 "Per favore indicare se si vuole ricevere un altro questionario" @@ -2349,20 +2381,20 @@ msgstr "" msgid "Please note:" msgstr "Attenzione:" -#: 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 "Per favore provvedi ad alcune spiegazioni perché stai riaprendo questa segnalazione" -#: 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 "Per favore provvedi a del testo come ad una foto" -#: 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 "Per favore dicci se hai mai precedentemente riportato un problema al tuo comune " @@ -2378,7 +2410,7 @@ msgstr "Si prega di selezionare il feed che si vuole" msgid "Please select the type of alert you want" msgstr "Per favore seleziona il tipo di avvertimento che desideri" -#: 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 "Si prega di indicare se il problema è stato risolto" @@ -2397,22 +2429,22 @@ msgstr "Per favore scrivi un messaggio" msgid "Please write your update here" msgstr "Per favore scrivi il tuo aggiornamento qui" -#: 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 "Posta" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Postato anonimamente al %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Postato da %s (<strong>%s</strong>) al %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Postato da %s al %s" @@ -2428,7 +2460,8 @@ msgstr "Precedente" 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 "Privato" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Privato" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Problema" @@ -2483,11 +2521,11 @@ msgstr "Il cambio di stato del problema è basato sui risultati del sondaggio" msgid "Problems" msgstr "Problemi" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Problemi vicino" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Problemi sulla mappa" @@ -2499,7 +2537,7 @@ msgstr "Problemi recentemente segnalati e risolti su FIxMyStreet" 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 "Problemi dentro i confini di:" msgid "Property address:" msgstr "L'indirizzo della proprietà:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Fornisci un'aggiornamento" @@ -2540,12 +2579,17 @@ 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 "Scegliere una password è opzionale, ma farlo ti acconsentirà di riportare più facilmente le future segnalazioni, di aggiungere degli aggiornamenti e gestire le tue segnalazioni." +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "Risposte pubbliche:" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Risposte pubbliche:" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "" @@ -2569,7 +2613,7 @@ msgstr "Questionario %d e risposte per il problema %d, %s o %s" msgid "Questionnaire %d sent for problem %d" msgstr "Questionario %d inviato per il problema %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "" @@ -2577,7 +2621,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 "RSS feed" @@ -2605,7 +2649,7 @@ msgstr "RSS feed di %s, dentro al quartiere %s " msgid "RSS feed of nearby problems" msgstr "RSS feed dei problemi vicino" -#: 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 +2665,12 @@ msgid "RSS feed of recent local problems" msgstr "RSS feed dei recenti problemi locali" #: 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 "RSS feed degli aggiornamenti su questa segnalazione" #: 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 "Ricevi un'email quando gli aggiornamenti sono aggiunti su questa segnalazione." @@ -2648,7 +2692,7 @@ msgstr "Recentemente <br>risolti" msgid "Recently reported problems" msgstr "Problemi segnalati di recente" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2656,13 +2700,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 "Ricorda che FIxMyStreet serve per segnalare problemi materiali che possono essere risolti. Se il tuo non è un problema appropriato, da segnalare attraverso questo sito, ti ricordiamo che puoi sempre contattare tu direttamente il comune attraverso il suo sito internet." -#: 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 +2716,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 +2730,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 +2741,7 @@ msgstr "" msgid "Report a problem" msgstr "Segnala un problema" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Segnala un abuso" @@ -2717,8 +2765,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Segnala, conosci e discuti sui problemi della tua città " -#: 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 "Riportati anonimamente al %s" @@ -2727,8 +2775,8 @@ msgstr "Riportati anonimamente al %s" msgid "Reported before" msgstr "Segnalati prima" -#: 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 "Segnalato da %s al %s" @@ -2741,27 +2789,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Riportato nella categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Riportato nella categoria %s anonimamente alle %s" -#: 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 "Riportato nella categoria %s da %s alle %s" -#: 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 +2919,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 +2939,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 "Salva modifiche" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -2942,6 +2994,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 +3041,27 @@ msgstr "Inviato:" 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 "Condividi" -#: 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 +3133,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 +3181,14 @@ msgstr "Data di inizio:" #: 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 "Stato" -#: 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 +3228,7 @@ msgstr "Sottocategoria: %s" msgid "Subdivision/Body" msgstr "Sottodivisione/Corpo" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Soggetto" @@ -3187,7 +3245,7 @@ msgstr "Soggetto:" msgid "Submit" msgstr "Invia" -#: 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 +3271,7 @@ msgid "Submitted" msgstr "Inviato" #: 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 "Sottoscrivi" @@ -3484,7 +3542,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "E' accaduto un problema visualizzando questa pagine. Per favore riprova ancora più tardi" -#: 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 +3624,9 @@ msgstr "Questa email è stata inviata ad entrambi i comuni che coprono la zona d 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 "Questa informazione è richiesta" @@ -3593,6 +3651,10 @@ msgstr "Questo problema è stato risolto" msgid "This problem has not been fixed" msgstr "Questo problema non è stato risolto" +#: 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 +3729,8 @@ msgstr "" msgid "Total" msgstr "Totale" -#: 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 +3738,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 +3755,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 +3782,8 @@ msgstr "Sconosciuto" 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 "Errore sconosciuto" @@ -3731,6 +3794,10 @@ msgstr "Errore sconosciuto" 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 +3851,7 @@ msgid "Updated" msgstr "Aggiornato" #: 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 +3866,7 @@ msgstr "Aggiornato!" msgid "Updates" msgstr "Aggiornamenti" -#: 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 +3897,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 +3910,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 +4000,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 +4052,7 @@ msgstr "Anno" #: 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 +4067,11 @@ msgstr "Si" msgid "Yes I have a password" msgstr "Si ho già la password" -#: 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 +4088,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 +4179,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 +4201,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 +4280,53 @@ msgstr "Modifica utente" msgid "from %s different users" msgstr "da %s utenti differenti" -#: 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 "ultimo aggiornamento %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "meno di un minuto" -#: 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 +4372,8 @@ msgstr "" msgid "other areas:" msgstr "altre aree:" -#: 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 "riaperto" @@ -4348,55 +4419,48 @@ 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" -msgstr[0] "<big>%s</big> segnalazione recente" -msgstr[1] "<big>%s</big> segnalazioni recenti" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d giorno" +msgstr[1] "%d giorni" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d ora" msgstr[1] "%d ore" -#: 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] "%d minuto" msgstr[1] "%d minuti" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> aggiornamento sulle segnalazioni" -msgstr[1] "<big>%s</big> aggiornamenti sulle segnalazioni" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Non abbiamo ancora i dettagli sul comune che copre questa zona." -msgstr[1] "Non abbiamo ancora i dettagli sui comuni che coprono questa zona." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "" +msgstr[1] "" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d settimana" msgstr[1] "%d settimane" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> risolti nel mese passato" +msgstr[1] "<big>%s</big> risolti nel mese passato" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4404,19 +4468,19 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> Segnalazione nell'ultima settimana" msgstr[1] "<big>%s</big> Segnalazioni nelle ultime settimane" -#: 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" -msgstr[0] "<big>%s</big> risolti nel mese passato" -msgstr[1] "<big>%s</big> risolti nel mese passato" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> segnalazione recente" +msgstr[1] "<big>%s</big> segnalazioni recenti" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d giorno" -msgstr[1] "%d giorni" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> aggiornamento sulle segnalazioni" +msgstr[1] "<big>%s</big> aggiornamenti sulle segnalazioni" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4424,3 +4488,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] "<strong>Non</strong>abbiamo ancora dettagli per un'altro comune che copre questa zona." msgstr[1] "<strong>Non</strong>abbiamo ancora dettagli sugli altri comuni che coprono questa zona." + +#: 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] "Non abbiamo ancora i dettagli sul comune che copre questa zona." +msgstr[1] "Non abbiamo ancora i dettagli sui comuni che coprono questa zona." diff --git a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po index 737e89639..872be63b9 100644 --- a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/lt_LT.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: Paulius Zaleckas <paulius.zaleckas@gmail.com>, 2017\n" "Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/mysociety/teams/12067/lt_LT/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:639 +#: perllib/FixMyStreet/DB/Result/Problem.pm:648 #: perllib/FixMyStreet/Script/Reports.pm:199 msgid " and " msgstr "ir" @@ -110,7 +110,7 @@ msgstr "%s rajonas, %s" msgid "%s, within %s ward" msgstr "%s, viduje %s rajonas" -#: 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 "(Elektroninis paštas piktnaudžiavo lentelėje)" @@ -142,12 +142,10 @@ msgstr "(numatytasis atstumas, kuris apima maždaug 200.000 žmonių)" 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 "(uždaryta)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(atlikta)" @@ -156,7 +154,7 @@ msgstr "(atlikta)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(pavyzdžiui, grafitis, šiukšlės, duobė kelyje ar gatvės apšvietimas)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(neišsiųsta savivaldybei)" @@ -164,21 +162,21 @@ msgstr "(neišsiųsta savivaldybei)" msgid "(optional)" msgstr "(pasirinktinai)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(išsiųsta į abu)" -#: 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 "-- Išsirinktite kategorija --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Pasirinkite nuosavybės tipą --" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "--Išsirinkinte šabloną--" @@ -197,8 +195,8 @@ msgstr "" "Turbūt dėl to \"padengta sritis\" yra tuščia (žemiau).<br>\n" "Galbūt pridėkite <code>MAPIT_TYPES</code> į savo config failą?" -#. ('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 "" @@ -221,11 +219,11 @@ msgstr "<strong>Ne</strong> Leisti patvirtinti mano atnaujinimą el. paštu" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Ne</strong> leisti man prisijungti el. paštu" -#: 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 "<strong>Pastaba:</strong> Šis pranešimas jau išsiūstas vykdymui. Bet kokie pakeitimai nebus perduoti." -#: 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 "<strong>Pastaba:</strong> Šis pranešimas dar neišsiūstas vykdymui. Bet kokie pakeitimai nebūtinai bus perduoti." @@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Taip</strong> Aš turiu slaptažodį" #: 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" @@ -268,26 +266,29 @@ msgstr "pridėti instituciją" msgid "Add new category" msgstr "Pridėti naują kategoriją" -#: 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 "Įdėti į trumpajį sąrašą" #: 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 "Pridėti vartotoją" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Add/edit problem categories" msgstr "Pridėti/redaguoti problemų kategorijas" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Add/edit response priorities" msgstr "Pridėti/redaguoti atsakymų prioritetus" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Add/edit response templates" msgstr "Pridėti/redaguoti atsakymo šablonus" @@ -295,7 +296,7 @@ msgstr "Pridėti/redaguoti atsakymo šablonus" msgid "Added %s" msgstr "Pridėta %s" -#: 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 "" @@ -350,7 +351,7 @@ msgstr "Atnaujinimas - Problema sutvarkyta" msgid "Anonymous" msgstr "Anoniminis" -#: 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 "Anoniminis:" @@ -405,7 +406,7 @@ msgstr "Priskirti išoriniai institucijai:" msgid "Assign to subdivision:" msgstr "Priskirti padaliniui:" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Assign users to areas" msgstr "" @@ -430,8 +431,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 "" @@ -439,7 +440,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 "Laukiama " @@ -452,12 +453,12 @@ msgstr "Atgal" 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 "Drausti el. paštą" #: 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 @@ -488,10 +489,6 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Nematote žemėlapio? <em>Praleiskite šitą žingsnį</em>" -#: 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" @@ -504,7 +501,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 @@ -524,7 +522,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "Problemų kategorijoje tvarkymo sparta > 4 savaitės senumo" -#: 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 @@ -600,6 +598,10 @@ msgstr "" "Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" "to the body too. These will appear in the drop-down menu on the report-a-problem page." +#: 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" @@ -628,10 +630,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 @@ -733,8 +736,8 @@ msgstr "Susisiekite su komanda" 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 "Vartotojas nerastas" @@ -788,7 +791,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 "Sukurti šabloną" @@ -829,7 +832,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Padalinys atliko per 5 darbo dienas" #: 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 "Pašalinti šabloną" @@ -895,21 +898,35 @@ msgstr "" msgid "Don’t know" msgstr "Don’t nežinau" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "Nepatinka anketos?" +#: 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 "Kopija" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Kopija" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Kopija" + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -921,7 +938,8 @@ msgstr "" "Different categories <strong>can have the same contact</strong> (email address).\n" "This means you can add many categories even if you only have one contact for the body." -#: 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 "" @@ -940,11 +958,11 @@ msgstr "Redaguoti" msgid "Edit body details" msgstr "Redaguoti institucijos informaciją" -#: 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 "" @@ -995,7 +1013,7 @@ msgstr "Redaktorius" msgid "Email" msgstr "El. paštas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "El. paštas pridėtas prie piktnaudžiavimo sąrašo" @@ -1013,11 +1031,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 "El. paštas jau yra piktnaudžiavimo sąraše" -#: 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 @@ -1091,7 +1109,7 @@ msgid "Enter details of the problem" msgstr "įveskite problemos detales" #: 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 @@ -1113,8 +1131,8 @@ msgstr "Pašto kodo pavyzdys %s" msgid "Examples:" msgstr "Pavyzdžiai:" -#: 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 "" @@ -1150,7 +1168,8 @@ msgstr "" msgid "Extra data:" msgstr "Papildoma informacija:" -#: 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 "" @@ -1172,11 +1191,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "Suvarkyti tai pasirenkant <strong>pažymėta vietovę</strong> <em>Redaguoti informaciją</em>formą." #: 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 @@ -1184,12 +1204,12 @@ msgid "Fixed" msgstr "Sutvarkyta" #: 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 "Sutvarkyta - Savivaldybe" #: 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 "Sutvarkyta - Vartotojas" @@ -1207,7 +1227,7 @@ msgstr "Sutvarkyta:" msgid "Flag as deleted" msgstr "Pažymeti kaip ištrinta" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Flag user" msgstr "Pažymėti vartotoją" @@ -1228,7 +1248,7 @@ msgstr "Flagged users are listed on the <a href='%s'>flagged</a> page." msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." -#: 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 "Pažymėta:" @@ -1266,7 +1286,7 @@ msgid "Frequently Asked Questions" msgstr "Dažniausiai Užduodami Klausimai" #: 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 "Gauti atnaujinimus" @@ -1292,7 +1312,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 "Pirmyn" @@ -1301,7 +1321,7 @@ msgstr "Pirmyn" msgid "Going to send questionnaire?" msgstr "Ar ruošiates išsiųsti klausimyną?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "" @@ -1343,8 +1363,8 @@ msgstr "Labas %s" #: 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 @@ -1387,7 +1407,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 "Apgailestaujame, bet jūsų problema nebuvo rasta duomenų bazėje.\n" @@ -1437,6 +1457,10 @@ msgstr "Jei norite, kad šis šablonas būtų naudojamas tik tam tikroms kategor 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" @@ -1504,7 +1528,7 @@ msgstr "In addition, the following attributes that are not part of the Open311 v #: 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 @@ -1540,7 +1564,7 @@ msgid "Internal notes" msgstr "Internal notes" #: 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 "Internal referral" @@ -1548,7 +1572,7 @@ msgstr "Internal referral" msgid "Invalid agency_responsible value %s" msgstr "Invalid agency_responsible value %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Klaidina pabaigos data" @@ -1556,16 +1580,16 @@ msgstr "Klaidina pabaigos data" msgid "Invalid format %s specified." msgstr "Pasirinktas klaidingas formatas %s." -#: 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 "Klaidinga pradžios data" #: 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 @@ -1611,7 +1635,11 @@ msgstr "Paskutinis atnaujinimas:" msgid "Last update:" msgstr "Last update:" -#: 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 "" @@ -1656,6 +1684,10 @@ msgstr "MAP" 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 "Žemėlapis" @@ -1680,7 +1712,7 @@ msgstr "" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Žinutė" @@ -1700,7 +1732,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Missing jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1708,7 +1740,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 "" @@ -1720,7 +1752,7 @@ msgstr "Moderated by division within one working day" msgid "Month" msgstr "Mėnuo" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "" @@ -1744,7 +1776,7 @@ msgstr "" msgid "Name" msgstr "Vardas" -#: 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 @@ -1756,7 +1788,7 @@ msgstr "Vardas:" msgid "Name: %s" msgstr "Vardas: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1858,7 +1890,7 @@ msgstr "New state" msgid "New template" msgstr "Naujas šablonas" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "" @@ -1873,7 +1905,7 @@ msgstr "Kitas" #: 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 @@ -1894,7 +1926,7 @@ msgstr "Nėra institucijos" msgid "No council" msgstr "Nėra savivaldybės" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Nepasirinkta savivaldybė" @@ -1960,7 +1992,7 @@ msgstr "" " activity across their body), the ability to hide reports or set special report statuses." #: 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" @@ -2038,15 +2070,15 @@ msgstr "Senesnis <br>sutvarkyta" msgid "Older <br>problems" msgstr "Senesnės <br>problemos" -#: 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 @@ -2092,13 +2124,13 @@ msgstr "Arba problemos praneštos:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Arba jūs galite prenumeruoti įspėjimą atsižvelgiant į jūsų rajoną arba savivaldybę:" -#: 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" @@ -2119,7 +2151,7 @@ msgid "Parent" msgstr "Parent" #: 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 "Dalinis" @@ -2153,7 +2185,7 @@ msgid "Phone number (optional)" msgstr "Telefono numeris (nebūtina)" #: 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:" @@ -2205,7 +2237,7 @@ msgstr "Padėkite smeigtuką ant žemėlapio" #: 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 @@ -2233,14 +2265,14 @@ msgid "Please check your email address is correct" msgstr "Prašome patikrinti ar jūsų el. pašto adresas teisingas " #: 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 "Prašome pasirinkti kategoriją" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Prašome pasirinkti nuosavybės tipą" @@ -2261,13 +2293,13 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Prašome neįžeidinėti — įžeidinėjimai nuvertina paslaugą visiems vartotojams." #: 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 "Prašome įvesti žinutę" #: 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 "" @@ -2282,13 +2314,13 @@ msgid "Please enter a password" msgstr "Prašome įvesti slaptažodį" #: 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 "Prašome įvesti temą" #: 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 @@ -2301,7 +2333,7 @@ msgstr "Prašome įvesti galiojantį el. paštą" msgid "Please enter a valid email address" msgstr "Prašome įvesti galiojantį el. pašto adresą" -#: 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 "Prašome įvesti daugiau informacijos" @@ -2334,8 +2366,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Prašome įvesti savo vardą ir pavardę, savivalldybei reikalinga jūsų informacija - jeigu pageidaujate, kad jūsų vardas nebūtu pateiktas puslapyje nužymėkite langelį apačioje" #: 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" @@ -2372,7 +2404,7 @@ msgstr "Prašome užpildyti problemos detales." 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 "Prašome pateikti problemos detales žemiau esančioje anketoje ir kuo tiksliau apibūdinkite vietą." -#: 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 "Prašome nurodyti, ar norite gauti kitą klausimyną." @@ -2398,20 +2430,20 @@ msgstr "" msgid "Please note:" msgstr "Atkreipkite dėmėsį:" -#: 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 "Prašome pateikti priežastis, kodėl jūs naujinate šį pranešimą" -#: 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 "Prašome pateikti šiek tiek teksto, taip pat nuotrauką" -#: 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 "Prašome pasakyti ar esate pranešęs apie problemą savo savivaldybei anksčiau" @@ -2427,7 +2459,7 @@ msgstr "Prašome pasirinkti jūsų pageidaujama srautą" msgid "Please select the type of alert you want" msgstr "Prašome pasirinkti pageidaujama įspėjimo tipą" -#: 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 "Prašome nurodyti, ar problema buvo sutvarkyta" @@ -2446,22 +2478,22 @@ msgstr "Prašome įvesti žinutę" msgid "Please write your update here" msgstr "Prašome raštyti savo naujinimą čia" -#: 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 "Įkelti" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Pateikta anonimiškai %s" -#: 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 "" @@ -2477,7 +2509,8 @@ msgstr "Ankstesnis" 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 "" @@ -2493,10 +2526,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 "Privatus" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Privatus" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Problema" @@ -2532,11 +2570,11 @@ msgstr "Problemos būklės pakeitimas remiantis tyrimo rezultatais" msgid "Problems" msgstr "Problemos" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Šalia esančios problemos" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Problemos žemėlapyje" @@ -2548,7 +2586,7 @@ msgstr "Neseniai praneštos problemos FixMyStreet" msgid "Problems within %.1fkm of this location" msgstr "Problemos %.1fkm atstumu aplink šią vietovę" -#: 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" @@ -2572,6 +2610,7 @@ msgstr "Problemos apibrėžtose ribose:" msgid "Property address:" msgstr "Nuosavybės adresas:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Pateikti naujinimą" @@ -2589,12 +2628,17 @@ msgstr "Pateikti vardą ir slaptažodį yra nebūtina, tačiau pateiktus bus jum msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Pateikti slaptažodį yra nebūtina, tačiau pateiktus bus jums papraščiau pranešti problemas, pateikti naujinimus ir tvarkyti savo pranešimus." +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "Viešas atsakymas:" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Viešas atsakymas:" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "" @@ -2618,7 +2662,7 @@ msgstr "Atsakyta anketa %d skirta problemoms %d, %s to %s" msgid "Questionnaire %d sent for problem %d" msgstr "Anketa %d išsiųsta dėl problemos %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Questionnaire filled in by problem reporter" @@ -2626,7 +2670,7 @@ msgstr "Questionnaire filled in by problem reporter" #: 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 "RSS srautas" @@ -2654,7 +2698,7 @@ msgstr "RSS srautas %s, viduje %s rajono" msgid "RSS feed of nearby problems" msgstr "Šalia esančių problemų RSS srautas" -#: 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" @@ -2670,12 +2714,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 "" @@ -2697,7 +2741,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 "" @@ -2705,13 +2749,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 "" @@ -2719,7 +2765,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!)" @@ -2733,7 +2779,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 "" @@ -2743,6 +2790,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 "" @@ -2766,8 +2814,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 "" @@ -2776,8 +2824,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 "" @@ -2790,27 +2838,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 "" @@ -2920,16 +2968,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" @@ -2940,21 +2988,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 "" @@ -2991,6 +3043,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" @@ -3034,27 +3090,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 "" @@ -3126,7 +3182,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 @@ -3174,12 +3230,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 @@ -3219,7 +3277,7 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "" @@ -3236,7 +3294,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 @@ -3262,7 +3320,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 "" @@ -3533,7 +3591,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 @@ -3615,9 +3673,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 "" @@ -3642,6 +3700,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 @@ -3716,7 +3778,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 "" @@ -3724,7 +3787,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 "" @@ -3741,14 +3804,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 @@ -3768,8 +3831,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 "" @@ -3780,6 +3843,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 "" @@ -3833,7 +3900,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 @@ -3848,7 +3915,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 "" @@ -3879,11 +3946,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 "" @@ -3892,7 +3959,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" @@ -3982,6 +4049,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 "" @@ -4030,7 +4101,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 @@ -4045,11 +4116,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 "" @@ -4066,7 +4137,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 "" @@ -4157,9 +4228,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 @@ -4179,7 +4250,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 @@ -4258,53 +4329,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 "" @@ -4350,8 +4421,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 "" @@ -4397,15 +4468,15 @@ 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] "" msgstr[2] "" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4413,15 +4484,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4429,26 +4492,26 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: 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] "" msgstr[2] "" -#: 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] "" msgstr[2] "" -#: 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] "" msgstr[2] "" @@ -4461,18 +4524,18 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: 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] "" msgstr[2] "" -#: 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] "" msgstr[2] "" @@ -4484,3 +4547,11 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" msgstr[2] "" + +#: 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] "" +msgstr[2] "" diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po index 0789a37a5..00d05d918 100644 --- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ms.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: Malay (https://www.transifex.com/mysociety/teams/12067/ms/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:639 +#: perllib/FixMyStreet/DB/Result/Problem.pm:648 #: perllib/FixMyStreet/Script/Reports.pm:199 msgid " and " msgstr " dan " @@ -110,7 +110,7 @@ msgstr "%s kawasan pentadbiran, %s" msgid "%s, within %s ward" msgstr "%s, dalam kawasan pentadbiran %s" -#: 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 "(Emel dalam jadual penyalahguna)" @@ -142,12 +142,10 @@ msgstr "(jarak lalai mengandunging 200,000 orang secara kasar)" 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 "(ditutup)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(tetap)" @@ -156,7 +154,7 @@ msgstr "(tetap)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(seperti graffiti, fly tipping, paving slabs rosak, atau lampu jalan)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(tidak dihantar kepada majlis)" @@ -164,21 +162,21 @@ msgstr "(tidak dihantar kepada majlis)" msgid "(optional)" msgstr "(tidak diwajibkan)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(hantar kepada kedua-dua)" -#: 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 "-- Pilih kategori --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Pilih jenis harta --" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "" @@ -197,8 +195,8 @@ msgstr "" "Mungkin ini kenapa \"kawasan ditutupi\" adalah kosong (bawah).<br>\n" "Tambahkan <code>MAPIT_TYPES</code> ke dalam fail konfigurasi anda?" -#. ('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 "" @@ -221,11 +219,11 @@ msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Tidak</strong> benarkan aku log masuk dengan emel" -#: 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 "" @@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ya</strong> Aku ada kata laluan" #: 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" @@ -265,26 +263,29 @@ msgstr "Tambah badan" msgid "Add new category" msgstr "Tambah kategori baru" -#: 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 "Tambah pengguna" -#: 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 "" @@ -292,7 +293,7 @@ msgstr "" msgid "Added %s" msgstr "%s telah ditambahi" -#: 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 "" @@ -347,7 +348,7 @@ msgstr "Ada kemas kini menanda masalah ini sebagai diselesai." msgid "Anonymous" msgstr "Tanpa nama" -#: 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 "Tanpa Nama:" @@ -402,7 +403,7 @@ msgstr "Ditugaskan kepada badan luaran:" msgid "Assign to subdivision:" msgstr "Ditugaskan kepada bahagian bawah:" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Assign users to areas" msgstr "" @@ -427,8 +428,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 "" @@ -436,7 +437,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 "Mengunggu penyederhanaan" @@ -449,12 +450,12 @@ msgstr "Balik" 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 "Melarang alamat emel" #: 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 @@ -485,10 +486,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" @@ -501,7 +498,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 @@ -521,7 +519,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategori rata masalah diselesai > 4 minggu" -#: 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 @@ -584,6 +582,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" @@ -612,10 +614,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 @@ -717,8 +720,8 @@ msgstr "Menghubungi pasukan" 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 "Tidak dapat mencari pengguna" @@ -772,7 +775,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 "" @@ -813,7 +816,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Diuruskan oleh bahagian bawah dalam 5 hari bekerja" #: 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 "" @@ -879,21 +882,35 @@ msgstr "" msgid "Don’t know" msgstr "Tidak tahu" -#: 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 "Salinan" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Salinan" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Salinan" + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -902,7 +919,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 "" @@ -921,11 +939,11 @@ msgstr "Menyunting" msgid "Edit body details" msgstr "Edit perincian badah" -#: 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 "" @@ -976,7 +994,7 @@ msgstr "Editor" msgid "Email" msgstr "Emel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "Emel ditambahkan kepada senarai penyalahguna" @@ -994,11 +1012,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 "Emel telah dalam senarai penyalahguna" -#: 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 @@ -1065,7 +1083,7 @@ msgid "Enter details of the problem" msgstr "Masukkan perincian masalah tersebut" #: 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 @@ -1087,8 +1105,8 @@ msgstr "Contoh poskod %s" msgid "Examples:" msgstr "Contoh:" -#: 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 "" @@ -1124,7 +1142,8 @@ msgstr "" msgid "Extra data:" msgstr "Data tambahan:" -#: 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 "" @@ -1146,11 +1165,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 @@ -1158,12 +1178,12 @@ msgid "Fixed" msgstr "Diselesai" #: 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 "Diselesai - Majlis" #: 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 "Diselesai - Pengguna" @@ -1181,7 +1201,7 @@ msgstr "Selesai:" msgid "Flag as deleted" msgstr "Tanda sebagai dipadam" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Flag user" msgstr "Tanda pengguna" @@ -1202,7 +1222,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 "Ditanda:" @@ -1240,7 +1260,7 @@ msgid "Frequently Asked Questions" msgstr "Soalan lazim" #: 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 "Dapatkan kemas kini" @@ -1266,7 +1286,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 "Pergi" @@ -1275,7 +1295,7 @@ msgstr "Pergi" msgid "Going to send questionnaire?" msgstr "Teruskan dengan menghantar soalan selidik?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "" @@ -1317,8 +1337,8 @@ msgstr "Hi %s" #: 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 @@ -1361,7 +1381,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 "Masalah anda tidak dapat dijumpai dalam database.\n" @@ -1407,6 +1427,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" @@ -1466,7 +1490,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 @@ -1502,7 +1526,7 @@ msgid "Internal notes" msgstr "Nota dalaman" #: 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 "Rujukan dalaman" @@ -1510,7 +1534,7 @@ msgstr "Rujukan dalaman" msgid "Invalid agency_responsible value %s" msgstr "Nilai agency_responsible %s salah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Tarikh berakhir yang tak sah" @@ -1518,16 +1542,16 @@ msgstr "Tarikh berakhir yang tak sah" msgid "Invalid format %s specified." msgstr "Format dinyatakan %s salah" -#: 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 "Tarikh mula yang tak sah" #: 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 @@ -1573,7 +1597,11 @@ msgstr "Kemas kini terakhir:" msgid "Last update:" msgstr "Kemas kini terakhir:" -#: 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 "" @@ -1618,6 +1646,10 @@ msgstr "PETA" 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 "" @@ -1642,7 +1674,7 @@ msgstr "" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Pesanan" @@ -1662,7 +1694,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Kehilangan jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1670,7 +1702,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 "" @@ -1682,7 +1714,7 @@ msgstr "" msgid "Month" msgstr "Bulan" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "" @@ -1706,7 +1738,7 @@ msgstr "" msgid "Name" msgstr "Nama" -#: 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 @@ -1718,7 +1750,7 @@ msgstr "Nama:" msgid "Name: %s" msgstr "Nama: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1818,7 +1850,7 @@ msgstr "Negeri baru" msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "" @@ -1833,7 +1865,7 @@ msgstr "Seterusnya" #: 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 @@ -1854,7 +1886,7 @@ msgstr "Tiada badan" msgid "No council" msgstr "Tiada majlis" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Tiada majlis dipilihi" @@ -1914,7 +1946,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" @@ -1994,15 +2026,15 @@ msgstr "Lebih tua<br>diselesai" msgid "Older <br>problems" msgstr "Lebih tua <br>masalah" -#: 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 @@ -2048,13 +2080,13 @@ msgstr "Atau masalah dilaporkan kepada:" 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" @@ -2075,7 +2107,7 @@ msgid "Parent" msgstr "Induk" #: 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 "Separa" @@ -2109,7 +2141,7 @@ msgid "Phone number (optional)" msgstr "Nombor telefon (tidak diwajibkan)" #: 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:" @@ -2161,7 +2193,7 @@ msgstr "Letakkan pin atas peta" #: 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 @@ -2189,14 +2221,14 @@ msgid "Please check your email address is correct" msgstr "Sila periksa sama ada alamat emel anda adalah betul" #: 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 "Sila pilihkan kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Sila pilihkan jenis bangunan" @@ -2217,13 +2249,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 "Sila masukkan pesanan" #: 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 "" @@ -2238,13 +2270,13 @@ msgid "Please enter a password" msgstr "Sila masukkan kata laluan" #: 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 "Sila masukkan tajuk" #: 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 @@ -2257,7 +2289,7 @@ msgstr "Silah masukkan emel yang benar" msgid "Please enter a valid email address" msgstr "Sila masukkan alamat emel yang benah" -#: 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 "Sila masukkan perincian" @@ -2290,8 +2322,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Sila masukkan nama penuh anda, majlis memerlukan maklumat ini - Jika anda tidak ingin nama anda dikemukakan dalam laman, untik kota dibawah" #: 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" @@ -2328,7 +2360,7 @@ msgstr "Sila isikan perincian untuk masalah tersebut" 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 "" @@ -2354,20 +2386,20 @@ msgstr "" msgid "Please note:" msgstr "Sila nota:" -#: 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 "" @@ -2383,7 +2415,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 "" @@ -2402,22 +2434,22 @@ msgstr "Sila tuliskan pesanan" msgid "Please write your update here" msgstr "Sila tuliskan kemas kini anda di sini" -#: 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 "Post" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Post tanpa nama pada %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Dipostkan oleh %s (<strong>%s</strong>) pada %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Dipostkan oleh %s pada %s" @@ -2433,7 +2465,8 @@ msgstr "Sebelumnya" 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 "" @@ -2449,10 +2482,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 "Peribadi" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Peribadi" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Masalah" @@ -2488,11 +2526,11 @@ msgstr "" msgid "Problems" msgstr "Masalah-masalah" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Masalah terdekat" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Masalah atas peta" @@ -2504,7 +2542,7 @@ msgstr "Masalah yang dilaporkan diselesai pada FixMyStreet baru-baru ini" msgid "Problems within %.1fkm of this location" msgstr "Masalah dalam %.1fkm dalam lokasi ini" -#: 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" @@ -2528,6 +2566,7 @@ msgstr "Masalah dalam sempadan" msgid "Property address:" msgstr "Alamat bangunan" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Sediakan kemas kini" @@ -2545,12 +2584,17 @@ 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 +#, fuzzy +msgid "Public details" +msgstr "Tindak balas awam:" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Tindak balas awam:" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "" @@ -2574,7 +2618,7 @@ msgstr "Soalan selidik %d dijawab untuk masalah %s, %s kepada %s" msgid "Questionnaire %d sent for problem %d" msgstr "Soalan selidik %d dihantar untuk masalah %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Soalan selidik diisikan oleh pelapor masalah" @@ -2582,7 +2626,7 @@ msgstr "Soalan selidik diisikan oleh pelapor masalah" #: 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 "Feed RSS" @@ -2610,7 +2654,7 @@ msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s" msgid "RSS feed of nearby problems" msgstr "Feed RSS untuk masalah berdekatan" -#: 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" @@ -2626,12 +2670,12 @@ msgid "RSS feed of recent local problems" msgstr "Feed RSS untuk masalah tempatan baru-baru ini" #: 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 "Feed RSS untuk kemas kini bagi masalah ini" #: 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 "Terima emel semasa kemas kini ditinggalkan bagi masalah ini" @@ -2653,7 +2697,7 @@ msgstr "Diselesai <br>baru-baru ini" msgid "Recently reported problems" msgstr "Masalah yang dilaporkan baru-baru ini" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2661,13 +2705,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 "" @@ -2675,7 +2721,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!)" @@ -2689,7 +2735,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 "" @@ -2699,6 +2746,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 "" @@ -2722,8 +2770,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 "" @@ -2732,8 +2780,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 "" @@ -2746,27 +2794,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 "" @@ -2876,16 +2924,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" @@ -2896,21 +2944,26 @@ 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 +#, fuzzy +msgid "Save + close as duplicate" +msgstr "ditanda sebagai laporan salinan" + #: 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 "" @@ -2947,6 +3000,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" @@ -2990,27 +3047,27 @@ msgstr "Dihantar:" msgid "Service:" msgstr "Servis:" -#: 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 "Kongsi" -#: 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 "" @@ -3082,7 +3139,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 @@ -3130,12 +3187,14 @@ msgstr "Tarikh bermula:" #: 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 "Negeri" -#: 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 @@ -3175,7 +3234,7 @@ msgstr "Subkategori: %s" msgid "Subdivision/Body" msgstr "Bahagian bawah/Badan" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Tajuk" @@ -3192,7 +3251,7 @@ msgstr "Tajuk:" msgid "Submit" msgstr "Hantar" -#: 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 @@ -3218,7 +3277,7 @@ msgid "Submitted" msgstr "Dihantarkan" #: 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 "Melanggan" @@ -3489,7 +3548,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 @@ -3571,9 +3630,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 "" @@ -3598,6 +3657,10 @@ msgstr "Masalah ini telah diselesai" msgid "This problem has not been fixed" msgstr "Masalah ini belum diselesai" +#: 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 @@ -3672,7 +3735,8 @@ msgstr "Melihat lokasi tepat atas peta bagi isu ini" msgid "Total" msgstr "Jumlah" -#: 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 "" @@ -3680,7 +3744,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 "" @@ -3697,14 +3761,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 "Tidak dapat diselesai" #: 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 @@ -3724,8 +3788,8 @@ msgstr "Tidak diketahui" msgid "Unknown alert type" msgstr "Jenis pemberitahuan tak diketahui" -#: 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 "Ralat tidak diketahui" @@ -3736,6 +3800,10 @@ msgstr "Ralat tidak diketahui" msgid "Unknown problem ID" msgstr "ID masalah tidak diketahui" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "Kemas kini" @@ -3789,7 +3857,7 @@ msgid "Updated" msgstr "Dikemas kinikan" #: 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 @@ -3804,7 +3872,7 @@ msgstr "Dikemas kinikan!" msgid "Updates" msgstr "Kemas kini" -#: 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 "" @@ -3835,11 +3903,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 "Tanda pengguna dipadam" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "Pengguna ditanda" @@ -3848,7 +3916,7 @@ msgid "User search finds matches in users' names and email addresses." msgstr "Carian pengguna mencari padanan dalam nama dan alamat emel pengguna." #: 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" @@ -3938,6 +4006,10 @@ msgstr "Bila diedit" msgid "When sent" msgstr "Bila dihantar" +#: 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 "" @@ -3986,7 +4058,7 @@ msgstr "Tahun" #: 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 @@ -4001,11 +4073,11 @@ msgstr "Ya" msgid "Yes I have a password" msgstr "Ya aku ada kata laluan" -#: 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 "" @@ -4022,7 +4094,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 "" @@ -4116,9 +4188,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 @@ -4138,7 +4210,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Maklumat anda akan digunakan mengikuti <a href=\"/privacy\">dasar privasi</a> kita" #: 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 @@ -4217,53 +4289,53 @@ msgstr "edit pengguna" msgid "from %s different users" msgstr "dari %s pengguna lain" -#: 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 "kemaskini yang lepas %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "kurang dari seminit" -#: templates/web/base/report/updates.html:57 +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 msgid "marked as a duplicate report" msgstr "ditanda sebagai laporan salinan" -#: templates/web/base/report/updates.html:47 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as action scheduled" msgstr "ditanda sebagai tindakan dijadualkan" -#: templates/web/base/report/updates.html:59 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "marked as an internal referral" msgstr "ditanda sebagai rujukan dalaman" -#: templates/web/base/report/updates.html:49 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as closed" msgstr "ditanda sebagai ditutupi" -#: 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 "ditanda sebagai diselesai" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "ditanda sebagai dijalani" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "ditanda sebagai disiasati" -#: templates/web/base/report/updates.html:55 +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 msgid "marked as not the council's responsibility" msgstr "ditanda sebagai bukan tanggungjawab majlis" -#: templates/web/base/report/updates.html:43 +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 msgid "marked as planned" msgstr "ditanda sebagai dijadual" -#: templates/web/base/report/updates.html:53 +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as unable to fix" msgstr "ditanda sebagai tak boleh dibaiki" @@ -4309,8 +4381,8 @@ msgstr "pemasukan asal: “%s”" msgid "other areas:" msgstr "kawasan lain:" -#: 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 "dibuka semula" @@ -4356,68 +4428,68 @@ msgstr "pengguna adalah pemilik masalah" msgid "ward" msgstr "kawasan pentadbiran" -#: 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" -msgstr[0] "<big>%s</big> laporan baru-baru ini" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d hari" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d jam" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d penyokong" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minit" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> laporan dikemaskini" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Kita belum ada maklumat tentang majlis yang menutupi lokasi ini" +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d penyokong" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d minggu" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> diselesai di bulan lepas" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> laporan di minggu lepas" -#: 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" -msgstr[0] "<big>%s</big> diselesai di bulan lepas" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> laporan baru-baru ini" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d hari" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> laporan dikemaskini" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format msgid "We do <strong>not</strong> yet have details for the other council that covers this location." msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "Kita <strong>belum</strong> ada maklumat tentang majlis lain yang menutupi lokasi ini." + +#: 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] "Kita belum ada maklumat tentang majlis yang menutupi lokasi ini" diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po index a0d1d90a2..428e50600 100644 --- a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/my_MM.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: Burmese (Myanmar) (https://www.transifex.com/mysociety/teams/12067/my_MM/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\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 "%sရပ္ကြက္၊ %s" msgid "%s, within %s ward" msgstr "%s၊ %s ရပ္ကြက္အတြင္း" -#: 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 "<strong>မဟုတ္ပါ</strong> ကၽြႏ္ုပ္၏အသ msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>မဟုတ္ပါ</strong> အီးေမးလ္ျဖင့္၀င္မည္" -#: 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 "<strong>ဟုတ္ကဲ့</strong> ကၽြႏ္ုပ္တြင္စကား၀ွက္တစ္ခုရွိသည္" #: 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 "%sကိုထည့္ျပီးျပီ" -#: 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 "ေျမပံုကိုမျမင္ဘူးလား။ <em>ဒီအဆင့္ကိုေက်ာ္မည္</em> " -#: 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 "နမူနာစာတိုက္ေသတၱာနံပါတ္ %s 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 "မဂၤလာပါ%s" #: 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 "ပံုစံ %s သည္မမွန္ကန္ပါ" -#: 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 "အမည္ - %s" -#: 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 "ပို၍ေဟာင္းေသာ <br> ျပင္ျပီးျ msgid "Older <br>problems" msgstr "ပို၍ေဟာင္းေသာ<br>ျပႆနာမ်ား" -#: 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 "သင္လိုခ်င္ေသာ feed ကိုေရြးပါ 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 "%sမွာ အမည္မသိကဲ့သို႔တင္မည္" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "%s မွာ %s(<strong>%s</strong>)မွတင္ခဲ့သည္" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "%s မွာ %s မွတင္ခဲ့သည္" @@ -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 "FixMyStreet ေပၚတြင္ လတ္တေလာ တင္ျပ 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 "စကားဝွက္ကို မထည့္သြင္းခ်င္လွ်င္ ရသည္။ စကားဝွက္ ထည့္သြင္းပါက ျပႆနာမ်ားကို တင္ျပျခင္း၊ update မ်ား ျပဳလုပ္ျခင္းႏွင့္ အစီရင္ခံစာမ်ား စီမံခန္႔ခြဲျခင္းတို႔ကို ပိုမိုလြယ္ကူစြာ ျပဳလုပ္ႏိုင္မည္။" +#: 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 "%d, %s ျပႆနာ အတြက္ %d မွ %s ထံ ေျဖၾ msgid "Questionnaire %d sent for problem %d" msgstr "%d ျပႆနာ အတြက္ %d ေပးပို႔သည့္ စစ္တမ္းေမးခြန္းလႊာ" -#: 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 "RSS feed" @@ -2605,7 +2648,7 @@ msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရ msgid "RSS feed of nearby problems" msgstr "အနီးအနားရိွ ျပႆနာမ်ား၏ RSS feed" -#: 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 "လတ္တေလာ ျပည္တြင္း ျပႆနာမ်ား အတြက္ RSS feed" #: 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 "လက္ရိွ ျပႆနာကို update ျပဳလုပ္ထားသည့္ RSS feed" #: 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 "မၾကာေသးမီက <br> ျပင္ဆင္ၿပီး" 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,26 @@ 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 +#, fuzzy +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 +2994,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 +3041,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 +3133,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 +3181,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 +3228,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 +3245,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 +3271,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 +3542,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 +3624,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 +3651,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 +3729,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 +3738,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 +3755,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 +3782,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 +3794,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 +3851,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 +3866,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 +3897,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 +3910,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 +4000,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 "" @@ -3983,7 +4054,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 @@ -3998,11 +4069,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 "တစ္ကိုယ္ရည္ အခ်က္အလက္မ်ား သို႔မဟုတ္ တူညီသည့္အရာမ်ား ေစာ္ကားခံရအတြက္ ေဖာ္ျပျပႆနာ အစီရင္ခံစာကို ရသည္။" @@ -4019,7 +4090,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 "" @@ -4115,9 +4186,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 @@ -4137,7 +4208,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 @@ -4216,53 +4287,53 @@ msgstr "သုံးစြဲသူအား ျပင္ဆင္ျခင္ msgid "from %s different users" msgstr "%s မွ မတူညီေသာ သုံးစြဲသူမ်ား" -#: 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 "ျပင္ဆင္၍ မရေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္" @@ -4308,8 +4379,8 @@ msgstr "နဂိုဝင္ေရာက္ထားမႈ: “%s”" 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 "ျပန္ဖြင့္ပါ" @@ -4355,68 +4426,68 @@ 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" -msgstr[0] "<big>%s</big> လတ္တေလာ တင္ျပထားေသာ အစီရင္ခံစာမ်ား" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d ရက္မ်ား" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d အခ်ိန္မ်ား" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d ေထာက္ပံ့ေပးသူမ်ား" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d မိနစ္မ်ား" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> ျပဳျပင္မြမ္းမံထားသည့္ အစီရင္ခံစာမ်ား" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "ကၽြႏု္ပ္တို႔သည္ ယခုေနရာကိုႏွင့္ ပတ္သက္သည့္ ေကာင္စီမ်ားအတြက္ အေသးစိတ္မရွိေသးပါ" +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d ေထာက္ပံ့ေပးသူမ်ား" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d ရက္သတၱပတ္မ်ား" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> ၿပီးခဲ့သည့္လက ျပဳျပင္ထားမႈ" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> ၿပီးခဲ့သည့္ ရက္သတၱပတ္က အစီရင္ခံစာမ်ား" -#: 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" -msgstr[0] "<big>%s</big> ၿပီးခဲ့သည့္လက ျပဳျပင္ထားမႈ" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> လတ္တေလာ တင္ျပထားေသာ အစီရင္ခံစာမ်ား" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d ရက္မ်ား" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> ျပဳျပင္မြမ္းမံထားသည့္ အစီရင္ခံစာမ်ား" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format msgid "We do <strong>not</strong> yet have details for the other council that covers this location." msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "ကၽြႏု္ပ္တို႔တြင္ ဒီတည္ေနရာႏွင့္ ပတ္သက္သည့္ အျခားေကာင္အတြက္ အေသးစိတ္မရွိေသးပါ။" + +#: 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] "ကၽြႏု္ပ္တို႔သည္ ယခုေနရာကိုႏွင့္ ပတ္သက္သည့္ ေကာင္စီမ်ားအတြက္ အေသးစိတ္မရွိေသးပါ" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index cf141fa83..4360c6a6a 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.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: pere <pere-transifex@hungry.com>, 2016\n" "Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/mysociety/teams/12067/nb_NO/)\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 " og " @@ -114,7 +114,7 @@ msgstr "%s bydel, %s" msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> -bidragsytere" @@ -122,7 +122,7 @@ msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap< msgid "(Defect & location of defect)" msgstr "(Feil & lokasjon for feil)" -#: 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 "(Epost i misbrukstabellen)" @@ -146,12 +146,10 @@ msgstr "(en standardavstand som dekker en befolkning på omtrent 200 000)" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "(alternativt kan RSS-strømmen tilpasses, innenfor %s)" -#: templates/web/base/report/_item.html:27 #: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(lukket)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(løst)" @@ -160,7 +158,7 @@ msgstr "(løst)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" @@ -168,21 +166,21 @@ msgstr "(ikke rapportert til administrasjonen)" msgid "(optional)" msgstr "(valgfritt)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(sendt til begge)" -#: 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 "-- Velg en kategori --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "--Velg en mal--" @@ -198,8 +196,8 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "<code>MAPIT_URL</code> er satt (<code>%s</code>) men ingen <code>MAPIT_TYPES</code>.<br>Dette er antagelig hvorfor \"dekket område\" er tom (under).<br>Kanskje du skal legge til noen <code>MAPIT_TYPES</code> i konfigurasjonsfilen?" -#. ('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 "<label for=\"statuses\">Vis</label> %s <label for=\"filter_categories\">om</label> %s" @@ -222,11 +220,11 @@ msgstr "<strong>Nei</strong> La meg bekrefte min oppdatering med e-post" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nei</strong>, la meg logge inn med e-post:" -#: 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 "<strong>Merk:</strong> Denne rapporten er sendt videre for å få noe til å skje. Ingen endringer sendes videre." -#: 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 "" @@ -237,7 +235,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, jeg har et passord" #: 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" @@ -266,26 +264,29 @@ msgstr "Legg til administrasjon" msgid "Add new category" msgstr "Legg til ny kategori" -#: 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 "Legg til bruker" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Add/edit problem categories" msgstr "Legg til / endre problemkategorier" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Add/edit response priorities" msgstr "Legg til / endre responsprioriteter" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Add/edit response templates" msgstr "Legg til / endre responsmaler" @@ -293,7 +294,7 @@ msgstr "Legg til / endre responsmaler" msgid "Added %s" msgstr "La til %s" -#: 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 "" @@ -348,7 +349,7 @@ msgstr "En oppdatering markerte dette problemet som fikset." msgid "Anonymous" msgstr "Anonym" -#: 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 "Anonym:" @@ -403,7 +404,7 @@ msgstr "Tildel til ekstern administrasjon:" msgid "Assign to subdivision:" msgstr "Tildelt underavdeling:" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Assign users to areas" msgstr "Tilordne brukere til områder" @@ -428,8 +429,8 @@ msgstr "" msgid "Auto-response:" msgstr "Auto-svar:" -#: 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 "Tilgjengelige kategorier" @@ -437,7 +438,7 @@ msgstr "Tilgjengelige kategorier" msgid "Avoid personal information and vehicle number plates" msgstr "Unngå personlig informasjon og bilnummerskilt" -#: 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 "Avventer moderasjon" @@ -450,12 +451,12 @@ msgstr "Tilbake" msgid "Back to all reports" msgstr "Tilbake til alle rapporter" -#: templates/web/base/admin/report_blocks.html:41 +#: templates/web/base/admin/report_blocks.html:43 msgid "Ban email address" msgstr "Bannlys epostadresse" #: 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 @@ -486,10 +487,6 @@ msgstr "Finner du ikke e-posten? Sjekk mappen for uønsket post. Det løser prob msgid "Can't see the map? <em>Skip this step</em>" msgstr "Hvis du ikke kan se kartet, <em>hopp over dette steget</em>." -#: templates/web/base/report/_inspect.html:141 -msgid "Cancel" -msgstr "Avbryt" - #: perllib/FixMyStreet/Cobrand/Default.pm:650 #: templates/web/base/admin/responsepriorities/list.html:8 msgid "Categories" @@ -502,7 +499,8 @@ msgstr "Kategorier:" #: 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 @@ -522,7 +520,7 @@ msgstr "Kategori endret fra '%s' til '%s'" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" -#: 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 @@ -594,6 +592,10 @@ msgid "" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "Velg et <strong>kategorinavn</strong> som gir mening for innbyggerne (f.eks. \"Hull i veien\", \"Gatelys\") men som også er nyttig for administrasjonen. Disse vil dukke opp i nedtrekksmenyen på rapporter-et-problem-siden." +#: 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" @@ -622,10 +624,11 @@ msgstr "Klikk lenken i bekreftelses-eposten for å logge inn." #: 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 @@ -727,8 +730,8 @@ msgstr "Kontakt prosjektgruppen" msgid "Coordinates:" msgstr "Koordinater:" -#: 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 "Kunne ikke finne bruker" @@ -782,7 +785,7 @@ msgstr "Opprett rapporter/oppdateringer som myndigheten" msgid "Create reports/updates on a user's behalf" msgstr "Opprett rapporter/oppdateringer på vegne av en bruker" -#: 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 "Lag mal" @@ -823,7 +826,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Behandlet av underavdeling innen 5 arbeidsdager" #: 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 "Slett mal" @@ -889,21 +892,35 @@ msgstr "Har du et %s-passord?" msgid "Don’t know" msgstr "Vet ikke" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "Liker ikke skjemaer?" +#: 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 "Dra og slipp bilder hit eller <u>klikk for å laste opp</u>" #: 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 "Duplikat" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Duplikat" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Duplikat" + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -915,7 +932,8 @@ msgstr "" "Ulike kategorier kan ha same kontakt</strong> (e-postadresse).\n" "Dette betyr at du kan legge til mange grupper/kategorier selv om du bare har <strong>en<strong> kontakt for administrasjonen." -#: 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 "" @@ -934,11 +952,11 @@ msgstr "Rediger" msgid "Edit body details" msgstr "Rediger detaljer for administrasjon" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Edit other users' details" msgstr "Endre andre brukeres detaljer" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Edit other users' permissions" msgstr "Endre andre brukeres rettigheter" @@ -989,7 +1007,7 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" @@ -1007,11 +1025,11 @@ msgstr "Epostvarsel laget" msgid "Email alert deleted" msgstr "Epostvarsel slettet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1622 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1624 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" -#: 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 @@ -1084,7 +1102,7 @@ msgid "Enter details of the problem" msgstr "Legg inn detaljer om problemet" #: 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 @@ -1106,8 +1124,8 @@ msgstr "Eksempel-postnummer %s" msgid "Examples:" msgstr "Eksempler:" -#: 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 "Eksisterende kategori" @@ -1143,7 +1161,8 @@ msgstr "Eksternt lag" msgid "Extra data:" msgstr "Ekstra data:" -#: 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 "Ekstra detaljer" @@ -1165,11 +1184,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "Fiks dette ved å velge en <strong>area covered</strong> i <em> Edit body details</em>-skjemaet nedenfor." #: 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 @@ -1177,12 +1197,12 @@ msgid "Fixed" msgstr "Løst" #: 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 "Løst - Administrasjon" #: 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 "Løst - Bruker" @@ -1200,7 +1220,7 @@ msgstr "Løst:" msgid "Flag as deleted" msgstr "Merk som slettet" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Flag user" msgstr "Flag bruker" @@ -1221,7 +1241,7 @@ msgstr "Flaggede brukere er listet opp på <a href='%s'>flaggede</a>-siden." msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Flaggede brukere er ikke begrenset på noe måte. Dette er bare en liste med brukere som har blitt markert for å gi dem oppmerksomhet." -#: 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 "Flagget:" @@ -1259,7 +1279,7 @@ msgid "Frequently Asked Questions" msgstr "Ofte spurte spørsmål" #: 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 "Få oppdateringer" @@ -1285,7 +1305,7 @@ msgstr "Glad for å høre at det er i orden!" #: 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 "Søk" @@ -1294,7 +1314,7 @@ msgstr "Søk" msgid "Going to send questionnaire?" msgstr "Skal det sendes spørreskjema?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "Gi tilgang til administratoren" @@ -1336,8 +1356,8 @@ msgstr "Hei, %s" #: 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 @@ -1380,7 +1400,7 @@ msgstr "Jeg rapporterte akkurat et problem på @fiksgatami" msgid "I just updated a problem on @fixmystreet" msgstr "Jeg oppdaterte akkurat et problem på @fiksgatami" -#: 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 "Jeg er redd vi ikke klarte å finne ditt problem i databasen.\n" @@ -1426,6 +1446,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" @@ -1492,7 +1516,7 @@ msgstr "I tillegg er følgende attributter som ikke er del av Open311 v2-spesifi #: 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 @@ -1528,7 +1552,7 @@ msgid "Internal notes" msgstr "Interne notater" #: 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 "Interne referanser" @@ -1536,7 +1560,7 @@ msgstr "Interne referanser" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1544,16 +1568,16 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: 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 "Ugyldig plassering. Ny plassering må være dekket av den samme administrasjonen." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1479 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1481 msgid "Invalid start date" msgstr "Ugyldig startdato" #: 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 @@ -1599,7 +1623,11 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" -#: 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 "" @@ -1644,6 +1672,10 @@ msgstr "KART" 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 "Kart" @@ -1668,7 +1700,7 @@ msgstr "Merket fikset/lukket mer enn åtte uker siden" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Melding" @@ -1688,7 +1720,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "Moderer" @@ -1696,7 +1728,7 @@ msgstr "Moderer" msgid "Moderate report details" msgstr "Moderer detaljer i rapprten" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate this report" msgstr "Moderer denne rapporten" @@ -1708,7 +1740,7 @@ msgstr "Moderert av avdeling innen en arbeidsdag" msgid "Month" msgstr "Måned" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "Mest kommentert" @@ -1732,7 +1764,7 @@ msgstr "Mest kommentert" msgid "Name" msgstr "Navn" -#: 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 @@ -1744,7 +1776,7 @@ msgstr "Navn:" msgid "Name: %s" msgstr "Navn: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "Naviger til dette problemet" @@ -1846,7 +1878,7 @@ msgstr "Ny tilstand" msgid "New template" msgstr "Ny mal" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "Nyeste" @@ -1861,7 +1893,7 @@ msgstr "Neste" #: 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 @@ -1882,7 +1914,7 @@ msgstr "Ingen administrasjon" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Ingen administrasjon er valgt" @@ -1949,7 +1981,7 @@ msgstr "" "aktivitet for hele instansen), mulighet å skjule meldinger eller sette status for spesialrapporter." #: 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" @@ -2027,15 +2059,15 @@ msgstr "Eldre <br>løste" msgid "Older <br>problems" msgstr "Eldre <br>problemer" -#: templates/web/base/reports/_list-filters.html:36 +#: templates/web/base/reports/_list-filters.html:39 msgid "Oldest" msgstr "Eldste" #: 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 @@ -2081,13 +2113,13 @@ msgstr "Eller problemer meldt til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Eller du kan abonnere på varsel basert på bydel eller administrasjon du hører inn under:" -#: 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" @@ -2108,7 +2140,7 @@ msgid "Parent" msgstr "Forelder" #: 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 "Delvis" @@ -2142,7 +2174,7 @@ msgid "Phone number (optional)" msgstr "Telefonnummer (valgfritt)" #: 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:" @@ -2194,7 +2226,7 @@ msgstr "Plasser tegnestiften på kartet" #: 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 @@ -2222,14 +2254,14 @@ msgid "Please check your email address is correct" msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" #: 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 "Velg en kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Velg en type egenskap" @@ -2253,13 +2285,13 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Ikke vær ufin — å kjefte på din administrasjon skader verdien av tjenesten for alle brukerne." #: 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 "Vennligst legg til en melding" #: 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 "Vennligst skriv et navn" @@ -2274,13 +2306,13 @@ msgid "Please enter a password" msgstr "Skriv inn et passord" #: 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 "Vennligst legg inn et emne" #: 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 @@ -2293,7 +2325,7 @@ msgstr "Legg til en gyldig e-post" msgid "Please enter a valid email address" msgstr "Legg inn din e-post" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:427 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" @@ -2326,8 +2358,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Vennligst legg inn ditt fulle navn, administrasjoner som mottar ditt problem trenger dette - hvis du ikke ønsker at ditt navn skal vises, fjern haken under" #: 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" @@ -2366,7 +2398,7 @@ msgstr "" "Vennligst fyll inn skjemaet under med detaljene om problemet,\n" "og beskriv plasseringen så nøyaktig som mulig i boksen for detaljer." -#: 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 "Vennligst indiker om du ønsker å motta et nytt spørreskjema" @@ -2392,20 +2424,20 @@ msgstr "Merk at din oppdatering <strong>enda ikke har blitt sendt</strong>." msgid "Please note:" msgstr "Vennligst merk deg:" -#: 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 "Vennligst bidra med en forklaring for hvorfor du gjenåpner denne problemrapporten" -#: 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 "Vennligst bidra med litt tekst i tillegg til et bilde" -#: 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 "Vennligst opplys om du har rapportert et problem til din administrasjon tidligere" @@ -2421,7 +2453,7 @@ msgstr "Velg den kilden du ønsker" msgid "Please select the type of alert you want" msgstr "Vennligst velg hvilken type varsel du ønsker" -#: 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 "Vennligs oppgi om dette problemet er blitt fikset eller ikke" @@ -2440,22 +2472,22 @@ msgstr "Skriv inn en melding" msgid "Please write your update here" msgstr "Vennligst skriv inn din oppdatering her" -#: 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 "Send inn" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Publisert anonymt %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Lagt inn av %s (<strong>%s</strong>) %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" @@ -2471,7 +2503,8 @@ msgstr "Forrige" msgid "Priorities" msgstr "Prioriteter" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:96 +#: templates/web/base/report/_item.html:90 msgid "Priority" msgstr "Prioritet" @@ -2487,10 +2520,15 @@ msgstr "Personvern og cookies" #: 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 "Privat" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Ekstra detaljer" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Problem" @@ -2526,11 +2564,11 @@ msgstr "Problemtilstandsendring basert på spørreundersøkelsesresultater" msgid "Problems" msgstr "Problemer" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Problemer i nærheten" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Problemer på kartet" @@ -2542,7 +2580,7 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Problemer innenfor %.1fkm av denne posisjonen" -#: 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" @@ -2566,6 +2604,7 @@ msgstr "Problemer innenfor grensene av:" msgid "Property address:" msgstr "Eiendomsadresse:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Bidra med en oppdatering" @@ -2583,12 +2622,17 @@ msgstr "Det er valgfritt å oppgi navn og passord, men hvis du gjør det kan du msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Det er valgfritt å oppgi et passord, men hvis du gjør det vil det bli enklere for deg å rapportere problemer, legge inn oppdateringer og holde oversikt over dine rapporter" +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "Offentlig oppdatering:" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Offentlig respons:" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "Offentlig oppdatering:" @@ -2612,7 +2656,7 @@ msgstr "Spørreskjema %d fylt inn for problem %d, %s til %s" msgid "Questionnaire %d sent for problem %d" msgstr "Spørreskjema %d sendt for problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Spørreskjema fylt inn av feilrapportøren" @@ -2620,7 +2664,7 @@ msgstr "Spørreskjema fylt inn av feilrapportøren" #: 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 "RSS-strøm" @@ -2648,7 +2692,7 @@ msgstr "RSS-strøm av %s, innenfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-strøm med problemer i nærheten" -#: 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" @@ -2664,12 +2708,12 @@ msgid "RSS feed of recent local problems" msgstr "RSS-strøm med nylige lokale problemer" #: 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 "RSS-strøm med oppdateringer for dette problemet" #: 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 "Motta e-post når det er oppdateringer på dette problemet" @@ -2691,7 +2735,7 @@ msgstr "Nylig løste <br>problemer" msgid "Recently reported problems" msgstr "Nylig meldte problemer" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2699,13 +2743,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 "Husk at FiksGataMi primert er laget for å rapportere fysiske problemer som kan bli fikset. Hvis ditt problem ikke er egnet for å sende inn via denne tjenesten, så husk at du kan kontakte administrasjonen direkte via deres egen nettside." -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "Fjern flagg" -#: 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 "" @@ -2713,7 +2759,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!)" @@ -2727,7 +2773,8 @@ msgstr "Svar til bruker:" msgid "Report" msgstr "Rapport" -#: 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 "Rapport-ID:" @@ -2737,6 +2784,7 @@ msgstr "Rapport-ID:" msgid "Report a problem" msgstr "Rapporter et problem" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Rapporter misbruk" @@ -2760,8 +2808,8 @@ msgstr "Rapporter problemet ditt" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problemer" -#: 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 "Rapportert anonymt %s" @@ -2770,8 +2818,8 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidligere" -#: 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 "Publisert av %s %s" @@ -2784,27 +2832,27 @@ msgstr "Rapportert av:" msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: 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 "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: 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 "Rapportert av %s i kategorien %s anonymt %s" -#: 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 "Rapportert av %s i kategorien %s av %s %s" @@ -2914,16 +2962,16 @@ msgstr "Veioperatør for denne navngitte veien (utledet fra veiens referansenumm msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" -#: 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 "Roter til venstre" -#: 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" @@ -2934,21 +2982,26 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Hvis du roterer dette bildet, mister du ikke lagrede endringer til rapporten." #: 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 "Satelitt" +#: templates/web/base/report/_inspect.html:150 +#, fuzzy +msgid "Save + close as duplicate" +msgstr "markert som duplisert rapport" + #: 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 "Lagre endringer" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -2985,6 +3038,11 @@ msgstr "Søket fant ingen brukere." msgid "See our privacy policy" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#, fuzzy +msgid "See user detail for reports created as the council" +msgstr "Opprett rapporter/oppdateringer som myndigheten" + #: templates/web/base/admin/body-form.html:39 #: templates/web/zurich/admin/body-form.html:16 msgid "Select a body" @@ -3028,27 +3086,27 @@ msgstr "Sendt:" msgid "Service:" msgstr "Tjeneste:" -#: 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 "Dele" -#: 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 "" @@ -3123,7 +3181,7 @@ msgstr "Beklager, det var ikke en gyldig lenke" msgid "Sorry, there has been an error confirming your problem." msgstr "Beklager, men det oppsto et problem når vi forsøkte å bekrefte problemrapporten din" -#: 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 @@ -3171,12 +3229,14 @@ msgstr "Start-dato:" #: 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 "Tilstand" -#: 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 @@ -3216,7 +3276,7 @@ msgstr "Underkategori: %s" msgid "Subdivision/Body" msgstr "Underavdeling/administrasjon" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Emne" @@ -3233,7 +3293,7 @@ msgstr "Emne:" msgid "Submit" msgstr "Send inn" -#: 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 @@ -3259,7 +3319,7 @@ msgid "Submitted" msgstr "Sendt inn" #: 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 "Abonner" @@ -3546,7 +3606,7 @@ msgstr "Det var problemer med å vise 'Alle rapporter'-siden. Vennligst prøv i msgid "There was a problem showing this page. Please try again later." msgstr "Det var problemer med å vise denne siden. Vennligst prøv igjen senere." -#: 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 @@ -3637,9 +3697,9 @@ msgstr "Denne e-posten har blitt sendt til begge administrasjonene som dekker st 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 "Denne e-posten har blitt sendt til flere administrasjoner som dekker stedet for problemet, da den valgte kategorien er tilgjengelig for disse. Vær så snill å ignorere e-posten hvis dere ikke er korrekt administrasjon for å håndtere denne saken." -#: 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 "Denne informasjonen er påkrevd" @@ -3664,6 +3724,10 @@ msgstr "Dette problemet er løst" msgid "This problem has not been fixed" msgstr "Dette problemet har ikke blitt løst" +#: 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 @@ -3738,7 +3802,8 @@ msgstr "For å se et kart med en mer presis plassering for dette problemet." msgid "Total" msgstr "Totalt" -#: 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 "" @@ -3746,7 +3811,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 "" @@ -3763,14 +3828,14 @@ msgid "Try emailing us directly:" msgstr "Forsøk å sende epost direkte til oss:" #: 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 "Kan ikke fikses" #: 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 @@ -3790,8 +3855,8 @@ msgstr "Ukjent" msgid "Unknown alert type" msgstr "Ukjent varsel-type" -#: 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 "Ukjent feil" @@ -3802,6 +3867,10 @@ msgstr "Ukjent feil" msgid "Unknown problem ID" msgstr "Ukjent problem-Id" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "Oppdatering" @@ -3855,7 +3924,7 @@ msgid "Updated" msgstr "Oppdatert" #: 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 @@ -3870,7 +3939,7 @@ msgstr "Oppdatert!" msgid "Updates" msgstr "Oppdateringer" -#: 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 "Oppdateringer er begrenset til %s tegn i lengde. Vennligst skriv en kortere tekst." @@ -3901,11 +3970,11 @@ msgstr "Brukte kart" 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 "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "Bruker flagget" @@ -3914,7 +3983,7 @@ msgid "User search finds matches in users' names and email addresses." msgstr "Brukersøk leter etter treff gjennom brukernavn og epostadresser. " #: 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" @@ -4004,6 +4073,10 @@ msgstr "Når redigert" msgid "When sent" msgstr "Når sendt" +#: 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 "Oj oj, brems ned! Tre bilder er nok." @@ -4052,7 +4125,7 @@ msgstr "År" #: 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 @@ -4067,11 +4140,11 @@ msgstr "Ja" msgid "Yes I have a password" msgstr "Ja, jeg har et passord" -#: 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 "Du klager over at denne problemrapporten ble moderert uten grunn:" -#: 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 "Du rapporterer at følgende problem er støtende, inneholder personlig informasjon eller lignende:" @@ -4088,7 +4161,7 @@ msgstr "Du kan <a href=\"%s%s\">lese om problemet på denne siden</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Du kan legge en misbrukers epostadresse til misbrukslista, hvilket automatisk skjuler (og aldri sender) rapporter vedkommende oppretter." -#: 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 "Du kan kontakte teknisk støtte via <a href='mailto:%s'>%s</a>" @@ -4183,9 +4256,9 @@ msgstr "Din konto" #: 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 @@ -4205,7 +4278,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Vi vil kun bruke personlig informasjon om deg i henhold til våre <a href=\"/faq#privacy\">personvernsregler.</a>" #: 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 @@ -4284,53 +4357,53 @@ msgstr "rediger bruker" msgid "from %s different users" msgstr "fra %s forskjellige brukere" -#: 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 "sist oppdatert %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "mindre enn et minutt" -#: templates/web/base/report/updates.html:57 +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 msgid "marked as a duplicate report" msgstr "markert som duplisert rapport" -#: templates/web/base/report/updates.html:47 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as action scheduled" msgstr "markert som planlagt" -#: templates/web/base/report/updates.html:59 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "marked as an internal referral" msgstr "markert som en intern henvisning" -#: templates/web/base/report/updates.html:49 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as closed" msgstr "markert som lukket" -#: 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 "markert som fikset" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "markert som under arbeid" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "markert som undersøkes" -#: templates/web/base/report/updates.html:55 +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 msgid "marked as not the council's responsibility" msgstr "markert som ikke administrasjonens ansvar" -#: templates/web/base/report/updates.html:43 +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 msgid "marked as planned" msgstr "markert som planlagt" -#: templates/web/base/report/updates.html:53 +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as unable to fix" msgstr "markert som uløselig" @@ -4376,8 +4449,8 @@ msgstr "opprinnelig lagt inn: “%s”" msgid "other areas:" msgstr "andre områder:" -#: 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 "åpnet på nytt" @@ -4423,55 +4496,48 @@ msgstr "bruker er eier av problemet" msgid "ward" msgstr "bydel" -#: 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" -msgstr[0] "<big>%s</big> rapportert<br>nylig" -msgstr[1] "<big>%s</big> rapportert<br>nylig" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dag" +msgstr[1] "%d dager" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d time" msgstr[1] "%d timer" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d støttespiller" -msgstr[1] "%d støttespillere" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minutt" msgstr[1] "%d minutter" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> rapport-<br>oppdatering" -msgstr[1] "<big>%s</big> rapport-<br>oppdateringer" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Vi har ennå ikke detaljer for administrasjonen som dekker dette stedet." -msgstr[1] "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d støttespiller" +msgstr[1] "%d støttespillere" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d uke" msgstr[1] "%d uker" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> fikset siste måned" +msgstr[1] "<big>%s</big> fikset siste måned" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4479,19 +4545,19 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> rapport siste uke" msgstr[1] "<big>%s</big> rapporter siste uke" -#: 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" -msgstr[0] "<big>%s</big> fikset siste måned" -msgstr[1] "<big>%s</big> fikset siste måned" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> rapportert<br>nylig" +msgstr[1] "<big>%s</big> rapportert<br>nylig" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d dag" -msgstr[1] "%d dager" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> rapport-<br>oppdatering" +msgstr[1] "<big>%s</big> rapport-<br>oppdateringer" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4499,3 +4565,13 @@ 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] "Vi har ennå <strong>ikke</strong> detaljene for den andre administrasjonen som dekker dette stedet." msgstr[1] "Vi har ennå <strong>ikke</strong> detaljene for de andre administrasjonene som dekker dette stedet." + +#: 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] "Vi har ennå ikke detaljer for administrasjonen som dekker dette stedet." +msgstr[1] "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet." + +#~ msgid "Cancel" +#~ msgstr "Avbryt" diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po index 800b9e58d..1e4d3746d 100644 --- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nl_NL.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: Jos Helmich <jos@valaquanta.fi>, 2016\n" "Language-Team: Dutch (Netherlands) (https://www.transifex.com/mysociety/teams/12067/nl_NL/)\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 "en" @@ -110,7 +110,7 @@ msgstr "%s district, %s" msgid "%s, within %s ward" msgstr "%s, in %s district" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "&Rechten; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> bijdragende partijen" @@ -118,7 +118,7 @@ msgstr "&Rechten; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetM msgid "(Defect & location of defect)" msgstr "(Defect & en locatie van het defect)" -#: 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 "(Email in misbruiktabel)" @@ -142,12 +142,10 @@ msgstr "(een stand afstand waarbinnen ongeveer 200.000 mensen leven)" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "(als alternatief kan de RSS feed worden aangepast binnen %s)" -#: templates/web/base/report/_item.html:27 #: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(gesloten)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(opgelost)" @@ -156,7 +154,7 @@ msgstr "(opgelost)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(zoals graffiti, zwerfafval, losliggende tegels of straatverlichting) " -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(niet verstuurd naar de gemeente)" @@ -164,21 +162,21 @@ msgstr "(niet verstuurd naar de gemeente)" msgid "(optional)" msgstr "(optioneel)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(verstuurd naar beide)" -#: 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 "-- Kies een categorie --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Kies een woning type --" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "--Kies een website indeling--" @@ -197,8 +195,8 @@ msgstr "" "Dit is waarschijnlijk de reden dat het \"bestreken gebied\" leeg is (zie beneden).<br>\n" "Misschien moeten er <code>MAPIT_TYPES</code> toegevoegd worden aan het configuratie bestand?" -#. ('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 "" @@ -221,11 +219,11 @@ msgstr "<strong>Nee</strong> Laat me mijn update per e-mail bevestigen" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nee</strong> Laat me inloggen per e-mail" -#: 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 "<strong>N.B:</strong> Deze rapportage is verzonden opdat actie wordt ondernomen. Veranderingen worden daarom niet meer meegenomen." -#: 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 "<strong>N.B:</strong>Deze rapportage is nog niet verzonden om actie te ondernemen. Veranderingen worden mogelijk niet doorgegeven." @@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong, ik heb een wachtwoord" #: 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" @@ -267,26 +265,29 @@ msgstr "Voeg openbaar lichaam toe" msgid "Add new category" msgstr "Voeg een nieuwe categorie toe" -#: 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 "Voeg aan favorieten toe" #: 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 "Gebruiker toevoegen" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Add/edit problem categories" msgstr "Voeg toe/wijzig categoriën" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Add/edit response priorities" msgstr "Voeg toe/wijzig beantwoordingsprioriteiten" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Add/edit response templates" msgstr "Voeg toe/wijzig antwoordstramien" @@ -294,7 +295,7 @@ msgstr "Voeg toe/wijzig antwoordstramien" msgid "Added %s" msgstr "%s toegevoegd" -#: 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 "Als dit rapport aan jouw favorieten toevoegd wordt het verwijderd van %s zijn favorieten." @@ -349,7 +350,7 @@ msgstr "Een update heeft dit probleem als opgelost gemarkeerd." msgid "Anonymous" msgstr "Anoniem" -#: 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 "Anoniem:" @@ -404,7 +405,7 @@ msgstr "Toegewezen aan:" msgid "Assign to subdivision:" msgstr "Toegewezen aan afdeling:" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Assign users to areas" msgstr "" @@ -429,8 +430,8 @@ msgstr "" msgid "Auto-response:" msgstr "Automatisch antwoord:" -#: 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 "Beschikbare categoriën" @@ -438,7 +439,7 @@ msgstr "Beschikbare categoriën" msgid "Avoid personal information and vehicle number plates" msgstr "Zet hier geen persoonlijke informatie of nummerborden van autos neer" -#: 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 "Wacht op controle" @@ -451,12 +452,12 @@ msgstr "Vorige" msgid "Back to all reports" msgstr "Terug naar alle rapportages" -#: templates/web/base/admin/report_blocks.html:41 +#: templates/web/base/admin/report_blocks.html:43 msgid "Ban email address" msgstr "Verban e-mailadres" #: 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 @@ -487,10 +488,6 @@ msgstr "Kun je onze email niet vinden? Check je spamfolder. Dat is oplossing in msgid "Can't see the map? <em>Skip this step</em>" msgstr "Kan je de kaart niet zien? <em>Sla deze stap over</em>" -#: templates/web/base/report/_inspect.html:141 -msgid "Cancel" -msgstr "Annuleren" - #: perllib/FixMyStreet/Cobrand/Default.pm:650 #: templates/web/base/admin/responsepriorities/list.html:8 msgid "Categories" @@ -503,7 +500,8 @@ msgstr "Categoriën:" #: 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 @@ -523,7 +521,7 @@ msgstr "Categorie veranderd van '%s' in '%s'" msgid "Category fix rate for problems > 4 weeks old" msgstr "Doorloopsnelheid voor problemen in categorie >4 weken oud" -#: 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 @@ -590,6 +588,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" @@ -618,10 +620,11 @@ msgstr "Klik op de link in onze bevestigingsemail om in te loggen." #: 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 @@ -723,8 +726,8 @@ msgstr "Neem contact op met het team" 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 "Kan de gebruiker niet vinden" @@ -778,7 +781,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 "Maak een sjabloon" @@ -819,7 +822,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Door een afdeling behandeld binnen 5 werkdagen" #: 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 "Verwijder sjabloon" @@ -885,21 +888,35 @@ msgstr "Heb je een %s wachtwoord?" msgid "Don’t know" msgstr "Geen idee" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "Hou je niet van formulieren?" +#: 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 "Plaats de fotos hier om ze te <u>verzenden</u>" #: 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 "Dubbeling" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Dubbeling" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Dubbeling" + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -908,7 +925,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 "Oostwaarde/Noordwaarde" @@ -927,11 +945,11 @@ msgstr "Bewerk" msgid "Edit body details" msgstr "Wijzig openbaar lichaam details" -#: 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 "" @@ -982,7 +1000,7 @@ msgstr "Redacteur" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "Email toegevoegd aan zwarte lijst" @@ -1000,11 +1018,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 "Email staat al op zwarte lijst" -#: 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 @@ -1071,7 +1089,7 @@ msgid "Enter details of the problem" msgstr "Geef details van het probleem" #: 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 @@ -1093,8 +1111,8 @@ msgstr "Voorbeeld van postcode %s" msgid "Examples:" msgstr "Voorbeelden:" -#: 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 "" @@ -1130,7 +1148,8 @@ msgstr "" msgid "Extra data:" msgstr "Extra info:" -#: 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 "" @@ -1152,11 +1171,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 @@ -1164,12 +1184,12 @@ msgid "Fixed" msgstr "Opgelost" #: 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 "Opgelost - Gemeente" #: 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 "Opgelost - Gebruiker" @@ -1187,7 +1207,7 @@ msgstr "Opgelost:" 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 "Gemarkeerde gebruikr" @@ -1208,7 +1228,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 "Gemarkeerd:" @@ -1246,7 +1266,7 @@ msgid "Frequently Asked Questions" msgstr "Veelgestelde Vragen" #: 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 "Updates ontvangen" @@ -1272,7 +1292,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 "Gaan" @@ -1281,7 +1301,7 @@ msgstr "Gaan" msgid "Going to send questionnaire?" msgstr "Vragenlijst versturen?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "" @@ -1323,8 +1343,8 @@ msgstr "Hoi %s" #: 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 @@ -1367,7 +1387,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 "Ik ben bang dat we je melding niet kunnen vinden in onze database.\n" @@ -1413,6 +1433,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" @@ -1472,7 +1496,7 @@ msgstr "Daarnaast worden de volgende attributen, die niet onderdeel zijn van de #: 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 @@ -1508,7 +1532,7 @@ msgid "Internal notes" msgstr "Interne notities" #: 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 "" @@ -1516,7 +1540,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ongeldige agency_responsible waarde %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Ongeldige einddatum" @@ -1524,16 +1548,16 @@ msgstr "Ongeldige einddatum" msgid "Invalid format %s specified." msgstr "Ongeldig formaat %s gespecifieerd" -#: 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 "Ongeldige startdatum" #: 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 @@ -1579,7 +1603,11 @@ msgstr "Laatste update:" msgid "Last update:" msgstr "Laatste update:" -#: 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 "" @@ -1624,6 +1652,10 @@ msgstr "Kaart" 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 "Kaart" @@ -1648,7 +1680,7 @@ msgstr "" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Bericht" @@ -1668,7 +1700,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Vermiste jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1676,7 +1708,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 "" @@ -1688,7 +1720,7 @@ msgstr "" msgid "Month" msgstr "Maand" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "" @@ -1712,7 +1744,7 @@ msgstr "" msgid "Name" msgstr "Naam" -#: 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 @@ -1724,7 +1756,7 @@ msgstr "Naam:" msgid "Name: %s" msgstr "Naam: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1826,7 +1858,7 @@ msgstr "Nieuwe status" msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "" @@ -1841,7 +1873,7 @@ msgstr "Volgende" #: 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 @@ -1862,7 +1894,7 @@ msgstr "" msgid "No council" msgstr "Geen gemeente" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Geen gemeente geselecteerd" @@ -1922,7 +1954,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" @@ -2000,15 +2032,15 @@ msgstr "Ouder<br>opgelost" msgid "Older <br>problems" msgstr "Oudere<br>problemen" -#: 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 @@ -2054,13 +2086,13 @@ msgstr "Of problemen gemeld aan:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Of je kan je abonneren op een melding gebaseerd op welke gemeente je woont:" -#: 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" @@ -2081,7 +2113,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 "Gedeeltelijk" @@ -2115,7 +2147,7 @@ msgid "Phone number (optional)" msgstr "Telefoonnummer (optioneel)" #: 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:" @@ -2167,7 +2199,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 @@ -2195,14 +2227,14 @@ msgid "Please check your email address is correct" msgstr "Controleer of je e-mailadres klopt" #: 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 "Kies een categorie" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Kies een pand type" @@ -2223,13 +2255,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 "Geef bericht in" #: 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 "" @@ -2244,13 +2276,13 @@ msgid "Please enter a password" msgstr "Geef wachtwoord" #: 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 "Geef onderwerp" #: 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 @@ -2263,7 +2295,7 @@ msgstr "Geef een geldig e-mailadres" msgid "Please enter a valid email address" msgstr "Geef een geldig e-mailadres" -#: 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 "Geef details" @@ -2296,8 +2328,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Geef je volledige naam, gemeentes hebben deze informatie nodig. Mocht je niet willen dat je naam op de site getoond wordt, haal dan de vink beneden weg." #: 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" @@ -2334,7 +2366,7 @@ msgstr "Vul de details van het probleem in." 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 "Vul zoveel mogelijk details in het veld beneden in. Vermeld ook de locatie zo precies mogelijk." -#: 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 "Geef aan of je een vragenlijst wilt ontvangen" @@ -2360,20 +2392,20 @@ msgstr "" msgid "Please note:" msgstr "Let op:" -#: 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 "Geef een reden op waarom je deze melding heropent" -#: 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 "Vermeld wat tekst en een foto" -#: 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 "Geef aan of je het probleem al eerder hebt doorgegeven aan de gemeente" @@ -2389,7 +2421,7 @@ msgstr "Kies de feed die je wilt" msgid "Please select the type of alert you want" msgstr "Kies de melding die je wilt" -#: 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 "Geef aan of het probleem is verholpen" @@ -2408,22 +2440,22 @@ msgstr "Schrijf een bericht" msgid "Please write your update here" msgstr "Schrijf je update hier" -#: 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 "Bericht" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Anoniem geplaatst bij %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Geplaatst door %s (<strong>%s</strong>) bij %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Geplaatst door %s bij %s" @@ -2439,7 +2471,8 @@ msgstr "Vorige" 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 "" @@ -2455,10 +2488,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 "Privé" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Privé" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Probleem" @@ -2494,11 +2532,11 @@ msgstr "Probleem status gewijzigd op basis van onderzoeksresultaten" msgid "Problems" msgstr "Problemen" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Problemen dichtbij" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Problemen op de kaart" @@ -2510,7 +2548,7 @@ msgstr "Recent gemelde problemen op FixMyStreet" msgid "Problems within %.1fkm of this location" msgstr "Problemen binnen een straal van %.1fkm van deze lokatie" -#: 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" @@ -2534,6 +2572,7 @@ msgstr "Problemen binnen de grenzen van:" 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 "Geef een update" @@ -2551,12 +2590,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 "Het is optioneel om een wachtwoord op de geven, maar hiermee is het makkelijker om in de toekomst problemen te melden, updates te plaatsen en je meldingen te beheren." +#: 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 "" @@ -2580,7 +2623,7 @@ msgstr "Vragenlijst %d beantwoord voor probleem %d, %s tot %s" msgid "Questionnaire %d sent for problem %d" msgstr "Vragenlijst %d verzonden voor probleem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Vragenlijst ingevuld door melder" @@ -2588,7 +2631,7 @@ msgstr "Vragenlijst ingevuld door melder" #: 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 "RSS feed" @@ -2616,7 +2659,7 @@ msgstr "RSS feed van %s, binnen wijk %s" msgid "RSS feed of nearby problems" msgstr "RSS feed van nabije problemen" -#: 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" @@ -2632,12 +2675,12 @@ msgid "RSS feed of recent local problems" msgstr "RSS feed van recente lokale problemen" #: 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 "RSS feed van updates voor dit probleem" #: 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 "Ontvang een e-mail als updates worden achtergelaten bij dit probleem." @@ -2659,7 +2702,7 @@ msgstr "Recent <br>opgelost" msgid "Recently reported problems" msgstr "Recent gemelde problemen" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2667,13 +2710,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 "Onthoud dat FixMyStreet zich richt op het melden van fysieke problemen die opgelost kunnen worden. Als jouw probleem niet gepast is voor het melden via onze site kun je altijd direct contact opnemen met de gemeente via hun eigen website." -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "Verwijder markering" -#: 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 "" @@ -2681,7 +2726,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!)" @@ -2695,7 +2740,8 @@ msgstr "Beantwoord" msgid "Report" msgstr "Melding" -#: 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 "" @@ -2705,6 +2751,7 @@ msgstr "" msgid "Report a problem" msgstr "Meld een probleem" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Meld misbruik" @@ -2728,8 +2775,8 @@ msgstr "Probleem melden" msgid "Report, view, or discuss local problems" msgstr "Meld, bekijk of discussier over lokale problemen" -#: 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 "Anoniem gemeld bij %s" @@ -2738,8 +2785,8 @@ msgstr "Anoniem gemeld bij %s" msgid "Reported before" msgstr "Eerder gemeld" -#: 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 "Gemeld door %s bij %s" @@ -2752,27 +2799,27 @@ msgstr "Gemeld door:" msgid "Reported in the %s category" msgstr "Toegewezen aan categorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Anoniem gemeld in de categorie %s bij %s" -#: 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 "Gemeld in de categorie %s door %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Anoniem door %s gemeld bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Gemeld door %s door %s bij %s" -#: 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 "Anoniem gemeld bij %s in de categorie %s door %s" -#: 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 "Gemeld door %s in de categorie %s door %s bij %s" @@ -2882,16 +2929,16 @@ msgstr "Wegbeheerder voor deze straat (afgeleid van wegnummer en type): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Wegbeheerder voor deze straat (uit OpenStreetMap): %s" -#: 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 "Linksom roteren" -#: 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" @@ -2902,21 +2949,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 "Wijzigingen opslaan" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -2953,6 +3004,10 @@ msgstr "Geen gebruikers gevonden." 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" @@ -2996,27 +3051,27 @@ msgstr "Verzonden:" msgid "Service:" msgstr "Service:" -#: 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 "Deel" -#: 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 "" @@ -3088,7 +3143,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 @@ -3136,12 +3191,14 @@ msgstr "Startdatum:" #: 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 "Staat" -#: 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 @@ -3181,7 +3238,7 @@ msgstr "Subcategorie: %s" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Onderwerp" @@ -3198,7 +3255,7 @@ msgstr "Onderwerp:" msgid "Submit" msgstr "Opslaan" -#: 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 @@ -3224,7 +3281,7 @@ msgid "Submitted" msgstr "Opgeslagen" #: 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 "" @@ -3495,7 +3552,7 @@ msgstr "Er was een probleem bij het tonen van de Alle Meldingen pagina. Probeer msgid "There was a problem showing this page. Please try again later." msgstr "Er was een probleem bij het tonen van deze pagina. Probeer het later nog eens." -#: 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 @@ -3577,9 +3634,9 @@ msgstr "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïn 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 "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïnteresseerd zijn in deze lokatie. Negeer deze melding als je niet de juiste contactpersoon bent." -#: 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 "Deze informatie is verplicht" @@ -3604,6 +3661,10 @@ msgstr "Dit probleem is opgelost" msgid "This problem has not been fixed" msgstr "Dit probleem is niet opgelost" +#: 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 @@ -3678,7 +3739,8 @@ msgstr "" msgid "Total" msgstr "Totaal" -#: 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 "" @@ -3686,7 +3748,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 "" @@ -3703,14 +3765,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 @@ -3730,8 +3792,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 "" @@ -3742,6 +3804,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 "" @@ -3795,7 +3861,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 @@ -3810,7 +3876,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 "" @@ -3841,11 +3907,11 @@ msgstr "Gebruikte kaart" 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 "" @@ -3854,7 +3920,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" @@ -3944,6 +4010,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 "" @@ -3992,7 +4062,7 @@ msgstr "Jaar" #: 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 @@ -4007,11 +4077,11 @@ msgstr "Ja" msgid "Yes I have a password" msgstr "Ja, ik heb een wachtwoord" -#: 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 "Je meld het volgende probleem als beledigend, persoonlijke informatie bevattend of gelijkend aan:" @@ -4028,7 +4098,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 "" @@ -4119,9 +4189,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 @@ -4141,7 +4211,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Je informatie wordt alleen gebruikt zoals vermeld in onze <a href=\"/privacy\">privacy policy</a>" #: 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 @@ -4220,53 +4290,53 @@ msgstr "" msgid "from %s different users" msgstr "door %s verschillende gebruikers" -#: 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 "minder dan een minuut" -#: 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 "gemarkeerd als gesloten" -#: 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 "gemarkeerd als opgelost" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "gemarkeerd als in behandeling" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "gemarkeerd als in onderzoek" -#: 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 "gemarkeerd als gepland" -#: templates/web/base/report/updates.html:53 +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as unable to fix" msgstr "" @@ -4312,8 +4382,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 "" @@ -4359,55 +4429,48 @@ 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" -msgstr[0] "" -msgstr[1] "" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dag" +msgstr[1] "%d dagen" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d uur" msgstr[1] "%d uur" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d voorstander" -msgstr[1] "%d voorstanders" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuut" msgstr[1] "%d minuten" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "" -msgstr[1] "" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "" +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d voorstander" +msgstr[1] "%d voorstanders" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d week" msgstr[1] "%d weken" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "" +msgstr[1] "" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4415,19 +4478,19 @@ 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" -msgstr[0] "%d dag" -msgstr[1] "%d dagen" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "" +msgstr[1] "" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4435,3 +4498,13 @@ 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] "" + +#~ msgid "Cancel" +#~ msgstr "Annuleren" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index e83fdd3fa..77f0cec84 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.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: Norwegian Nynorsk (Norway) (https://www.transifex.com/mysociety/teams/12067/nn_NO/)\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 " og " @@ -110,7 +110,7 @@ msgstr "%s bydel, %s" msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" -#: 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 "(Epost i misbruktabellen)" @@ -142,12 +142,10 @@ msgstr "(ein standardavstand som dekkjer ein folkesetnad på omtrent 200 000)" 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 "(lukka)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(løyst)" @@ -156,7 +154,7 @@ msgstr "(løyst)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" @@ -164,21 +162,21 @@ msgstr "(ikkje rapportert til administrasjonen)" msgid "(optional)" msgstr "(valfritt)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(sendt til begge)" -#: 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 "-- Vel ein kategori --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" -#: 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 "<strong>Ja</strong>, eg har eit passord" #: 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 "Legg til ny kategori" -#: 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 "La til %s" -#: 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 "Ei oppdatering markerte dette problemet som løyst." msgid "Anonymous" msgstr "Anonym" -#: 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 "Anonym:" @@ -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 "Bannlys e-postadresse" #: 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 "Løysingsrate fordelt på kategori for problem > 4 veker gamle" -#: 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 "Kontakt prosjektgruppa" 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 "Kunne ikkje finna brukaren" @@ -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,33 @@ msgstr "" msgid "Don’t know" msgstr "Veit ikkje" -#: 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 +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" @@ -899,7 +914,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 +934,11 @@ msgstr "Rediger" 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 +989,7 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" @@ -991,11 +1007,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 "E-post allereie i misbruklista" -#: 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 +1078,7 @@ msgid "Enter details of the problem" msgstr "Legg inn detaljar om problemet" #: 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 +1100,8 @@ msgstr "Postnummerdøme %s" msgid "Examples:" msgstr "Døme:" -#: 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 +1137,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 +1160,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 +1173,12 @@ msgid "Fixed" msgstr "Løyst" #: 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 "Løyst – Administrasjon" #: 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 "Løyst – Brukar" @@ -1178,7 +1196,7 @@ msgstr "Løyst:" 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 "Flagg brukar" @@ -1199,7 +1217,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 "Flagga:" @@ -1237,7 +1255,7 @@ msgid "Frequently Asked Questions" msgstr "Ofte spurde spurnader" #: 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 +1281,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 "Hald fram" @@ -1272,7 +1290,7 @@ msgstr "Hald fram" msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "" @@ -1314,8 +1332,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 +1376,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 "Eg er redd vi ikkje klarte å finna problemet ditt i databasen.\n" @@ -1404,6 +1422,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 +1485,7 @@ msgstr "I tillegg er følgjande attributt som ikkje er del av Open311 v2-spesifi #: 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 +1521,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 +1529,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1515,16 +1537,16 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: 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 "Ugyldig startdato" #: 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 +1592,11 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" -#: 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 +1641,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 +1669,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 +1689,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Manglar jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1667,7 +1697,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 +1709,7 @@ msgstr "" msgid "Month" msgstr "Månad" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "" @@ -1703,7 +1733,7 @@ msgstr "" msgid "Name" msgstr "Namn" -#: 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 +1745,7 @@ msgstr "Namn:" 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 +1845,7 @@ msgstr "Ny tilstand" 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 +1860,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 +1881,7 @@ msgstr "" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Ingen administrasjon er vald" @@ -1911,7 +1941,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 +2019,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 +2073,13 @@ msgstr "Eller problem meldt til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Eller du kan abonnera på varsel basert på bydel eller administrasjon du høyrer til under:" -#: 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 +2100,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 "Delvis" @@ -2104,7 +2134,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 +2186,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 +2214,14 @@ msgid "Please check your email address is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" #: 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 "Vel ein kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Vel ein type eigenskap" @@ -2212,13 +2242,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 "Ver venleg og skriv ei melding" #: 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 +2263,13 @@ msgid "Please enter a password" msgstr "Skriv inn eit passord" #: 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 "Ver venleg og legg inn eit emne" #: 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 +2282,7 @@ msgstr "Ver venleg og legg til ein gyldig e-post" msgid "Please enter a valid email address" msgstr "Ver venleg og legg inn e-postadressa di" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:427 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" @@ -2285,8 +2315,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" @@ -2325,7 +2355,7 @@ msgstr "" "Ver venleg og fyll inn skjemaet under med detaljane om problemet,\n" "og skildra plasseringa så nøyaktig som mogleg i boksen for detaljar." -#: 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 "Ver venleg og indiker om du ynskjer å motta eit nytt spørjeskjema" @@ -2351,20 +2381,20 @@ msgstr "" msgid "Please note:" msgstr "Merk:" -#: 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 "Ver venleg og bidra med ei forklaring på kvifor du gjenopnar denne problemrapporten" -#: 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 "Ver venleg og bidra med litt tekst i tillegg til eit bilete" -#: 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 "Ver venleg og opplys om du har rapportert eit problem til administrasjonen din tidlegare" @@ -2380,7 +2410,7 @@ msgstr "Vel den kjelda du ynskjer" msgid "Please select the type of alert you want" msgstr "Ver venleg og vel kva for ein type varsel du ynskjer" -#: 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 "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" @@ -2399,22 +2429,22 @@ msgstr "Skriv inn ei melding" 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 "Send inn" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Publisert anonymt %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Lagt inn av %s (<strong>%s</strong>) %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" @@ -2430,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 "" @@ -2446,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 "Ver venleg og legg inn opplysningar om problemet" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Problem" @@ -2485,11 +2521,11 @@ msgstr "Endring av problemtilstand basert på spørjeundersøkingsresultat" msgid "Problems" msgstr "Problem" -#: 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 "" @@ -2501,7 +2537,7 @@ msgstr "Problem nyleg rapportert fiksa på FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Problem innanfor %.1fkm av denne posisjonen" -#: 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" @@ -2525,6 +2561,7 @@ msgstr "Problem innanfor grensene av:" 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 "Bidra med ei oppdatering" @@ -2542,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 "Det er valfritt å oppgje eit passord, men om du gjer det vil det verta enklare for deg å rapportera problem, leggja inn oppdateringar og halda oversyn over rapportane dine" +#: 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 "" @@ -2571,7 +2612,7 @@ msgstr "Spørjeskjema %d fylt inn for problem %d, %s til %s" msgid "Questionnaire %d sent for problem %d" msgstr "Spørjeskjema %d sendt for problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Spørjeskjema fylt inn av feilrapportøren" @@ -2579,7 +2620,7 @@ msgstr "Spørjeskjema fylt inn av feilrapportøren" #: 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 "RSS-straum" @@ -2607,7 +2648,7 @@ msgstr "RSS-straum av %s, innanfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-straum med problem i nærleiken" -#: 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" @@ -2623,12 +2664,12 @@ msgid "RSS feed of recent local problems" msgstr "RSS-straum med nye lokale problem" #: 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 "RSS-straum med oppdateringar for dette problemet" #: 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 "Motta e-post når det er oppdateringar på dette problemet" @@ -2650,7 +2691,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Nyleg melde problem" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2658,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 "Hugs at FiksGataMi primert er laga for å rapportera fysiske problem som kan fiksast. Viss problemet ditt ikkje er eigna for å senda inn via denne tenesta, hugs at du kan kontakta administrasjonen direkte via deira eiga nettside." -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "Fjern flagg" -#: 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 "" @@ -2672,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!)" @@ -2686,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 "" @@ -2696,6 +2740,7 @@ msgstr "" msgid "Report a problem" msgstr "Rapporter eit problem" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "" @@ -2719,8 +2764,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problem" -#: 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 "Rapportert anonymt %s" @@ -2729,8 +2774,8 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: 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 "Publisert av %s %s" @@ -2743,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 "Rapportert i kategorien %s anonymt %s" -#: 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 "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: 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 "Rapportert av %s i kategorien %s anonymt %s" -#: 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 "Rapportert av %s i kategorien %s av %s %s" @@ -2873,16 +2918,16 @@ msgstr "Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" -#: 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" @@ -2893,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 "Lagra endringar" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -2944,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" @@ -2987,27 +3040,27 @@ msgstr "Sendt:" msgid "Service:" msgstr "Teneste:" -#: 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 "" @@ -3079,7 +3132,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Orsak, men det oppstod eit problem når vi freista å stadfesta problemrapporten din" -#: 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 @@ -3127,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 "Tilstand" -#: 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 @@ -3172,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 "" @@ -3189,7 +3244,7 @@ msgstr "Emne:" msgid "Submit" msgstr "Send inn" -#: 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 @@ -3215,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 "Abonner" @@ -3489,7 +3544,7 @@ msgstr "Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og 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 @@ -3571,9 +3626,9 @@ msgstr "Denne e-posten er sendt til begge administrasjonane som dekkjer staden f 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 "Denne e-posten er sendt til fleire administrasjonar som dekkjer staden for problemet, sidan den valde kategorien er tilgjengeleg for desse. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera denne saka." -#: 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 "Denne informasjonen er påkravd" @@ -3598,6 +3653,10 @@ msgstr "Dette problemet er løyst" msgid "This problem has not been fixed" msgstr "Dette problemet har ikkje vorte løyst" +#: 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 @@ -3672,7 +3731,8 @@ msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet" msgid "Total" msgstr "Totalt" -#: 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 "" @@ -3680,7 +3740,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 "" @@ -3697,14 +3757,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 @@ -3724,8 +3784,8 @@ msgstr "" msgid "Unknown alert type" msgstr "Ukjend varsel-type" -#: 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 "" @@ -3736,6 +3796,10 @@ msgstr "" msgid "Unknown problem ID" msgstr "Ukjend problem-ID" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "" @@ -3789,7 +3853,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 @@ -3804,7 +3868,7 @@ msgstr "Oppdatert!" msgid "Updates" msgstr "Oppdateringar" -#: 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 "" @@ -3835,11 +3899,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 "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "Brukar flagga" @@ -3848,7 +3912,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" @@ -3938,6 +4002,10 @@ msgstr "Når redigert" msgid "When sent" msgstr "Når sendt" +#: 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 "" @@ -3986,7 +4054,7 @@ msgstr "År" #: 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 @@ -4001,11 +4069,11 @@ msgstr "Ja" 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 "Du rapporterer at følgjande problem er støytande, inneheld personleg informasjon eller liknande:" @@ -4022,7 +4090,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 "" @@ -4113,9 +4181,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 @@ -4135,7 +4203,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 @@ -4214,53 +4282,53 @@ msgstr "" msgid "from %s different users" msgstr "frå %s ulike brukarar" -#: 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 "mindre enn eitt minutt" -#: 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 "markert som løyst" -#: 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 "" @@ -4306,8 +4374,8 @@ msgstr "" msgid "other areas:" msgstr "andre område:" -#: 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 "opna på nytt" @@ -4353,55 +4421,48 @@ msgstr "brukaren er eigaren av problemet" msgid "ward" msgstr "bydel" -#: templates/web/base/front/stats.html:13 -#, perl-format -msgid "<big>%s</big> report recently" -msgid_plural "<big>%s</big> reports recently" -msgstr[0] "<big>%s</big> rapport nyleg" -msgstr[1] "<big>%s</big> rapportar nyleg" - -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:223 #, perl-format -msgid "%d hour" -msgid_plural "%d hours" +msgid "%d day" +msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/report/_support.html:6 +#: perllib/Utils.pm:225 #, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" +msgid "%d hour" +msgid_plural "%d hours" 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 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> rapportoppdatering" -msgstr[1] "<big>%s</big> rapportoppdateringar" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Vi har enno ikkje detaljar for administrasjonen som dekkjer denne staden." -msgstr[1] "Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "" +msgstr[1] "" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> løyst siste månad" +msgstr[1] "<big>%s</big> løyst siste månad" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4409,19 +4470,19 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> rapport siste veke" msgstr[1] "<big>%s</big> rapportar siste veke" -#: 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" -msgstr[0] "<big>%s</big> løyst siste månad" -msgstr[1] "<big>%s</big> løyst siste månad" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> rapport nyleg" +msgstr[1] "<big>%s</big> rapportar nyleg" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> rapportoppdatering" +msgstr[1] "<big>%s</big> rapportoppdateringar" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4429,3 +4490,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] "Vi har enno <strong>ikkje</strong> detaljane for den andre administrasjonen som dekkjer denne staden." msgstr[1] "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane som dekkjer denne staden." + +#: 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] "Vi har enno ikkje detaljar for administrasjonen som dekkjer denne staden." +msgstr[1] "Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden." diff --git a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po index 0ed42fa6c..da6c17968 100644 --- a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/pt.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: Portuguese (https://www.transifex.com/mysociety/teams/12067/pt/)\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 "e" @@ -110,7 +110,7 @@ msgstr "%s ala, %s" msgid "%s, within %s ward" msgstr "%s, %s dentro da ala" -#: 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 "(E-mail na tabela de abuso)" @@ -142,12 +142,10 @@ msgstr "(A distância padrão, que abrange cerca de 50 mil pessoas)" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "(alternativamente, o feed RSS pode ser personalizado, dentro de %s)" -#: templates/web/base/report/_item.html:27 #: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(fechado)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(Corrigido)" @@ -156,7 +154,7 @@ msgstr "(Corrigido)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(Como ruas e pavimentos esburacados, grafitis, árvores caídas, lajes partidas, entulhos, lixo, sinais transito, vandalismo, postes caídos, vazamentos de agua e esgotos, iluminação pública ou qualquer outro problema)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(Não reportar ao município)" @@ -164,21 +162,21 @@ msgstr "(Não reportar ao município)" msgid "(optional)" msgstr "(opcional)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(remeter para ambos)" -#: 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 "-- Escolha uma categoria --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Escolha um tipo de categoria --" -#: 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 "<label for=\"statuses\">Mostrar</label> %s <label for=\"filter_categories\">sobre</label> %s" @@ -218,11 +216,11 @@ msgstr "<strong> Não </strong> Deixe-me confirmar a minha atualização por e-m msgid "<strong>No</strong> let me sign in by email" msgstr "<strong> Não </strong>, deixe-me entrar por e-mail" -#: 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 "<strong> Sim </strong> Eu tenho uma password" #: 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 "Adicionar" msgid "Add new category" msgstr "Adicionar nova categoria" -#: 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 "Adicionar user" -#: 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 "Adicionado %s" -#: 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 "Uma atualização marcada, problema esta resolvido" msgid "Anonymous" msgstr "Anonimo" -#: 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 "Anonimo:" @@ -399,7 +400,7 @@ msgstr "Atribuir ao órgão externo:" msgid "Assign to subdivision:" msgstr "Atribuir a subdivisão:" -#: 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 "Aguardando moderação" @@ -446,12 +447,12 @@ msgstr "Voltar" 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 "Ban endereço de e-mail" #: 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 "Não recebeu o email de confirmação? Verifique o SPAM da sua caixa de msgid "Can't see the map? <em>Skip this step</em>" msgstr "Não pode ver a localizaçao no mapa <em> Salte esta etapa </em>" -#: 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 "Categoria para cada correção taxa para problemas> 4 semanas, um mes" -#: 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 "Clique no link do email de confirmação para entrar" #: 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 "Fale com a equipe" 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 "Não foi possível encontrar usuário" @@ -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 "Tratadas pelas subdivisões dentro de 5 dias úteis" #: 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 "Já tem uma password?" msgid "Don’t know" msgstr "Não sei" -#: 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 "Duplicar" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Duplicar" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Duplicar" + #: 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 "Editar" msgid "Edit body details" msgstr "Editar os detalhes do corpo" -#: 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 "Editar" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "Email adicionado a lista de abusos" @@ -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 "E-mail já está na lista abusos" -#: 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 "Escreva de forma detalhada o problema, incluindo uma fotografia" #: 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 "Exemplo PostCode %s" msgid "Examples:" msgstr "Exemplos:" -#: 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 "Dados adicionais:" -#: 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 "FIX" #: 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 "Corrigido - Concelho" #: 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 "Corrigido - Usuario" @@ -1178,7 +1198,7 @@ msgstr "Corrigido:" 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 "Bandeira - Usuario" @@ -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 "Marcado:" @@ -1237,7 +1257,7 @@ msgid "Frequently Asked Questions" msgstr "Perguntas mais frequentes" #: 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 "Atualizações" @@ -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 " Ir" @@ -1272,7 +1292,7 @@ msgstr " Ir" msgid "Going to send questionnaire?" msgstr "Vai enviar questionário?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "" @@ -1314,8 +1334,8 @@ msgstr "Oi %s" #: 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 "Receio que não foi possível localizar o seu problema no banco de dados.\n" @@ -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 "Além disso, os seguintes atributos que não fazem parte da especificaç #: 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 "Agencia_responsavel valor %s inválido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Invalido data final" @@ -1515,16 +1539,16 @@ msgstr "Invalido data final" msgid "Invalid format %s specified." msgstr "Formato inválido%s especificado." -#: 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 "Data de inicio invalida" #: 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 "Última atualização:" msgid "Last update:" msgstr "Última atualização:" -#: 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 "Mapa" 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 "Menssagem" @@ -1659,7 +1691,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Falta informaçao jurisdiction_id" -#: 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 "Moderado por divisão dentro de um dia de trabalho" msgid "Month" msgstr "Mês" -#: 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 "Nome" -#: 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 "Nome:" msgid "Name: %s" msgstr "Nome: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1818,7 +1850,7 @@ msgstr "Novo estado" msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "" @@ -1833,7 +1865,7 @@ msgstr "Proximo" #: 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 @@ -1854,7 +1886,7 @@ msgstr "Nenhum corpo" msgid "No council" msgstr "Sem concelho" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Nenhum Concelho selecionado" @@ -1914,7 +1946,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" @@ -1992,15 +2024,15 @@ msgstr "Mais antigo <br>fixado" msgid "Older <br>problems" msgstr "Mais antigo <br>problemas" -#: 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 @@ -2046,13 +2078,13 @@ msgstr "Ou os problemas relatados para:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ou você pode se inscrever em um alerta baseado no que ala, zona ou concelho você está inserido" -#: 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" @@ -2073,7 +2105,7 @@ msgid "Parent" msgstr "Parente" #: 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 "Parcial" @@ -2107,7 +2139,7 @@ msgid "Phone number (optional)" msgstr "Telefone (opcional)" #: 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:" @@ -2159,7 +2191,7 @@ msgstr "Coloque a fix pin no mapa" #: 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 @@ -2187,14 +2219,14 @@ msgid "Please check your email address is correct" msgstr "Favor verificar se seu email esta correcto" #: 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 "Escolher uma categoria" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Por favor, escolha um tipo de imóvel" @@ -2218,13 +2250,13 @@ msgstr "" "<a href=\"/\"> ir par a Página Inicial </a> e como SIGA INSTRUÇÕES." #: 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 "Por favor insira uma mensagem" #: 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 "" @@ -2239,13 +2271,13 @@ msgid "Please enter a password" msgstr "Por favor insira uma password" #: 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 "Por favor insira um assunto" #: 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 @@ -2258,7 +2290,7 @@ msgstr "Por favor insira um email valido" msgid "Please enter a valid email address" msgstr "Por favor insira um endereço de e-mail válido" -#: 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 "Por favor, insira alguns detalhes" @@ -2291,8 +2323,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Por favor, insira o seu nome completo, os conselhos precisam desta informação - se você não quiser que seu nome seja mostrado no site, desmarque a caixa abaixo" #: 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" @@ -2329,7 +2361,7 @@ msgstr "Por favor, preencha os detalhes do problema." 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 "Por favor, preencha o formulário abaixo com detalhes do problema e descrever a localização mais precisa possível na caixa de detalhes." -#: 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 "Por favor, indique se você gostaria de receber um outro questionário" @@ -2355,20 +2387,20 @@ msgstr "" msgid "Please note:" msgstr "Favor notar:" -#: 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 "Favor fornecer uma explicação de por que você está reabrindo este relatório" -#: 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 "Por favor, forneça algum texto, bem como uma foto" -#: 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 "Por favor, diga se você já relatou um problema para o seu conselho antes" @@ -2384,7 +2416,7 @@ msgstr "Por favor, selecione o feed que deseja" msgid "Please select the type of alert you want" msgstr "Selecione o tipo de alerta que deseja" -#: 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 "Por favor, indique se o problema foi corrigido" @@ -2403,22 +2435,22 @@ msgstr "Por favor, escreva uma mensagem" msgid "Please write your update here" msgstr "Por favor, escreva a sua atualização aqui" -#: 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 "Postar" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Postado anonimamente em %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Postado por %s (<strong>%s</strong>) em %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Postado por %s aem %s" @@ -2434,7 +2466,8 @@ msgstr "Anterior" 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 "" @@ -2450,10 +2483,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 "Privado" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Privado" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Problema" @@ -2489,11 +2527,11 @@ msgstr "Mudança de estado do problema com base nos resultados da pesquisa" msgid "Problems" msgstr "Problemas" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Nas proximidades" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Problemas no mapa" @@ -2505,7 +2543,7 @@ msgstr "Problemas relatados recentemente fixados em FixMyStreetMindelo" msgid "Problems within %.1fkm of this location" msgstr "Problemas dentro de %.1fkm deste local" -#: 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" @@ -2529,6 +2567,7 @@ msgstr "Problemas dentro do limite de:" msgid "Property address:" msgstr "Endereço do imóvel:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Fornecer uma atualização" @@ -2546,12 +2585,17 @@ 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 "Fornecer uma password é opcional, mas isso vai permitir reportar problemas de forma mais fácil, actualizar e gerir os seus relatórios." +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "Resposta do público:" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Resposta do público:" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "" @@ -2575,7 +2619,7 @@ msgstr "Questionário %d respondeu para o problema de %d, %s para %s" msgid "Questionnaire %d sent for problem %d" msgstr "Questionário %d enviou para o problema de %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Questionário preenchido por problema repórter" @@ -2583,7 +2627,7 @@ msgstr "Questionário preenchido por problema repórter" #: 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 "RSS feed" @@ -2611,7 +2655,7 @@ msgstr "RSS feed de %s, %s problemas pendentes" msgid "RSS feed of nearby problems" msgstr "RSS feed dos problemas próximos" -#: 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" @@ -2627,12 +2671,12 @@ msgid "RSS feed of recent local problems" msgstr "RSS feed dos problemas locais recentes" #: 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 "RSS feed de atualizações para este problema" #: 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 "RSS feed dos problemas locais recentes" @@ -2654,7 +2698,7 @@ msgstr "Recentement <br>fixed" msgid "Recently reported problems" msgstr "Problemas recentemente reportados" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2662,13 +2706,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 "Lembre-se que FixMyStreetMIndelo é principalmente para relatar problemas físicos que podem ser corrigidos. Se o seu problema não é apropriado para a apresentação através deste site, lembre-se que você pode contactar o seu município diretamente usando seu próprio site." -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "Remover bandeira" -#: 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 "" @@ -2676,7 +2722,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!)" @@ -2690,7 +2736,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 "" @@ -2700,6 +2747,7 @@ msgstr "" msgid "Report a problem" msgstr "Reportar um problema" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Abusivo" @@ -2723,8 +2771,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Reportar, ver ou discutir problemas locais" -#: 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 "Relatado anonimamente em %s" @@ -2733,8 +2781,8 @@ msgstr "Relatado anonimamente em %s" msgid "Reported before" msgstr "Relatado antes" -#: 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 "Relatado por %s em %s" @@ -2747,27 +2795,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Relatado na categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Relatado na categoria %s anonimamente em %s" -#: 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 "Relatado na categoria %s por %s em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Relatado por %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Relatado por %s por%s em %s" -#: 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 "Relatado por %s na categoria %s anonimamente em %s" -#: 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 "Relatado por %s na categoria %s por %s em %s" @@ -2877,16 +2925,16 @@ msgstr "Operador de estrada por esta estrada chamada (derivado do número de ref msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operador de estrada por esta estrada chamada (a partir de OpenStreetMap): %s" -#: 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 "Girar para a esquerda" -#: 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" @@ -2897,21 +2945,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 "Salvar alterações" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -2948,6 +3000,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" @@ -2991,27 +3047,27 @@ msgstr "Enviar:" msgid "Service:" msgstr "Srerviço:" -#: 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 "Acçao" -#: 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 "" @@ -3083,7 +3139,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Desculpe, houve um erro ao confirmar o seu problema." -#: 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 @@ -3131,12 +3187,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 "Estado" -#: 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 @@ -3176,7 +3234,7 @@ msgstr "Subcategoria: %s" msgid "Subdivision/Body" msgstr "Zona / Bairro" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Assunto:" @@ -3193,7 +3251,7 @@ msgstr "Assunto:" msgid "Submit" msgstr "Submeter" -#: 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 @@ -3219,7 +3277,7 @@ msgid "Submitted" msgstr "Submitido" #: 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 "Subscrever" @@ -3490,7 +3548,7 @@ msgstr "Houve um problema ao mostrar a página de todos os relatórios. Por favo msgid "There was a problem showing this page. Please try again later." msgstr "Houve um problema mostrada nesta página. Por favor, tente novamente mais tarde." -#: 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 @@ -3572,9 +3630,9 @@ msgstr "Este e-mail foi enviado para ambos os conselhos que cobrem o local do pr 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 "Este e-mail foi enviado para vários conselhos que cobrem o local do problema, como a categoria selecionada é fornecida para todos eles, por favor, ignorar se você não é o conselho correto para lidar com o problema." -#: 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 "Esta informação é necessária" @@ -3599,6 +3657,10 @@ msgstr "Este problema foi resolvido" msgid "This problem has not been fixed" msgstr "Este problema não foi corrigido" +#: 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 @@ -3673,7 +3735,8 @@ msgstr "Para ver no mapa a localização exata desse problema" msgid "Total" msgstr "Total" -#: 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 "" @@ -3681,7 +3744,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 "" @@ -3698,14 +3761,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 "Incapaz de ser resolvido" #: 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 @@ -3725,8 +3788,8 @@ msgstr "Desconhecido" msgid "Unknown alert type" msgstr "Tipo de alerta desconhecido" -#: 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 "Erro desconhecido" @@ -3737,6 +3800,10 @@ msgstr "Erro desconhecido" msgid "Unknown problem ID" msgstr "Desconhecido problema com ID" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "Actualizar" @@ -3790,7 +3857,7 @@ msgid "Updated" msgstr "Atualizado" #: 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 @@ -3805,7 +3872,7 @@ msgstr "Actualizado!" msgid "Updates" msgstr "Actualizaçoes" -#: 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 "" @@ -3836,11 +3903,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 "Bandeira usuário removida" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "Usuário sinalizado" @@ -3849,7 +3916,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" @@ -3939,6 +4006,10 @@ msgstr "Quando editar" msgid "When sent" msgstr "Quando enviar" +#: 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 "" @@ -3987,7 +4058,7 @@ msgstr "Ano" #: 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 @@ -4002,11 +4073,11 @@ msgstr "Sim" msgid "Yes I have a password" msgstr "Sim, tenho uma password" -#: 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 "Você está reportando o seguinte relatório de problema por ser abusiva, contendo informações pessoais, ou similar:" @@ -4023,7 +4094,7 @@ msgstr "Você pode <a href=\"%s%s\"> ver o problema neste site </a>." 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 "" @@ -4114,9 +4185,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 @@ -4136,7 +4207,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Suas informações só serão utilizadas de acordo com nossa <a href=\"/privacy\"> política de privacidade </a>" #: 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 @@ -4215,53 +4286,53 @@ msgstr "" msgid "from %s different users" msgstr "e %s usuários diferentes" -#: 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 "Última atualizada %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "menos de um minuto" -#: 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 "marcados como fechados" -#: 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 "marcado como fixo" -#: 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 "" @@ -4307,8 +4378,8 @@ msgstr "originalmente introduzido: \"%s\"" msgid "other areas:" msgstr "outras áreas:" -#: 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 "reaberto" @@ -4354,55 +4425,48 @@ msgstr "usuário é proprietário problema" msgid "ward" msgstr "pendente" -#: 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" -msgstr[0] "<big>%s</big> Relatorio recentemente" -msgstr[1] "<big>%s</big> Relatorios recentemente" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dia" +msgstr[1] "%d dias" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d suppoter" -msgstr[1] "%d supporters" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> atualização em relatório" -msgstr[1] "<big>%s</big>Atualização dos relatórios" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Nós ainda não temos detalhes para o conselho, que abrange este local." -msgstr[1] "Nós ainda não temos detalhes sobre o concelho, abrangido por este local." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d suppoter" +msgstr[1] "%d supporters" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> fixado no mês passado" +msgstr[1] "<big>%s</big>Arranjado no mês passado" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4410,19 +4474,19 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> Relatório de semana passada" msgstr[1] "<big>%s</big> Relatórios da semana passada" -#: 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" -msgstr[0] "<big>%s</big> fixado no mês passado" -msgstr[1] "<big>%s</big>Arranjado no mês passado" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> Relatorio recentemente" +msgstr[1] "<big>%s</big> Relatorios recentemente" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d dia" -msgstr[1] "%d dias" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> atualização em relatório" +msgstr[1] "<big>%s</big>Atualização dos relatórios" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4430,3 +4494,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] "Fazemos <strong> não </strong> ainda tem detalhes para os outros conselhos que cobrem este local." msgstr[1] "Fazemos <strong> não </strong> ainda tem detalhes para os outros conselhos que cobrem este local." + +#: 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] "Nós ainda não temos detalhes para o conselho, que abrange este local." +msgstr[1] "Nós ainda não temos detalhes sobre o concelho, abrangido por este local." diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po index 81ce09a26..28e1433b4 100644 --- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ro_RO.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: Romanian (Romania) (https://www.transifex.com/mysociety/teams/12067/ro_RO/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2: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 "şi" @@ -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 "(o distanță implicită ce acoperă în jur de 200 000 de locuitori)" 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 "(închis)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(rezolvat)" @@ -156,7 +154,7 @@ msgstr "(rezolvat)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(cum ar fi graffiti, gunoaie depozitate ilegal, pavaj spart sau iluminat stradal)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(netrimis)" @@ -164,21 +162,21 @@ msgstr "(netrimis)" msgid "(optional)" msgstr "(opțional)" -#: 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 "-- Alege o categorie --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Alege un tip de proprietate --" -#: 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 "Adaugă o categorie nouă" -#: 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 "Adaugă utilizator" -#: 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,33 @@ 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 +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" @@ -899,7 +914,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 +934,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 +989,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 +1007,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 +1078,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 +1100,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 +1137,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 +1160,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 +1173,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 +1196,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 +1217,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 +1255,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 +1281,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 +1290,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 +1332,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 +1376,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 +1422,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 +1485,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 +1521,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 +1529,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 +1537,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 +1592,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 +1641,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 +1669,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 +1689,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 +1697,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 +1709,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 +1733,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 +1745,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 +1845,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 +1860,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 +1881,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 +1941,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 +2019,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 +2073,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 +2100,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 +2134,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 +2186,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 +2214,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 +2242,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 +2263,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 +2282,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 +2315,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 +2353,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 +2379,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 +2408,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 +2427,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 +2458,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 +2475,14 @@ 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 +msgid "Private details" +msgstr "" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "" @@ -2483,11 +2518,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 +2534,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 +2558,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 +2576,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 +2609,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 +2617,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 +2645,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 +2661,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 +2688,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 +2696,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 +2712,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 +2726,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 +2737,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 +2761,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 +2771,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 +2785,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 +2915,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 +2935,26 @@ 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 +#, fuzzy +msgid "Save + close as duplicate" +msgstr "marcat ca raport duplicat" + #: 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 +2991,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 +3038,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 +3130,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 +3178,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 +3225,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 +3242,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 +3268,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 +3539,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 +3621,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 +3648,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 +3726,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 +3735,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 +3752,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 +3779,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 +3791,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 +3848,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 +3863,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 +3894,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 +3907,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 +3997,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 +4049,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 +4064,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 +4085,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 +4176,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 +4198,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 +4277,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 "mai puţin de un minut" -#: templates/web/base/report/updates.html:57 +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 msgid "marked as a duplicate report" msgstr "marcat ca raport duplicat" -#: templates/web/base/report/updates.html:47 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as action scheduled" msgstr "marcat ca acţiune planificată" -#: templates/web/base/report/updates.html:59 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "marked as an internal referral" msgstr "marcat ca trimitere internă" -#: templates/web/base/report/updates.html:49 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as closed" msgstr "marcat ca închis" -#: 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 "marcat ca rezolvat" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "marcat ca fiind în curs de desfăşurare" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "marcat ca fiind în curs de cercetare" -#: templates/web/base/report/updates.html:55 +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 msgid "marked as not the council's responsibility" msgstr "marcat ca nefiind responsabilitatea consiliului" -#: templates/web/base/report/updates.html:43 +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 msgid "marked as planned" msgstr "marcat ca planificat" -#: templates/web/base/report/updates.html:53 +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as unable to fix" msgstr "marcat ca imposibil de rezolvat" @@ -4301,8 +4369,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,15 +4416,15 @@ 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] "" msgstr[2] "" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4364,15 +4432,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4380,26 +4440,26 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: 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] "" msgstr[2] "" -#: 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] "" msgstr[2] "" -#: 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] "" msgstr[2] "" @@ -4412,18 +4472,18 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: 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] "" msgstr[2] "" -#: 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] "" msgstr[2] "" @@ -4435,3 +4495,11 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" msgstr[2] "" + +#: 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] "" +msgstr[2] "" diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po index beca79978..41174b382 100644 --- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ru.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: Russian (https://www.transifex.com/mysociety/teams/12067/ru/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:639 +#: perllib/FixMyStreet/DB/Result/Problem.pm:648 #: perllib/FixMyStreet/Script/Reports.pm:199 msgid " and " msgstr "и" @@ -122,7 +122,7 @@ msgstr "%s район, %s" msgid "%s, within %s ward" msgstr "%s, в пределах района: %s" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© участники проекта <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>" @@ -130,7 +130,7 @@ msgstr "© участники проекта <a href=\"http://www.openstreet 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 "(адрес эл. почты в таблице пользователей, которые писали оскорбительные комментарии)" @@ -154,12 +154,10 @@ msgstr "(Территория, заданная по умолчанию, на к msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "(RSS-фид можно настроить по параметру удаленности: %s)" -#: 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 "(исправлено)" @@ -168,7 +166,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 "(не отправлено в органы самоуправления)" @@ -176,21 +174,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 "" @@ -209,8 +207,8 @@ msgstr "" "Возможно, поэтому поле «зона покрытия» не заполнено (см. ниже).<br>\n" "Хотите добавить несколько <code>MAPIT_TYPES</code> в ваш файл конфигурации?" -#. ('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 "<label for=\"statuses\">Показать отчеты:</label> %s <label for=\"filter_categories\">в категории:</label> %s" @@ -233,11 +231,11 @@ msgstr "<strong>Нет</strong> Я хочу подтвердить обновл msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Нет</strong>, я хочу войти на сайт с помощью адреса эл. почты" -#: 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 "" @@ -248,7 +246,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Да</strong> У меня есть пароль" #: 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" @@ -280,26 +278,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 "" @@ -307,7 +308,7 @@ msgstr "" msgid "Added %s" msgstr "Добавлено: %s" -#: 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 "" @@ -362,7 +363,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 "Анонимно:" @@ -417,7 +418,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 "" @@ -442,8 +443,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 "" @@ -451,7 +452,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 "Ожидает модерации" @@ -464,12 +465,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 @@ -500,10 +501,6 @@ msgstr "Письмо не пришло? Оно могло попасть в па msgid "Can't see the map? <em>Skip this step</em>" msgstr "Карта не отображается? <em>Пропустите этот шаг</em>" -#: 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" @@ -516,7 +513,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 @@ -536,7 +534,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "Процент устранения неполадок в этой категории, которым больше 4 недель" -#: 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 @@ -612,6 +610,10 @@ msgstr "" "Выберите название <strong>категории</strong> которое будет понятно не только другим пользователям (например, «Выбоина» или «Уличное освещение»), но и \n" " сотрудникам учреждения. Варианты названий отобразятся в раскрывающемся меню на странице подачи обращений." +#: 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" @@ -640,10 +642,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 @@ -745,8 +748,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 "Не удалось найти пользователя" @@ -800,7 +803,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 "Создать шаблон" @@ -841,7 +844,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Вопрос решен подразделением в течение 5 рабочих дней" #: 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 "Удалить шаблон" @@ -907,21 +910,35 @@ msgstr "У вас есть пароль на сайте %s?" 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" @@ -934,7 +951,8 @@ msgstr "" " Следовательно, вы можете добавлять много категорий для одного контакта учреждения.\n" " " -#: 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 "" @@ -953,11 +971,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 "" @@ -1008,7 +1026,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 "Адрес эл. почты добавлен в черный список" @@ -1026,11 +1044,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 @@ -1104,7 +1122,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 @@ -1126,8 +1144,8 @@ msgstr "Пример почтового индекса: %s" 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 "" @@ -1163,7 +1181,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 "" @@ -1185,11 +1204,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "Исправьте это, выбрав <strong>зону покрытия</strong> в форме <em>Редактирование информации об учреждении</em>, расположенной ниже." #: 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 @@ -1197,12 +1217,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 "Исправлено (пользователь)" @@ -1220,7 +1240,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 "Пометить пользователя" @@ -1241,7 +1261,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 "Помечено:" @@ -1279,7 +1299,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 "Получать обновления" @@ -1305,7 +1325,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 "Поехали!" @@ -1314,7 +1334,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 "" @@ -1356,8 +1376,8 @@ msgstr "Привет, %s!" #: 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 @@ -1400,7 +1420,7 @@ msgstr "Я сообщаю о проблеме на @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Я обновляю информацию о проблеме на @fixmystreet" -#: 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 "Нам не удалось найти ваше обращение в базе данных.\n" @@ -1450,6 +1470,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" @@ -1519,7 +1543,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 @@ -1555,7 +1579,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 "Внутренний реферал" @@ -1563,7 +1587,7 @@ msgstr "Внутренний реферал" msgid "Invalid agency_responsible value %s" msgstr "Неверно задано значение agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Неверно указана дата окончания" @@ -1571,16 +1595,16 @@ msgstr "Неверно указана дата окончания" msgid "Invalid format %s specified." msgstr "Неверно задан формат: %s." -#: 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 @@ -1626,7 +1650,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 "" @@ -1671,6 +1699,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 "Карта" @@ -1695,7 +1727,7 @@ msgstr "Помечено как решенный/закрытый вопрос msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Сообщение" @@ -1715,7 +1747,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Не найден параметр jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1723,7 +1755,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 "" @@ -1735,7 +1767,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 "" @@ -1759,7 +1791,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 @@ -1771,7 +1803,7 @@ msgstr "Имя:" msgid "Name: %s" msgstr "Имя: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1873,7 +1905,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 "" @@ -1888,7 +1920,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 @@ -1909,7 +1941,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 "Орган самоуправления не выбран" @@ -1975,7 +2007,7 @@ 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" @@ -2053,15 +2085,15 @@ msgstr "Более давние <br>устраненные" msgid "Older <br>problems" msgstr "Давние <br>неполадки" -#: 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 @@ -2107,13 +2139,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" @@ -2134,7 +2166,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 "Частичная" @@ -2168,7 +2200,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:" @@ -2220,7 +2252,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 @@ -2248,14 +2280,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 "Выберите тип имущества" @@ -2279,13 +2311,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 "" @@ -2300,13 +2332,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 @@ -2319,7 +2351,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 "Введите дополнительную информацию" @@ -2352,8 +2384,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" @@ -2390,7 +2422,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 "Укажите, хотите ли вы еще один опросник" @@ -2416,20 +2448,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 "Вы впервые отправляете обращение в ваш орган самоуправления?" @@ -2445,7 +2477,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 "Сообщите о статусе неполадки: проблема была решена?" @@ -2464,22 +2496,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 "Опубликовано анонимно (%s)" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Автор публикации: %s (<strong>%s</strong>), время публикации: %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Автор публикации: %s, время публикации: %s" @@ -2495,7 +2527,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 "" @@ -2511,10 +2544,15 @@ msgstr "Конфиденциальность и файлы cookie" #: 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 "Проблема" @@ -2550,11 +2588,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 "Проблемы на карте" @@ -2566,7 +2604,7 @@ msgstr "Недавно решенные проблемы на сайте FixMySt msgid "Problems within %.1fkm of this location" msgstr "Проблемы в пределах %.1fkm от этого места" -#: 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" @@ -2590,6 +2628,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 "Предоставить новые данные" @@ -2607,12 +2646,17 @@ 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 +#, fuzzy +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 "" @@ -2636,7 +2680,7 @@ msgstr "Опрос (%d) заполнен для проблемы «%d» (%s — msgid "Questionnaire %d sent for problem %d" msgstr "Опрос (%d) отправлен для проблемы «%d»" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Опрос заполнен автором обращения" @@ -2644,7 +2688,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 "RSS-фид" @@ -2672,7 +2716,7 @@ msgstr "%s: RSS-фид, в пределах района: %s" msgid "RSS feed of nearby problems" msgstr "RSS-фид о проблемах поблизости" -#: 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" @@ -2688,12 +2732,12 @@ msgid "RSS feed of recent local problems" msgstr "RSS-фид о недавних проблемах поблизости" #: 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 "RSS-фид об обновлениях по этой проблеме" #: 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 "Получать эл. письма об обновлениях по этой проблеме." @@ -2715,7 +2759,7 @@ msgstr "Недавно <br>устранены" 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 "" @@ -2723,13 +2767,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 "Важно: сайт FixMyStreet предназначен для регистрации материальных проблем, которые возможно устранить, и работы с ними. Если проблема, о которой вы хотите сообщить, не соответствует тематике сайта, обратитесь в местный орган самоуправления через соответствующий сайт." -#: 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 "" @@ -2737,7 +2783,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!)" @@ -2751,7 +2797,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 "" @@ -2761,6 +2808,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 "Сообщить об оскорбительном поведении" @@ -2784,8 +2832,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 "Сообщено анонимно в: %s" @@ -2794,8 +2842,8 @@ msgstr "Сообщено анонимно в: %s" 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 "Автор обращения: %s, время отправки: %s" @@ -2808,27 +2856,27 @@ msgstr "Автор обращения:" msgid "Reported in the %s category" msgstr "Обращение отнесено к категории: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Обращение (категория: %s) отправлено анонимно в: %s" -#: 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 "Обращение (категория: %s), автор: %s, отправлено в: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Анонимно отправлено через: %s, время отправки: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Отправлено через: %s, автор: %s, время отправки: %s" -#: 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 "Анонимно отправлено через: %s, категория: %s, время отправки: %s" -#: 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 "Отправлено через: %s, категория: %s, автор обращения: %s, время отправки: %s" @@ -2938,16 +2986,16 @@ msgstr "Дорога находится в ведении: %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Дорога находится в ведении (информация из ресурса OpenStreetMap): %s" -#: 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" @@ -2958,21 +3006,26 @@ 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 +#, fuzzy +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 "" @@ -3009,6 +3062,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" @@ -3052,27 +3109,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 "" @@ -3146,7 +3203,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 @@ -3194,12 +3251,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 @@ -3239,7 +3298,7 @@ msgstr "Субкатегория: %s" msgid "Subdivision/Body" msgstr "Подразделение/учреждение" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Тема" @@ -3256,7 +3315,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 @@ -3282,7 +3341,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 "Подписаться" @@ -3565,7 +3624,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 @@ -3657,9 +3716,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 "Эта информация является обязательной" @@ -3684,6 +3743,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 @@ -3758,7 +3821,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 "" @@ -3766,7 +3830,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 "" @@ -3783,14 +3847,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 @@ -3810,8 +3874,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 "Неизвестная ошибка" @@ -3822,6 +3886,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 "Обновление" @@ -3875,7 +3943,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 @@ -3890,7 +3958,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 "Текст обновления ограничен %s симв. Напишите более короткое сообщение" @@ -3921,11 +3989,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 "Аккаунт пользователя помечен" @@ -3934,7 +4002,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" @@ -4024,6 +4092,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 "" @@ -4072,7 +4144,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 @@ -4087,11 +4159,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 "Вы собираетесь пожаловаться на это обращение и считаете, что оно содержит оскорбления, конфиденциальную информацию или как-либо еще нарушает правила сайта:" @@ -4108,7 +4180,7 @@ msgstr "Вы можете <a href=\"%s%s\">ознакомиться с проб 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 "Вы можете написать в службу технической поддержки: <a href='mailto:%s'>%s</a>" @@ -4205,9 +4277,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 @@ -4227,7 +4299,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Мы обязуемся использовать предоставленные вами персональные данные в соответствии с нашей <a href=\"/privacy\">политикой конфиденциальности</a>" #: 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 @@ -4306,53 +4378,53 @@ msgstr "редактировать информацию о пользовате msgid "from %s different users" msgstr "от разных пользователей (%s)" -#: 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 "последнее обновление: %s" -#: 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 "помечено как проблема, которую невозможно устранить" @@ -4398,8 +4470,8 @@ msgstr "введено: “%s”" 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 "заново открыто" @@ -4445,16 +4517,16 @@ 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" -msgstr[0] "<big>%s</big> недавнее обращение" -msgstr[1] "<big>%s</big> недавних обращения" -msgstr[2] "<big>%s</big> недавних обращений" -msgstr[3] "<big>%s</big> недавних обращений" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d день" +msgstr[1] "%d дня" +msgstr[2] "%d дней" +msgstr[3] "%d дней" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4463,16 +4535,7 @@ msgstr[1] "%d часа" msgstr[2] "%d часов" msgstr[3] "%d часов" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d спонсор" -msgstr[1] "%d спонсора" -msgstr[2] "%d спонсоров" -msgstr[3] "%d спонсоров" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4481,25 +4544,16 @@ msgstr[1] "%d минуты" msgstr[2] "%d минут" msgstr[3] "%d минут" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> обновление обращений" -msgstr[1] "<big>%s</big> обновления обращений" -msgstr[2] "<big>%s</big> обновлений обращений" -msgstr[3] "<big>%s</big> обновлений обращений" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место." -msgstr[2] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место." -msgstr[3] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d спонсор" +msgstr[1] "%d спонсора" +msgstr[2] "%d спонсоров" +msgstr[3] "%d спонсоров" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4508,6 +4562,15 @@ msgstr[1] "%d недели" msgstr[2] "%d недель" msgstr[3] "%d недель" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> проблема решена за прошлый месяц" +msgstr[1] "<big>%s</big> проблемы решены за прошлый месяц" +msgstr[2] "<big>%s</big> проблем решено за прошлый месяц" +msgstr[3] "<big>%s</big> проблем решено за прошлый месяц" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4517,23 +4580,23 @@ msgstr[1] "<big>%s</big> обращения за прошлую неделю" msgstr[2] "<big>%s</big> обращений за прошлую неделю" msgstr[3] "<big>%s</big> обращений за прошлую неделю" -#: 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" -msgstr[0] "<big>%s</big> проблема решена за прошлый месяц" -msgstr[1] "<big>%s</big> проблемы решены за прошлый месяц" -msgstr[2] "<big>%s</big> проблем решено за прошлый месяц" -msgstr[3] "<big>%s</big> проблем решено за прошлый месяц" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> недавнее обращение" +msgstr[1] "<big>%s</big> недавних обращения" +msgstr[2] "<big>%s</big> недавних обращений" +msgstr[3] "<big>%s</big> недавних обращений" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d день" -msgstr[1] "%d дня" -msgstr[2] "%d дней" -msgstr[3] "%d дней" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> обновление обращений" +msgstr[1] "<big>%s</big> обновления обращений" +msgstr[2] "<big>%s</big> обновлений обращений" +msgstr[3] "<big>%s</big> обновлений обращений" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4543,3 +4606,12 @@ msgstr[0] "У нас пока <strong>нет</strong> подробной инф msgstr[1] "У нас пока <strong>нет</strong> подробной информации об органах самоуправления, в ведении которых находится это место." msgstr[2] "У нас пока <strong>нет</strong> подробной информации об органах самоуправления, в ведении которых находится это место." msgstr[3] "У нас пока <strong>нет</strong> подробной информации об органах самоуправления, в ведении которых находится это место." + +#: 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] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место." +msgstr[2] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место." +msgstr[3] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место." diff --git a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po index fb2c07012..d27cbeff6 100644 --- a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sq.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: Granit Zhubi <granitzhubi@gmail.com>, 2016\n" "Language-Team: Albanian (https://www.transifex.com/mysociety/teams/12067/sq/)\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 "dhe" @@ -118,7 +118,7 @@ msgstr "%s lagje, %s" msgid "%s, within %s ward" msgstr "%s, brenda lagjes %s" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> kontribuesit" @@ -126,7 +126,7 @@ msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap< msgid "(Defect & location of defect)" msgstr "(Defekt & lokacioni i defektit)" -#: 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 "(Email-i në tabelen abuzimi)" @@ -150,12 +150,10 @@ msgstr "(nje distance e paracaktuar e cila mbulon pothuajse 200,000 persona)" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "(Ndryshe RSS mund të personalizohet, brenda% s)" -#: templates/web/base/report/_item.html:27 #: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(i mbyllur)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(i rregulluar)" @@ -164,7 +162,7 @@ msgstr "(i rregulluar)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(Si mbishkrime, pllaka të thyera , ose ndriçimit të rrugëve)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(nuk ju dergua kuvendit)" @@ -172,21 +170,21 @@ msgstr "(nuk ju dergua kuvendit)" msgid "(optional)" msgstr "(opsionale)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(dërguar te të dy)" -#: 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 "-- Zgjedh në kategori --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Zgjedh nje lloj te karakteristikes --" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "--Zgjedh një template--" @@ -205,8 +203,8 @@ msgstr "" " Kjo eshte ndoshta arsyeja pse \"zona e mbuluar\" eshte e zbrazet (me poshte).<br>\n" " Ndoshta shtoni disa <code>MAPIT_TYPES</code> ne skedarin tuaj te konfigurimit?" -#. ('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 "" @@ -231,11 +229,11 @@ msgstr "<strong>Jo</strong> Me lejoni te konfirmoj perditesimin me email" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Jo</strong> më lejo të kyqem me email" -#: 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 "<Strong> Shënim: </ strong> Ky raport është dërguar tutje për veprim. Çdo ndryshim i bërë tutje nuk do të kalojë." -#: 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 "<Strong> Shënim: </ strong> Ky raport nuk është dërguar ende në vazhdim për veprim. Çdo ndryshim i bërë nuk mund të kalohet." @@ -246,7 +244,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Po</strong> Unë kam një fjalëkalim" #: 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" @@ -277,26 +275,29 @@ msgstr "Shto trup" msgid "Add new category" msgstr "Shto një kategori të re" -#: 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 "Shto në listën e ngushtë" #: 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 "Shto përdorues" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Add/edit problem categories" msgstr "Shto/përditëso kategoritë e problemeve" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Add/edit response priorities" msgstr "Shto/përditëso prioritetet e përgjigjeve" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Add/edit response templates" msgstr "Shto/Përditëso përgjigjet nga template" @@ -304,7 +305,7 @@ msgstr "Shto/Përditëso përgjigjet nga template" msgid "Added %s" msgstr "Shtoi %s" -#: 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 "Duke shtuar këtë raport në listën tuaj do të heqni atë nga lista %s''s e ngushtë." @@ -359,7 +360,7 @@ msgstr "Nje perditesim e ka perditesuar kete problem si te zgjidhur." msgid "Anonymous" msgstr "Anonim" -#: 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 "Anonim:" @@ -414,7 +415,7 @@ msgstr "Caktoja një drejtorije të jashtme:" msgid "Assign to subdivision:" msgstr "Cakto per nenndarje:" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Assign users to areas" msgstr "Cakto përdorues për ëonat" @@ -439,8 +440,8 @@ msgstr "Përdoruesit e stafit te autorizuar mund të jenë të lidhur me kategor msgid "Auto-response:" msgstr "Përgjigje-Automatike:" -#: 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 "Kategoritë në dispozicion" @@ -448,7 +449,7 @@ msgstr "Kategoritë në dispozicion" msgid "Avoid personal information and vehicle number plates" msgstr "Shmangni të dhënat personale dhe targat e automjeteve" -#: 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 "Në pritje të vlerësimit" @@ -461,12 +462,12 @@ msgstr "Prapa" msgid "Back to all reports" msgstr "Prapa te të gjitha raportet" -#: templates/web/base/admin/report_blocks.html:41 +#: templates/web/base/admin/report_blocks.html:43 msgid "Ban email address" msgstr "bllokoemail adresen" #: 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 @@ -497,10 +498,6 @@ msgstr "Nuk mund ta gjeni emailin tonë? Kontrolloni folderin spam ne e-mail. Kj msgid "Can't see the map? <em>Skip this step</em>" msgstr "Nuk mund te shihni harten? <em>Kaloni kete hap</em>" -#: templates/web/base/report/_inspect.html:141 -msgid "Cancel" -msgstr "Anulo" - #: perllib/FixMyStreet/Cobrand/Default.pm:650 #: templates/web/base/admin/responsepriorities/list.html:8 msgid "Categories" @@ -513,7 +510,8 @@ msgstr "Kategoritë:" #: 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 @@ -533,7 +531,7 @@ msgstr "Kategoria u ndryshua nga '%s' në '%s'" msgid "Category fix rate for problems > 4 weeks old" msgstr "Norma e rregullimit të kategorive për problemet > 4 javë" -#: 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 @@ -610,6 +608,10 @@ msgstr "" "Zgjidhni një emër të<strong> kategorisë </ strong> emër që ka kuptim për publikun (p.sh., \"\", \"ndriçimi publik\",\"Rruga Lokale\"), por është i kuptueshëm edhe për\n" "Drejtorinë. Këto do të shfaqen në drop-down menynë në faqen Raportimit të problemeve." +#: 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" @@ -638,10 +640,11 @@ msgstr "Klikoni linkun në emailin tonë konfirmues për tu kyçur." #: 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 @@ -743,8 +746,8 @@ msgstr "Kontakto ekipin" msgid "Coordinates:" msgstr "Koordinatat:" -#: 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 "Nuk mund te gjeni perdoruesin" @@ -798,7 +801,7 @@ msgstr "Krijo raporte/përditësime si Kuvend Komunal" msgid "Create reports/updates on a user's behalf" msgstr "Krijo raport/përditësim në emër të shfrytëzuesit" -#: 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 "Krijo template" @@ -839,7 +842,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Trajtohet nga nën-drejtoritë brenda 5 ditëve të punës" #: 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 "Fshije template" @@ -905,21 +908,35 @@ msgstr "A keni vondosur nje %s fjalëkalim ?" msgid "Don’t know" msgstr "Nuk e di" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "Nuk i'u pelqen kjo forme?" +#: 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 "Merr dhe lësho fotot këtu ose <u>kliko për të ngarkuar foto</u>" #: 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 "Dyfisho" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Dyfisho" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Dyfisho" + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -931,7 +948,8 @@ msgstr "" "kategoritë të ndryshme <strong> mund të kenë të njëjtin kontakt </ strong> (adresë e-mail).\n" "Kjo do të thotë që ju mund të shtoni shumë kategori edhe në qoftë se ju keni vetëm një kontakt për llojin e problemit" -#: 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 "Lëvizje drejtë Lindjes/Veriut:" @@ -950,11 +968,11 @@ msgstr "Përditëso" msgid "Edit body details" msgstr "Përditëso detajet:" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Edit other users' details" msgstr "Përditëso detajet e përdoruesit" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Edit other users' permissions" msgstr "Përditëso autorizimet e përdoruesit" @@ -1005,7 +1023,7 @@ msgstr "Editor" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "Emaili u shtua te lista e abuzimeve" @@ -1023,11 +1041,11 @@ msgstr "Notifikimi me email u krijua" msgid "Email alert deleted" msgstr "Notifikimi me email u fshi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1622 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1624 msgid "Email already in abuse list" msgstr "Emaili tanimë është në listë e abuzuesve" -#: 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 @@ -1094,7 +1112,7 @@ msgid "Enter details of the problem" msgstr "Pershkruaje problemin" #: 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 @@ -1116,8 +1134,8 @@ msgstr "Shembull i kodit postar %s" msgid "Examples:" msgstr "Shembuj:" -#: 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 "Kategori ekzistuese" @@ -1153,7 +1171,8 @@ msgstr "Ekipi i jashtëm" msgid "Extra data:" msgstr "Te dhena shtese:" -#: 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 "Ekstra detajet" @@ -1175,11 +1194,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "Rregulloni këtë duke zgjedhur një <strong> zonë të mbuluar </ strong> në detajet e trupit <em> Ndrysho </ em> formularin e mëposhtëm." #: 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 @@ -1187,12 +1207,12 @@ msgid "Fixed" msgstr "E rregulluar" #: 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 "E rregulluar - Këshilli" #: 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 "E rregulluar - Perdoruesi" @@ -1210,7 +1230,7 @@ msgstr "E rregulluar:" msgid "Flag as deleted" msgstr "E fshirë" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Flag user" msgstr "Flamuri i perdoruesit" @@ -1231,7 +1251,7 @@ msgstr "Përdoruesit e shënjuar janë të listuar në <a href='%s'> faqen e sh msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Përdoruesit e shënjuar nuk janë të kufizuar në asnjë mënyrë. Kjo është vetëm një listë e përdoruesve që kanë qenë të shënuar për vëmendje të mëtutjeshme." -#: 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 "Shënjuar:" @@ -1269,7 +1289,7 @@ msgid "Frequently Asked Questions" msgstr "Pyetjet më të shpeshta" #: 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 "Merr perditesimet" @@ -1295,7 +1315,7 @@ msgstr "Jemi të kënaqur që është regulluar!" #: 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 "Vazhdo" @@ -1304,7 +1324,7 @@ msgstr "Vazhdo" msgid "Going to send questionnaire?" msgstr "Do dërgoni pyetsorin?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "Lejoni akses për administratorin" @@ -1346,8 +1366,8 @@ msgstr "Pershendetje %s" #: 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 @@ -1390,7 +1410,7 @@ msgstr "Unë sapo raportova një problem në @rregullorrugëntime" msgid "I just updated a problem on @fixmystreet" msgstr "Unë sapo përditësova një poroblem në @rregullorrugëntime" -#: 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 "Une jam i frikesuar se ne nuk mund te lokalizojme problemin tuaj e databaze.\n" @@ -1436,6 +1456,10 @@ msgstr "Nëse ju vetëm dëshironi që kjo template të jetë një alternativë msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council." msgstr "Në qoftë se ju do të paraqitni një problem këtu ,problemi do të <strong> nuk </ strong> të raportohet në këshill." +#: 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" @@ -1497,7 +1521,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 @@ -1533,7 +1557,7 @@ msgid "Internal notes" msgstr "Shenim i brendshem" #: 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 "Rekomandim i brendshem" @@ -1541,7 +1565,7 @@ msgstr "Rekomandim i brendshem" msgid "Invalid agency_responsible value %s" msgstr "Vlerë agency_responsible e gabuar %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Data e fundit jovalide" @@ -1549,16 +1573,16 @@ msgstr "Data e fundit jovalide" msgid "Invalid format %s specified." msgstr "Format jo i vlefshëm %s i specifikuar." -#: 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 "Lokacion jo valid. Lokacioni i ri duhet të mbulohet nga i njëjti këshill." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1479 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1481 msgid "Invalid start date" msgstr "Data e fillimit jovalide" #: 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 @@ -1606,7 +1630,11 @@ msgstr "Perditesimi i fundit:" msgid "Last update:" msgstr "Perditesimi fundit:" -#: 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 "I përditësuar kohët e fundit" @@ -1651,6 +1679,10 @@ msgstr "HARTA" msgid "Manage shortlist" msgstr "Menaxhoni listën e shkurtë" +#: templates/web/base/reports/_list-filters.html:36 +msgid "Manual order" +msgstr "" + #: templates/web/base/js/translation_strings.html:46 msgid "Map" msgstr "Harta" @@ -1675,7 +1707,7 @@ msgstr "Shëno si të rregulluar/mbyllyr në më shumë se 8 javë" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Mesazh" @@ -1695,7 +1727,7 @@ msgstr "Mungojnë drejtori:" msgid "Missing jurisdiction_id" msgstr "Mungesë juridiksioni_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "Mesatare" @@ -1703,7 +1735,7 @@ msgstr "Mesatare" msgid "Moderate report details" msgstr "Raportet e detajuara mesatare" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate this report" msgstr "Moderoni këtë raport" @@ -1715,7 +1747,7 @@ msgstr "Moderuar me divizion brenda një ditë pune" msgid "Month" msgstr "Muaji" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "Më të komentuarat" @@ -1739,7 +1771,7 @@ msgstr "Më të komentuarat" msgid "Name" msgstr "Emri" -#: 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 @@ -1751,7 +1783,7 @@ msgstr "Emri:" msgid "Name: %s" msgstr "Emri: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "Shko tek ky problem" @@ -1851,7 +1883,7 @@ msgstr "Gjendje e re" msgid "New template" msgstr "Shabllon i ri" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "Më e reja" @@ -1866,7 +1898,7 @@ msgstr "Tjetra" #: 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 @@ -1887,7 +1919,7 @@ msgstr "Ska drejtori" msgid "No council" msgstr "Ska council" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Asnjë council e zgjedhur" @@ -1947,7 +1979,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" @@ -2025,15 +2057,15 @@ msgstr "E vjeter <br>e kryer" msgid "Older <br>problems" msgstr "Probleme <br> te vjetra" -#: templates/web/base/reports/_list-filters.html:36 +#: templates/web/base/reports/_list-filters.html:39 msgid "Oldest" msgstr "Më i vjetri" #: 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 @@ -2079,13 +2111,13 @@ msgstr "Ose raportoni problemet n:" 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" @@ -2106,7 +2138,7 @@ msgid "Parent" msgstr "Burim" #: 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 "I pjesshem" @@ -2140,7 +2172,7 @@ msgid "Phone number (optional)" msgstr "Numri i telefonit (opsionale)" #: 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:" @@ -2192,7 +2224,7 @@ msgstr "Vendose shenjen ne harte" #: 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 @@ -2220,14 +2252,14 @@ msgid "Please check your email address is correct" msgstr "Ju lutem kontrolloni email adresen tuaj nese eshte e sakte" #: 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 "Ju lutem zgjedhni kategorine" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Ju lutem zgjedhni tipin e pronës" @@ -2248,13 +2280,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 "Ju lutem shkruaj nje mesazh" #: 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 "Ju lutem shkruani emrin" @@ -2269,13 +2301,13 @@ msgid "Please enter a password" msgstr "Ju lutem shkruaj fjalekalimin" #: 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 "Ju lutem shkruaj subjektin" #: 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 @@ -2288,7 +2320,7 @@ msgstr "Ju lutem shkruaj nje email valid" msgid "Please enter a valid email address" msgstr "Ju lutem shkruani një email adresë valide" -#: 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 "Ju lutem shkruaj disa te dhena" @@ -2321,8 +2353,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Ju lutem shkruani emrin tuaj të plotë, council i cili kërkon këtë informatë - nëse nuk doni që emri juaj të shihet në faqe, largoni etiketimin nga kutia e mëposhtme" #: 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" @@ -2359,7 +2391,7 @@ msgstr "Ju lutem të plotësoni në detaje problemin" 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 "Ju lutem plotësoni formën e mëposhtme me detajet e problemit dhe përshkruani lokacionin sa më saktë që është e mundur në kutinë e detajeve." -#: 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 "Ju lutem tregoni nëse ju do dëshironit të merrni një pyetsor tjetër" @@ -2385,20 +2417,20 @@ msgstr "" msgid "Please note:" msgstr "Ju lutem vini re:" -#: perllib/FixMyStreet/App/Controller/Report.pm:335 +#: perllib/FixMyStreet/App/Controller/Report.pm:354 msgid "Please provide a public update for this report." msgstr "Ju lutem sigorni një përditësim publik për këtë raport" -#: 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 "Ju lutem na siguroni më shumë shpjegime se pse po ri-hapni këtë raport" -#: 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 "Ju lutem ofroni nje pershkrim si dhe nje fotografi" -#: 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 "Ju lutem na tregoni nëse keni raportuar ndonjë problem tek council i juaj më parë." @@ -2414,7 +2446,7 @@ msgstr "Ju lutem zgjedhni furnizuesin qe deshironi" 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 "Ju lutem tregoni nëse problemi është zgjedhur apo jo " @@ -2433,22 +2465,22 @@ msgstr "Ju lutem shkruani nje mesazh" msgid "Please write your update here" msgstr "Ju lutem shkruani perditesimin tuaj ketu" -#: 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 "Posto" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Postuar ne menyre anonime ne %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Postuar nga %s (<strong>%s</strong>) ne %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Postuar nga %s ne %s" @@ -2464,7 +2496,8 @@ msgstr "Paraprak" msgid "Priorities" msgstr "Prioritetet" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:96 +#: templates/web/base/report/_item.html:90 msgid "Priority" msgstr "Prioritet" @@ -2480,10 +2513,15 @@ msgstr "Privatësia dhe cookiesa" #: 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 "Privat" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Ekstra detajet" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Problem" @@ -2519,11 +2557,11 @@ msgstr "Ndryshim i gjendjes se problemit bazuar ne rezultatet e anketes" msgid "Problems" msgstr "Problemet" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Problemet ne afersi" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Problemet ne harte" @@ -2535,7 +2573,7 @@ msgstr "Problemet e raportuara se fundi ne FixMyStreet" msgid "Problems within %.1fkm of this location" msgstr "Problemet brenda %.1fkm te ketij lokacioni" -#: 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" @@ -2559,6 +2597,7 @@ msgstr "Problemet brenda kufijve te:" msgid "Property address:" msgstr "Adresa e prones:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ofro nje perditesim" @@ -2576,12 +2615,17 @@ msgstr "Dhënia e emrit dhe fjalëkalimit janë opcionale, por nëse jepni këto msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Dhënia e fjalëkalimit është opcional, por duke dhënë atë do të ju lejohet që më lehtë të raportoni problemin, bëni përditësim dhe menaxhoni raportet tuaja." +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "Përditësim publik." + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Pergjigje publike:" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "Përditësim publik." @@ -2605,7 +2649,7 @@ msgstr "Pyetsorë %d përgjigjur për probleme " msgid "Questionnaire %d sent for problem %d" msgstr "Pyetsorë dërguar për problem" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Pyestor i plotësuar nga raportuesi i problemit" @@ -2613,7 +2657,7 @@ msgstr "Pyestor i plotësuar nga raportuesi i problemit" #: 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 "RSS feed" @@ -2641,7 +2685,7 @@ msgstr "RSS feed i %s, brenda lagjes %s" msgid "RSS feed of nearby problems" msgstr "RSS feed i problemeve ne afersi" -#: 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" @@ -2657,12 +2701,12 @@ msgid "RSS feed of recent local problems" msgstr "RSS feed nga problemet e fundit lokale" #: 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 "RSS feed per te rejat rreth ketij problemi" #: 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 "Prano email kur ka perditesime te ketij problemi" @@ -2684,7 +2728,7 @@ msgstr "Rregullimet <br> e fundit" msgid "Recently reported problems" msgstr "Problemet e raportuara së fundmi" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "Përditësuar së fundmi" @@ -2692,13 +2736,15 @@ msgstr "Përditësuar së fundmi" 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 "Mbani në mend që FixMyStreet është për të raportuar problemet fizike primare që mund të rregullohen. Nëse problemi juaj nuk është i përshtashëm tu dërguar përmes kësaj faqe mbani në mend që mund të kontaktoni përmes council tuaj direkt duke përdorur councin e tyre." -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "Largo flamurin" -#: 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 "Fshije nga lista e ngushtë" @@ -2706,7 +2752,7 @@ msgstr "Fshije nga lista e ngushtë" msgid "Remove from site" msgstr "Fshije nga website" -#: 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!)" @@ -2720,7 +2766,8 @@ msgstr "Përgjigju përdoruesit:" msgid "Report" msgstr "Raporto" -#: 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 "ID e raportit:" @@ -2730,6 +2777,7 @@ msgstr "ID e raportit:" msgid "Report a problem" msgstr "Raporto nje problem" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Raporto abuzimin" @@ -2753,8 +2801,8 @@ msgstr "Raportoni problemin tuaj" msgid "Report, view, or discuss local problems" msgstr "Raporto,shiqo apo diskuto problemet lokale" -#: 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 "Raportuar ne menyre anonime te %s" @@ -2763,8 +2811,8 @@ msgstr "Raportuar ne menyre anonime te %s" msgid "Reported before" msgstr "Të raportuara më parë" -#: 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 "Raportuar nga %s ne %s" @@ -2777,27 +2825,27 @@ msgstr "Raportuar nga:" msgid "Reported in the %s category" msgstr "Raportuar ne kategorine %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Raportuar ne kategorine %s ne menyre anonime ne %s" -#: 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 "Raportuar ne kategorine %s nga %s ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Raportuar nepermjet %s ne menyre anonime ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Raportuar nepermjet %s nga %s ne %s" -#: 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 "Raportuar nepermjet %s ne kategorine %s ne menyre anonime ne %s" -#: 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 "Raportuar nepermjet %s ne kategorine %s ne %s" @@ -2907,16 +2955,16 @@ msgstr "Operatori i rrugës për emrin e kësaj rruge (rrjedh nga numri i refer msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operatori i rrugës për emrin e kësaj rruge (nga OpenStreetMap)." -#: 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 "Rrotullo Majtas" -#: 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" @@ -2927,21 +2975,26 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Rrotullimi i kësaj foto do të heq dorë nga ndryshimet e paruajtura në raport." #: 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 "Satelitore" +#: templates/web/base/report/_inspect.html:150 +#, fuzzy +msgid "Save + close as duplicate" +msgstr "shenuar si raport i dyfishuar" + #: 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 "Ruaj ndryshimet" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "Ruaje me një përditësim për publikun" @@ -2978,6 +3031,11 @@ msgstr "Gjate kerkimit nuk eshte gjetur asnje perdorues." msgid "See our privacy policy" msgstr "Shiqo rregulloren tonë të privatësisë" +#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#, fuzzy +msgid "See user detail for reports created as the council" +msgstr "Krijo raporte/përditësime si Kuvend Komunal" + #: templates/web/base/admin/body-form.html:39 #: templates/web/zurich/admin/body-form.html:16 msgid "Select a body" @@ -3021,27 +3079,27 @@ msgstr "Dërgo:" msgid "Service:" msgstr "Shërbim:" -#: templates/web/base/report/_inspect.html:26 +#: templates/web/base/report/_inspect.html:25 msgid "Set to my current location" msgstr "Vendos tek lokacioni im i tanishëm" -#: templates/web/base/report/display_tools.html:15 +#: templates/web/base/report/display_tools.html:17 msgid "Share" msgstr "Shpërndajë" -#: 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 "Lista e ngushtë" -#: 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 "Përzgjedhur" -#: templates/web/base/report/_main.html:140 +#: templates/web/base/report/_main.html:144 msgid "Shortlisted by %s" msgstr "Përzgjedhur nga %s" @@ -3113,7 +3171,7 @@ msgstr "Na vjen keq, ai nuk ishte link valid" msgid "Sorry, there has been an error confirming your problem." msgstr "Na vjen keq, është nje problem me konfirmimin e raportit tuaj." -#: 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 @@ -3161,12 +3219,14 @@ msgstr "Data e Fillimit:" #: 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 "Gjendje" -#: 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 @@ -3206,7 +3266,7 @@ msgstr "Nenkategoria: %s" msgid "Subdivision/Body" msgstr "Nëndivizioni/Drejtoria" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Tema" @@ -3223,7 +3283,7 @@ msgstr "Tema:" msgid "Submit" msgstr "Dërgo" -#: 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 @@ -3249,7 +3309,7 @@ msgid "Submitted" msgstr "Paraqitur" #: 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 "Abonohu" @@ -3530,7 +3590,7 @@ msgstr "Ka problem në hapjën e faqes Të gjitha raportet. Ju lutem provoni pë msgid "There was a problem showing this page. Please try again later." msgstr "Ka probleme në hapjën e kësaj faqe. Ju lutem provoni përsëri më vonë." -#: 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 @@ -3617,9 +3677,9 @@ msgstr "Ky email është dërguar të dy Drejtorite që mbulojnë vendndodhjen e 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 "Ky email është dërguar në disa Drejtori që mbulojnë vendndodhjen e problemit, pasi që kategoria e zgjedhur është dhënë për të gjithë ata; ju lutemi ta injoroni atë në qoftë se ju nuk jeni Drejtoria e duhur për t'u marrë me këtë çështje." -#: 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 "Ky informacion është i nevojshëm" @@ -3644,6 +3704,10 @@ msgstr "Ky problem ka qene i rregulluar" msgid "This problem has not been fixed" msgstr "Ky problem nuk ka qene i rregulluar" +#: 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 @@ -3718,7 +3782,8 @@ msgstr "Për të parë një hartë të vendndodhjen e saktë të kësaj çështj msgid "Total" msgstr "Total" -#: 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 "Menaxhimi i trafikut i nevojshëm?" @@ -3726,7 +3791,7 @@ msgstr "Menaxhimi i trafikut i nevojshëm?" msgid "Trusted by bodies:" msgstr "Të besuar nga Drejtoritë:" -#: 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 "I besuar për të bërë raporte të cilat nuk duhet të kontrollhen" @@ -3743,14 +3808,14 @@ msgid "Try emailing us directly:" msgstr "Provoni për të na shkruar email direkt:" #: 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 "E pamundur të zgjidhet" #: 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 @@ -3770,8 +3835,8 @@ msgstr "E panjohur" msgid "Unknown alert type" msgstr "Lloj i njoftimit i panjohur" -#: 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 "Gabim i panjohur" @@ -3782,6 +3847,10 @@ msgstr "Gabim i panjohur" msgid "Unknown problem ID" msgstr "ID problemi i panjohur" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "Perditesim" @@ -3835,7 +3904,7 @@ msgid "Updated" msgstr "Perditesuar" #: 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 @@ -3850,7 +3919,7 @@ msgstr "Perditesuar!" msgid "Updates" msgstr "Perditesime" -#: 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 "" @@ -3881,11 +3950,11 @@ msgstr "Harta të përdorura" 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 "Flamuri i përdoruesit është hequr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "" @@ -3894,7 +3963,7 @@ msgid "User search finds matches in users' names and email addresses." msgstr "Përdoruesi gjen përputhje në kërkimet e emrit të përdoruesit dhe email adresës." #: 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" @@ -3984,6 +4053,10 @@ msgstr "Kur redaktohet" msgid "When sent" msgstr "Kur është dërguar" +#: 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 "Whoa Testino ! Tre foto janë të mjaftueshme." @@ -4032,7 +4105,7 @@ msgstr "Viti" #: 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 @@ -4047,11 +4120,11 @@ msgstr "Po" msgid "Yes I have a password" msgstr "Po une kam nje fjalekalim" -#: 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 "" @@ -4068,7 +4141,7 @@ msgstr "Ju mund <a href=\"%s%s\">te shihni problemin ne kete faqe</a>." 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 "Ju mund te kontaktoni per ndihme teknike ne <a href='mailto:%s'>%s</a>" @@ -4159,9 +4232,9 @@ msgstr "Llogaria juaj" #: 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 @@ -4181,7 +4254,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Informatat tuaja do të përdoren në përputhje me politikën tonë të privatsisë" #: 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 @@ -4260,53 +4333,53 @@ msgstr "Ndryshoni përdoruesin" msgid "from %s different users" msgstr "nga %s perdorues te ndryshem" -#: 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 "Perditesimi i fundit %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "më pak se një minutë" -#: templates/web/base/report/updates.html:57 +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 msgid "marked as a duplicate report" msgstr "shenuar si raport i dyfishuar" -#: templates/web/base/report/updates.html:47 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as action scheduled" msgstr "shenuar si veprim i planifikuar" -#: templates/web/base/report/updates.html:59 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "marked as an internal referral" msgstr "shenuar si nje rekomandim i brendshem" -#: templates/web/base/report/updates.html:49 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as closed" msgstr "shenuar si i mbyllur" -#: 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 "shenuar si i rregulluar" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "shenuar si ne progres" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "shenuar si i shqyrtuar" -#: 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 "shenuar si i planifikuar" -#: templates/web/base/report/updates.html:53 +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as unable to fix" msgstr "Etiketuar si e pamundur për ta rregulluar" @@ -4352,8 +4425,8 @@ msgstr "E dhënë origjinale" msgid "other areas:" msgstr "zona tjera:" -#: 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 "rihapur" @@ -4399,55 +4472,48 @@ msgstr "perdoruesi eshte shkaktar i problemit" msgid "ward" msgstr "lagje" -#: 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" -msgstr[0] "<big>%s</big> raporti i fundit" -msgstr[1] "<big>%s</big> raportet e fundit" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d ditë" +msgstr[1] "%d dit" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d orë" msgstr[1] "%d orë" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d perkrahes" -msgstr[1] "%d perkrahes" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minutë" msgstr[1] "%d minuta" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> perditesim ne raporte" -msgstr[1] "<big>%s</big> perditesime ne raporte" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "" +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d perkrahes" +msgstr[1] "%d perkrahes" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d javë" msgstr[1] "%d javë" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> e rregulluar ne muajin e kaluar" +msgstr[1] "<big>%s</big> e rregulluar ne muajin e kaluar" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4455,19 +4521,19 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> raport ne javen e fundit" msgstr[1] "<big>%s</big> raporte ne javen e fundit" -#: 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" -msgstr[0] "<big>%s</big> e rregulluar ne muajin e kaluar" -msgstr[1] "<big>%s</big> e rregulluar ne muajin e kaluar" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> raporti i fundit" +msgstr[1] "<big>%s</big> raportet e fundit" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d ditë" -msgstr[1] "%d dit" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> perditesim ne raporte" +msgstr[1] "<big>%s</big> perditesime ne raporte" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4475,3 +4541,13 @@ 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] "" + +#~ msgid "Cancel" +#~ msgstr "Anulo" diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po index 807e8a185..bf25313be 100644 --- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sv_SE.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: Jon Kristensen <info@jonkri.com>, 2016\n" "Language-Team: Swedish (Sweden) (https://www.transifex.com/mysociety/teams/12067/sv_SE/)\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 " och " @@ -110,7 +110,7 @@ msgstr "Administrativa området %s, %s" msgid "%s, within %s ward" msgstr "%s inom det administrativa området %s" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" @@ -118,7 +118,7 @@ msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap< msgid "(Defect & location of defect)" msgstr "(Defekt & defektens plats)" -#: 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 "(Epost i missbrukstabellen)" @@ -142,12 +142,10 @@ msgstr "(ett avstånd som täcker ungefär 200,000 invånare)" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "(alternativt kan RSS-flödet konfigureras inom %s)" -#: templates/web/base/report/_item.html:27 #: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(stängd)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(fixad)" @@ -156,7 +154,7 @@ msgstr "(fixad)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(ex.v. graffiti, skräp, trasiga gatustenar eller belysning)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(ej skickat till kommunen)" @@ -164,21 +162,21 @@ msgstr "(ej skickat till kommunen)" msgid "(optional)" msgstr "(valfritt)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(skickat till båda)" -#: 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 "-- Välj en katagori --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Välj en fastighetstyp --" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "--Välj en mall--" @@ -197,8 +195,8 @@ msgstr "" " Detta är förmodligen anledningen till att \"område som täcks (area covered)\" är tomt nedan.<br>\n" " Vill du lägga till några <code>MAPIT_TYPES</code> i konfigruationsfilen?" -#. ('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 "<label for=\"statuses\">Visa</label> %s <label for=\"filter_categories\">om</label> %s" @@ -221,11 +219,11 @@ msgstr "<strong>Nej</strong> Låt mig bekräfta uppdateringen via epost" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nej</strong> Låt mig logga in med min epostadress" -#: 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 "<strong>Notera:</strong> Den här rapporten har vidarebefordrats. Ändringar i rapporten kommer inte att vidarebefordras." -#: 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 "<strong>Notera:</strong> Den här rapporten har vidarebefordrats. Ändringar i rapporten kommer inte att vidarebefordras." @@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, jag har ett lösenord" #: 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" @@ -265,26 +263,29 @@ msgstr "Lägg till förvaltning" msgid "Add new category" msgstr "Ny kategori" -#: 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 "Lägg till i slutlista" #: 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 "Lägg till användare" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Add/edit problem categories" msgstr "Lägg till eller ta bort problemkategorier" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Add/edit response priorities" msgstr "Lägg till eller ta bort svarsprioriteringar" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Add/edit response templates" msgstr "Lägg till eller ta bort svarsmallar" @@ -292,7 +293,7 @@ msgstr "Lägg till eller ta bort svarsmallar" msgid "Added %s" msgstr "Lades till %s" -#: 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 "Att lägga till den här rapporten i din kortlista tar bort den från kortlistan för %s." @@ -347,7 +348,7 @@ msgstr "En uppdatering markerade det här problemet som löst." msgid "Anonymous" msgstr "Anonym" -#: 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 "Anonym:" @@ -402,7 +403,7 @@ msgstr "Tilldela extern förvaltning:" msgid "Assign to subdivision:" msgstr "Tilldela underavdelning:" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Assign users to areas" msgstr "Tilldela användare till områden" @@ -427,8 +428,8 @@ msgstr "Bemyndigade kommunanvändare kan vara associerade med de kategorier som msgid "Auto-response:" msgstr "Autosvar:" -#: 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 "Tillgängliga kategorier" @@ -436,7 +437,7 @@ msgstr "Tillgängliga kategorier" msgid "Avoid personal information and vehicle number plates" msgstr "Undvik personlig information och nummerplåtar" -#: 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 "Väntar på att granskas" @@ -449,12 +450,12 @@ msgstr "Tillbaka" msgid "Back to all reports" msgstr "Tillbaka till samtliga rapporter" -#: templates/web/base/admin/report_blocks.html:41 +#: templates/web/base/admin/report_blocks.html:43 msgid "Ban email address" msgstr "Förbjud epostadress" #: 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 @@ -485,10 +486,6 @@ msgstr "Kan du inte hitta vårt e-brev? Kolla din skräppostmapp – det är msgid "Can't see the map? <em>Skip this step</em>" msgstr "Kan du inte se kartan? <em>Hoppa över det här steget</em>" -#: templates/web/base/report/_inspect.html:141 -msgid "Cancel" -msgstr "Avbryt" - #: perllib/FixMyStreet/Cobrand/Default.pm:650 #: templates/web/base/admin/responsepriorities/list.html:8 msgid "Categories" @@ -501,7 +498,8 @@ msgstr "Kategorier:" #: 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 @@ -521,7 +519,7 @@ msgstr "Kategori ändrat från ‘%s’ till ‘%s’" msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategorins lösningsnivå för problem över 4 veckor gamla" -#: 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 @@ -586,6 +584,10 @@ msgid "" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "Välj ett <strong>kategorinamn</strong> som å ena sidan är förståeligt för allmänheten (som t. ex. \"Väggrop\" eller \"Gatubelysning\") men som också är hjälpsamt för förvaltningen. Dessa kommer att visas i en rullgardinsmeny på problemrapporteringssidan." +#: 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" @@ -614,10 +616,11 @@ msgstr "Klicka på länken i vårt bekräftelsemail för att logga in." #: 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 @@ -719,8 +722,8 @@ msgstr "Kontakta teamet" msgid "Coordinates:" msgstr "Koordinater:" -#: 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 "Kan inte hitta användaren" @@ -774,7 +777,7 @@ msgstr "Skapa rapporter/uppdateringar som kommunen" msgid "Create reports/updates on a user's behalf" msgstr "Skapa rapporter/uppdateringar på en användares vägnar" -#: 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 "Välj mall" @@ -815,7 +818,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Hanterat av underavdelning inom 5 arbetsdagar" #: 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 "Ta bort mall" @@ -881,21 +884,35 @@ msgstr "Har du ett lösenord för %s?" msgid "Don’t know" msgstr "Vet ej" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "Gillar du inte formulär?" +#: 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 "Släpp foton här eller <u>klicka för att ladda upp</u>" #: 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 "Finns redan" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Finns redan" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Finns redan" + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -904,7 +921,8 @@ msgid "" " " msgstr "Varje förvaltningskontakt har en kategori, och denna visas för allmänheten. Olika kategorier <strong>kan ha samma kontakt</strong> (e-postadress). Detta betyder att du kan lägga till flera kategorier även om du bara har en förvaltningskontakt." -#: 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 "Easting/Northing:" @@ -923,11 +941,11 @@ msgstr "Ändra" msgid "Edit body details" msgstr "Ändra förvaltningsdetaljer" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Edit other users' details" msgstr "Redigera andra användares uppgifter" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Edit other users' permissions" msgstr "Redigera andra användares rättigheter" @@ -978,7 +996,7 @@ msgstr "Redaktör" msgid "Email" msgstr "Epost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "Epostadressen tillagd till missbrukslistan" @@ -996,11 +1014,11 @@ msgstr "E-postnotifikation skapad" msgid "Email alert deleted" msgstr "E-postnotifikation borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1622 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1624 msgid "Email already in abuse list" msgstr "Epostadressen finns redan i missbrukslistan" -#: 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 @@ -1070,7 +1088,7 @@ msgid "Enter details of the problem" msgstr "Skriv in information om problemet" #: 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 @@ -1092,8 +1110,8 @@ msgstr "Exempelpostnummer %s" msgid "Examples:" msgstr "Exempel:" -#: 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 "Befintlig kategori" @@ -1129,7 +1147,8 @@ msgstr "Externt arbetslag" msgid "Extra data:" msgstr "Extra data:" -#: 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 "Extra uppgifter" @@ -1151,11 +1170,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "Lös detta genom att välja ett <strong>lämpligt område</strong> i <em>Ändra förvaltningsdetaljer</em> i formuläret nedan." #: 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 @@ -1163,12 +1183,12 @@ msgid "Fixed" msgstr "Löst" #: 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 "Löst - Kommun" #: 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 "Löst - Användare" @@ -1186,7 +1206,7 @@ msgstr "Löst:" msgid "Flag as deleted" msgstr "Flagga som borttagen" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Flag user" msgstr "Flagga användare" @@ -1207,7 +1227,7 @@ msgstr "Flaggade användare är listade på <a href='%s'>flaggningssidan</a>." msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Flaggade användare är inte begränsade på något sätt. Detta är bara en lista på användare som har markerats för uppmärksamhet." -#: 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 "Flaggat:" @@ -1245,7 +1265,7 @@ msgid "Frequently Asked Questions" msgstr "Vanliga frågor" #: 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 "Få uppdateringar" @@ -1271,7 +1291,7 @@ msgstr "Vi är glada att höra att det har blivit löst!" #: 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 "Gå" @@ -1280,7 +1300,7 @@ msgstr "Gå" msgid "Going to send questionnaire?" msgstr "Skicka enkät?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "Bevilja tillgång till administratörskontrollpanelen" @@ -1322,8 +1342,8 @@ msgstr "Hej %s" #: 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 @@ -1366,7 +1386,7 @@ msgstr "Jag rapporterade precis ett problem på @fixamingata" msgid "I just updated a problem on @fixmystreet" msgstr "Jag uppdaterade precis ett problem på @fixamingata" -#: 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 "Tyvärr kunde vi inte hitta ditt problem i databasen.\n" @@ -1412,6 +1432,10 @@ msgstr "Om du bara vill att den här mallen skall vara valbar för specifika kat msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council." msgstr "Om du skapar en problemrapport här så kommer rapporten <strong>inte</strong> att skickas till kommunen." +#: 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" @@ -1471,7 +1495,7 @@ msgstr "I tillägg, följande attribut som inte är del av Open311 v2-specifikat #: 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 @@ -1507,7 +1531,7 @@ msgid "Internal notes" msgstr "Interna anteckningar" #: 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 "Interna refereringar" @@ -1515,7 +1539,7 @@ msgstr "Interna refereringar" msgid "Invalid agency_responsible value %s" msgstr "Inkorrekt värde för agency_responsible, \"%s\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Inkorrekt slutdatum" @@ -1523,16 +1547,16 @@ msgstr "Inkorrekt slutdatum" msgid "Invalid format %s specified." msgstr "Inkorrekt format %s angivet." -#: 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 "Oglitlig plats. Samma kommun måste ansvara för den nya platsen." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1479 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1481 msgid "Invalid start date" msgstr "Inkorrekt startdatum" #: 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 @@ -1578,7 +1602,11 @@ msgstr "Senaste uppdatering:" msgid "Last update:" msgstr "Senaste uppdatering:" -#: 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 "Tidigast uppdaterad" @@ -1623,6 +1651,10 @@ msgstr "KARTA" msgid "Manage shortlist" msgstr "Hantera slutlista" +#: templates/web/base/reports/_list-filters.html:36 +msgid "Manual order" +msgstr "" + #: templates/web/base/js/translation_strings.html:46 msgid "Map" msgstr "Karta" @@ -1647,7 +1679,7 @@ msgstr "Markerad som löst/stängd för mer än åtta veckor sedan" msgid "Markup problem details" msgstr "Lägg till problemdetaljer" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Meddelande" @@ -1667,7 +1699,7 @@ msgstr "Saknade förvaltningar:" msgid "Missing jurisdiction_id" msgstr "Saknat jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "Moderera" @@ -1675,7 +1707,7 @@ msgstr "Moderera" msgid "Moderate report details" msgstr "Moderera rapportdetaljer" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate this report" msgstr "Moderera den här rapporten" @@ -1687,7 +1719,7 @@ msgstr "Granskat av underavdelningen inom en arbetsdag" msgid "Month" msgstr "Månad" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "Mest kommenterad" @@ -1711,7 +1743,7 @@ msgstr "Mest kommenterad" msgid "Name" msgstr "Namn" -#: 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 @@ -1723,7 +1755,7 @@ msgstr "Namn:" msgid "Name: %s" msgstr "Namn: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "Navigera till det här problemet" @@ -1825,7 +1857,7 @@ msgstr "Ny status" msgid "New template" msgstr "Ny mall" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "Senaste" @@ -1840,7 +1872,7 @@ msgstr "Nästa" #: 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 @@ -1861,7 +1893,7 @@ msgstr "Ingen förvaltning" msgid "No council" msgstr "Ingen kommun" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Ingen kommun vald" @@ -1923,7 +1955,7 @@ msgid "" msgstr "Normala (publika) användare skall inte associeras med någon <strong>förvaltning</strong>.<br>Användare för behörig personal skall kunna bli associerade med den förvaltning som de representerar.<br>Beroende på implementationen kan personal ha tillgång till dashboard-sidan (som summerar förvaltningsaktiviteterna), möjligheten att dölja rapporter, eller möjligheten att sätta speciella rapportstatusvärden." #: 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" @@ -2001,15 +2033,15 @@ msgstr "Äldre <br>fixat" msgid "Older <br>problems" msgstr "Äldre <br>problem" -#: templates/web/base/reports/_list-filters.html:36 +#: templates/web/base/reports/_list-filters.html:39 msgid "Oldest" msgstr "Äldst" #: 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 @@ -2055,13 +2087,13 @@ msgstr "Eller problem rapporterade til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Du kan också prenumerera på bevakningar baserat på vilken kommun du bor i:" -#: 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" @@ -2082,7 +2114,7 @@ msgid "Parent" msgstr "Förälder" #: 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 "Partiell" @@ -2116,7 +2148,7 @@ msgid "Phone number (optional)" msgstr "Telefonnummer (valfritt)" #: 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:" @@ -2168,7 +2200,7 @@ msgstr "Placera nålen på kartan" #: 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 @@ -2196,14 +2228,14 @@ msgid "Please check your email address is correct" msgstr "Vänligen kontrollera att din epostadress är korrekt" #: 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 "Välj en kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Välj en fastighetstyp" @@ -2224,13 +2256,13 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Var snäll och missbruka inte tjänsten, det förstör för alla." #: 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 "Skriv in ett meddelande" #: 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 "Skriv in ett namn" @@ -2245,13 +2277,13 @@ msgid "Please enter a password" msgstr "Skriv in ett lösenord" #: 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 "Skriv in ett ärende" #: 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 @@ -2264,7 +2296,7 @@ msgstr "Skriv in en giltig epostadress" msgid "Please enter a valid email address" msgstr "Skriv in en giltig epostadress" -#: 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 "Skriv några detaljer" @@ -2297,8 +2329,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Skriv in ditt namn och efternamn om kommunen behöver den informationen. Om du inte vill att dit namn visas kan du välja det nedanför" #: 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" @@ -2335,7 +2367,7 @@ msgstr "Fyll i information om problemet nedan." 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 "Fyll i information om problemet nedan och beskriv den exakta platsen för problemet så noga du kan." -#: 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 "Ange ifall du vill ta emot ett annat frågeformulär" @@ -2361,20 +2393,20 @@ msgstr "Observera att din uppdatering <strong>inte har publicerats än</strong>. msgid "Please note:" msgstr "Observera:" -#: perllib/FixMyStreet/App/Controller/Report.pm:335 +#: perllib/FixMyStreet/App/Controller/Report.pm:354 msgid "Please provide a public update for this report." msgstr "Tillhandahåll en offentlig uppdatering för den här rapporten." -#: 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 "Skriv en förklaring till varför du öppna de här rapporten igen" -#: 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 "Skriv lite förklarande text tillsammans med ett foto" -#: 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 "Ange om du har anmält ett problem till kommunen tidigare eller ej" @@ -2390,7 +2422,7 @@ msgstr "Välj det RSS-flöde du vill ha" msgid "Please select the type of alert you want" msgstr "Välj den kategori av rapporter du vill ha" -#: 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 "Ange om problemet har lösts eller ej" @@ -2409,22 +2441,22 @@ msgstr "Skriv ett meddelande" msgid "Please write your update here" msgstr "Skriv din uppdatering här" -#: 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 "Skicka" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Postat anonymt %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Postat av %s (<strong>%s</strong>) %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Postat av %s %s" @@ -2440,7 +2472,8 @@ msgstr "Föregående" msgid "Priorities" msgstr "Prioriteringar" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:96 +#: templates/web/base/report/_item.html:90 msgid "Priority" msgstr "Prioritet" @@ -2456,10 +2489,15 @@ msgstr "Integritetsskydd och kakor" #: 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 "Privat" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Extra uppgifter" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Rapport" @@ -2495,11 +2533,11 @@ msgstr "Problemets status ändrats baserat på utredningsresultat" msgid "Problems" msgstr "Problem" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Närliggande problem" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Problem på kartan" @@ -2511,7 +2549,7 @@ msgstr "Problem nyligen rapporterade som lösta på FixaMinGata" msgid "Problems within %.1fkm of this location" msgstr "Problem inom %.1f km från denna position" -#: 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" @@ -2535,6 +2573,7 @@ msgstr "Problem inom gränsen för:" msgid "Property address:" msgstr "Fastighetsadress:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ge en uppdatering" @@ -2552,12 +2591,17 @@ msgstr "Du måste inte ange namn och ett lösenord men om du gör det är det l msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Att ange ett lösenord är valfritt, men om du gör det kommer du lättare att kunna rapportera problem, lämna uppdateringar och hantera dina anmälningar." +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "Offentlig uppdatering:" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Offentligt svar:" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "Offentlig uppdatering:" @@ -2581,7 +2625,7 @@ msgstr "Frågeformulär %d svarat för problem %d, %s till %s" msgid "Questionnaire %d sent for problem %d" msgstr "Frågeformulär %d skickat för problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Frågeformulär ifyllt av rapportören" @@ -2589,7 +2633,7 @@ msgstr "Frågeformulär ifyllt av rapportören" #: 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 "RSS-flöde" @@ -2617,7 +2661,7 @@ msgstr "RSS-flöde för %s, inom område %s" msgid "RSS feed of nearby problems" msgstr "RSS-flöde av närliggande problem" -#: 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" @@ -2633,12 +2677,12 @@ msgid "RSS feed of recent local problems" msgstr "RSS-flöde för senaste lokala problemen" #: 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 "RSS-flöde för uppdateringar till denna rapport" #: 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 "Erhåll epost när uppdateringar ges till denna rapport" @@ -2660,7 +2704,7 @@ msgstr "Nyligen <br>åtgärdat" msgid "Recently reported problems" msgstr "Senaste rapporterade problemen" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "Senast uppdaterad" @@ -2668,13 +2712,15 @@ msgstr "Senast uppdaterad" 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 "Kom ihåg att FixaMinGata primärt är avsett för att rapportera fysiska problem som kan åtgärdas. Om ditt problem inte lämpar sig för att rapportera via den här webbsidan kan du kontakta din kommun direkt via deras webbsida." -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "Ta bort flagga" -#: 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 "Ta bort från slutlista" @@ -2682,7 +2728,7 @@ msgstr "Ta bort från slutlista" msgid "Remove from site" msgstr "Ta bort från sajten" -#: 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!)" @@ -2696,7 +2742,8 @@ msgstr "Besvara användare:" msgid "Report" msgstr "Rapportera" -#: 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 "Rapport-ID:" @@ -2706,6 +2753,7 @@ msgstr "Rapport-ID:" msgid "Report a problem" msgstr "Rapportera ett problem" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Rapportera missbruk" @@ -2729,8 +2777,8 @@ msgstr "Rapportera ditt problem" msgid "Report, view, or discuss local problems" msgstr "Rapportera, visa, eller diskutera lokala problem" -#: 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 "Rapporterat anonymt %s" @@ -2739,8 +2787,8 @@ msgstr "Rapporterat anonymt %s" msgid "Reported before" msgstr "Rapporterat tidigare" -#: 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 "Rapporterat av %s den %s" @@ -2753,27 +2801,27 @@ msgstr "Rapporterad av:" msgid "Reported in the %s category" msgstr "Rapporterat i kategori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Anonym rapport i kategori %s, %s" -#: 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 "Rapporterat i kategori %s av %s den %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Rapporterat av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Rapporterat av %s av %s den %s" -#: 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 "Rapporterat av %s i kategorin %s, anonymt %s" -#: 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 "Rapporterat av %s i kategorin %s av %s den %s" @@ -2883,16 +2931,16 @@ msgstr "Vägoperatör för den här namngivna vägen (hämtat från vägens numm msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vägoperatör för den här namngivna vägen (från OpenStreetMap): %s" -#: 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 "Rotera åt vänster" -#: 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" @@ -2903,21 +2951,26 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Rotation av detta foto kommer att radera osparade rapportändringar." #: 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 "Satellit" +#: templates/web/base/report/_inspect.html:150 +#, fuzzy +msgid "Save + close as duplicate" +msgstr "markerad som dubblett av rapport" + #: 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 "Spara ändringar" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "Spara med en offentlig uppdatering" @@ -2954,6 +3007,11 @@ msgstr "Inga användare hittades." msgid "See our privacy policy" msgstr "Se vår integritetsskyddspolicy" +#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#, fuzzy +msgid "See user detail for reports created as the council" +msgstr "Skapa rapporter/uppdateringar som kommunen" + #: templates/web/base/admin/body-form.html:39 #: templates/web/zurich/admin/body-form.html:16 msgid "Select a body" @@ -2997,27 +3055,27 @@ msgstr "Skickades:" msgid "Service:" msgstr "Tjänst:" -#: templates/web/base/report/_inspect.html:26 +#: templates/web/base/report/_inspect.html:25 msgid "Set to my current location" msgstr "Sätt till min nuvarande position" -#: templates/web/base/report/display_tools.html:15 +#: templates/web/base/report/display_tools.html:17 msgid "Share" msgstr "Dela" -#: 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 "Slutlista" -#: 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 "Satt på slutlistan" -#: templates/web/base/report/_main.html:140 +#: templates/web/base/report/_main.html:144 msgid "Shortlisted by %s" msgstr "Satt på slutlistan av %s" @@ -3091,7 +3149,7 @@ msgstr "Länken är tyvärr ogiltig" msgid "Sorry, there has been an error confirming your problem." msgstr "Tyvärr har det uppstått ett fel med att bekräfta ditt problem." -#: 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 @@ -3139,12 +3197,14 @@ msgstr "Startdatum:" #: 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 "Status" -#: 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 @@ -3184,7 +3244,7 @@ msgstr "Underkategori: %s" msgid "Subdivision/Body" msgstr "Underavdelning/Förvaltning" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Ärende" @@ -3201,7 +3261,7 @@ msgstr "Ärende:" msgid "Submit" msgstr "Skicka" -#: 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 @@ -3227,7 +3287,7 @@ msgid "Submitted" msgstr "Skickad" #: 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 "Prenumerera" @@ -3498,7 +3558,7 @@ msgstr "Det uppstod ett problem med att visa sidan med alla rapporter. Försök msgid "There was a problem showing this page. Please try again later." msgstr "Det uppstod ett problem med att visa denna sida. Försök gärna igen senare." -#: 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 @@ -3580,9 +3640,9 @@ msgstr "Det här brevet har skickats till flera adresser eftersom rapportören i 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 "Det här brevet har skickats till flera adresser eftersom rapportören inte angav någon kategori, eller den kategori som angavs hör till flera olika enheter. Du kan ignorera det här brevet om du inte är rätt person att hantera det, men det vore också mycket hjälpsamt om du kan ta reda på vem som är rätt person och anmäla detta till oss så att vi kan ändra databasen för framtida brev." -#: 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 "Den här informationen krävs" @@ -3607,6 +3667,10 @@ msgstr "Det här problemet har lösts" msgid "This problem has not been fixed" msgstr "Det här problemet har inte lösts" +#: 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 @@ -3681,7 +3745,8 @@ msgstr "För att visa en karta med den exakta positionen för problemet" msgid "Total" msgstr "Totalt" -#: 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 "Krävs trafikövervakning?" @@ -3689,7 +3754,7 @@ msgstr "Krävs trafikövervakning?" msgid "Trusted by bodies:" msgstr "Anförtrodd av kommunen:" -#: 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 "Anförtrodd att skapa rapporter som inte behöver bli inspekterade" @@ -3706,14 +3771,14 @@ msgid "Try emailing us directly:" msgstr "Prova att skicka ett e-brev till oss direkt:" #: 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 "Kunde inte åtgärda" #: 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 @@ -3733,8 +3798,8 @@ msgstr "Okänt" msgid "Unknown alert type" msgstr "Okänd feltyp" -#: 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 "Okänt fel" @@ -3745,6 +3810,10 @@ msgstr "Okänt fel" msgid "Unknown problem ID" msgstr "Okänt problemnummer" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "Uppdatering" @@ -3798,7 +3867,7 @@ msgid "Updated" msgstr "Uppdaterad" #: 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 @@ -3813,7 +3882,7 @@ msgstr "Uppdaterad!" msgid "Updates" msgstr "Uppdateringar" -#: 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 "Uppdateringar kan inte innehålla mer än %s tecken. Var vänlig korta ned din uppdatering." @@ -3844,11 +3913,11 @@ msgstr "Använde kartan" msgid "User ID to attribute fetched comments to" msgstr "Användar-ID att attribuera hämtade kommentarer till" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1681 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1683 msgid "User flag removed" msgstr "Användarflaggan borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "Användaren flaggad" @@ -3857,7 +3926,7 @@ msgid "User search finds matches in users' names and email addresses." msgstr "Användarsökningen matchar mot användares namn och e-postadresser." #: 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" @@ -3947,6 +4016,10 @@ msgstr "Vid förändringar" msgid "When sent" msgstr "Vid avsändning" +#: 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 "Du kan som mest ladda upp tre foton." @@ -3995,7 +4068,7 @@ msgstr "År" #: 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 @@ -4010,11 +4083,11 @@ msgstr "Ja" msgid "Yes I have a password" msgstr "Ja, jag har ett lösenord" -#: 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 "Du anmäler att den här problemrapporten var modererad i onödan:" -#: 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 "Du vill anmäla missbruk, personlig inforation, eller motsvarande i följande rapport:" @@ -4031,7 +4104,7 @@ msgstr "Du kan <a href=\"%s%s\">se problemet på den här webbplatsen</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Du kan lägga till en elakartade användares e-postadresser i missbrukarlistan, vilket automatiskt döljer (och aldrig skickar) rapporter som användarna skapar." -#: 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 "Du kan kontakta teknisk support på <a href='mailto:%s'>%s</a>." @@ -4122,9 +4195,9 @@ msgstr "Ditt konto" #: 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 @@ -4144,7 +4217,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Din information kommer endast att användas i enlighet med vår <a href=\"/privacy\">sekretesspolicy</a>" #: 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 @@ -4223,53 +4296,53 @@ msgstr "ändra användare" msgid "from %s different users" msgstr "från %s olika användare" -#: 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 "senast uppdaterad %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "mindre än en minut" -#: templates/web/base/report/updates.html:57 +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 msgid "marked as a duplicate report" msgstr "markerad som dubblett av rapport" -#: templates/web/base/report/updates.html:47 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as action scheduled" msgstr "markerad som åtgärd schemalagd" -#: templates/web/base/report/updates.html:59 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "marked as an internal referral" msgstr "markerad som intern referering" -#: templates/web/base/report/updates.html:49 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as closed" msgstr "markerad som stängd" -#: 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 "markerad som löst" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "markerad som pågående" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "markerad som under utredning" -#: templates/web/base/report/updates.html:55 +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 msgid "marked as not the council's responsibility" msgstr "markerad som ej kommunens ansvar" -#: templates/web/base/report/updates.html:43 +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 msgid "marked as planned" msgstr "markerad som planerad" -#: templates/web/base/report/updates.html:53 +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as unable to fix" msgstr "markerad som kunde inte åtgärda" @@ -4315,8 +4388,8 @@ msgstr "ursprungligen inmatat: “%s”" msgid "other areas:" msgstr "andra områden:" -#: 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 "öppnat på nytt" @@ -4362,55 +4435,48 @@ msgstr "användaren är inte problemägare" msgid "ward" msgstr "område" -#: 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" -msgstr[0] "<big>%s</big> rapport nyligen" -msgstr[1] "<big>%s</big> rapporter nyligen" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dag" +msgstr[1] "%d dagar" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d timme" msgstr[1] "%d timmar" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d supporter" -msgstr[1] "%d supportrar" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minut" msgstr[1] "%d minuter" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> uppdatering av rapporter" -msgstr[1] "<big>%s</big> uppdateringar av rapporter" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "Vi har ännu ingen information om kommunen på den platsen" -msgstr[1] "Kommunen på platsen har valt att inte ta emot rapporter från FixaMinGata." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d supporter" +msgstr[1] "%d supportrar" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d vecka" msgstr[1] "%d veckor" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> löst problem senaste månaden" +msgstr[1] "<big>%s</big> lösta problem senaste månaden" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4418,19 +4484,19 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> rapport senaste veckan" msgstr[1] "<big>%s</big> rapporter senaste veckan" -#: 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" -msgstr[0] "<big>%s</big> löst problem senaste månaden" -msgstr[1] "<big>%s</big> lösta problem senaste månaden" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> rapport nyligen" +msgstr[1] "<big>%s</big> rapporter nyligen" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d dag" -msgstr[1] "%d dagar" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> uppdatering av rapporter" +msgstr[1] "<big>%s</big> uppdateringar av rapporter" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4438,3 +4504,13 @@ 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] "Vi har ännu <strong>ingen</strong> information om kommunen på den platsen" msgstr[1] "Kommunen på platsen har valt att inte ta emot rapporter från FixaMinGata." + +#: 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] "Vi har ännu ingen information om kommunen på den platsen" +msgstr[1] "Kommunen på platsen har valt att inte ta emot rapporter från FixaMinGata." + +#~ msgid "Cancel" +#~ msgstr "Avbryt" diff --git a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po index 951df1f0c..e73754901 100644 --- a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/tr_TR.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: Turkish (Turkey) (https://www.transifex.com/mysociety/teams/12067/tr_TR/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:639 +#: perllib/FixMyStreet/DB/Result/Problem.pm:648 #: perllib/FixMyStreet/Script/Reports.pm:199 msgid " and " msgstr "ve" @@ -110,7 +110,7 @@ msgstr "%s bölüm, %s" msgid "%s, within %s ward" msgstr "%s, içinde %s bölüm" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>katkıda bulunanlar" @@ -118,7 +118,7 @@ msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap< 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 "(E-posta kara listede)" @@ -142,12 +142,10 @@ msgstr "(yaklaşık 200,000 kişiyi kapsayan bir mesafe)" 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 "(kapalı)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(onarıldı)" @@ -156,7 +154,7 @@ msgstr "(onarıldı)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(duvar yazısı (grafiti), moloz atma, kırık kaldırım döşeme, ya da sokak aydınlatma gibi)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(kurula gönderilmemiş)" @@ -164,21 +162,21 @@ msgstr "(kurula gönderilmemiş)" msgid "(optional)" msgstr "(isteğe bağlı)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(her ikisine de gönderildi)" -#: 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 "-- Kategori seçiniz--" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Bir özellik seçiniz --" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "" @@ -197,8 +195,8 @@ msgstr "" "Bu muhtemelen \"kapalı alanın\" neden boş olduğunu(aşağıda)<br>\n" "Belkide yapılandırma dosyanıza bazı <code>MAPIT_TYPES</code> eklemelisiniz?" -#. ('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 "" @@ -221,11 +219,11 @@ msgstr "<strong>Hayır</strong> Güncellemelerimi e-posta yoluyla onaylamama izi msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Hayır</strong> e-posta yoluyla giriş yapmama izin ver" -#: 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 "" @@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Evet</strong> şifrem var" #: 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" @@ -269,26 +267,29 @@ msgstr "Bölüm ekle" msgid "Add new category" msgstr "Yeni kategori ekle" -#: 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 "Kullanıcı ekle" -#: 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 "" @@ -296,7 +297,7 @@ msgstr "" msgid "Added %s" msgstr "Eklenmiş %s" -#: 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 "" @@ -351,7 +352,7 @@ msgstr "Bir güncelleştirme sorun giderildi olarak işaretlenmiş. " msgid "Anonymous" msgstr "Anonim" -#: 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 "Anonim:" @@ -406,7 +407,7 @@ msgstr "Dışarıdan bir organ atamak:" msgid "Assign to subdivision:" msgstr "Alt bölüm atamak:" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Assign users to areas" msgstr "" @@ -431,8 +432,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 "" @@ -440,7 +441,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 "Denetleme bekliyor" @@ -453,12 +454,12 @@ msgstr "Geri" 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 "Email adresini engelle" #: 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 @@ -489,10 +490,6 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Haritayı göremiyor musunuz? <em>Bu adımı atlayın</em>" -#: 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" @@ -505,7 +502,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 @@ -525,7 +523,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "Bu kategori için problemlerin onarılma süresi > 4 hafta" -#: 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 @@ -600,6 +598,10 @@ msgstr "" "Herkes tarafından kolay anlaşılabilecek bir <strong>kategori</strong> ismi seçin (ör: \"çukur\", \"sokak lambası\") aynı zamanda birime de\n" "yardımcı olacak. Bunlar problem-bildir sayfasındaki açılan menüde görüntülenecektir." +#: 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" @@ -628,10 +630,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 @@ -733,8 +736,8 @@ msgstr "Grupla bağlantı kur" 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 "Kullanıcı bulunamadı" @@ -788,7 +791,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 "" @@ -829,7 +832,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Alt komisyon tarafından 5 iş günü içinde üstesinden gelinilecek" #: 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 "" @@ -895,21 +898,35 @@ msgstr "" msgid "Don’t know" msgstr "Don’t know" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "Şekilleri beğenmediniz mi?" +#: 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 "Çoğaltmak" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Çoğaltmak" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Çoğaltmak" + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -918,7 +935,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 "" @@ -937,11 +955,11 @@ msgstr "Ekle" msgid "Edit body details" msgstr "Bölümün detaylarını düzenle" -#: 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 "" @@ -992,7 +1010,7 @@ msgstr "Editör" msgid "Email" msgstr "E-posta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "E-posta kara listeye eklendi" @@ -1010,11 +1028,11 @@ msgstr "E-posta uyarısı oluşturuldu" msgid "Email alert deleted" msgstr "E-posta uyarısı silindi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1622 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1624 msgid "Email already in abuse list" msgstr "E-posta kara listede" -#: 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 @@ -1085,7 +1103,7 @@ msgid "Enter details of the problem" msgstr "Problem hakkında detaylı bilgi giriniz" #: 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 @@ -1107,8 +1125,8 @@ msgstr "Örnek postakodu " msgid "Examples:" msgstr "Örnekler:" -#: 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 "" @@ -1144,7 +1162,8 @@ msgstr "" msgid "Extra data:" msgstr "İlave veriler:" -#: 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 "" @@ -1166,11 +1185,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 @@ -1178,12 +1198,12 @@ msgid "Fixed" msgstr "Sorun çözüldü" #: 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 "Sorun çözüldü- Kurul" #: 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 "Sorun çözüldü- Kullanıcı" @@ -1201,7 +1221,7 @@ msgstr "Sorun çözüldü:" msgid "Flag as deleted" msgstr "Silindi olarak seçildi" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Flag user" msgstr "Kullanıcıyı seç" @@ -1222,7 +1242,7 @@ msgstr "Seçilen kullanıcılar <a href='%s'>etiketliler</a>sayfasında listelen msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Seçilen kullanıcılar hiç bir şekilde kısıtlanmamıştır. Bu sadece dikkate alınmak üzere işaretlenen kullanıcıların listesidir." -#: 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 "Seçilenler:" @@ -1260,7 +1280,7 @@ msgid "Frequently Asked Questions" msgstr "Sıkça Sorulan Sorular" #: 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 "Güncellemeleri yap" @@ -1286,7 +1306,7 @@ msgstr "Problemin çözüldüğünü duymak güzel" #: 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 "Git" @@ -1295,7 +1315,7 @@ msgstr "Git" msgid "Going to send questionnaire?" msgstr "Anket gönderecek misiniz?" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "" @@ -1337,8 +1357,8 @@ msgstr "Merhaba %s" #: 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 @@ -1381,7 +1401,7 @@ msgstr "@fixmystreet'e bir problemi henüz bildirdim." msgid "I just updated a problem on @fixmystreet" msgstr "@fixmystreet'teki problemi yeni güncelledim" -#: 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 "Maalesef veri tabanında sorunun yerini bulamadık.\n" @@ -1427,6 +1447,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" @@ -1486,7 +1510,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 @@ -1522,7 +1546,7 @@ msgid "Internal notes" msgstr "İç notlar" #: 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 "İç yönlendirme" @@ -1530,7 +1554,7 @@ msgstr "İç yönlendirme" msgid "Invalid agency_responsible value %s" msgstr "Geçersiz ajans_sorumlu değer %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Geçersiz bitiş tarihi" @@ -1538,16 +1562,16 @@ msgstr "Geçersiz bitiş tarihi" msgid "Invalid format %s specified." msgstr "Geçersiz format %s belirlenmiş." -#: 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 "Geçersiz başlangıç tarihi" #: 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 @@ -1593,7 +1617,11 @@ msgstr "Son güncelleme:" msgid "Last update:" msgstr "Son güncelleme:" -#: 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 "" @@ -1638,6 +1666,10 @@ msgstr "HARİTA" 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 "Harita" @@ -1662,7 +1694,7 @@ msgstr "8 haftadan daha uzun bir süre önce halledilmiş/kapatılmış olarak i msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "İleti" @@ -1682,7 +1714,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Eksik yetki_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1690,7 +1722,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 "" @@ -1702,7 +1734,7 @@ msgstr "Bir iş gününe bölünmüş bir şekilde yönetilmiştir" msgid "Month" msgstr "Ay" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "" @@ -1726,7 +1758,7 @@ msgstr "" msgid "Name" msgstr "İsim" -#: 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 @@ -1738,7 +1770,7 @@ msgstr "İsim:" msgid "Name: %s" msgstr "İsim: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1838,7 +1870,7 @@ msgstr "Yeni durum" msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "" @@ -1853,7 +1885,7 @@ msgstr "Sonraki" #: 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 @@ -1874,7 +1906,7 @@ msgstr "Birim yok" msgid "No council" msgstr "Kurul yok" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "Seçilmiş kurul yok" @@ -1934,7 +1966,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" @@ -2012,15 +2044,15 @@ msgstr "Geçmişte <br>onarılmış" msgid "Older <br>problems" msgstr "Eski <br>sorunlar" -#: 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 @@ -2066,13 +2098,13 @@ msgstr "Veya 'e bildirilen sorunlar:" 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" @@ -2093,7 +2125,7 @@ msgid "Parent" msgstr "Ebeveyn" #: 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 "Kısmi" @@ -2127,7 +2159,7 @@ msgid "Phone number (optional)" msgstr "Telefon numarası (isteğe bağlı)" #: 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:" @@ -2179,7 +2211,7 @@ msgstr "Harita üzerine işaretleyin" #: 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 @@ -2207,14 +2239,14 @@ msgid "Please check your email address is correct" msgstr "E-posta adresinizin doğruluğunu kontrol ediniz" #: 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 "Kategori seçiniz" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "Bir özellik seçin" @@ -2235,13 +2267,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 "Mesaj giriniz" #: 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 "" @@ -2256,13 +2288,13 @@ msgid "Please enter a password" msgstr "Şifre giriniz" #: 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 "Konu giriniz" #: 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 @@ -2275,7 +2307,7 @@ msgstr "Geçerli e-posta giriniz" msgid "Please enter a valid email address" msgstr "Geçerli e-posta adresi giriniz" -#: 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 "Lütfen bir kaç ayrıntı giriniz" @@ -2308,8 +2340,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Lütfen adınızı ve soyadınızı giriniz, kurullar için gereklidir – eğer isminizin sitede kullanılmasını istemiyorsanız, aşağıda bulunan kutucuktan tiki kaldırınız." #: 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" @@ -2346,7 +2378,7 @@ msgstr "Lütfen probleme ait ayrıntıları giriniz." 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 "Lütfen aşağıda verilen formu problemin detayları ile ilgili doldurunuz ve konumu detay kutucuğu içerisine mümkün oldukça yakın bir şekilde tarif ediniz." -#: 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 "Başka bir anket doldurmak istediğinizi belirtiniz." @@ -2372,20 +2404,20 @@ msgstr "" msgid "Please note:" msgstr "Lütfen dikkat:" -#: 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 "Bu bildirimi neden paylaşatığınza dair lütfen bir kaç açıklama yapın" -#: 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 "Hem metin hem de fotoğraf ekleyiniz" -#: 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 "Bir kurula daha önce sorun bildirip bildirmediğinizi belirtin" @@ -2401,7 +2433,7 @@ msgstr "Bilgilendirme seçiniz" msgid "Please select the type of alert you want" msgstr "İstediğiniz bir bildiri şekli secin" -#: 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 "Problemin giderilmiş veya giderilmemiş olması durumunu bildiriniz lütfen" @@ -2420,22 +2452,22 @@ msgstr "Mesaj gönderin" msgid "Please write your update here" msgstr "Güncellemeleri buraya yazınız" -#: 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 "Paylaş" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "%s Anonim olarak gönderildi" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "%s (<strong>%s</strong>) tarafından %s 'te paylaşılmıştır" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Tarafından paylaşıldı %s saat %s" @@ -2451,7 +2483,8 @@ msgstr "Önceki" 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 "" @@ -2467,10 +2500,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 "Özel" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Özel" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Sorun" @@ -2506,11 +2544,11 @@ msgstr "Araştırma sonucu göz önünde bulundurularak problemin durumundaki de msgid "Problems" msgstr "Sorunlar" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Çevredeki problemler" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Haritadaki problemler" @@ -2522,7 +2560,7 @@ msgstr "FixMyStreet'te kısa bir süre önce onarıldı olarak bildirilen proble msgid "Problems within %.1fkm of this location" msgstr "Konumun %.1fkm içerisinde yer alan sorunlar" -#: 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" @@ -2546,6 +2584,7 @@ msgstr "İlgilenilen kısım içinde yer alan sorunlar:" msgid "Property address:" msgstr "Emlak adresi:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Güncellemeye izin ver" @@ -2563,12 +2602,17 @@ msgstr "İsim ve şifre edinmek isteğe bağlıdır, fakat şifre almış olman msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Şifre sağlamak isteğe bağlıdır, fakat şifre almış olmanız durumunda sorunları bildirmek, güncellemeleri yapmak ve bildirimleri yönetmek daha kolay olacaktır." +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "Toplumsal geri bildirim:" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Toplumsal geri bildirim:" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "" @@ -2592,7 +2636,7 @@ msgstr "%s den %s 'e cevaplanan %d sorunun %d anketi" msgid "Questionnaire %d sent for problem %d" msgstr "%d sorunu için gönderilen %d anket" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Anket sorun bildirici tarafından dolduruldu" @@ -2600,7 +2644,7 @@ msgstr "Anket sorun bildirici tarafından dolduruldu" #: 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 "RSS besleme" @@ -2628,7 +2672,7 @@ msgstr "%s içinde %s gözetimiyle RSS besleme" msgid "RSS feed of nearby problems" msgstr "Civardaki problemlerle alakalı RSS besleme" -#: 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" @@ -2644,12 +2688,12 @@ msgid "RSS feed of recent local problems" msgstr "Son günlerdeki yerel problemlerle alakalı RSS besleme" #: 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 "Bu problemin güncellemelerini RSS olarak besle" #: 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 "Bu sorunda herhangi bir güncelleme olduğunda e-posta ile bildir." @@ -2671,7 +2715,7 @@ msgstr "Yakın zamanda <br>onarılmış" msgid "Recently reported problems" msgstr "Yakın zamanda bildirilen problemler" -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2679,13 +2723,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 "Şehir Dedektifi uygulamasının temel amacının, kamusal alanlardaki alt ve üst yapıları ile alakalı problemlerin ilgili kurumlara iletilmesini sağlamak olduğunu hatırlatır, bahse konu alanlar dışındaki problem veya şikayetlerin ilgili kuruma direk olarak iletilmesini tavsiye ederiz." -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "İşareti kaldır" -#: 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 "" @@ -2693,7 +2739,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!)" @@ -2707,7 +2753,8 @@ msgstr "" msgid "Report" msgstr "Bildirim" -#: 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 "" @@ -2717,6 +2764,7 @@ msgstr "" msgid "Report a problem" msgstr "Bir problem bildir" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Kötüye kullanım bildir" @@ -2740,8 +2788,8 @@ msgstr "Probleminizi bildirin" msgid "Report, view, or discuss local problems" msgstr "Yerel problemleri bildir, göster ve tartış" -#: 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 "%s 'e ananim olarak bildirilmiş" @@ -2750,8 +2798,8 @@ msgstr "%s 'e ananim olarak bildirilmiş" msgid "Reported before" msgstr "Önceden bildirilmiş" -#: 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 "%s tarafından %s de bildirilmiştir" @@ -2764,27 +2812,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "%s kategorisine bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "%s kategorisine anonim olarak %s de bildirilmiştir" -#: 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 " %s tarafından %s kategorisinde %s de bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "%s aracılığıyla anonim olarak %s de bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "%s yoluyla %s tarafından %s da bildirilmiştir" -#: 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 "%s aracılığıyla %s kategorisine anonim olarak %s de bildirilmiştir" -#: 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 " %s tarafından %s kategorisinde %s aracılığıyla %s 'e bildirilen raporlar" @@ -2894,16 +2942,16 @@ msgstr "Bu isimli yol için yol operatörü (yol referans numarası ve türünde msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Bu isimli yol için yol operatörü (OpenStreetMap'ten): %s" -#: 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 "Sola Yerleştir" -#: 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" @@ -2914,21 +2962,26 @@ 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 "Uydu" +#: templates/web/base/report/_inspect.html:150 +#, fuzzy +msgid "Save + close as duplicate" +msgstr "tekrarlanmış bildirim olarak işaretle" + #: 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 "Değişiklikleri kaydet" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -2965,6 +3018,10 @@ msgstr "Arama sonucu kullanıcı bulunamadı" 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" @@ -3008,27 +3065,27 @@ msgstr "gönderildi:" msgid "Service:" msgstr "Hizmet:" -#: 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 "Paylaş" -#: 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 "" @@ -3100,7 +3157,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Üzgünüz, sorununuzu onaylarken bir hata oluştu." -#: 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 @@ -3148,12 +3205,14 @@ msgstr "Başlangıç Tarihi:" #: 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 "Devlet" -#: 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 @@ -3193,7 +3252,7 @@ msgstr "Alt kategori: %s" msgid "Subdivision/Body" msgstr "Alt bölüm/Bölüm" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Konu" @@ -3210,7 +3269,7 @@ msgstr "Konu:" msgid "Submit" msgstr "Kaydet" -#: 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 @@ -3236,7 +3295,7 @@ msgid "Submitted" msgstr "Kaydedildi" #: 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 "Kaydet" @@ -3507,7 +3566,7 @@ msgstr "Tüm Bildirimlerin görüntülendiği sayfada bir sorun var. Lütfen dah msgid "There was a problem showing this page. Please try again later." msgstr "Bu sayfa görüntülenirken bir sorun oluştu. Lütfen daha sonra tekrar deneyin." -#: 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 @@ -3589,9 +3648,9 @@ msgstr "Kullanıcının problemi sınıflandırmama durumunda, bu e-posta proble 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 "Bu e-posta problemin konumunu kapsayan çeşitli kurullara gönderilmiştir. Seçilmiş kategori kurulun yetki alanı dışındaysa, bu sorunu dikkate almayın." -#: 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 "Bu bilgi gereklidir" @@ -3616,6 +3675,10 @@ msgstr "Bu problem çözüldü" msgid "This problem has not been fixed" msgstr "Bu problem giderilemedi" +#: 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 @@ -3690,7 +3753,8 @@ msgstr "Bu konudaki kesin lokasyonu haritasını göstermek için" msgid "Total" msgstr "Toplam" -#: 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 "" @@ -3698,7 +3762,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 "" @@ -3715,14 +3779,14 @@ msgid "Try emailing us directly:" msgstr "Direkt olarak e-posta gönderin:" #: 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 "Onarımı mümkün değil" #: 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 @@ -3742,8 +3806,8 @@ msgstr "Bilinmeyen" msgid "Unknown alert type" msgstr "Bilinmeyen uyarı tipi" -#: 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 "Bilinmeyen hata" @@ -3754,6 +3818,10 @@ msgstr "Bilinmeyen hata" msgid "Unknown problem ID" msgstr "Bilinmeyen ID problemi" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "Güncelleme" @@ -3807,7 +3875,7 @@ msgid "Updated" msgstr "Güncellendi" #: 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 @@ -3822,7 +3890,7 @@ msgstr "Güncellendi!" msgid "Updates" msgstr "Güncellemeler" -#: 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 "Güncellemeler %s uzunluğunda karakter ile sınırlıdır. Lütfen güncellemenizi kısaltın." @@ -3853,11 +3921,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 "Kullanıcı etiketi kaldırıldı" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "Kullanıcı etiketlendi" @@ -3866,7 +3934,7 @@ msgid "User search finds matches in users' names and email addresses." msgstr "Arama sonuçları kullanıcı adı ve e-posta adresi ile uyumludur." #: 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" @@ -3956,6 +4024,10 @@ msgstr "Yayınlandığında" msgid "When sent" msgstr "Gönderildiğinde" +#: 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 "" @@ -4004,7 +4076,7 @@ msgstr "Yıl" #: 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 @@ -4019,11 +4091,11 @@ msgstr "Evet" msgid "Yes I have a password" msgstr "Evet şifrem var" -#: 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 "Bu problem bildirimini gereksiz bir şekilde yönetildiği için şikayet ediyorsun:" -#: 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 "Aşağıdaki kişisel bilgi veya benzeri kötü niyetli raporları içeren sorunları bildiriyorsun: " @@ -4040,7 +4112,7 @@ msgstr "Problemi <a href=\"%s%s\">bu site üzerinde görüntüleyebilir siniz</a msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Kötü niyetli bir kullanıcının e-postasını otomatik olarak gizlenen (ve asla gönderilmeyen) raporların bulunduğu kara listeye ekleyebilirsiniz." -#: 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 "Teknik destek için <a href='mailto:%s'>%s</a> iletişime geçebilirsiniz." @@ -4133,9 +4205,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 @@ -4155,7 +4227,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Bilgileriniz sadece bizim <a href=\"/privacy\">gizlilik politikası</a> uyumluluğu çerçevesinde kullanılacaktır" #: 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 @@ -4234,53 +4306,53 @@ msgstr "kullanıcı düzenle" msgid "from %s different users" msgstr " %s farklı kullanıcılardan" -#: 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 "son güncelleme %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "bir dakikadan az" -#: templates/web/base/report/updates.html:57 +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 msgid "marked as a duplicate report" msgstr "tekrarlanmış bildirim olarak işaretle" -#: templates/web/base/report/updates.html:47 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as action scheduled" msgstr "planlanan eylem olarak işaretle" -#: templates/web/base/report/updates.html:59 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "marked as an internal referral" msgstr "bir iç yönlendirme olarak işaretle" -#: templates/web/base/report/updates.html:49 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as closed" msgstr "kapandı olarak işaretle" -#: 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 "Onarıldı olarak işaretle" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "Devam etmekte olarak işaretle" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "araştırılıyor olarak işaretle" -#: templates/web/base/report/updates.html:55 +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 msgid "marked as not the council's responsibility" msgstr "Kurulun sorumluluğu dışında olarak işaretle" -#: templates/web/base/report/updates.html:43 +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 msgid "marked as planned" msgstr "Planlandı olarak işaretle" -#: templates/web/base/report/updates.html:53 +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as unable to fix" msgstr "onarılamaz olarak işaretle" @@ -4326,8 +4398,8 @@ msgstr "özgün giriş: “%s”" msgid "other areas:" msgstr "diğer bölgeler:" -#: 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 "yeniden açıldı" @@ -4373,68 +4445,68 @@ msgstr "kullanıcı problemin sahibi" msgid "ward" msgstr "bölge" -#: 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" -msgstr[0] "<big>%s</big> son bildirimler" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d gün" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d saat" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d destekçiler" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d dakika" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> bildirimlerin güncellemeleri" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] " Bahsettiğiniz alanı kapsayan ilgili kurul hakkında detaylı bilgimiz yok." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d destekçiler" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d hafta" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> geçen ay onarıldı" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> geçen haftaki bildirimler" -#: 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" -msgstr[0] "<big>%s</big> geçen ay onarıldı" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> son bildirimler" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d gün" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> bildirimlerin güncellemeleri" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format msgid "We do <strong>not</strong> yet have details for the other council that covers this location." msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "Bahsettiğiniz alanı kapsayan ilgili diğer kurullar hakkında henüz detaylı bilgimiz <strong>yok</strong>" + +#: 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] " Bahsettiğiniz alanı kapsayan ilgili kurul hakkında detaylı bilgimiz yok." diff --git a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po index 1ef5207d9..64c7427ff 100644 --- a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/uk_UA.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: Ukrainian (Ukraine) (https://www.transifex.com/mysociety/teams/12067/uk_UA/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 "%s район, %s" msgid "%s, within %s ward" msgstr "%s, в межах %s району" -#: 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 "" @@ -197,8 +195,8 @@ msgstr "" " This is probably why \"area covered\" is empty (below).<br>\n" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" -#. ('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 "" @@ -221,11 +219,11 @@ msgstr "<strong>Ні</strong> Я підтверджу поновлення е-п msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Ні</strong> я залогінюсь через е-пошту" -#: 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 "" @@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Так</strong> В мене є пароль" #: 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" @@ -265,26 +263,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 "" @@ -292,7 +293,7 @@ msgstr "" msgid "Added %s" msgstr "Додано %s" -#: 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 "" @@ -347,7 +348,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 "Анонім:" @@ -402,7 +403,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 "" @@ -427,8 +428,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 "" @@ -436,7 +437,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 "Очікує перевірки модератором" @@ -449,12 +450,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 @@ -485,10 +486,6 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Не бачите мапу? <em>Пропустіть цей крок</em>" -#: 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" @@ -501,7 +498,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 @@ -521,7 +519,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "В цій категорії проблеми не вирішуються > 4 тижнів" -#: 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 @@ -586,6 +584,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" @@ -614,10 +616,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 @@ -719,8 +722,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 "Не вдалось знайти користувача" @@ -774,7 +777,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 "" @@ -815,7 +818,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Dealt with by subdivision within 5 working days" #: 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 "" @@ -881,21 +884,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" @@ -904,7 +921,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 "" @@ -923,11 +941,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 "" @@ -978,7 +996,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 "Пошта занесена в чорний список" @@ -996,11 +1014,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 @@ -1067,7 +1085,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 @@ -1089,8 +1107,8 @@ msgstr "Зразок поштового коду %s" 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 "" @@ -1126,7 +1144,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 "" @@ -1148,11 +1167,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "Полагодіть це вибравши <strong>зону покриття</strong> в <em>формі редагування органу </em> нижче." #: 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 @@ -1160,12 +1180,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 "Вирішено - Користувач" @@ -1183,7 +1203,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 "Відмітьте користувача" @@ -1204,7 +1224,7 @@ msgstr "Відмічені користувачі виписані на <a href= 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 "Відмічено:" @@ -1242,7 +1262,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 "Отримувати оновлення" @@ -1268,7 +1288,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 "Вперед" @@ -1277,7 +1297,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 "" @@ -1319,8 +1339,8 @@ msgstr "Вітаємо, %s" #: 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 @@ -1363,7 +1383,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 "Нажаль ми не можем знайти вашу проблему в базі даних.\n" @@ -1413,6 +1433,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" @@ -1472,7 +1496,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 @@ -1508,7 +1532,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 "Внутрішнє посилання" @@ -1516,7 +1540,7 @@ msgstr "Внутрішнє посилання" msgid "Invalid agency_responsible value %s" msgstr "Невірне значення agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Невірна кінцева дата" @@ -1524,16 +1548,16 @@ msgstr "Невірна кінцева дата" msgid "Invalid format %s specified." msgstr "Невірний формат %s ." -#: 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 @@ -1579,7 +1603,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 "" @@ -1624,6 +1652,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 "" @@ -1648,7 +1680,7 @@ msgstr "" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Повідомлення" @@ -1668,7 +1700,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Бракує jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1676,7 +1708,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 "" @@ -1688,7 +1720,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 "" @@ -1712,7 +1744,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 @@ -1724,7 +1756,7 @@ msgstr "Ім'я:" msgid "Name: %s" msgstr "Ім'я: %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1826,7 +1858,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 "" @@ -1841,7 +1873,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 @@ -1862,7 +1894,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 "Не вибраний департамент" @@ -1922,7 +1954,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" @@ -2000,15 +2032,15 @@ msgstr "Раніше <br>виправлено" msgid "Older <br>problems" msgstr "Старіші <br>проблеми" -#: 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 @@ -2054,13 +2086,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" @@ -2081,7 +2113,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 "Частково" @@ -2115,7 +2147,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:" @@ -2167,7 +2199,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 @@ -2195,14 +2227,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 "Будь ласка оберіть тип майна" @@ -2223,13 +2255,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 "" @@ -2244,13 +2276,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 @@ -2263,7 +2295,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 "Будь ласка додайте трохи подробиць" @@ -2296,8 +2328,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" @@ -2334,7 +2366,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 "Будь ласка вкажіть чи ви хочете отримати інші опитування." @@ -2360,20 +2392,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 "Будь ласка розкажіть чи ви відправляли сповіщення департаменту раніше" @@ -2389,7 +2421,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 "Будь ласка вкажіть чи була вирішена проблема" @@ -2408,22 +2440,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 "Опубліковано анонімно в %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Опубліковано %s (<strong>%s</strong>) в %s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Опубліковано %s в %s" @@ -2439,7 +2471,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 "" @@ -2455,10 +2488,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 "Проблема" @@ -2494,11 +2532,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 "Проблеми на мапі" @@ -2510,7 +2548,7 @@ msgstr "Нещодавно вирішені проблеми" msgid "Problems within %.1fkm of this location" msgstr "Проблеми в радіусі %.1fkm від цієї точки" -#: 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" @@ -2534,6 +2572,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 "Надішліть оновлення" @@ -2551,12 +2590,17 @@ 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 +#, fuzzy +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 "" @@ -2580,7 +2624,7 @@ msgstr "Опитування %d проведено стосовно пробле msgid "Questionnaire %d sent for problem %d" msgstr "Анкета %d відправлена по проблемі %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "Анкета заповнена автором сповіщення" @@ -2588,7 +2632,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 "RSS потік" @@ -2616,7 +2660,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" @@ -2632,12 +2676,12 @@ msgid "RSS feed of recent local problems" msgstr "RSS стрічка недавніх локальних проблем" #: 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 "RSS стрічка з оновленнями по цій проблемі" #: 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 "Отримувати листа коли інформація по проблемі буде оновлена" @@ -2659,7 +2703,7 @@ msgstr "Нещодавно <br>вирішені" 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 "" @@ -2667,13 +2711,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 "" @@ -2681,7 +2727,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!)" @@ -2695,7 +2741,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 "" @@ -2705,6 +2752,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 "Поскаржитись" @@ -2728,8 +2776,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 "Сповіщено анонімно по %s" @@ -2738,8 +2786,8 @@ msgstr "Сповіщено анонімно по %s" 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 "Перевідкрито %s о %s" @@ -2752,27 +2800,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Сповіщено в категорії %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Сповіщено в категорії %s анонімно о %s" -#: 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 "Сповіщено в категорію %s %s о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Сповіщено %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Сповіщено через %s %s о %s" -#: 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 "Сповіщено через %s в категорію %s анонімно о %s" -#: 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 "Сповіщено через %s в категорію %s %s о %s" @@ -2882,16 +2930,16 @@ msgstr "Обслуговувач цієї дороги (отримано з до msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Обслуговувач цієї дороги (з OpenStreetMap): %s" -#: 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" @@ -2902,21 +2950,26 @@ 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 +#, fuzzy +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 "" @@ -2953,6 +3006,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" @@ -2996,27 +3053,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 "" @@ -3088,7 +3145,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 @@ -3136,12 +3193,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 @@ -3181,7 +3240,7 @@ msgstr "Підкатегорія: %s" msgid "Subdivision/Body" msgstr "Підрозділ/Орган" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Тема" @@ -3198,7 +3257,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 @@ -3224,7 +3283,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 "Підписатись" @@ -3501,7 +3560,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 @@ -3583,9 +3642,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 "Ця інформація обов'язкова" @@ -3610,6 +3669,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 @@ -3684,7 +3747,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 "" @@ -3692,7 +3756,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 "" @@ -3709,14 +3773,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 @@ -3736,8 +3800,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 "Невідома помилка" @@ -3748,6 +3812,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 "Поновлення" @@ -3801,7 +3869,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 @@ -3816,7 +3884,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 "Поновлення обмежені кількістю в %s символів. Будь ласка скоротіть текст." @@ -3847,11 +3915,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 "Користувач відмічений" @@ -3860,7 +3928,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" @@ -3950,6 +4018,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 "" @@ -3998,7 +4070,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 @@ -4013,11 +4085,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 "You are reporting the following problem report for being abusive, containing personal information, or similar:" @@ -4034,7 +4106,7 @@ msgstr "Ви можете <a href=\"%s%s\">переглянути проблем msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." -#: 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 "Технічна підтримка доступна за адресою <a href='mailto:%s'>%s</a>" @@ -4128,9 +4200,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 @@ -4150,7 +4222,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "Ваша інформація буде використана згідно <a href=\"/privacy\">політики конфіденційності</a>" #: 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 @@ -4229,53 +4301,53 @@ msgstr "редагувати користувача" msgid "from %s different users" msgstr "від %s різних користувачів" -#: 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 "останнє поновлення %s" -#: 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 "позначено як неможливо полагодити" @@ -4321,8 +4393,8 @@ msgstr "в оригіналі вказано: “%s”" 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 "перевідкрито" @@ -4368,15 +4440,15 @@ 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" -msgstr[0] "<big>%s</big> звіт недавно" -msgstr[1] "<big>%s</big> звітів недавно" -msgstr[2] "<big>%s</big> звітів недавно" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d день" +msgstr[1] "%d днів" +msgstr[2] "%d днів" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4384,15 +4456,7 @@ msgstr[0] "%d година" msgstr[1] "%d годин" msgstr[2] "%d годин" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d прибічник" -msgstr[1] "%d прибічників" -msgstr[2] "%d прибічників" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4400,23 +4464,15 @@ msgstr[0] "%d хвилина" msgstr[1] "%d хвилин" msgstr[2] "%d хвилин" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> оновлення на звіті" -msgstr[1] "<big>%s</big> оновлень на звіті" -msgstr[2] "<big>%s</big> оновлень на звіті" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "" -msgstr[2] "" +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d прибічник" +msgstr[1] "%d прибічників" +msgstr[2] "%d прибічників" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4424,6 +4480,14 @@ msgstr[0] "%d тиждень" msgstr[1] "%d тижднів" msgstr[2] "%d тижднів" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "<big>%s</big> полагоджено минувшого місяця" +msgstr[1] "<big>%s</big> полагоджено минувшого місяця" +msgstr[2] "<big>%s</big> полагоджено минувшого місяця" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4432,21 +4496,21 @@ msgstr[0] "<big>%s</big> звіт за минувший тиждень" msgstr[1] "<big>%s</big> звітів за минувший тиждень" msgstr[2] "<big>%s</big> звітів за минувший тиждень" -#: 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" -msgstr[0] "<big>%s</big> полагоджено минувшого місяця" -msgstr[1] "<big>%s</big> полагоджено минувшого місяця" -msgstr[2] "<big>%s</big> полагоджено минувшого місяця" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> звіт недавно" +msgstr[1] "<big>%s</big> звітів недавно" +msgstr[2] "<big>%s</big> звітів недавно" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d день" -msgstr[1] "%d днів" -msgstr[2] "%d днів" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> оновлення на звіті" +msgstr[1] "<big>%s</big> оновлень на звіті" +msgstr[2] "<big>%s</big> оновлень на звіті" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4455,3 +4519,11 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" msgstr[2] "" + +#: 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] "" +msgstr[2] "" diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po index 6d7242b38..600c79006 100644 --- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/zh.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: Chinese (https://www.transifex.com/mysociety/teams/12067/zh/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:639 +#: perllib/FixMyStreet/DB/Result/Problem.pm:648 #: perllib/FixMyStreet/Script/Reports.pm:199 msgid " and " msgstr "與" @@ -121,7 +121,7 @@ msgstr "%s 里/區, %s " msgid "%s, within %s ward" msgstr "%s, 在%s 里/區" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "版本; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap開放街道地圖</a> 貢獻者" @@ -129,7 +129,7 @@ msgstr "版本; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap 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 "電郵為濫發信件" @@ -153,12 +153,10 @@ msgstr "預設距離約涵蓋20萬人口" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "或可在 %s另外修改自定RSS訂閱" -#: 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 "(己處理)" @@ -167,7 +165,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 "不要向地方政府送出" @@ -175,21 +173,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 "" @@ -210,8 +208,8 @@ msgstr "" "\n" "可以在你的設定檔加入一些 <code>地圖連結別</code> " -#. ('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 "<label for=\"statuses\">颢示</label> %s <label for=\"filter_categories\">關於</label> %s" @@ -234,11 +232,11 @@ msgstr "<strong>不</strong> 我要用電子郵件收到更新通知" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>不</strong> 我要用電子郵件登入" -#: 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 "" @@ -249,7 +247,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>是</strong> 我有密碼" #: 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" @@ -282,26 +280,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 "" @@ -309,7 +310,7 @@ msgstr "" msgid "Added %s" msgstr "新增 %s" -#: 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 "" @@ -364,7 +365,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 "匿名:" @@ -419,7 +420,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 "" @@ -444,8 +445,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 "" @@ -453,7 +454,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 "待核可" @@ -466,12 +467,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 @@ -502,10 +503,6 @@ msgstr "你的信箱中找不到我們的來信嗎？先檢查看看垃圾回收 msgid "Can't see the map? <em>Skip this step</em>" msgstr "無法顯示地圖？ <em>略過本步驟</em>" -#: 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" @@ -518,7 +515,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 @@ -538,7 +536,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "4週前己修復問題之類別" -#: 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 @@ -611,6 +609,10 @@ msgid "" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "選擇民眾可理解的<strong>類別</strong> (例如., \"路面坑洞\", \"街燈故障\") 也助於讓有關單位掌握. 此類別將會顯示在申報問題頁的下拉式選項上。" +#: 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" @@ -639,10 +641,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 @@ -744,8 +747,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 "找不到該戶用" @@ -799,7 +802,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 "創建模版" @@ -840,7 +843,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "下屬單位5個工作天內處理。" #: 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 "刪除模版" @@ -906,21 +909,35 @@ msgstr "您是否有 %s密碼？ " 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" @@ -932,7 +949,8 @@ msgstr "" "不同類別 <strong>能夠同一位承辦人</strong> (電子郵件)\n" "這表示你可以多加一些類別，即使你只聯絡一位承辦人員。" -#: 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 "" @@ -951,11 +969,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 "" @@ -1006,7 +1024,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 "電子郵件列入濫發名單" @@ -1024,11 +1042,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 @@ -1100,7 +1118,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 @@ -1122,8 +1140,8 @@ msgstr "郵遞區號範例 %s" 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 "" @@ -1159,7 +1177,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 "" @@ -1181,11 +1200,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "選擇<strong>涵蓋的區域</strong> <em>編輯有關單位</em> 表單。" #: 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 @@ -1193,12 +1213,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 "已處理－用戶" @@ -1216,7 +1236,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 "標記警告用戶" @@ -1237,7 +1257,7 @@ msgstr "標記警告用戶其已被列入 <a href='%s'>警告頁</a>" 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 "警告:" @@ -1275,7 +1295,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 "取得更新" @@ -1301,7 +1321,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 "走" @@ -1310,7 +1330,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 "" @@ -1352,8 +1372,8 @@ msgstr "您好 %s" #: 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 @@ -1396,7 +1416,7 @@ msgstr "我剛才申報了一個問題 " msgid "I just updated a problem on @fixmystreet" msgstr "我利用@fixmystreet 申報了一個問題 " -#: 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 " 我們無法在資料庫中找到您的問題。\n" @@ -1447,6 +1467,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" @@ -1519,7 +1543,7 @@ msgstr "此外，下列理由並非為Open311 v2更新特定部份回覆傳送: #: 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 @@ -1555,7 +1579,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 "內部推薦" @@ -1563,7 +1587,7 @@ msgstr "內部推薦" msgid "Invalid agency_responsible value %s" msgstr "無效的權責單位數值 %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "無效的結束日期" @@ -1571,16 +1595,16 @@ msgstr "無效的結束日期" msgid "Invalid format %s specified." msgstr "無效的%s 特定格式" -#: 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 @@ -1626,7 +1650,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 "" @@ -1671,6 +1699,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 "地圖" @@ -1695,7 +1727,7 @@ msgstr "八週前曾經標記為已修復/結案" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "留言" @@ -1715,7 +1747,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "遺失 jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1723,7 +1755,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 "" @@ -1735,7 +1767,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 "" @@ -1759,7 +1791,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 @@ -1771,7 +1803,7 @@ msgstr "名字：" msgid "Name: %s" msgstr "名字： %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1873,7 +1905,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 "" @@ -1888,7 +1920,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 @@ -1909,7 +1941,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 "未選擇地方政府" @@ -1975,7 +2007,7 @@ 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" @@ -2053,15 +2085,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 @@ -2107,13 +2139,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" @@ -2134,7 +2166,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 "部份" @@ -2168,7 +2200,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:" @@ -2220,7 +2252,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 @@ -2248,14 +2280,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 "選擇公物種類" @@ -2279,13 +2311,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 "" @@ -2300,13 +2332,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 @@ -2319,7 +2351,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 "請填寫進一步細節" @@ -2352,8 +2384,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" @@ -2390,7 +2422,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 "請選擇您是否願意收到其它問卷" @@ -2416,20 +2448,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 "請敍明您是否曾向地方政府申報過問題？ " @@ -2445,7 +2477,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 "請敍明該問題是否已解決" @@ -2464,22 +2496,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 "匿名張貼 %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "由%s (<strong>%s</strong>) 在%s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "由 %s 在 %s 張貼" @@ -2495,7 +2527,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 "" @@ -2511,10 +2544,15 @@ msgstr "隱私與cookies" #: 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 "問題" @@ -2550,11 +2588,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 "地圖上的問題" @@ -2566,7 +2604,7 @@ msgstr "FixMyStreet 最近回報的已修復問題 " msgid "Problems within %.1fkm of this location" msgstr "該地點 %.1f公里內的問題 " -#: 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" @@ -2590,6 +2628,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 "提供更新資訊" @@ -2607,12 +2646,17 @@ 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 +#, fuzzy +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 "" @@ -2636,7 +2680,7 @@ msgstr " %d回覆之問題%d, %s 到 %s 問卷 " msgid "Questionnaire %d sent for problem %d" msgstr "關於 %d問題所送出之 %d問卷 " -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "由問題申報者所填之問卷" @@ -2644,7 +2688,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 "RSS訂閱" @@ -2672,7 +2716,7 @@ msgstr "%s, 在%s 里/區" msgid "RSS feed of nearby problems" msgstr " RSS訂閱 %s區域問題" -#: 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" @@ -2688,12 +2732,12 @@ msgid "RSS feed of recent local problems" msgstr "最近當地問題的RSS訂閱" #: 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 "最近當地問題更新的RSS訂閱" #: 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 "透過電子郵件收取該問題之更新消息" @@ -2715,7 +2759,7 @@ msgstr "最新 <br>解決" 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 "" @@ -2723,13 +2767,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 "記住 FixMyStreet主要為申報可修復之物理性問題。如果您的問題不適合透過本網站投送，請直接到地方政府各機關之網站。 " -#: 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 "" @@ -2737,7 +2783,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!)" @@ -2751,7 +2797,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 "" @@ -2761,6 +2808,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 "申報濫用" @@ -2784,8 +2832,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 "在%s 匿名申報 " @@ -2794,8 +2842,8 @@ msgstr "在%s 匿名申報 " 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 "由%s 的 %s 申報" @@ -2808,27 +2856,27 @@ msgstr "由 申報" msgid "Reported in the %s category" msgstr "%s 種類之申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "%s 種類下的匿名申報" -#: 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 "%s 在 %s %s類別的申報 " -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "在%s 匿名申報 " -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "%s 透過 %s 在 %s類別的申報" -#: 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 "透過 %s 在 %s類別的匿名申報" -#: 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 "%s 在 %s %s類別的申報 " @@ -2938,16 +2986,16 @@ msgstr "此指定街道之道路營運者(取自道路參照碼與種類): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "此指定街道之道路營運者(來自OpenStreetMap): %s" -#: 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" @@ -2958,21 +3006,26 @@ 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 +#, fuzzy +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 "" @@ -3009,6 +3062,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" @@ -3052,27 +3109,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 "" @@ -3147,7 +3204,7 @@ msgstr "抱歉這個wasn’t 為有效的網址連結" 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 @@ -3195,12 +3252,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 @@ -3240,7 +3299,7 @@ msgstr "子類別：%s" msgid "Subdivision/Body" msgstr "下屬單位/機關" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "主旨" @@ -3257,7 +3316,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 @@ -3283,7 +3342,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 "訂閱" @@ -3566,7 +3625,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 @@ -3658,9 +3717,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 "本項資訊必填" @@ -3685,6 +3744,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 @@ -3759,7 +3822,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 "" @@ -3767,7 +3831,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 "" @@ -3784,14 +3848,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 @@ -3811,8 +3875,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 "未知的錯誤" @@ -3823,6 +3887,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 "更新" @@ -3876,7 +3944,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 @@ -3891,7 +3959,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 "更新內容有 %s 字數限制，請簡化您的更新。" @@ -3922,11 +3990,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 "給用戶標記警告" @@ -3935,7 +4003,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" @@ -4025,6 +4093,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 "" @@ -4073,7 +4145,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 @@ -4088,11 +4160,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 "您檢舉下列問題的申報遭到濫用，包含個人資料或相關問題 " @@ -4109,7 +4181,7 @@ msgstr "您可<a href=\"%s%s\">在本站上檢視問題</a>." 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 "您可寫信給<a href='mailto:%s'>%s</a>詢求技術支援。" @@ -4206,9 +4278,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 @@ -4228,7 +4300,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "您的個人資料，將會依照<a href=\"/privacy\">本站隱私權政策</a>作處理使用" #: 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 @@ -4307,53 +4379,53 @@ msgstr "用戶編輯" msgid "from %s different users" msgstr "從不同的用戶%s " -#: 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 "%s上回更新:" -#: 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 "標註為無法解決" @@ -4399,8 +4471,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 "重啟申報" @@ -4446,68 +4518,68 @@ msgstr "%d 天數" 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" -msgstr[0] "近期的申報 <big>%s</big> " +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d 日期" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 時數" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d 支援者" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分鐘數" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> 更新申報" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, 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] "我們尚未有該區域負責單位之細節 " +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d 支援者" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d 週數" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "上個月解決的<big>%s</big> " + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> 上一週的申報 " -#: 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" -msgstr[0] "上個月解決的<big>%s</big> " +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "近期的申報 <big>%s</big> " -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d 日期" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> 更新申報" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format msgid "We do <strong>not</strong> yet have details for the other council that covers this location." msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "我們<strong>尚未<strong>有該區域其它單位之細節 " + +#: 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] "我們尚未有該區域負責單位之細節 " |