diff options
Diffstat (limited to 'locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po')
| -rw-r--r-- | locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po | 1280 |
1 files changed, 699 insertions, 581 deletions
diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index 7cfa37723..24062a28e 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: 2018-02-12 15:46+0000\n" +"POT-Creation-Date: 2018-05-29 13:33+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety <transifex@mysociety.org>, 2017\n" "Language-Team: Welsh (https://www.transifex.com/mysociety/teams/12067/cy/)\n" @@ -18,13 +18,14 @@ 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:650 -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/DB/Result/Problem.pm:673 +#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "a" -#: templates/web/base/report/new/category_extras.html:13 -#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/category_extras.html:15 +#: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 #: templates/web/base/report/new/top_message_none.html:15 #: templates/web/base/report/new/top_message_some.html:12 @@ -32,7 +33,7 @@ msgstr "a" msgid " or " msgstr "neu" -#: templates/web/base/report/_inspect.html:152 +#: templates/web/base/report/_inspect.html:163 msgid "%d characters maximum" msgstr "" @@ -44,6 +45,11 @@ msgstr "" msgid "%d to %d of %d" msgstr "%d i %d o %d" +#: templates/web/base/admin/user_import.html:42 +#, fuzzy +msgid "%d users already existed" +msgstr "E-bost eisoes yn y rhestr camddefnydd" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 msgid "%s - Summary reports" @@ -146,7 +152,7 @@ msgstr "" msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:70 +#: templates/web/base/report/_item.html:71 msgid "(not sent to council)" msgstr "(heb ei anfon at y cyngor)" @@ -156,6 +162,11 @@ msgid "(optional)" msgstr "(dewisol)" #: templates/web/base/report/_item.html:69 +#, fuzzy +msgid "(sent to all)" +msgstr "(anfonwyd i'r ddau)" + +#: templates/web/base/report/_item.html:70 msgid "(sent to both)" msgstr "(anfonwyd i'r ddau)" @@ -166,16 +177,21 @@ msgid "(we also have RSS feeds for problems within %s)" msgstr "Ffrwd RSS o broblemau yn %s" #: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:685 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Dewiswch gategori --" +#: templates/web/base/report/new/category_extras_fields.html:18 +#, fuzzy +msgid "-- Pick an option --" +msgstr "-- Dewiswch gategori --" + #: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "" -#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_title.html:6 msgid "10 inch pothole on Example St, near post box" msgstr "" @@ -192,7 +208,7 @@ msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:58 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s" msgstr "" @@ -233,11 +249,11 @@ msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost" msgid "<strong>No</strong> let me sign in by email or text" msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost" -#: templates/web/base/report/_inspect.html:177 +#: templates/web/base/report/_inspect.html:188 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:179 +#: templates/web/base/report/_inspect.html:190 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -292,7 +308,7 @@ msgid "Add fixed state" msgstr "" #: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:31 +#: templates/web/zurich/admin/body.html:33 msgid "Add new category" msgstr "Ychwanegu categori newydd" @@ -321,18 +337,16 @@ msgstr "" msgid "Add user" msgstr "Ychwanegu defnyddiwr" -#: perllib/FixMyStreet/Cobrand/ACV.pm:108 -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:110 -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:109 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response templates" msgstr "" @@ -360,7 +374,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "Analluogwyd yr hysbysiad %d (créwyd %s)" -#: templates/web/base/report/update/form_name.html:42 +#: templates/web/base/report/update/form_name.html:39 msgid "Alert me to future updates" msgstr "Rhoi gwybod am ddiweddariadau i ddod" @@ -368,7 +382,7 @@ msgstr "Rhoi gwybod am ddiweddariadau i ddod" #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 -#: templates/web/base/reports/_list-filters.html:3 +#: templates/web/base/reports/_list-filters.html:4 msgid "All" msgstr "" @@ -376,7 +390,7 @@ msgstr "" msgid "All Reports" msgstr "Pob adroddiad" -#: templates/web/zurich/admin/stats/index.html:5 +#: templates/web/zurich/admin/stats/index.html:47 msgid "All Reports as CSV" msgstr "" @@ -398,13 +412,13 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/admin/stats/index.html:11 #: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Pob adroddiad" -#: templates/web/zurich/admin/stats/index.html:8 +#: templates/web/zurich/admin/stats/index.html:45 msgid "All reports between %s and %s" msgstr "Pob adroddiad rhwng %s a %s" @@ -416,7 +430,11 @@ msgstr "" msgid "Alternatively, we can hide your name on <strong>all of your reports and updates</strong> across the site:" msgstr "" -#: templates/web/base/questionnaire/index.html:47 +#: templates/web/base/admin/open311-form-fields.html:165 +msgid "Always fetch all problems" +msgstr "" + +#: templates/web/base/questionnaire/index.html:31 msgid "An update marked this problem as fixed." msgstr "Mae diweddariad wedi nodi'r broblem wedi ei thrwsio." @@ -431,7 +449,7 @@ msgstr "Dienw" msgid "Anonymous user" msgstr "Dienw" -#: templates/web/base/admin/report_edit.html:122 +#: templates/web/base/admin/report_edit.html:129 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Dienw:" @@ -445,8 +463,8 @@ msgstr "" msgid "Are you sure you want to cancel this upload?" msgstr "" -#: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/admin/report_edit.html:85 +#: templates/web/base/admin/template_edit.html:91 #: templates/web/base/js/translation_strings.html:79 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" @@ -467,29 +485,28 @@ msgstr "" msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" -#: templates/web/zurich/admin/report_edit.html:209 +#: templates/web/zurich/admin/report_edit.html:211 msgid "Assign to competent body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats/index.html:36 +#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/zurich/admin/stats/index.html:57 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:207 +#: templates/web/zurich/admin/report_edit.html:209 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:186 +#: templates/web/zurich/admin/report_edit.html:188 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:105 -#: perllib/FixMyStreet/Cobrand/Default.pm:733 +#: perllib/FixMyStreet/Cobrand/Default.pm:734 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:220 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:184 msgid "Assigned to %s" msgstr "" @@ -511,7 +528,7 @@ msgstr "" msgid "Auto Response" msgstr "Ymateb cyhoeddus:" -#: templates/web/base/admin/template_edit.html:64 +#: templates/web/base/admin/template_edit.html:80 msgid "Auto-response:" msgstr "" @@ -545,20 +562,22 @@ msgstr "" msgid "Ban user" msgstr "Ychwanegu defnyddiwr" -#: perllib/FixMyStreet/Cobrand/ACV.pm:107 -#: perllib/FixMyStreet/Cobrand/ACV.pm:260 #: perllib/FixMyStreet/Cobrand/Default.pm:651 -#: perllib/FixMyStreet/Cobrand/Default.pm:735 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:261 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:382 #: templates/web/base/admin/bodies.html:1 -#: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:50 +#: templates/web/base/admin/report_edit.html:56 +#: templates/web/zurich/header.html:49 msgid "Bodies" msgstr "Cyrff" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 +#: templates/web/base/admin/user_import.html:25 +#: templates/web/base/admin/user_import.html:48 #: templates/web/base/admin/users.html:18 msgid "Body" msgstr "Corff" @@ -567,6 +586,10 @@ msgstr "Corff" msgid "Body:" msgstr "Corff:" +#: templates/web/base/admin/user_import.html:12 +msgid "CSV File" +msgstr "" + #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (<code>meta.datatype_description</code>), you must add it in <code>category_extras_fields.html</code>" msgstr "" @@ -579,8 +602,8 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:260 #: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:261 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -595,15 +618,16 @@ msgstr "" #: templates/web/base/admin/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:54 -#: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:12 +#: templates/web/base/report/_inspect.html:65 +#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/new/category.html:14 #: 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/index.html:50 +#: templates/web/zurich/admin/stats/index.html:26 +#: templates/web/zurich/admin/stats/index.html:71 msgid "Category" msgstr "Categori" @@ -612,7 +636,7 @@ msgstr "Categori" msgid "Category and State" msgstr "Categori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1026 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -621,19 +645,14 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:125 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/body.html:43 -#: templates/web/zurich/admin/contact-form.html:2 +#: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" msgstr "Categori:" -#: perllib/FixMyStreet/Script/Reports.pm:184 -msgid "Category: %s" -msgstr "Categori: %s" - #: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 #: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 msgid "Change" @@ -677,7 +696,7 @@ 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:109 +#: templates/web/base/report/_inspect.html:120 msgid "Choose another" msgstr "" @@ -709,26 +728,29 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" -#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:132 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:1004 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:195 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:136 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:157 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:160 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 #: templates/web/base/admin/states/index.html:33 #: templates/web/base/dashboard/index.html:113 -#: 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/index.html:31 +#: templates/web/zurich/admin/stats/index.html:52 msgid "Closed" msgstr "Ar gau" -#: perllib/FixMyStreet/DB/Result/Problem.pm:844 +#: perllib/FixMyStreet/DB/Result/Problem.pm:861 msgid "Closed by council" msgstr "Caewyd gan y cyngor" -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:175 +#, fuzzy +msgid "Closed to updates" +msgstr "Derbyn diweddariadau" + +#: templates/web/base/admin/report_edit.html:38 msgid "Co-ordinates:" msgstr "Cyfesurynnau:" @@ -738,12 +760,12 @@ msgstr "Cyfesurynnau:" msgid "Cobrand" msgstr "" -#: templates/web/base/admin/report_edit.html:92 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "" -#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/report_edit.html:92 #: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "" @@ -758,8 +780,9 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:256 -#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:257 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -787,14 +810,14 @@ msgid "Confirmation" msgstr "" #: templates/web/base/admin/contact-form.html:56 -#: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats/index.html:40 +#: templates/web/zurich/admin/contact-form.html:25 +#: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Cadarnhawyd" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:78 +#: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" msgstr "Cadarnhawyd:" @@ -813,13 +836,17 @@ msgstr "Cysylltu â ni" msgid "Contact the team" msgstr "Cysylltu â'r tîm" +#: templates/web/base/admin/open311-form-fields.html:151 +msgid "Convert location from Easting/Northing" +msgstr "" + #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:61 msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1854 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1883 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1963 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1992 msgid "Could not find user" msgstr "Methu dod o hyd i'r defnyddiwr" @@ -845,8 +872,8 @@ msgstr "" msgid "Council:" msgstr "Cyngor:" -#: templates/web/zurich/admin/stats/index.html:45 -#: templates/web/zurich/admin/stats/index.html:50 +#: templates/web/zurich/admin/stats/index.html:66 +#: templates/web/zurich/admin/stats/index.html:71 msgid "Count" msgstr "" @@ -860,7 +887,7 @@ msgid "Create a report" msgstr "Creu adroddiad" #: templates/web/base/admin/contact-form.html:138 -#: templates/web/zurich/admin/body.html:62 +#: templates/web/zurich/admin/contact-form.html:39 msgid "Create category" msgstr "Creu categori" @@ -868,22 +895,22 @@ msgstr "Creu categori" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:91 -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:149 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:92 -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:150 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:90 -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/admin/template_edit.html:87 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" @@ -893,8 +920,12 @@ msgstr "" msgid "Created" msgstr "Crëwyd" +#: templates/web/base/admin/user_import.html:20 +msgid "Created %d new users" +msgstr "" + #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" @@ -919,7 +950,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "Ar hyn o bryd does dim cyrff." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:869 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:845 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -935,7 +966,7 @@ msgstr "" msgid "Deactivate two-factor authentication" msgstr "" -#: templates/web/zurich/admin/stats/index.html:35 +#: templates/web/zurich/admin/stats/index.html:56 msgid "Dealt with by subdivision within 5 working days" msgstr "" @@ -947,24 +978,24 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:78 +#: templates/web/base/report/_inspect.html:89 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 -#: templates/web/base/admin/template_edit.html:75 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1162 +#: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:31 #: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:13 +#: templates/web/zurich/admin/contact-form.html:26 msgid "Deleted" msgstr "Dilëwyd" #: templates/web/base/report/_main.html:110 -#: templates/web/base/report/update.html:71 +#: templates/web/base/report/update.html:52 msgid "Describe why you are moderating this" msgstr "" @@ -980,7 +1011,7 @@ msgstr "Disgrifiad" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:350 +#: perllib/FixMyStreet/App/Controller/Report.pm:372 msgid "Detailed information is limited to %d characters." msgstr "" @@ -989,7 +1020,7 @@ msgstr "" msgid "Details" msgstr "Manylion" -#: templates/web/base/admin/report_edit.html:112 +#: templates/web/base/admin/report_edit.html:118 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1014,11 +1045,11 @@ msgid "Diligency prize league table" msgstr "" #: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:73 +#: templates/web/base/report/update.html:54 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:95 +#: templates/web/base/admin/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1026,20 +1057,20 @@ msgstr "" #: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:30 +#: templates/web/base/report/update-form.html:34 #: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:104 msgid "Do you want to automatically raise a defect?" msgstr "" -#: templates/web/base/questionnaire/index.html:57 +#: templates/web/base/questionnaire/index.html:41 msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:112 +#: templates/web/base/contact/index.html:115 msgid "Don't like forms?" msgstr "" @@ -1051,11 +1082,11 @@ msgstr "" msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" -#: templates/web/base/report/_inspect.html:104 +#: templates/web/base/report/_inspect.html:115 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:114 +#: templates/web/base/report/_inspect.html:125 msgid "Duplicates" msgstr "" @@ -1067,54 +1098,56 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:26 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:32 +#: templates/web/base/report/_item.html:84 msgid "Easting/Northing:" msgstr "" -#: templates/web/base/admin/list_updates.html:42 -#: templates/web/base/admin/problem_row.html:41 +#: templates/web/base/admin/list_updates.html:44 +#: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:31 #: templates/web/base/admin/users.html:34 -#: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Golygu" #: templates/web/base/admin/body.html:141 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:69 +#: templates/web/zurich/admin/body.html:47 msgid "Edit body details" msgstr "Golygu manylion y corff" -#: perllib/FixMyStreet/Cobrand/ACV.pm:102 -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:103 -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:89 -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:147 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:88 -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:146 msgid "Edit reports" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:731 +msgid "Edit users' details/search for their reports" +msgstr "" + #: templates/web/base/admin/report_edit.html:0 -#: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:5 +#: templates/web/base/admin/report_edit.html:15 +#: templates/web/base/admin/report_edit.html:6 #: templates/web/zurich/admin/report_edit-sdm.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 @@ -1138,6 +1171,8 @@ msgstr "Golygydd" #: templates/web/base/admin/bodies.html:27 #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 +#: templates/web/base/admin/user_import.html:24 +#: templates/web/base/admin/user_import.html:47 #: templates/web/base/admin/users.html:17 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 @@ -1154,8 +1189,8 @@ msgstr "E-bost" msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:71 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/new/form_user_loggedin.html:56 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 #, fuzzy msgid "Email address (optional)" msgstr "Cyfrinair (dewisol)" @@ -1172,15 +1207,38 @@ msgstr "Dilëwyd hysbysiad e-bost" msgid "Email verified:" msgstr "" -#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/report_edit.html:145 #: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/body.html:48 -#: templates/web/zurich/admin/contact-form.html:6 +#: templates/web/zurich/admin/contact-form.html:18 msgid "Email:" msgstr "E-bost:" -#: templates/web/base/admin/open311-form-fields.html:55 -#: templates/web/base/admin/open311-form-fields.html:56 +#: templates/web/base/admin/open311-form-fields.html:156 +#: templates/web/base/admin/open311-form-fields.html:157 +msgid "" +"Enable <strong>Always fetch all problems</strong> if you've enabled Open311 problem-fetching above\n" +" and the endpoint always returns a list of all problems. This will suppress error messages about\n" +" bad dates in the problems fetched." +msgstr "" + +#: templates/web/base/admin/open311-form-fields.html:143 +#: templates/web/base/admin/open311-form-fields.html:144 +msgid "" +"Enable <strong>Convert location from Easting/Northing</strong> if you've enabled Open311 problem-fetching above\n" +" and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." +msgstr "" + +#: templates/web/base/admin/open311-form-fields.html:127 +#: templates/web/base/admin/open311-form-fields.html:128 +msgid "" +"Enable <strong>Open311 problem-fetching</strong> if you want to display reports created at\n" +" the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" +" For more information, see \n" +" <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." +msgstr "" + +#: templates/web/base/admin/open311-form-fields.html:66 +#: templates/web/base/admin/open311-form-fields.html:67 msgid "" "Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1196,6 +1254,11 @@ msgid "" " problem must be emailed, while others can be sent over Open311." msgstr "" +#: templates/web/base/admin/open311-form-fields.html:54 +#: templates/web/base/admin/open311-form-fields.html:55 +msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" +msgstr "" + #: templates/web/base/dashboard/index.html:78 #, fuzzy msgid "End Date" @@ -1205,7 +1268,7 @@ msgstr "Dyddiad dod i ben:" msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:82 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 msgid "Enter a Zürich street name" msgstr "" @@ -1225,7 +1288,7 @@ msgid "Enter a nearby street name and area" msgstr "Rhowch enw stryd ac ardal gerllaw" #: templates/web/base/auth/general.html:128 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:47 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:33 #: templates/web/base/report/update/form_user_loggedout_by_email.html:20 #: templates/web/zurich/auth/general.html:58 msgid "Enter a password" @@ -1244,8 +1307,8 @@ msgstr "Rhowch fanylion am y broblem" msgid "Error" msgstr "Gwall" -#: templates/web/base/reports/_list-filters.html:39 -#: templates/web/base/reports/_list-filters.html:47 +#: templates/web/base/reports/_list-filters.html:40 +#: templates/web/base/reports/_list-filters.html:49 msgid "Everything" msgstr "" @@ -1262,11 +1325,15 @@ msgstr "Enghraifft:" msgid "Existing category" msgstr "" +#: templates/web/base/admin/user_import.html:66 +msgid "Existing users won't be modified." +msgstr "" + #: templates/web/base/js/translation_strings.html:55 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:54 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong" msgstr "" @@ -1274,13 +1341,6 @@ msgstr "" msgid "Export as CSV" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:957 -#: templates/web/zurich/admin/header.html:1 -#: templates/web/zurich/admin/header.html:12 -msgid "Extern" -msgstr "" - #: templates/web/base/admin/report_edit.html:97 #: templates/web/base/admin/responsepriorities/edit.html:27 msgid "External ID" @@ -1294,11 +1354,20 @@ msgstr "URL allanol" msgid "External body" msgstr "" +#: templates/web/base/admin/report_edit.html:106 +#: templates/web/base/admin/template_edit.html:66 +msgid "External status code" +msgstr "" + +#: templates/web/base/admin/update_edit.html:57 +msgid "External status code:" +msgstr "" + #: templates/web/base/admin/report_edit.html:101 msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:674 +#: perllib/FixMyStreet/Cobrand/Default.pm:675 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1306,12 +1375,12 @@ msgid "Extra Fields" msgstr "Data ychwanegol:" #: templates/web/base/admin/contact-form.html:141 -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:128 msgid "Extra data:" msgstr "Data ychwanegol:" -#: templates/web/base/report/_inspect.html:150 -#: templates/web/base/report/_item.html:108 +#: templates/web/base/report/_inspect.html:161 +#: templates/web/base/report/_item.html:109 msgid "Extra details" msgstr "" @@ -1338,7 +1407,8 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 -#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:179 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:135 #: templates/web/base/admin/states/index.html:29 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:114 @@ -1363,7 +1433,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "" @@ -1380,12 +1450,12 @@ 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:142 +#: templates/web/base/admin/report_edit.html:149 #: templates/web/base/admin/user-form.html:115 msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:6 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1407,11 +1477,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Wedi anghofio eich cyfrinair?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:760 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:761 msgid "Forwarded wish to external body" msgstr "" @@ -1457,10 +1527,10 @@ msgstr "Mae'n dda gennym glywed y cafodd ei drwsio!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:35 #: templates/web/base/around/postcode_form.html:15 -#: templates/web/base/reports/_list-filters.html:57 -#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:74 #: templates/web/base/reports/index.html:89 -#: templates/web/zurich/admin/stats/index.html:26 +#: templates/web/zurich/admin/stats/index.html:37 msgid "Go" msgstr "" @@ -1468,8 +1538,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:104 -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Grant access to the admin" msgstr "" @@ -1486,7 +1555,7 @@ msgstr "gan %s" msgid "Group by:" msgstr "" -#: templates/web/base/questionnaire/index.html:48 +#: templates/web/base/questionnaire/index.html:32 msgid "Has this problem been fixed?" msgstr "Gafodd y broblem ei thrwsio?" @@ -1501,8 +1570,8 @@ msgstr "Ydych chi wedi adrodd problem at y cyngor o'r blaen, neu ai dyma eich tr msgid "Help" msgstr "Cymorth" -#: templates/web/base/report/new/category_extras.html:13 -#: templates/web/base/report/new/category_extras.html:14 +#: templates/web/base/report/new/category_extras.html:15 +#: templates/web/base/report/new/category_extras.html:16 msgid "Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" @@ -1515,12 +1584,9 @@ msgstr "Lluniau o adroddiadau diweddar gerllaw" msgid "Hi %s" msgstr "Helo %s" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:950 #: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: 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/index.html:32 +#: templates/web/zurich/admin/stats/index.html:53 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Cudd" @@ -1557,12 +1623,12 @@ msgstr "" msgid "Hide pins" msgstr "Cuddio'r piniau" -#: templates/web/base/report/update.html:13 +#: templates/web/base/report/update.html:14 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_update_state.html:16 msgid "Hide your name?" msgstr "" @@ -1596,7 +1662,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:87 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:92 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1631,7 +1697,7 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" -#: templates/web/base/admin/template_edit.html:59 +#: templates/web/base/admin/template_edit.html:75 msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" @@ -1662,7 +1728,11 @@ 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:46 +#: templates/web/base/admin/template_edit.html:62 +msgid "If you want to use this template to prefill the update field when a report’s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here." +msgstr "" + +#: templates/web/base/admin/template_edit.html:49 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1676,30 +1746,30 @@ msgstr "" msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:101 +#: templates/web/base/admin/open311-form-fields.html:112 +#: templates/web/base/admin/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" -" its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" -" Check that your cobrand supports this feature before switching it on." +" its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" +" Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:87 -#: templates/web/base/admin/open311-form-fields.html:88 +#: templates/web/base/admin/open311-form-fields.html:100 +#: templates/web/base/admin/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" -" if you do <strong>not</strong> want that user to be notified whenever these updates are created." +" if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:70 -#: templates/web/base/admin/open311-form-fields.html:71 +#: templates/web/base/admin/open311-form-fields.html:82 +#: templates/web/base/admin/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" -" FixMyStreet <strong>user</strong> will be attributed as the creator of those updates\n" -" when they are shown on the site. Enter the ID (number) of that user." +" FixMyStreet <strong>user</strong> will be attributed as the creator of those updates\n" +" when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:138 msgid "Illegal ID" msgstr "ID annerbynniol" @@ -1707,6 +1777,11 @@ msgstr "ID annerbynniol" msgid "Illegal feed selection" msgstr "" +#: templates/web/base/admin/user_import.html:15 +#, fuzzy +msgid "Import users" +msgstr "Adrodd camddefnydd" + #: templates/web/base/admin/flagged.html:39 msgid "In abuse table?" msgstr "" @@ -1715,13 +1790,6 @@ 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:198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:998 -#: templates/web/zurich/admin/header.html:1 -#: templates/web/zurich/admin/header.html:8 -msgid "In progress" -msgstr "Ar y gweill" - #: templates/web/base/admin/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1730,11 +1798,11 @@ msgstr "" msgid "Inbox zero, here we come!" msgstr "" -#: templates/web/zurich/admin/report_edit.html:223 +#: templates/web/zurich/admin/report_edit.html:225 msgid "Include reporter personal details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:352 +#: perllib/FixMyStreet/App/Controller/Open311.pm:354 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1746,7 +1814,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Instruct contractors to fix problems" msgstr "" @@ -1758,15 +1826,15 @@ msgstr "Nodiadau mewnol" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:337 +#: perllib/FixMyStreet/App/Controller/Open311.pm:339 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:430 +#: perllib/FixMyStreet/App/Controller/Open311.pm:434 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1778,16 +1846,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "Mae ar y ffordd i'r cyngor y funud hon." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 -msgid "Jurisdiction Unknown" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Zurich.pm:962 -#: templates/web/zurich/admin/header.html:1 -#: templates/web/zurich/admin/header.html:15 -msgid "Jurisdiction unknown" -msgstr "" - #: templates/web/base/auth/general.html:92 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 @@ -1822,11 +1880,11 @@ msgstr "" msgid "Last editor" msgstr "Golygydd diwethaf" -#: templates/web/base/questionnaire/index.html:25 +#: templates/web/base/questionnaire/index.html:53 msgid "Last update" msgstr "" -#: templates/web/base/admin/report_edit.html:89 +#: templates/web/base/admin/report_edit.html:90 msgid "Last update:" msgstr "Diweddariad diwethaf:" @@ -1834,12 +1892,12 @@ msgstr "Diweddariad diwethaf:" msgid "Last update:" msgstr "Diweddariad diwethaf:" -#: templates/web/base/report/_inspect.html:30 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:36 +#: templates/web/base/report/_item.html:89 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:69 +#: templates/web/base/reports/_list-filters.html:71 msgid "Least recently updated" msgstr "" @@ -1922,11 +1980,11 @@ msgstr "MAP" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:64 +#: templates/web/base/reports/_list-filters.html:66 msgid "Manual order" msgstr "" @@ -1934,7 +1992,7 @@ msgstr "" msgid "Map" msgstr "Map" -#: templates/web/base/admin/report_edit.html:86 +#: templates/web/base/admin/report_edit.html:87 msgid "Mark as sent" msgstr "Nodi ei fod wedi'i anfon" @@ -1942,7 +2000,7 @@ msgstr "Nodi ei fod wedi'i anfon" msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Markup problem details" msgstr "" @@ -1950,19 +2008,19 @@ msgstr "" msgid "Message" msgstr "Neges" -#: templates/web/zurich/admin/report_edit.html:280 +#: templates/web/zurich/admin/report_edit.html:281 msgid "Message to competent body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:278 +#: templates/web/zurich/admin/report_edit.html:279 msgid "Message to external body:" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:72 msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:438 +#: perllib/FixMyStreet/App/Controller/Open311.pm:442 msgid "Missing jurisdiction_id" msgstr "jurisdiction_id coll" @@ -1970,8 +2028,8 @@ msgstr "jurisdiction_id coll" msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:87 -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:145 msgid "Moderate report details" msgstr "" @@ -1979,29 +2037,30 @@ msgstr "" msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:10 +#: templates/web/base/report/update.html:11 msgid "Moderate this update" msgstr "" #: templates/web/base/report/_main.html:69 -#: templates/web/base/report/update.html:61 +#: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats/index.html:34 +#: templates/web/zurich/admin/stats/index.html:55 msgid "Moderated by division within one working day" msgstr "" #: templates/web/base/report/_main.html:109 -#: templates/web/base/report/update.html:69 +#: templates/web/base/report/update.html:50 msgid "Moderation reason:" msgstr "" #: templates/web/base/dashboard/index.html:102 +#: templates/web/zurich/admin/stats/index.html:9 msgid "Month" msgstr "Mis" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:72 msgid "Most commented" msgstr "" @@ -2018,10 +2077,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 +#: templates/web/base/admin/user_import.html:23 +#: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 #: templates/web/base/auth/general.html:115 -#: templates/web/base/report/new/form_user_loggedin.html:49 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 +#: templates/web/base/report/new/form_user_name.html:1 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:50 @@ -2029,33 +2089,32 @@ msgstr "" msgid "Name" msgstr "Enw" -#: templates/web/base/admin/report_edit.html:127 +#: templates/web/base/admin/report_edit.html:134 #: 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/base/my/my.html:35 -#: templates/web/zurich/admin/stats/index.html:41 +#: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Enw:" -#: templates/web/base/report/_inspect.html:44 +#: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_inspect.html:45 msgid "Nearest calculated address:" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 -#: perllib/FixMyStreet/Geocode/OSM.pm:145 +#: perllib/FixMyStreet/Geocode/OSM.pm:151 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:134 +#: perllib/FixMyStreet/Geocode/Address.pm:21 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:539 -#: perllib/FixMyStreet/Cobrand/Default.pm:567 +#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2078,15 +2137,15 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:129 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:230 +#: perllib/FixMyStreet/App/Controller/Admin.pm:237 msgid "New body added" msgstr "Ychwanegwyd corff newydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:354 +#: perllib/FixMyStreet/App/Controller/Admin.pm:368 msgid "New category contact added" msgstr "" @@ -2151,13 +2210,13 @@ msgid "New state" msgstr "" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:34 +#: templates/web/base/admin/templates.html:37 #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:66 +#: templates/web/base/reports/_list-filters.html:68 msgid "Newest" msgstr "" @@ -2165,19 +2224,19 @@ msgstr "" msgid "Next" msgstr "Nesaf" -#: perllib/FixMyStreet/Cobrand/Default.pm:1240 +#: perllib/FixMyStreet/Cobrand/Default.pm:1199 #: 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:125 +#: templates/web/base/admin/report_edit.html:132 #: 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/report/_inspect.html:98 +#: templates/web/base/questionnaire/index.html:39 +#: templates/web/base/report/_inspect.html:109 msgid "No" msgstr "" @@ -2206,7 +2265,7 @@ msgid "No flagged users found." msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:125 -#: templates/web/zurich/admin/report_edit.html:259 +#: templates/web/zurich/admin/report_edit.html:260 msgid "No further updates" msgstr "Dim diweddariadau pellach" @@ -2238,9 +2297,9 @@ msgstr "" msgid "No supporters" msgstr "Dim cefnogwyr" -#: templates/web/base/admin/report_edit.html:66 -#: templates/web/base/admin/report_edit.html:90 -#: templates/web/base/admin/report_edit.html:92 +#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/report_edit.html:93 msgid "None" msgstr "Dim" @@ -2260,13 +2319,6 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:187 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:972 -#: templates/web/zurich/admin/header.html:1 -#: templates/web/zurich/admin/header.html:13 -msgid "Not contactable" -msgstr "" - #: templates/web/zurich/admin/report_edit-sdm.html:104 msgid "Not for my subdivision" msgstr "" @@ -2285,8 +2337,7 @@ msgstr "" msgid "Note" msgstr "Nodyn" -#: templates/web/zurich/admin/body.html:55 -#: templates/web/zurich/admin/contact-form.html:19 +#: templates/web/zurich/admin/contact-form.html:35 msgid "Note:" msgstr "Nodyn:" @@ -2306,7 +2357,7 @@ msgstr "" msgid "Now to submit your report…" msgstr "Nawr i gyflwyno eich adroddiad…" -#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update-form.html:33 #: templates/web/base/report/update/form_user_loggedout.html:2 #: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" @@ -2336,7 +2387,7 @@ msgstr "" msgid "Old state" msgstr "Hen gyflwr" -#: templates/web/base/reports/_list-filters.html:67 +#: templates/web/base/reports/_list-filters.html:69 msgid "Oldest" msgstr "" @@ -2344,16 +2395,14 @@ msgstr "" msgid "On behalf of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:175 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:944 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:155 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 #: templates/web/base/admin/states/index.html:32 #: templates/web/base/admin/update_edit.html:30 #: templates/web/base/dashboard/index.html:112 -#: 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 "Ar agor" @@ -2390,17 +2439,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1262 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:686 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:687 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:716 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1286 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 #: perllib/FixMyStreet/App/Controller/Report/New.pm:719 -#: perllib/FixMyStreet/DB/Result/Problem.pm:588 -#: perllib/FixMyStreet/DB/Result/Problem.pm:595 -#: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/DB/Result/Problem.pm:619 -#: perllib/FixMyStreet/Script/Reports.pm:179 -#: perllib/FixMyStreet/Script/Reports.pm:194 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 +#: perllib/FixMyStreet/DB/Result/Problem.pm:622 +#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" msgstr "" @@ -2436,7 +2485,7 @@ msgid "Partial" msgstr "Rhannol" #: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 #: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:22 #: templates/web/zurich/auth/general.html:53 @@ -2455,7 +2504,12 @@ msgstr "Dolen barhaol" msgid "Permissions:" msgstr "" -#: templates/web/base/report/_inspect.html:19 +#: templates/web/base/admin/open311-form-fields.html:61 +#, fuzzy +msgid "Permit blank updates" +msgstr "Darparu diweddariad" + +#: templates/web/base/report/_inspect.html:25 msgid "Phone Reporter:" msgstr "" @@ -2465,8 +2519,8 @@ msgstr "" msgid "Phone number" msgstr "Rhif ffôn" -#: templates/web/base/report/new/form_user_loggedin.html:67 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 +#: templates/web/base/report/new/form_user_loggedin.html:52 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 msgid "Phone number (optional)" msgstr "Rhif ffôn (dewisol)" @@ -2474,25 +2528,25 @@ msgstr "Rhif ffôn (dewisol)" msgid "Phone verified:" msgstr "" -#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/report_edit.html:142 #: templates/web/base/admin/user-form.html:23 templates/web/base/my/my.html:47 -#: templates/web/zurich/admin/stats/index.html:39 +#: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Ffôn:" #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:30 -#: templates/web/base/report/new/form_report.html:45 -#: templates/web/base/report/new/form_report.html:47 +#: templates/web/base/report/new/form_report.html:27 +#: templates/web/base/report/new/form_report.html:42 +#: templates/web/base/report/new/form_report.html:44 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 -#: templates/web/zurich/admin/stats/index.html:37 +#: templates/web/zurich/admin/stats/index.html:58 #: templates/web/zurich/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:36 #: templates/web/zurich/report/new/fill_in_details_form.html:38 @@ -2503,12 +2557,12 @@ msgstr "Llun" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:16 +#: templates/web/zurich/admin/contact-form.html:32 msgid "Photo required" msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:30 +#: templates/web/base/report/new/form_report.html:27 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2533,14 +2587,6 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:984 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:990 -#: 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 "" - #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Byddwch yn gwrtais, yn gryno ac yn berthnasol." @@ -2557,18 +2603,18 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/DB/Result/User.pm:205 -#: perllib/FixMyStreet/DB/Result/User.pm:206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 +#: perllib/FixMyStreet/DB/Result/User.pm:219 +#: perllib/FixMyStreet/DB/Result/User.pm:220 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:7 #, fuzzy msgid "Please check your phone number is correct" msgstr "Rhowch eich rhif ffôn" -#: perllib/FixMyStreet/App/Controller/Admin.pm:297 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:923 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:946 +#: perllib/FixMyStreet/App/Controller/Admin.pm:310 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:931 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 #: templates/web/base/js/translation_strings.html:13 msgid "Please choose a category" @@ -2579,7 +2625,7 @@ msgstr "" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:359 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" @@ -2596,27 +2642,27 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Peidiwch â bod yn sarhaus — byddai sarhau eich cyngor yn dibrisio'r gwasanaeth i bawb." -#: perllib/FixMyStreet/App/Controller/Admin.pm:298 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Rhowch neges" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 -#: perllib/FixMyStreet/DB/Result/User.pm:208 -#: perllib/FixMyStreet/DB/Result/User.pm:209 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/DB/Result/User.pm:222 +#: perllib/FixMyStreet/DB/Result/User.pm:223 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:4 #, fuzzy msgid "Please enter a mobile number" msgstr "Rhowch eich rhif ffôn" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1358 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1529 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:490 msgid "Please enter a name for this body" msgstr "" @@ -2626,28 +2672,28 @@ msgstr "" msgid "Please enter a password" msgstr "Rhowch gyfrinair" -#: perllib/FixMyStreet/App/Controller/Contact.pm:115 +#: perllib/FixMyStreet/App/Controller/Contact.pm:119 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Rhowch bwnc" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1453 -#: perllib/FixMyStreet/App/Controller/Admin.pm:311 -#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1422 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1520 +#: perllib/FixMyStreet/App/Controller/Admin.pm:324 +#: perllib/FixMyStreet/DB/Result/User.pm:212 #: templates/web/base/js/translation_strings.html:16 #: templates/web/base/js/translation_strings.html:20 msgid "Please enter a valid email" msgstr "Rhowch e-bost dilys" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:129 msgid "Please enter a valid email address" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1349 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1416 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1514 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Rhowch eich rhif ffôn" @@ -2657,8 +2703,8 @@ msgstr "Rhowch eich rhif ffôn" msgid "Please enter some details" msgstr "Rhowch fanylion" -#: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:196 +#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/DB/Result/User.pm:210 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 @@ -2676,15 +2722,15 @@ msgstr "Rhowch eich cyfeiriad e-bost" msgid "Please enter your first name" msgstr "Rhowch eich enw cyntaf" -#: perllib/FixMyStreet/Cobrand/UK.pm:326 +#: perllib/FixMyStreet/Cobrand/UK.pm:322 #: templates/web/base/js/translation_strings.html:11 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 "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:113 +#: perllib/FixMyStreet/App/Controller/Contact.pm:117 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: perllib/FixMyStreet/DB/Result/User.pm:205 #: templates/web/base/js/translation_strings.html:10 msgid "Please enter your name" msgstr "Rhowch eich enw" @@ -2726,7 +2772,7 @@ msgstr "" msgid "Please generate a two-factor code and enter it below:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2743,7 +2789,7 @@ msgstr "Noder na chaiff diweddariadau eu hanfon at y cyngor." msgid "Please note your report has <strong>not yet been sent</strong>." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" @@ -2757,28 +2803,28 @@ msgstr "" msgid "Please note:" msgstr "Noder:" -#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#: perllib/FixMyStreet/App/Controller/Report.pm:407 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:367 +#: perllib/FixMyStreet/App/Controller/Report.pm:389 msgid "Please provide a public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:262 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:269 msgid "Please provide some text as well as a photo" msgstr "Rhowch destun yn ogystal â llun" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:120 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:255 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" -#: templates/web/zurich/admin/report_edit.html:204 +#: templates/web/zurich/admin/report_edit.html:206 msgid "Please select a body." msgstr "" @@ -2790,7 +2836,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:231 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please state whether or not the problem has been fixed" msgstr "Dywedwch a gafodd y broblem ei thrwsio" @@ -2801,12 +2847,12 @@ msgstr "Dywedwch a gafodd y broblem ei thrwsio" msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1352 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1419 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1517 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:116 +#: perllib/FixMyStreet/App/Controller/Contact.pm:120 msgid "Please write a message" msgstr "Ysgrifennwch neges" @@ -2814,7 +2860,7 @@ msgstr "Ysgrifennwch neges" msgid "Please write your update here" msgstr "Ysgrifennwch eich diweddariad yma" -#: templates/web/base/report/update-form.html:25 +#: templates/web/base/report/update-form.html:29 #: templates/web/base/report/update/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" @@ -2848,8 +2894,8 @@ msgstr "Blaenorol" msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:129 -#: templates/web/base/report/_item.html:100 +#: templates/web/base/report/_inspect.html:140 +#: templates/web/base/report/_item.html:101 msgid "Priority" msgstr "" @@ -2865,7 +2911,9 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:144 +#: templates/web/base/admin/report_edit.html:151 +#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/new/form_user_loggedin.html:63 msgid "Private" msgstr "Preifat" @@ -2895,7 +2943,7 @@ msgstr "Anfonwyd y broblem %s at y cyngor" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1350 msgid "Problem marked as open." msgstr "" @@ -2903,8 +2951,8 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:86 -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:144 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemau" @@ -2931,18 +2979,18 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "Problemau yn %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 -#: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 -#: perllib/FixMyStreet/Cobrand/UK.pm:269 +#: perllib/FixMyStreet/Cobrand/Default.pm:840 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 +#: perllib/FixMyStreet/Cobrand/UK.pm:211 perllib/FixMyStreet/Cobrand/UK.pm:253 +#: perllib/FixMyStreet/Cobrand/UK.pm:265 msgid "Problems within %s" msgstr "Problemau yn %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:229 +#: perllib/FixMyStreet/Cobrand/UK.pm:225 msgid "Problems within %s ward" msgstr "Problemau yn ward %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:263 perllib/FixMyStreet/Cobrand/UK.pm:275 +#: perllib/FixMyStreet/Cobrand/UK.pm:259 perllib/FixMyStreet/Cobrand/UK.pm:271 #, fuzzy msgid "Problems within %s ward, %s" msgstr "Problemau yn ward %s" @@ -2953,13 +3001,13 @@ msgstr "Problemau yn ward %s" msgid "Problems within %s, %s" msgstr "" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:75 msgid "Property address:" msgstr "Cyfeiriad yr eiddo:" #: templates/web/base/report/display.html:57 #: templates/web/base/report/duplicate-no-updates.html:3 -#: templates/web/base/report/update-form.html:6 +#: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Darparu diweddariad" @@ -2971,26 +3019,26 @@ msgstr "" msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Mae darparu enw a chyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:43 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 #: templates/web/base/report/update/form_user_loggedout_by_email.html:16 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 +#: templates/web/base/report/new/form_report.html:11 msgid "Public details" msgstr "" -#: templates/web/zurich/admin/report_edit.html:241 -#: templates/web/zurich/admin/report_edit.html:268 +#: templates/web/zurich/admin/report_edit.html:242 +#: templates/web/zurich/admin/report_edit.html:269 msgid "Public response:" msgstr "Ymateb cyhoeddus:" -#: templates/web/base/report/_inspect.html:169 +#: templates/web/base/report/_inspect.html:180 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:122 -#: templates/web/zurich/admin/stats/index.html:38 +#: templates/web/zurich/admin/stats/index.html:59 msgid "Publish photo" msgstr "Cyhoeddi llun" @@ -3009,7 +3057,7 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:211 msgid "Questionnaire filled in by problem reporter" msgstr "" @@ -3021,23 +3069,23 @@ msgstr "" msgid "RSS feed" msgstr "Ffrwd RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270 +#: perllib/FixMyStreet/Cobrand/UK.pm:254 perllib/FixMyStreet/Cobrand/UK.pm:266 msgid "RSS feed for %s" msgstr "Ffrwd RSS ar gyfer %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:264 perllib/FixMyStreet/Cobrand/UK.pm:276 +#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 msgid "RSS feed for %s ward, %s" msgstr "Ffrwd RSS ar gyfer ward %s, %s" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:153 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:172 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:180 +#: perllib/FixMyStreet/Cobrand/UK.pm:280 perllib/FixMyStreet/Cobrand/UK.pm:292 msgid "RSS feed of %s" msgstr "Ffrwd RSS %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:289 perllib/FixMyStreet/Cobrand/UK.pm:301 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 msgid "RSS feed of %s, within %s ward" msgstr "Ffrwd RSS %s, o fewn ward %s" @@ -3045,13 +3093,13 @@ 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:840 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:222 +#: perllib/FixMyStreet/Cobrand/Default.pm:841 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:218 msgid "RSS feed of problems within %s" msgstr "Ffrwd RSS o broblemau yn %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:228 +#: perllib/FixMyStreet/Cobrand/UK.pm:224 msgid "RSS feed of problems within %s ward" msgstr "Ffrwd RSS o broblemau o fewn ward %s" @@ -3070,7 +3118,7 @@ msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon" msgid "Receive email when updates are left on this problem." msgstr "Derbyn e-bost pan fydd diweddariadau i'r broblem hon." -#: perllib/FixMyStreet/DB/Result/Problem.pm:756 +#: perllib/FixMyStreet/DB/Result/Problem.pm:773 msgid "Received by %s moments later" msgstr "" @@ -3084,10 +3132,15 @@ msgstr "" msgid "Recently reported problems" msgstr "Problemau a adroddwyd yn ddiweddar" -#: templates/web/base/reports/_list-filters.html:68 +#: templates/web/base/reports/_list-filters.html:70 msgid "Recently updated" msgstr "" +#: templates/web/base/report/_inspect.html:57 +#, fuzzy +msgid "Reject report" +msgstr "Ailanfon adrodd" + #: templates/web/zurich/report/new/notes.html:5 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 "" @@ -3120,8 +3173,8 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:161 -#: templates/web/base/admin/update_edit.html:71 +#: templates/web/base/admin/report_edit.html:168 +#: templates/web/base/admin/update_edit.html:74 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" @@ -3130,7 +3183,7 @@ msgstr "" msgid "Replace token" msgstr "" -#: templates/web/zurich/admin/report_edit.html:239 +#: templates/web/zurich/admin/report_edit.html:240 msgid "Reply to user:" msgstr "" @@ -3138,8 +3191,8 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:14 -#: templates/web/base/report/_item.html:78 +#: templates/web/base/report/_inspect.html:17 +#: templates/web/base/report/_item.html:79 msgid "Report ID:" msgstr "" @@ -3172,12 +3225,17 @@ msgstr "" msgid "Report your problem" msgstr "Adrodd eich problem" +#: templates/web/base/header_opengraph.html:4 +#, fuzzy +msgid "Report, view, and discuss local street-related problems." +msgstr "Adrodd, gweld, neu drafod problemau lleol" + #: templates/web/base/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 msgid "Report, view, or discuss local problems" msgstr "Adrodd, gweld, neu drafod problemau lleol" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddienw am %s" @@ -3187,7 +3245,7 @@ msgstr "Adroddwyd yn ddienw am %s" msgid "Reported before" msgstr "Adroddwyd eisoes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/Result/Problem.pm:635 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" @@ -3201,27 +3259,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:608 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:620 +#: perllib/FixMyStreet/DB/Result/Problem.pm:632 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 msgid "Reported via %s anonymously at %s" msgstr "Adroddwyd drwy %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:617 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s by %s at %s" msgstr "Adroddwyd drwy %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:602 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:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s in the %s category by %s at %s" msgstr "Adroddwyd drwy %s yn y categori %s am %s" @@ -3239,14 +3297,15 @@ msgstr "" msgid "Reporting a problem" msgstr "Adrodd problem" -#: perllib/FixMyStreet/Cobrand/ACV.pm:265 #: perllib/FixMyStreet/Cobrand/Default.pm:656 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 -#: templates/web/zurich/header.html:46 +#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:266 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:374 +#: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Adroddiadau" -#: perllib/FixMyStreet/Cobrand/UK.pm:333 perllib/FixMyStreet/Cobrand/UK.pm:335 +#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -3275,12 +3334,12 @@ msgstr "Adroddiadau a gyhoeddwyd" msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 +#: perllib/FixMyStreet/Cobrand/UK.pm:279 perllib/FixMyStreet/Cobrand/UK.pm:291 #, fuzzy msgid "Reports sent to %s" msgstr "Adroddwyd ar %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 #, fuzzy msgid "Reports sent to %s, within %s ward" msgstr "Ffrwd RSS %s, o fewn ward %s" @@ -3301,7 +3360,7 @@ msgstr "" msgid "Required" msgstr "" -#: templates/web/base/admin/report_edit.html:84 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "Ailanfon adrodd" @@ -3350,27 +3409,25 @@ msgstr "" msgid "Right place?" msgstr "Y lle cywir?" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Geocode/OSM.pm:152 +#: perllib/FixMyStreet/Geocode/OSM.pm:158 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 -#: perllib/FixMyStreet/Geocode/OSM.pm:149 +#: perllib/FixMyStreet/Geocode/OSM.pm:155 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1928 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: templates/web/base/admin/report_edit.html:158 -#: templates/web/base/admin/update_edit.html:68 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2037 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: templates/web/base/admin/report_edit.html:165 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Cylchdroi i'r chwith" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1928 -#: templates/web/base/admin/report_edit.html:159 -#: templates/web/base/admin/update_edit.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2037 +#: templates/web/base/admin/report_edit.html:166 +#: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Cylchdroi i'r dde" @@ -3384,19 +3441,18 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:200 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:71 -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/admin/template_edit.html:87 +#: templates/web/base/report/_inspect.html:200 #: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:72 -#: templates/web/zurich/admin/body.html:62 -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/base/report/update.html:53 +#: templates/web/zurich/admin/contact-form.html:39 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Cadw'r newidiadau" @@ -3405,7 +3461,7 @@ msgstr "Cadw'r newidiadau" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:165 +#: templates/web/base/report/_inspect.html:176 msgid "Save with a public update" msgstr "" @@ -3414,7 +3470,7 @@ msgstr "" msgid "Saving reports offline" msgstr "" -#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:130 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 msgid "Scheduled" msgstr "" @@ -3428,7 +3484,7 @@ msgstr "Chwilio am adroddiadau" msgid "Search Users" msgstr "Chwilio am ddefnyddwyr" -#: templates/web/zurich/header.html:68 +#: templates/web/zurich/header.html:67 msgid "Search reports" msgstr "Chwilio am adroddiadau" @@ -3459,8 +3515,8 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:93 -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:151 msgid "See user detail for reports created as the council" msgstr "" @@ -3478,6 +3534,14 @@ msgstr "" msgid "Select if this is the default priority" msgstr "" +#: templates/web/base/reports/_ward-list.html:7 +msgid "Select multiple wards to view only reports within those wards." +msgstr "" + +#: templates/web/base/reports/_ward-list.html:8 +msgid "Select multiple wards?" +msgstr "" + #: templates/web/base/admin/category-checkboxes.html:6 msgid "Select:" msgstr "" @@ -3486,7 +3550,7 @@ msgstr "" msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:109 +#: templates/web/base/admin/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" @@ -3495,20 +3559,20 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:870 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:846 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:759 +#: perllib/FixMyStreet/DB/Result/Problem.pm:776 msgid "Sent to %s %s later" msgstr "" -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/report_edit.html:80 msgid "Sent:" msgstr "Anfonwyd:" -#: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/zurich/admin/stats/index.html:66 msgid "Service:" msgstr "Gwasanaeth:" @@ -3518,7 +3582,7 @@ msgstr "Gwasanaeth:" msgid "Set password" msgstr "Newid cyfrinair" -#: templates/web/base/report/_inspect.html:47 +#: templates/web/base/report/_inspect.html:53 msgid "Set to my current location" msgstr "" @@ -3540,7 +3604,7 @@ msgstr "" #: templates/web/base/report/_main.html:130 #: templates/web/base/report/_main.html:16 #: templates/web/base/report/_main.html:21 -#: templates/web/base/reports/_list-filters.html:17 +#: templates/web/base/reports/_list-filters.html:18 msgid "Shortlisted" msgstr "" @@ -3549,21 +3613,19 @@ msgstr "" msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:18 +#: templates/web/base/report/update.html:19 msgid "Show Photo?" msgstr "" -#: templates/web/base/questionnaire/index.html:26 +#: templates/web/base/questionnaire/index.html:54 msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/base/report/update/form_name.html:37 +#: templates/web/base/report/_show_name_label.html:4 msgid "Show my name publicly" msgstr "Dangos fy enw yn gyhoeddus" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:16 msgid "Show name publicly?" msgstr "" @@ -3632,19 +3694,20 @@ msgstr "Lluniau o adroddiadau diweddar" msgid "Some text to localize" msgstr "Testun i'w leoleiddio" -#: perllib/FixMyStreet/Cobrand/ACV.pm:59 perllib/FixMyStreet/Cobrand/UK.pm:80 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:117 +#: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:73 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:131 msgid "Sorry, that appears to be a Northern Irish postcode, which we don't cover." msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:65 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:123 msgid "Sorry, that appears to be a Scottish postcode, which we don't cover." msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:69 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:127 msgid "Sorry, that appears to be a Welsh postcode, which we don't cover." msgstr "" @@ -3662,20 +3725,19 @@ 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:242 -#: 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/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 +#: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Mae'n ddrwg gennym, ni allwn ddod o hyd i'r lleoliad hwnnw." #: templates/web/base/auth/general.html:11 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:15 +#: templates/web/base/report/new/fill_in_details_form.html:17 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:35 -#: perllib/FixMyStreet/Geocode/Google.pm:45 +#: perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/Google.pm:55 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -3694,7 +3756,7 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:63 msgid "Sort by" msgstr "" @@ -3718,23 +3780,28 @@ msgstr "Dyddiad cychwyn:" #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 -#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:88 -#: templates/web/base/report/_item.html:96 +#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_item.html:97 #: templates/web/base/report/update/form_update.html:39 -#: templates/web/zurich/admin/contact-form.html:10 +#: templates/web/zurich/admin/contact-form.html:23 msgid "State" msgstr "Cyflwr" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1180 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1181 +msgid "State and external status code cannot be used simultaneously." +msgstr "" + #: perllib/FixMyStreet/Script/Alerts.pm:102 -#: templates/web/base/report/update.html:49 +#: templates/web/base/report/_update_state.html:7 #, fuzzy msgid "State changed to:" msgstr "Cadw'r newidiadau" -#: templates/web/base/admin/report_edit.html:116 +#: templates/web/base/admin/report_edit.html:122 #: 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 @@ -3743,20 +3810,21 @@ msgstr "Cadw'r newidiadau" msgid "State:" msgstr "Cyflwr:" -#: perllib/FixMyStreet/Cobrand/ACV.pm:255 -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:256 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:395 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Cyflwr" -#: perllib/FixMyStreet/Cobrand/Default.pm:640 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:418 +#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:377 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 #: templates/web/zurich/admin/stats/index.html:1 -#: templates/web/zurich/header.html:59 +#: templates/web/zurich/header.html:58 msgid "Stats" msgstr "Ystadegau" @@ -3766,8 +3834,10 @@ msgstr "Ystadegau" msgid "Status" msgstr "Statws" +#: templates/web/base/report/_update_state.html:22 #: templates/web/base/report/updates.html:16 -msgid "Still open, via questionnaire, %s" +#, fuzzy +msgid "Still open, via questionnaire" msgstr "Ar agor o hyd, drwy holiadur, %s" #: templates/web/zurich/admin/report_edit-sdm.html:27 @@ -3775,19 +3845,19 @@ msgstr "Ar agor o hyd, drwy holiadur, %s" msgid "Street View" msgstr "" +#: perllib/FixMyStreet/Cobrand/Smidsy.pm:26 +msgid "Street, area, or landmark" +msgstr "" + #: templates/web/base/admin/extra-metadata-form.html:46 msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:35 +#: templates/web/base/report/new/category.html:37 #, fuzzy msgid "Subcategory" msgstr "Is-gategori: %s" -#: perllib/FixMyStreet/Script/Reports.pm:188 -msgid "Subcategory: %s" -msgstr "Is-gategori: %s" - #: templates/web/zurich/admin/index-dm.html:27 msgid "Subdivision/Body" msgstr "" @@ -3796,7 +3866,7 @@ msgstr "" msgid "Subject" msgstr "Pwnc" -#: templates/web/base/admin/report_edit.html:110 +#: templates/web/base/admin/report_edit.html:116 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Pwnc:" @@ -3804,19 +3874,19 @@ msgstr "Pwnc:" #: templates/web/base/auth/2faform.html:21 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:76 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:48 +#: templates/web/base/report/new/form_user_loggedin.html:68 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Cyflwyno" -#: templates/web/base/admin/report_edit.html:169 -#: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/report_edit.html:179 +#: templates/web/base/admin/report_edit.html:25 +#: templates/web/base/admin/update_edit.html:82 #: templates/web/base/admin/user-form.html:191 #: templates/web/zurich/admin/report_edit-sdm.html:124 -#: templates/web/zurich/admin/report_edit.html:264 +#: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Cyflwyno newidiadau" @@ -3825,10 +3895,6 @@ msgstr "Cyflwyno newidiadau" msgid "Submit questionnaire" msgstr "Cyflwyno'r holiadur" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:170 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:937 -#: templates/web/zurich/admin/header.html:1 -#: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 @@ -3848,7 +3914,7 @@ msgstr "Tanysgrifio" msgid "Subscribe by email" msgstr "Tanysgrifio i hysbysiad e-bost" -#: templates/web/base/report/new/form_report.html:19 +#: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" @@ -3856,16 +3922,16 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:249 -#: perllib/FixMyStreet/Cobrand/Default.pm:638 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:414 +#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:250 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:373 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 -#: templates/web/zurich/header.html:43 +#: templates/web/zurich/header.html:42 msgid "Summary" msgstr "Crynodeb" @@ -3898,8 +3964,9 @@ msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:662 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:425 -#: templates/web/zurich/header.html:63 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:384 +#: templates/web/base/develop/email_list.html:3 +#: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" @@ -3939,7 +4006,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "Diolch am eich adborth" -#: templates/web/base/around/_error_multiple.html:18 +#: templates/web/base/around/_error_multiple.html:23 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Diolch am uwchlwytho eich llun. Nawr mae'n rhaid i ni leoli eich problem, felly rhowch enw stryd cyfagos neu god post yn y blwch uchod :" @@ -3951,7 +4018,7 @@ msgstr "Diolch, mae'n dda gennym glywed y cafodd ei drwsio! Gawn ni ofyn a ydych msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Ni uwchlwythwyd y llun yn gywir (%s), ceisiwch eto." -#: perllib/FixMyStreet/App/Controller/Council.pm:102 +#: perllib/FixMyStreet/App/Controller/Council.pm:110 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -3959,43 +4026,43 @@ msgstr "" msgid "That location does not appear to be in the UK; please try again." msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arni." -#: perllib/FixMyStreet/Cobrand/ACV.pm:52 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:110 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:858 +#: perllib/FixMyStreet/App/Controller/Admin.pm:903 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:851 +#: perllib/FixMyStreet/App/Controller/Admin.pm:896 msgid "That problem will now be resent." msgstr "Ailanfonir y broblem nawr." -#: perllib/FixMyStreet/App/Controller/Report.pm:134 +#: perllib/FixMyStreet/App/Controller/Report.pm:137 msgid "That report cannot be viewed on %s." msgstr "Ni ellir gweld yr adroddiad hwnnw ar %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report has been removed from FixMyStreet." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1769 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1891 #, fuzzy msgid "That user has been logged out." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1898 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1812 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1921 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1790 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1912 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4066,8 +4133,7 @@ msgstr "" msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 -#: perllib/FixMyStreet/Geocode/OSM.pm:144 +#: perllib/FixMyStreet/Geocode/OSM.pm:150 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -4121,7 +4187,11 @@ msgstr "Ni chanfuwyd yr URL '%s' ar y gweinydd hwn" msgid "The type of input field to show to the user. <strong>Text</strong> is a simple text field, <strong>List</strong> is a drop-down selection." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: templates/web/base/admin/user_import.html:68 +msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" +msgstr "" + +#: perllib/FixMyStreet/Script/Reports.pm:99 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -4138,7 +4208,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Nid oes unrhyw adroddiadau i'w dangos." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1208 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4146,7 +4216,7 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:138 +#: perllib/FixMyStreet/App/Controller/Contact.pm:142 #: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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." @@ -4155,7 +4225,7 @@ msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen." msgid "There was a problem with your email/password combination. Please try again." msgstr "Bu gwall gyda'r e-bost neu'r cyfrinair. Rhowch gynnig arall arni." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:815 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:818 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 #: templates/web/base/auth/general.html:51 #: templates/web/zurich/auth/general.html:18 @@ -4163,15 +4233,15 @@ msgstr "Bu gwall gyda'r e-bost neu'r cyfrinair. Rhowch gynnig arall arni." msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "Bu problem gyda'r e-bost neu gyfrinair. Os na allwch gofio eich cyfrinair, neu os nad oes un gennych, llenwch ddarn ‘mewngofnodi drwy e-bost’ y ffurflen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:348 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:349 msgid "There was a problem with your update. Please try again." msgstr "Bu gwall gyda'r diweddariad. Rhowch gynnig arall arni." -#: perllib/FixMyStreet/App/Controller/Contact.pm:142 +#: perllib/FixMyStreet/App/Controller/Contact.pm:146 msgid "There were problems with your report. Please see below." msgstr "Bu gwallau gyda'r adroddiad. Gwelwch isod." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:389 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:390 msgid "There were problems with your update. Please see below." msgstr "Bu gwallau gyda'r diweddariad. Gwelwch isod." @@ -4185,13 +4255,17 @@ msgid "" " " msgstr "" +#: templates/web/base/admin/user_import.html:43 +msgid "These users weren't updated." +msgstr "" + #: templates/web/base/report/new/councils_text.html:3 #: templates/web/base/report/new/councils_text.html:4 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>." msgstr "" -#: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/councils_text_all.html:6 +#: templates/web/base/report/new/councils_text_all.html:5 +#: templates/web/base/report/new/councils_text_all.html:7 msgid "These will be sent to <strong>%s</strong> and also published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>." msgstr "" @@ -4226,18 +4300,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:195 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/Script/Reports.pm:193 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:1004 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1021 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1067 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:960 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1028 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1045 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Mae'r wybodaeth hon yn ofynnol" @@ -4254,19 +4328,23 @@ msgstr "" msgid "This is the <strong>public</strong> text that will be shown on the site." msgstr "" -#: templates/web/base/report/new/form_report.html:58 +#: templates/web/base/admin/user_import.html:65 +msgid "This page is a quick way to create many new staff users in one go." +msgstr "" + +#: templates/web/base/report/new/form_report.html:56 msgid "This pothole has been here for two months and…" msgstr "" -#: templates/web/base/report/update/form_update.html:55 +#: templates/web/base/report/update/form_state_checkbox.html:14 msgid "This problem has been fixed" msgstr "Trwsiwyd y broblem hon" -#: templates/web/base/report/update/form_update.html:48 +#: templates/web/base/report/update/form_state_checkbox.html:7 msgid "This problem has not been fixed" msgstr "Ni thrwsiwyd y broblem hon" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_state_checkbox.html:5 msgid "This problem is still ongoing" msgstr "" @@ -4274,8 +4352,8 @@ msgstr "" msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:167 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:168 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: templates/web/zurich/report/_main.html:12 msgid "This report is awaiting moderation." msgstr "" @@ -4292,7 +4370,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:90 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Mae'r dudalen we hon yn cynnwys llun o'r broblem, a ddarparwyd gan y defnyddiwr." @@ -4303,8 +4381,8 @@ msgstr "Mae'r dudalen we hon yn cynnwys llun o'r broblem, a ddarparwyd gan y def msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:250 -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:251 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Llinell amser" @@ -4342,7 +4420,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4367,12 +4445,12 @@ msgstr "" #: templates/web/base/dashboard/index.html:115 #: templates/web/base/dashboard/index.html:120 #: templates/web/base/dashboard/index.html:144 -#: templates/web/zurich/admin/stats/index.html:30 +#: templates/web/zurich/admin/stats/index.html:51 msgid "Total" msgstr "Cyfanswm" -#: templates/web/base/report/_inspect.html:140 -#: templates/web/base/report/_item.html:104 +#: templates/web/base/report/_inspect.html:151 +#: templates/web/base/report/_item.html:105 msgid "Traffic management required?" msgstr "" @@ -4388,8 +4466,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/ACV.pm:99 -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4448,14 +4525,14 @@ msgstr "" msgid "Unknown error" msgstr "Gwall anhysbys" -#: perllib/FixMyStreet/App/Controller/My.pm:200 +#: perllib/FixMyStreet/App/Controller/My.pm:199 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:18 +#: templates/web/base/reports/_list-filters.html:19 msgid "Unshortlisted" msgstr "" @@ -4526,13 +4603,13 @@ msgstr "Postiwyd gan <strong>%s</strong> (%s) am %s" msgid "Updated by <strong>%s</strong> at %s" msgstr "Postiwyd gan <strong>%s</strong> am %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1391 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1592 -#: perllib/FixMyStreet/App/Controller/Admin.pm:933 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:806 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:831 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:901 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1659 +#: perllib/FixMyStreet/App/Controller/Admin.pm:984 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:779 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:804 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:877 msgid "Updated!" msgstr "Diweddarwyd!" @@ -4556,6 +4633,11 @@ msgstr "Diweddariadau ar {{title}}" msgid "Updates to this problem, %s" msgstr "" +#: templates/web/base/admin/user_import.html:64 +#, fuzzy +msgid "Usage notes" +msgstr "Noder:" + #: templates/web/base/admin/contact-form.html:43 #: templates/web/base/admin/contact-form.html:44 msgid "" @@ -4567,7 +4649,11 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:65 +#: templates/web/base/admin/open311-form-fields.html:137 +msgid "Use Open311 problem fetching" +msgstr "" + +#: templates/web/base/admin/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" @@ -4580,32 +4666,36 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:78 +#: templates/web/base/admin/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1756 +#: templates/web/base/admin/user_import.html:1 +msgid "User Import" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1868 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1878 #, fuzzy msgid "User added to abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1369 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1474 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1436 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1541 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1743 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1753 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1865 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 #, fuzzy msgid "User already in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1887 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1996 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1858 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1967 msgid "User flagged" msgstr "" @@ -4619,18 +4709,18 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:136 #: templates/web/base/admin/update_edit.html:36 #, fuzzy msgid "User:" msgstr "Defnyddwyr" -#: perllib/FixMyStreet/Cobrand/ACV.pm:101 -#: perllib/FixMyStreet/Cobrand/ACV.pm:271 -#: perllib/FixMyStreet/Cobrand/Default.pm:670 -#: perllib/FixMyStreet/Cobrand/Default.pm:729 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:430 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:272 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:389 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Defnyddwyr" @@ -4638,9 +4728,9 @@ msgstr "Defnyddwyr" msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 -#: perllib/FixMyStreet/App/Controller/Admin.pm:407 +#: perllib/FixMyStreet/App/Controller/Admin.pm:363 +#: perllib/FixMyStreet/App/Controller/Admin.pm:399 +#: perllib/FixMyStreet/App/Controller/Admin.pm:426 msgid "Values updated" msgstr "" @@ -4660,7 +4750,7 @@ msgstr "Eich cyfeiriad e-bost" msgid "Verify phone number" msgstr "Eich rhif ffôn" -#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:36 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 #: templates/web/zurich/admin/report_edit.html:24 @@ -4672,6 +4762,11 @@ msgstr "" msgid "View reports by ward" msgstr "Gweld adroddiadau yn ôl ward" +#: templates/web/base/reports/_ward-list.html:24 +#, fuzzy +msgid "View wards" +msgstr "ardaloedd eraill:" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4709,7 +4804,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:204 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4718,7 +4813,7 @@ msgid "We send it to the council on your behalf" msgstr "" #: templates/web/base/alert/choose.html:12 -#: templates/web/base/around/_error_multiple.html:12 +#: templates/web/base/around/_error_multiple.html:17 msgid "We show up to ten matches, please try a different search if yours is not here." msgstr "" @@ -4760,7 +4855,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:105 +#: templates/web/base/report/_inspect.html:116 msgid "Which report is it a duplicate of?" msgstr "" @@ -4772,13 +4867,6 @@ msgstr "" msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:191 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:967 -#: templates/web/zurich/admin/header.html:1 -#: templates/web/zurich/admin/header.html:14 -msgid "Wish" -msgstr "" - #: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" @@ -4803,7 +4891,7 @@ msgstr "Mae ysgrifennu eich holl neges mewn priflythrennau yn ei gwneud hi'n ano msgid "Wrong location? Just click again on the map." msgstr "Lleoliad anghywir? Cliciwch ar y map eto." -#: perllib/FixMyStreet/Cobrand/Default.pm:1239 +#: perllib/FixMyStreet/Cobrand/Default.pm:1198 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4811,14 +4899,14 @@ msgstr "Lleoliad anghywir? Cliciwch ar y map eto." #: 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:124 +#: templates/web/base/admin/report_edit.html:131 #: 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/report/_inspect.html:96 +#: templates/web/base/questionnaire/index.html:37 +#: templates/web/base/report/_inspect.html:107 msgid "Yes" msgstr "" @@ -4856,7 +4944,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:115 +#: templates/web/base/contact/index.html:118 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>" @@ -4890,7 +4978,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:39 +#: templates/web/base/report/new/form_report.html:36 #: templates/web/zurich/report/new/fill_in_details_form.html:30 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" @@ -5002,7 +5090,6 @@ msgstr "" #: templates/web/base/auth/general.html:116 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:51 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -5013,11 +5100,11 @@ msgstr "Eich enw" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:272 +#: perllib/FixMyStreet/App/Controller/My.pm:271 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:268 +#: perllib/FixMyStreet/App/Controller/My.pm:267 msgid "Your name has been hidden." msgstr "" @@ -5038,7 +5125,7 @@ msgid "Your password has been changed" msgstr "Newidiwyd eich cyfrinair" #: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:52 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:25 #: templates/web/zurich/auth/general.html:63 msgid "Your password should include %d or more characters." @@ -5050,7 +5137,7 @@ msgstr "" msgid "Your phone number" msgstr "Eich rhif ffôn" -#: templates/web/base/questionnaire/index.html:16 +#: templates/web/base/questionnaire/index.html:44 msgid "Your report" msgstr "" @@ -5085,14 +5172,23 @@ msgstr "" msgid "Yourself" msgstr "" +#: templates/web/base/admin/user_import.html:72 +msgid "a colon-separated list of permissions to grant that user, e.g. <code>contribute_as_body:moderate:user_edit</code>." +msgstr "" + +#: templates/web/base/report/_inspect.html:20 +msgid "admin" +msgstr "" + #: templates/web/base/admin/category-checkboxes.html:7 #: templates/web/base/admin/user-form.html:171 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Admin.pm:960 #: perllib/FixMyStreet/App/Controller/Moderate.pm:85 #: perllib/FixMyStreet/DB/Result/Comment.pm:216 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 msgid "an administrator" msgstr "" @@ -5109,7 +5205,7 @@ msgstr "gan %s" msgid "council" msgstr "cyngor" -#: templates/web/base/admin/report_edit.html:52 +#: templates/web/base/admin/report_edit.html:53 msgid "didn't use map" msgstr "" @@ -5119,7 +5215,7 @@ msgid "e.g. ‘%s’ or ‘%s’" msgstr "e.e. '%s' neu '%s'" #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:81 +#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "" @@ -5137,7 +5233,7 @@ msgstr "diweddarwyd ddiwethaf %s" msgid "less than a minute" msgstr "llai na munud" -#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: perllib/FixMyStreet/App/Controller/Admin.pm:122 #: templates/web/base/admin/stats/questionnaire.html:15 #: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" @@ -5157,8 +5253,8 @@ msgstr "" msgid "or locate me automatically" msgstr "neu dewch o hyd i fi'n awtomatig" -#: templates/web/base/admin/report_edit.html:48 -#: templates/web/base/admin/report_edit.html:50 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:34 #: templates/web/zurich/admin/report_edit-sdm.html:55 @@ -5172,7 +5268,7 @@ msgstr "neu dewch o hyd i fi'n awtomatig" msgid "originally entered: “%s”" msgstr "" -#: templates/web/base/admin/report_edit.html:68 +#: templates/web/base/admin/report_edit.html:69 msgid "other areas:" msgstr "ardaloedd eraill:" @@ -5180,7 +5276,11 @@ msgstr "ardaloedd eraill:" msgid "sign out" msgstr "allgofnodi" -#: templates/web/base/report/new/form_report.html:13 +#: templates/web/base/admin/user_import.html:71 +msgid "the database id of the body to associate that user with, e.g. <code>2217</code> for Buckinghamshire." +msgstr "" + +#: templates/web/base/report/new/form_report.html:14 msgid "the local council" msgstr "y cyngor lleol" @@ -5194,7 +5294,7 @@ msgstr "" msgid "this location" msgstr "y cyngor lleol" -#: perllib/FixMyStreet/Script/Reports.pm:180 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "" @@ -5210,7 +5310,7 @@ msgstr "" msgid "updates" msgstr "" -#: templates/web/base/admin/report_edit.html:52 +#: templates/web/base/admin/report_edit.html:53 msgid "used map" msgstr "" @@ -5222,12 +5322,12 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1831 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1940 #, fuzzy msgid "user not in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1829 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1938 #, fuzzy msgid "user removed from abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" @@ -5309,7 +5409,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/fixmystreet.com/reports/summary.html:104 +#: templates/web/fixmystreet.com/reports/summary.html:153 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -5336,7 +5436,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/fixmystreet.com/reports/summary.html:119 +#: templates/web/fixmystreet.com/reports/summary.html:168 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -5390,7 +5490,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/report/_item.html:51 +#: templates/web/buckinghamshire/report/_item.html:51 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5417,7 +5517,7 @@ 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." -#: templates/web/base/report/_item.html:61 +#: templates/web/buckinghamshire/report/_item.html:61 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" @@ -5426,7 +5526,16 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/email/oxfordshire/archive.txt:9 +#: templates/email/default/inactive-account.txt:8 +#, fuzzy, perl-format +msgid "month" +msgid_plural "months" +msgstr[0] "Mis" +msgstr[1] "Mis" +msgstr[2] "Mis" +msgstr[3] "Mis" + +#: templates/email/warwickshire/archive.txt:9 #, perl-format msgid "report" msgid_plural "reports" @@ -5435,6 +5544,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#~ msgid "Category: %s" +#~ msgstr "Categori: %s" + +#~ msgid "In progress" +#~ msgstr "Ar y gweill" + +#~ msgid "Subcategory: %s" +#~ msgstr "Is-gategori: %s" + #~ msgid "Email: %s" #~ msgstr "E-bost: %s" |