diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-02-03 15:02:33 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-02-03 15:02:33 +0000 |
| commit | ef93bf3f103c0ecddf0eb912d4d4f2159a7867b3 (patch) | |
| tree | 9522a5c46f0ff4b3f78ed1bb65a7350381cc1fa8 /locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po | |
| parent | 8eb377e1fc9153f4ec05c37988502f764e1784fd (diff) | |
| parent | afb90c54e9bfbabf9adc5fe0c66db38b0f406781 (diff) | |
Merge branch 'version-2.0.2'v2.0.2
Diffstat (limited to 'locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po')
| -rw-r--r-- | locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po | 831 |
1 files changed, 405 insertions, 426 deletions
diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index 2e7128820..91efc9979 100644 --- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -3,23 +3,22 @@ # This file is distributed under the same license as the main FixMyStreet code. # Matthew Somerville <matthew@mysociety.org>, 2011-06-03. # -# Translators: -# ciaran, 2015 +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: fixmystreet\n" +"Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-11-08 11:39+0000\n" -"PO-Revision-Date: 2016-05-03 09:48+0000\n" -"Last-Translator: mySociety <transifex@mysociety.org>\n" -"Language-Team: Welsh (http://www.transifex.com/mysociety/fixmystreet/language/cy/)\n" +"POT-Creation-Date: 2017-02-02 10:31+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n" +"Language-Team: Welsh (https://www.transifex.com/mysociety/teams/12067/cy/)\n" "Language: cy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:639 +#: perllib/FixMyStreet/DB/Result/Problem.pm:648 #: perllib/FixMyStreet/Script/Reports.pm:199 msgid " and " msgstr "a" @@ -111,7 +110,7 @@ msgstr "ward %s, %s" msgid "%s, within %s ward" msgstr "%s, o fewn ward %s" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" @@ -119,7 +118,7 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:41 +#: templates/web/base/admin/report_blocks.html:43 #: templates/web/base/admin/users.html:32 msgid "(Email in abuse table)" msgstr "" @@ -143,12 +142,10 @@ msgstr "" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "" -#: templates/web/base/report/_item.html:27 #: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(ar gau)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(wedi trwsio)" @@ -157,7 +154,7 @@ msgstr "(wedi trwsio)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "(heb ei anfon at y cyngor)" @@ -165,21 +162,21 @@ msgstr "(heb ei anfon at y cyngor)" msgid "(optional)" msgstr "(dewisol)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "(anfonwyd i'r ddau)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:231 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:650 -#: perllib/FixMyStreet/DB/Result/Problem.pm:438 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:239 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/DB/Result/Problem.pm:439 msgid "-- Pick a category --" msgstr "-- Dewiswch gategori --" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "" @@ -219,11 +216,11 @@ msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bo msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost" -#: templates/web/base/report/_inspect.html:133 +#: templates/web/base/report/_inspect.html:142 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:135 +#: templates/web/base/report/_inspect.html:144 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -234,7 +231,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Oes</strong>, mae gen i gyfrinair" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:8 +#: templates/web/base/admin/report_blocks.html:10 #: templates/web/base/report/update/form_update.html:41 #: templates/web/base/report/update/form_update.html:42 msgid "Action Scheduled" @@ -263,27 +260,29 @@ msgstr "Ychwanegu corff" msgid "Add new category" msgstr "Ychwanegu categori newydd" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_item.html:10 +#: templates/web/base/report/_item.html:14 +#: templates/web/base/report/_main.html:136 #: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:30 msgid "Add to shortlist" msgstr "" #: templates/web/base/admin/user_edit.html:4 #: templates/web/base/admin/users.html:48 +#: templates/web/base/admin/users.html:51 msgid "Add user" msgstr "Ychwanegu defnyddiwr" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 -#, fuzzy +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Add/edit problem categories" -msgstr "Ychwanegu categori newydd" +msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Add/edit response templates" msgstr "" @@ -291,7 +290,7 @@ msgstr "" msgid "Added %s" msgstr "Ychwanegwyd %s" -#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:145 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -321,15 +320,13 @@ msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/responsepriorities/list.html:19 -#, fuzzy msgid "All categories" -msgstr "Pob adroddiad" +msgstr "" #: templates/web/base/footer.html:29 #: templates/web/base/reports/_list-filters.html:2 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 -#: templates/web/zurich/footer.html:21 +#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Pob adroddiad" @@ -348,16 +345,15 @@ msgstr "Mae diweddariad wedi nodi'r broblem wedi ei thrwsio." msgid "Anonymous" msgstr "Dienw" -#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/report_edit.html:134 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Dienw:" #: templates/web/base/report/new/form_user_loggedin.html:20 #: templates/web/base/report/update/form_name.html:13 -#, fuzzy msgid "Another user" -msgstr "Ychwanegu defnyddiwr" +msgstr "" #: templates/web/base/front/footer-marketing.html:16 msgid "Are you a developer?" @@ -369,9 +365,8 @@ msgstr "" #: templates/web/base/admin/report_edit.html:84 #: templates/web/base/report/display_tools.html:6 -#, fuzzy msgid "Are you sure?" -msgstr "Ydych chi'n ddatblygwr?" +msgstr "" #: templates/web/base/admin/body-form.html:75 #: templates/web/base/admin/body.html:20 @@ -405,7 +400,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Assign users to areas" msgstr "" @@ -427,12 +422,11 @@ msgid "Authorised staff users can be associated with the categories in which the msgstr "" #: templates/web/base/admin/template_edit.html:22 -#, fuzzy msgid "Auto-response:" -msgstr "Ymateb cyhoeddus:" +msgstr "" -#: templates/web/base/admin/report_edit.html:133 -#: templates/web/base/report/_inspect.html:42 +#: templates/web/base/admin/report_edit.html:127 +#: templates/web/base/report/_inspect.html:41 msgid "Available categories" msgstr "" @@ -440,7 +434,7 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:402 #: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -450,16 +444,15 @@ msgid "Back" msgstr "Yn ôl" #: templates/web/base/report/_main.html:6 -#, fuzzy msgid "Back to all reports" -msgstr "Pob adroddiad" +msgstr "" -#: templates/web/base/admin/report_blocks.html:41 +#: templates/web/base/admin/report_blocks.html:43 msgid "Ban email address" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 @@ -490,25 +483,20 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: templates/web/base/report/_inspect.html:141 -msgid "Cancel" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:650 #: templates/web/base/admin/responsepriorities/list.html:8 -#, fuzzy msgid "Categories" -msgstr "Categori" +msgstr "" #: templates/web/base/admin/category-checkboxes.html:2 -#, fuzzy msgid "Categories:" -msgstr "Categori:" +msgstr "" #: templates/web/base/admin/body.html:72 #: templates/web/base/admin/contact-form.html:19 #: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/base/report/_inspect.html:33 +#: templates/web/base/report/_inspect.html:32 +#: templates/web/base/report/_item.html:82 #: templates/web/base/report/new/category.html:6 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -520,16 +508,15 @@ msgid "Category" msgstr "Categori" #: perllib/FixMyStreet/App/Controller/Admin.pm:854 -#, fuzzy msgid "Category changed from ‘%s’ to ‘%s’" -msgstr "e.e. '%s' neu '%s'" +msgstr "" #: templates/web/base/admin/stats.html:58 #: templates/web/base/admin/stats_fix_rate.html:1 msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/report_edit.html:125 +#: templates/web/base/admin/report_edit.html:119 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -548,9 +535,8 @@ msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 #: templates/web/base/auth/change_email.html:30 -#, fuzzy msgid "Change email address" -msgstr "Eich cyfeiriad e-bost" +msgstr "" #: templates/web/base/auth/change_password.html:1 #: templates/web/base/auth/change_password.html:16 @@ -593,6 +579,10 @@ msgid "" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" +#: templates/web/base/report/_inspect.html:76 +msgid "Choose another" +msgstr "" + #: templates/web/base/admin/stats.html:72 #: templates/web/base/admin/stats.html:78 msgid "Click here or enter as dd/mm/yyyy" @@ -621,10 +611,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:189 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960 #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:15 -#: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/admin/report_blocks.html:17 +#: templates/web/base/admin/report_blocks.html:27 #: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 +#: templates/web/base/report/_item.html:43 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -638,9 +629,8 @@ msgid "Closed by council" msgstr "Caewyd gan y cyngor" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "Closed reports" -msgstr "Ailanfon adrodd" +msgstr "" #: templates/web/base/admin/problem_row.html:38 msgid "Closed:" @@ -727,8 +717,8 @@ msgstr "Cysylltu â'r tîm" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1649 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1677 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1651 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1679 msgid "Could not find user" msgstr "Methu dod o hyd i'r defnyddiwr" @@ -771,20 +761,18 @@ msgid "Create category" msgstr "Creu categori" #: templates/web/base/admin/responsepriorities/edit.html:36 -#, fuzzy msgid "Create priority" -msgstr "Creu adroddiad" +msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#, fuzzy msgid "Create reports/updates as the council" -msgstr "Noder na chaiff diweddariadau eu hanfon at y cyngor." +msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" @@ -825,7 +813,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: templates/web/base/admin/template_edit.html:40 +#: templates/web/base/admin/template_edit.html:50 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -846,9 +834,8 @@ msgid "Description" msgstr "Disgrifiad" #: templates/web/base/admin/responsepriorities/edit.html:17 -#, fuzzy msgid "Description:" -msgstr "Disgrifiad" +msgstr "" #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 @@ -892,21 +879,35 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "" +#: templates/web/base/report/_item.html:25 +msgid "Down one" +msgstr "" + #: templates/web/base/js/translation_strings.html:52 msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:14 +#: templates/web/base/admin/report_blocks.html:16 #: templates/web/base/report/update/form_update.html:41 #: templates/web/base/report/update/form_update.html:43 msgid "Duplicate" msgstr "Lluosogi" +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "Lluosogi" + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "Lluosogi" + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -915,7 +916,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:16 +#: templates/web/base/report/_inspect.html:15 +#: templates/web/base/report/_item.html:73 msgid "Easting/Northing:" msgstr "" @@ -934,28 +936,25 @@ msgstr "Golygu" msgid "Edit body details" msgstr "Golygu manylion y corff" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#, fuzzy +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Edit other users' details" -msgstr "Golygu manylion y corff" +msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:709 -#, fuzzy msgid "Edit report category" -msgstr "Creu categori" +msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:708 -#, fuzzy msgid "Edit reports" -msgstr "Pob adroddiad" +msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 @@ -992,16 +991,15 @@ msgstr "Golygydd" msgid "Email" msgstr "E-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" #: templates/web/base/admin/contact-form.html:36 #: templates/web/base/report/new/form_user_loggedin.html:28 #: templates/web/base/report/update/form_name.html:19 -#, fuzzy msgid "Email address" -msgstr "Cyfeiriad e-bost:" +msgstr "" #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" @@ -1011,11 +1009,11 @@ msgstr "Crëwyd hysbysiad e-bost" msgid "Email alert deleted" msgstr "Dilëwyd hysbysiad e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1622 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1624 msgid "Email already in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: templates/web/base/admin/report_edit.html:147 +#: templates/web/base/admin/report_edit.html:141 #: templates/web/base/admin/update_edit.html:35 #: templates/web/base/admin/user-form.html:19 #: templates/web/zurich/admin/body.html:48 @@ -1082,7 +1080,7 @@ msgid "Enter details of the problem" msgstr "Rhowch fanylion am y broblem" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:4 +#: templates/web/base/errors/generic.html:8 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 @@ -1104,11 +1102,10 @@ msgstr "Cod post enghreifftiol %s" msgid "Examples:" msgstr "Enghraifft:" -#: templates/web/base/admin/report_edit.html:128 -#: templates/web/base/report/_inspect.html:37 -#, fuzzy +#: templates/web/base/admin/report_edit.html:122 +#: templates/web/base/report/_inspect.html:36 msgid "Existing category" -msgstr "Creu categori" +msgstr "" #: templates/web/base/report/new/form_report.html:52 msgid "Explain what’s wrong" @@ -1122,33 +1119,30 @@ msgid "Extern" msgstr "" #: templates/web/base/admin/report_edit.html:97 -#, fuzzy msgid "External ID" -msgstr "URL allanol" +msgstr "" #: templates/web/base/admin/body-form.html:87 msgid "External URL" msgstr "URL allanol" #: templates/web/base/admin/report_edit.html:99 -#, fuzzy msgid "External body" -msgstr "URL allanol" +msgstr "" #: templates/web/base/admin/report_edit.html:101 -#, fuzzy msgid "External team" -msgstr "URL allanol" +msgstr "" #: templates/web/base/admin/category_edit.html:25 #: templates/web/base/admin/report_edit.html:94 msgid "Extra data:" msgstr "Data ychwanegol:" -#: templates/web/base/report/_inspect.html:107 -#, fuzzy +#: templates/web/base/report/_inspect.html:116 +#: templates/web/base/report/_item.html:98 msgid "Extra details" -msgstr "Data ychwanegol:" +msgstr "" #: templates/web/base/contact/submit.html:13 msgid "Failed to send message" @@ -1168,11 +1162,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:24 -#: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/admin/report_blocks.html:11 +#: templates/web/base/admin/report_blocks.html:26 #: templates/web/base/admin/stats_fix_rate.html:4 #: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 +#: templates/web/base/report/_item.html:41 #: templates/web/base/report/banner.html:12 #: templates/web/base/report/update/form_update.html:41 #: templates/web/base/report/update/form_update.html:45 @@ -1180,19 +1175,18 @@ msgid "Fixed" msgstr "" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:11 +#: templates/web/base/admin/report_blocks.html:13 msgid "Fixed - Council" msgstr "" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:10 +#: templates/web/base/admin/report_blocks.html:12 msgid "Fixed - User" msgstr "" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "Fixed reports" -msgstr "Adroddiadau newydd" +msgstr "" #: templates/web/base/admin/problem_row.html:37 msgid "Fixed:" @@ -1204,7 +1198,7 @@ msgstr "" msgid "Flag as deleted" msgstr "" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Flag user" msgstr "" @@ -1225,7 +1219,7 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:153 +#: templates/web/base/admin/report_edit.html:147 #: templates/web/base/admin/user-form.html:100 msgid "Flagged:" msgstr "" @@ -1263,7 +1257,7 @@ msgid "Frequently Asked Questions" msgstr "Cwestiynau a ofynnir yn aml" #: templates/web/base/around/_updates.html:3 -#: templates/web/base/report/display_tools.html:12 +#: templates/web/base/report/display_tools.html:14 msgid "Get updates" msgstr "Derbyn diweddariadau" @@ -1289,7 +1283,7 @@ msgstr "Mae'n dda gennym glywed y cafodd ei drwsio!" #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:29 -#: templates/web/base/reports/_list-filters.html:41 +#: templates/web/base/reports/_list-filters.html:44 #: templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "" @@ -1298,7 +1292,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "" @@ -1340,8 +1334,8 @@ msgstr "Helo %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:906 #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:17 -#: templates/web/base/admin/report_blocks.html:26 +#: templates/web/base/admin/report_blocks.html:19 +#: templates/web/base/admin/report_blocks.html:28 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 @@ -1384,7 +1378,7 @@ msgstr "Dwi newydd adrodd problem ar @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Dwi newydd ddiweddaru problem ar @fixmystreet" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1427,9 +1421,12 @@ msgstr "" #: templates/web/base/report/new/top_message_none.html:10 #: templates/web/base/report/new/top_message_none.html:9 -#, fuzzy msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council." -msgstr "Os cyflwynwch chi broblem yma, bydd y pwnc a manylion y broblem yn gyhoeddus, ond <strong>ni</strong> chaiff y broblem ei hanfon at y cyngor." +msgstr "" + +#: templates/web/base/admin/template_edit.html:36 +msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." +msgstr "" #: templates/web/base/questionnaire/index.html:70 msgid "" @@ -1490,7 +1487,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:192 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954 #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:7 +#: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 @@ -1526,7 +1523,7 @@ msgid "Internal notes" msgstr "Nodiadau mewnol" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:16 +#: templates/web/base/admin/report_blocks.html:18 msgid "Internal referral" msgstr "" @@ -1534,7 +1531,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "Dyddiad dod i ben annilys" @@ -1542,16 +1539,16 @@ msgstr "Dyddiad dod i ben annilys" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:361 +#: perllib/FixMyStreet/App/Controller/Report.pm:384 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1479 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1481 msgid "Invalid start date" msgstr "Dyddiad cychwyn annilys" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:5 +#: templates/web/base/admin/report_blocks.html:7 #: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:141 #: templates/web/base/report/update/form_update.html:41 @@ -1597,10 +1594,13 @@ msgstr "Diweddariad diwethaf:" msgid "Last update:" msgstr "Diweddariad diwethaf:" -#: templates/web/base/reports/_list-filters.html:38 -#, fuzzy +#: templates/web/base/report/_item.html:78 +msgid "Latitude/Longitude:" +msgstr "" + +#: templates/web/base/reports/_list-filters.html:41 msgid "Least recently updated" -msgstr "Diweddariad diwethaf:" +msgstr "" #: templates/web/base/admin/body-form.html:127 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." @@ -1615,10 +1615,9 @@ msgid "Loading..." msgstr "Wrthi'n llwytho..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 -#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 -#: templates/web/base/alert/updates.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 +#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" msgstr "Ffrydiau RSS lleol a hysbysiadau e-bost" @@ -1644,6 +1643,10 @@ msgstr "MAP" msgid "Manage shortlist" msgstr "" +#: templates/web/base/reports/_list-filters.html:36 +msgid "Manual order" +msgstr "" + #: templates/web/base/js/translation_strings.html:46 msgid "Map" msgstr "Map" @@ -1668,7 +1671,7 @@ msgstr "" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "Neges" @@ -1688,19 +1691,17 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "jurisdiction_id coll" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:707 -#, fuzzy msgid "Moderate report details" -msgstr "Golygu manylion y corff" +msgstr "" -#: templates/web/base/report/_main.html:126 -#, fuzzy +#: templates/web/base/report/_main.html:130 msgid "Moderate this report" -msgstr "Creu adroddiad" +msgstr "" #: templates/web/zurich/admin/stats.html:34 msgid "Moderated by division within one working day" @@ -1710,7 +1711,7 @@ msgstr "" msgid "Month" msgstr "Mis" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "" @@ -1734,7 +1735,7 @@ msgstr "" msgid "Name" msgstr "Enw" -#: templates/web/base/admin/report_edit.html:145 +#: templates/web/base/admin/report_edit.html:139 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 #: templates/web/base/admin/user-form.html:16 @@ -1746,10 +1747,9 @@ msgstr "Enw:" msgid "Name: %s" msgstr "Enw: %s" -#: templates/web/base/report/_inspect.html:23 -#, fuzzy +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" -msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon" +msgstr "" #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 @@ -1788,9 +1788,8 @@ msgid "New category contact added" msgstr "" #: templates/web/base/auth/change_email.html:26 -#, fuzzy msgid "New email address:" -msgstr "Cyfeiriad e-bost:" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:109 #: templates/web/zurich/admin/report_edit.html:137 @@ -1806,15 +1805,13 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:35 -#, fuzzy msgid "New password:" -msgstr "Cyfrinair:" +msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:32 -#, fuzzy msgid "New priority" -msgstr "Adroddiadau newydd" +msgstr "" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1850,7 +1847,7 @@ msgstr "" msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "" @@ -1865,7 +1862,7 @@ msgstr "Nesaf" #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:143 +#: templates/web/base/admin/report_edit.html:137 #: templates/web/base/admin/report_edit.html:95 #: templates/web/base/admin/update_edit.html:26 #: templates/web/base/questionnaire/creator_fixed.html:16 @@ -1875,9 +1872,8 @@ msgid "No" msgstr "" #: templates/web/base/admin/user-form.html:66 -#, fuzzy msgid "No area" -msgstr "ardaloedd eraill:" +msgstr "" #: templates/web/base/admin/user-form.html:37 msgid "No body" @@ -1887,7 +1883,7 @@ msgstr "Dim corff" msgid "No council" msgstr "Dim cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "" @@ -1903,6 +1899,13 @@ msgstr "" msgid "No flagged users found." msgstr "" +#: templates/web/base/admin/report_blocks.html:1 +#: templates/web/base/admin/report_blocks.html:14 +#: templates/web/base/report/update/form_update.html:41 +#: templates/web/base/report/update/form_update.html:44 +msgid "No further action" +msgstr "Methu trwsio" + #: templates/web/zurich/admin/report_edit-sdm.html:125 #: templates/web/zurich/admin/report_edit.html:259 msgid "No further updates" @@ -1947,7 +1950,7 @@ msgid "" msgstr "" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:13 +#: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/report/update/form_update.html:41 #: templates/web/base/report/update/form_update.html:44 msgid "Not Responsible" @@ -2025,15 +2028,15 @@ msgstr "Trwsiwyd <br>o'r blaen" msgid "Older <br>problems" msgstr "Problemau <br>hŷn" -#: templates/web/base/reports/_list-filters.html:36 +#: templates/web/base/reports/_list-filters.html:39 msgid "Oldest" msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900 #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:23 -#: templates/web/base/admin/report_blocks.html:4 +#: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/admin/report_blocks.html:6 #: templates/web/base/admin/update_edit.html:30 #: templates/web/base/dashboard/index.html:140 #: templates/web/base/report/update/form_update.html:41 @@ -2060,9 +2063,8 @@ msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 i weinydd mySociety FixMyStreet" #: templates/web/base/admin/open311-form-fields.html:34 -#, fuzzy msgid "Open311 Jurisdiction" -msgstr "jurisdiction_id coll" +msgstr "" #: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" @@ -2080,13 +2082,13 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Neu gallwch danysgrifio i hysbysiad yn seiliedig ar eich ward neu etholaeth:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:650 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:651 -#: perllib/FixMyStreet/DB/Result/Problem.pm:594 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 +#: perllib/FixMyStreet/DB/Result/Problem.pm:602 #: perllib/FixMyStreet/DB/Result/Problem.pm:617 +#: perllib/FixMyStreet/DB/Result/Problem.pm:626 #: perllib/FixMyStreet/Script/Reports.pm:185 #: perllib/FixMyStreet/Script/Reports.pm:200 msgid "Other" @@ -2107,7 +2109,7 @@ msgid "Parent" msgstr "Rhiant" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/report_blocks.html:20 msgid "Partial" msgstr "Rhannol" @@ -2141,7 +2143,7 @@ msgid "Phone number (optional)" msgstr "Rhif ffôn (dewisol)" #: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:152 +#: templates/web/base/admin/report_edit.html:146 #: templates/web/base/admin/user-form.html:21 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" @@ -2178,9 +2180,8 @@ msgstr "" #: templates/web/base/report/new/form_report.html:28 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 -#, fuzzy msgid "Photos" -msgstr "Llun" +msgstr "" #: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" @@ -2194,7 +2195,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:940 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946 #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:6 +#: templates/web/base/admin/report_blocks.html:8 #: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 @@ -2222,20 +2223,19 @@ msgid "Please check your email address is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:350 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:837 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:860 -#: perllib/FixMyStreet/DB/Result/Problem.pm:440 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:868 +#: perllib/FixMyStreet/DB/Result/Problem.pm:441 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:396 -#: templates/web/base/admin/bodies.html:4 -#: templates/web/base/admin/body.html:11 +#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 msgid "Please correct the errors below" msgstr "" @@ -2251,20 +2251,19 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Peidiwch â bod yn sarhaus — byddai sarhau eich cyngor yn dibrisio'r gwasanaeth i bawb." #: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:127 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Rhowch neges" #: perllib/FixMyStreet/App/Controller/Admin.pm:1204 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 msgid "Please enter a name" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:478 -#, fuzzy msgid "Please enter a name for this body" -msgstr "Rhowch gyfrinair" +msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 @@ -2273,13 +2272,13 @@ msgid "Please enter a password" msgstr "Rhowch gyfrinair" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/Problem.pm:423 +#: perllib/FixMyStreet/DB/Result/Problem.pm:424 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Rhowch bwnc" #: perllib/FixMyStreet/App/Controller/Admin.pm:1201 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 #: perllib/FixMyStreet/App/Controller/Admin.pm:363 #: perllib/FixMyStreet/DB/Result/User.pm:164 #: templates/web/base/js/translation_strings.html:12 @@ -2292,7 +2291,7 @@ msgstr "Rhowch e-bost dilys" msgid "Please enter a valid email address" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:427 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Rhowch fanylion" @@ -2325,8 +2324,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "Rhowch eich enw llawn, mae angen y wybodaeth hon ar y cyngor – os na hoffech ddatgelu eich enw ar y wefan, dad-diciwch y blwch isod" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 -#: perllib/FixMyStreet/DB/Result/Problem.pm:434 +#: perllib/FixMyStreet/DB/Result/Comment.pm:124 +#: perllib/FixMyStreet/DB/Result/Problem.pm:435 #: perllib/FixMyStreet/DB/Result/User.pm:157 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2363,7 +2362,7 @@ msgstr "Rhowch fanylion am y broblem." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2389,21 +2388,20 @@ msgstr "" msgid "Please note:" msgstr "Noder:" -#: perllib/FixMyStreet/App/Controller/Report.pm:335 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Report.pm:354 msgid "Please provide a public update for this report." -msgstr "Ysgrifennwch eich diweddariad yma" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 msgid "Please provide some text as well as a photo" msgstr "Rhowch destun yn ogystal â llun" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Dywedwch wrthym a ydych wedi adrodd problem i'ch cyngor o'r blaen" @@ -2419,7 +2417,7 @@ msgstr "Dewiswch y ffrwd hoffech chi ei chael" msgid "Please select the type of alert you want" msgstr "Dewiswch pa fath o hysbysiad hoffech chi ei gael" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231 msgid "Please state whether or not the problem has been fixed" msgstr "Dywedwch a gafodd y broblem ei thrwsio" @@ -2438,25 +2436,29 @@ msgstr "Ysgrifennwch neges" msgid "Please write your update here" msgstr "Ysgrifennwch eich diweddariad yma" -#: templates/web/base/contact/index.html:105 +#: templates/web/base/contact/index.html:103 #: templates/web/base/report/update-form.html:25 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "Postiwyd yn ddienw am %s" -#: templates/web/base/report/updates.html:22 -msgid "Posted by %s (<strong>%s</strong>) at %s" -msgstr "Postiwyd gan %s (<strong>%s</strong>) am %s" - -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "Postiwyd gan %s am %s" +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 +msgid "Posted by <strong>%s</strong> (%s) at %s" +msgstr "Postiwyd gan <strong>%s</strong> (%s) am %s" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 +msgid "Posted by <strong>%s</strong> at %s" +msgstr "Postiwyd gan <strong>%s</strong> am %s" + #: templates/web/base/front/footer-marketing.html:12 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" @@ -2469,7 +2471,8 @@ msgstr "Blaenorol" msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:96 +#: templates/web/base/report/_item.html:90 msgid "Priority" msgstr "" @@ -2485,10 +2488,15 @@ msgstr "" #: templates/web/base/admin/body.html:91 #: templates/web/base/admin/contact-form.html:74 -#: templates/web/base/admin/report_edit.html:155 +#: templates/web/base/admin/report_edit.html:149 msgid "Private" msgstr "Preifat" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "Preifat" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "Problem" @@ -2524,11 +2532,11 @@ msgstr "" msgid "Problems" msgstr "Problemau" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "Problemau gerllaw" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "Problemau ar y map" @@ -2540,7 +2548,7 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:833 +#: perllib/FixMyStreet/Cobrand/Default.pm:834 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" @@ -2564,14 +2572,14 @@ msgstr "Problemau o fewn ffiniau:" msgid "Property address:" msgstr "Cyfeiriad yr eiddo:" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Darparu diweddariad" #: templates/web/base/report/update/form_name.html:9 -#, fuzzy msgid "Provide update as" -msgstr "Darparu diweddariad" +msgstr "" #: templates/web/base/auth/general.html:112 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." @@ -2582,15 +2590,19 @@ msgstr "Mae darparu enw a chyfrinair yn ddewisol, ond bydd yn eich galluogi i ad msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Mae darparu cyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau." +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "Ymateb cyhoeddus:" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Ymateb cyhoeddus:" -#: templates/web/base/report/_inspect.html:125 -#, fuzzy +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" -msgstr "Ymateb cyhoeddus:" +msgstr "" #: templates/web/zurich/admin/report_edit.html:123 #: templates/web/zurich/admin/stats.html:38 @@ -2612,7 +2624,7 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "" @@ -2620,7 +2632,7 @@ msgstr "" #: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/display_tools.html:42 msgid "RSS feed" msgstr "Ffrwd RSS" @@ -2648,7 +2660,7 @@ msgstr "Ffrwd RSS %s, o fewn ward %s" msgid "RSS feed of nearby problems" msgstr "Ffrwd RSS o broblemau gerllaw" -#: perllib/FixMyStreet/Cobrand/Default.pm:834 +#: perllib/FixMyStreet/Cobrand/Default.pm:835 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" @@ -2664,12 +2676,12 @@ msgid "RSS feed of recent local problems" msgstr "Ffrwd RSS o broblemau lleol diweddar" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/display_tools.html:42 msgid "RSS feed of updates to this problem" msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon" #: templates/web/base/alert/updates.html:14 -#: templates/web/base/report/display_tools.html:42 +#: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." msgstr "Derbyn e-bost pan fydd diweddariadau i'r broblem hon." @@ -2691,22 +2703,23 @@ msgstr "Trwsiwyd yn <br>ddiweddar" msgid "Recently reported problems" msgstr "Problemau a adroddwyd yn ddiweddar" -#: templates/web/base/reports/_list-filters.html:37 -#, fuzzy +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" -msgstr "Derbyn diweddariadau" +msgstr "" #: 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 "" -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "" -#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_item.html:12 +#: templates/web/base/report/_item.html:9 +#: templates/web/base/report/_main.html:134 #: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:26 msgid "Remove from shortlist" msgstr "" @@ -2714,7 +2727,7 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:172 +#: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" @@ -2728,10 +2741,10 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:11 -#, fuzzy +#: templates/web/base/report/_inspect.html:10 +#: templates/web/base/report/_item.html:68 msgid "Report ID:" -msgstr "Adroddiadau" +msgstr "" #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:19 @@ -2739,14 +2752,14 @@ msgstr "Adroddiadau" msgid "Report a problem" msgstr "Adrodd problem" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "Adrodd camddefnydd" #: templates/web/base/report/new/form_user_loggedin.html:16 -#, fuzzy msgid "Report as" -msgstr "Adroddiadau" +msgstr "" #: perllib/FixMyStreet/App/Controller/Rss.pm:298 msgid "Report on %s" @@ -2763,8 +2776,8 @@ msgstr "Adrodd eich problem" msgid "Report, view, or discuss local problems" msgstr "Adrodd, gweld, neu drafod problemau lleol" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:606 +#: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddienw am %s" @@ -2773,8 +2786,8 @@ msgstr "Adroddwyd yn ddienw am %s" msgid "Reported before" msgstr "Adroddwyd eisoes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:621 -#: templates/web/base/contact/index.html:59 +#: perllib/FixMyStreet/DB/Result/Problem.pm:630 +#: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" @@ -2787,27 +2800,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddwyd yn y categori %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "Adroddwyd drwy %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "Adroddwyd drwy %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Adroddwyd drwy %s yn y categori %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:610 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 msgid "Reported via %s in the %s category by %s at %s" msgstr "Adroddwyd drwy %s yn y categori %s am %s" @@ -2917,16 +2930,16 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1724 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1728 -#: templates/web/base/admin/report_edit.html:169 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1730 +#: templates/web/base/admin/report_edit.html:163 #: templates/web/base/admin/update_edit.html:66 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Cylchdroi i'r chwith" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1724 -#: templates/web/base/admin/report_edit.html:170 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1726 +#: templates/web/base/admin/report_edit.html:164 #: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" @@ -2937,21 +2950,25 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:9 +#: templates/web/base/maps/google-ol.html:11 msgid "Satellite" msgstr "" +#: templates/web/base/report/_inspect.html:150 +msgid "Save + close as duplicate" +msgstr "" + #: templates/web/base/admin/contact-form.html:137 #: templates/web/base/admin/responsepriorities/edit.html:36 -#: templates/web/base/admin/template_edit.html:36 -#: templates/web/base/report/_inspect.html:142 +#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/report/_inspect.html:150 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:20 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Cadw'r newidiadau" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -2961,8 +2978,7 @@ msgstr "" msgid "Search Reports" msgstr "Chwilio am adroddiadau" -#: templates/web/base/admin/index.html:29 -#: templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1 msgid "Search Users" msgstr "Chwilio am ddefnyddwyr" @@ -2989,6 +3005,10 @@ msgstr "" msgid "See our privacy policy" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:716 +msgid "See user detail for reports created as the council" +msgstr "" + #: templates/web/base/admin/body-form.html:39 #: templates/web/zurich/admin/body-form.html:16 msgid "Select a body" @@ -3008,9 +3028,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f msgstr "" #: templates/web/base/admin/category-checkboxes.html:6 -#, fuzzy msgid "Select:" -msgstr "Pwnc:" +msgstr "" #: templates/web/base/admin/open311-form-fields.html:109 msgid "Send extended Open311 statuses with service request updates" @@ -3033,30 +3052,29 @@ msgstr "Anfonwyd:" msgid "Service:" msgstr "Gwasanaeth:" -#: templates/web/base/report/_inspect.html:26 +#: templates/web/base/report/_inspect.html:25 msgid "Set to my current location" msgstr "" -#: templates/web/base/report/display_tools.html:15 +#: templates/web/base/report/display_tools.html:17 msgid "Share" msgstr "Rhannu" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:136 #: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:29 msgid "Shortlist" msgstr "" -#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:134 #: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:25 msgid "Shortlisted" msgstr "" -#: templates/web/base/report/_main.html:140 -#, fuzzy +#: templates/web/base/report/_main.html:144 msgid "Shortlisted by %s" -msgstr "Postiwyd gan %s am %s" +msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:54 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 @@ -3126,7 +3144,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Mae'n ddrwg gennym, bu gwall tra'n cadarnhau eich problem." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:222 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:230 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3174,12 +3192,14 @@ msgstr "Dyddiad cychwyn:" #: templates/web/base/admin/index.html:58 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 -#: templates/web/base/report/_inspect.html:67 +#: templates/web/base/admin/template_edit.html:40 +#: templates/web/base/report/_inspect.html:66 +#: templates/web/base/report/_item.html:86 #: templates/web/base/report/update/form_update.html:39 msgid "State" msgstr "Cyflwr" -#: templates/web/base/admin/report_edit.html:115 +#: templates/web/base/admin/report_edit.html:116 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:75 #: templates/web/zurich/admin/report_edit.html:103 @@ -3190,8 +3210,7 @@ msgstr "Cyflwr:" #: perllib/FixMyStreet/Cobrand/Default.pm:640 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386 -#: templates/web/base/admin/index.html:65 -#: templates/web/base/admin/stats.html:1 +#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1 #: templates/web/base/admin/stats_by_state.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 msgid "Stats" @@ -3220,7 +3239,7 @@ msgstr "Is-gategori: %s" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "Pwnc" @@ -3237,7 +3256,7 @@ msgstr "Pwnc:" msgid "Submit" msgstr "Cyflwyno" -#: templates/web/base/admin/report_edit.html:180 +#: templates/web/base/admin/report_edit.html:174 #: templates/web/base/admin/report_edit.html:24 #: templates/web/base/admin/update_edit.html:77 #: templates/web/base/admin/user-form.html:177 @@ -3263,7 +3282,7 @@ msgid "Submitted" msgstr "Cyflwynwyd" #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:49 +#: templates/web/base/report/display_tools.html:51 msgid "Subscribe" msgstr "Tanysgrifio" @@ -3272,20 +3291,17 @@ msgid "Subscribe me to an email alert" msgstr "Tanysgrifio i hysbysiad e-bost" #: templates/web/base/report/new/form_report.html:19 -#, fuzzy msgid "Summarise the problem" -msgstr "Rhowch fanylion am y broblem" +msgstr "" #: templates/web/base/admin/contact-form.html:129 -#, fuzzy msgid "Summarise your changes" -msgstr "Cyflwyno newidiadau" +msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382 #: templates/web/base/admin/bodies.html:29 -#: templates/web/base/admin/index.html:1 -#: templates/web/base/status/index.html:1 +#: 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 @@ -3352,9 +3368,8 @@ msgid "Thank you for updating this issue!" msgstr "Diolch am ddiweddaru'r broblem!" #: templates/web/base/contact/submit.html:6 -#, fuzzy msgid "Thank you for your enquiry" -msgstr "Diolch am eich adborth" +msgstr "" #: templates/web/base/questionnaire/completed.html:5 msgid "Thank you for your feedback" @@ -3538,7 +3553,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:759 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 #: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 @@ -3573,15 +3588,13 @@ msgstr "" #: templates/web/base/report/new/councils_text.html:3 #: templates/web/base/report/new/councils_text.html:4 -#, fuzzy msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>." -msgstr "Rydym ond yn defnyddio eich gwybodaeth bersonol yn unol â'n <a href=\"/privacy\">polisi preifatrwydd.</a>" +msgstr "" #: templates/web/base/report/new/councils_text_all.html:4 #: templates/web/base/report/new/councils_text_all.html:6 -#, fuzzy 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 "Rydym ond yn defnyddio eich gwybodaeth bersonol yn unol â'n <a href=\"/privacy\">polisi preifatrwydd.</a>" +msgstr "" #: templates/web/base/report/new/councils_text_private.html:5 #: templates/web/base/report/new/form_user.html:4 @@ -3622,9 +3635,9 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:918 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:882 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:926 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Mae'r wybodaeth hon yn ofynnol" @@ -3649,6 +3662,10 @@ msgstr "Trwsiwyd y broblem hon" msgid "This problem has not been fixed" msgstr "Ni thrwsiwyd y broblem hon" +#: templates/web/base/report/duplicate-no-updates.html:3 +msgid "This report is a duplicate. Please leave updates on the original report:" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162 #: templates/web/zurich/report/_main.html:14 @@ -3723,7 +3740,8 @@ msgstr "" msgid "Total" msgstr "Cyfanswm" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:107 +#: templates/web/base/report/_item.html:94 msgid "Traffic management required?" msgstr "" @@ -3731,14 +3749,13 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Trusted to make reports that don't need to be inspected" msgstr "" #: templates/web/base/admin/user-form.html:119 -#, fuzzy msgid "Trusted:" -msgstr "Crëwyd:" +msgstr "" #: templates/web/base/js/translation_strings.html:29 msgid "Try again" @@ -3749,14 +3766,7 @@ msgid "Try emailing us directly:" msgstr "Ceisiwch anfon e-bost atom yn uniongyrchol:" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:41 -#: templates/web/base/report/update/form_update.html:44 -msgid "Unable to fix" -msgstr "Methu trwsio" - -#: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:19 +#: templates/web/base/admin/report_blocks.html:21 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -3765,9 +3775,8 @@ msgid "Unconfirmed" msgstr "Heb ei gadarnhau" #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "Unfixed reports" -msgstr "Adroddiadau newydd" +msgstr "" #: templates/web/base/report/banner.html:9 msgid "Unknown" @@ -3777,8 +3786,8 @@ msgstr "Anhysbys" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:530 #: perllib/FixMyStreet/App/Controller/Photo.pm:109 +#: perllib/FixMyStreet/App/Controller/Root.pm:124 #: templates/web/base/js/translation_strings.html:38 msgid "Unknown error" msgstr "Gwall anhysbys" @@ -3789,6 +3798,10 @@ msgstr "Gwall anhysbys" msgid "Unknown problem ID" msgstr "" +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "" @@ -3842,7 +3855,7 @@ msgid "Updated" msgstr "Diweddarwyd" #: perllib/FixMyStreet/App/Controller/Admin.pm:1161 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1224 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1223 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376 #: perllib/FixMyStreet/App/Controller/Admin.pm:824 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762 @@ -3857,7 +3870,7 @@ msgstr "Diweddarwyd!" msgid "Updates" msgstr "Diweddariadau" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:133 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3876,9 +3889,8 @@ msgid "Use Open311 update-sending extension" msgstr "" #: templates/web/base/admin/contact-form.html:124 -#, fuzzy msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." -msgstr "Defnyddiwch y <strong>nodyn</strong> i gofnodi manylion a ddangosir yma yn unig. Ni ddangosir nodiadau'n gyhoeddus, ac ni chânt eu hanfon at y corff." +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 @@ -3889,11 +3901,11 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1681 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1683 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "" @@ -3902,10 +3914,9 @@ msgid "User search finds matches in users' names and email addresses." msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:670 -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/base/admin/flagged.html:29 -#: templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 msgid "Users" msgstr "Defnyddwyr" @@ -3993,6 +4004,10 @@ msgstr "" msgid "When sent" msgstr "" +#: templates/web/base/report/_inspect.html:72 +msgid "Which report is it a duplicate of?" +msgstr "" + #: templates/web/base/js/translation_strings.html:51 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4041,7 +4056,7 @@ msgstr "Blwyddyn" #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:142 +#: templates/web/base/admin/report_edit.html:136 #: templates/web/base/admin/report_edit.html:95 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/admin/users.html:32 @@ -4056,11 +4071,11 @@ msgstr "" msgid "Yes I have a password" msgstr "Oes, mae gen i gyfrinair" -#: templates/web/base/contact/index.html:46 +#: templates/web/base/contact/index.html:45 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/unsuitable-text.html:2 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" @@ -4077,7 +4092,7 @@ msgstr "Gallwch <a href=\"%s%s\">weld y broblem ar y wefan hon</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/base/contact/index.html:113 +#: templates/web/base/contact/index.html:111 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "Gallwch gysylltu â'n tîm cymorth technegol drwy <a href='mailto:%s'>%s</a>" @@ -4168,9 +4183,9 @@ msgstr "" #: templates/web/base/alert/_list.html:90 #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 -#: templates/web/base/contact/index.html:83 -#: templates/web/base/report/display_tools.html:44 -#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/contact/index.html:81 +#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/zurich/report/new/fill_in_details_form.html:53 @@ -4190,7 +4205,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "" #: templates/web/base/auth/general.html:107 -#: templates/web/base/contact/index.html:76 +#: templates/web/base/contact/index.html:74 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 #: templates/web/base/report/update/form_name.html:29 #: templates/web/zurich/auth/general.html:61 @@ -4224,9 +4239,8 @@ msgstr "Eich adroddiadau" #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18 #: templates/web/base/my/planned.html:5 -#, fuzzy msgid "Your shortlist" -msgstr "Eich adroddiadau" +msgstr "" #: templates/web/base/my/my.html:51 msgid "Your updates" @@ -4234,9 +4248,8 @@ msgstr "Eich diweddariadau" #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/update/form_name.html:11 -#, fuzzy msgid "Yourself" -msgstr "Eich e-bost" +msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 #: templates/web/base/admin/user-form.html:159 @@ -4247,6 +4260,10 @@ msgstr "" msgid "by %s" msgstr "gan %s" +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 +msgid "closed as a duplicate report" +msgstr "" + #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 msgid "council" @@ -4271,54 +4288,50 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:15 +#: templates/web/base/report/_item.html:54 #: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "diweddarwyd ddiwethaf %s" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "llai na munud" -#: templates/web/base/report/updates.html:57 -msgid "marked as a duplicate report" -msgstr "" - -#: templates/web/base/report/updates.html:47 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as action scheduled" msgstr "" -#: templates/web/base/report/updates.html:59 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "marked as an internal referral" msgstr "" -#: templates/web/base/report/updates.html:49 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as closed" msgstr "" -#: templates/web/base/report/updates.html:28 -#: templates/web/base/report/updates.html:51 +#: perllib/FixMyStreet/DB/Result/Comment.pm:261 +#: perllib/FixMyStreet/DB/Result/Comment.pm:282 msgid "marked as fixed" msgstr "" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "" -#: templates/web/base/report/updates.html:55 -msgid "marked as not the council's responsibility" +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 +msgid "marked as no further action" msgstr "" -#: templates/web/base/report/updates.html:43 -msgid "marked as planned" +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 +msgid "marked as not the council's responsibility" msgstr "" -#: templates/web/base/report/updates.html:53 -msgid "marked as unable to fix" +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 +msgid "marked as planned" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:122 @@ -4333,9 +4346,8 @@ msgid "none" msgstr "" #: templates/web/base/admin/category_edit.html:35 -#, fuzzy msgid "optional" -msgstr "(dewisol)" +msgstr "" #: templates/web/base/alert/_list.html:86 msgid "or" @@ -4364,8 +4376,8 @@ msgstr "" msgid "other areas:" msgstr "ardaloedd eraill:" -#: templates/web/base/report/updates.html:29 -#: templates/web/base/report/updates.html:39 +#: perllib/FixMyStreet/DB/Result/Comment.pm:263 +#: perllib/FixMyStreet/DB/Result/Comment.pm:269 msgid "reopened" msgstr "ailagorwyd" @@ -4411,16 +4423,16 @@ msgstr "" msgid "ward" msgstr "ward" -#: templates/web/base/front/stats.html:13 +#: perllib/Utils.pm:223 #, perl-format -msgid "<big>%s</big> report recently" -msgid_plural "<big>%s</big> reports recently" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d diwrnod" +msgstr[1] "%d ddiwrnod" +msgstr[2] "%d o ddiwrnodau" +msgstr[3] "%d diwrnod" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4429,16 +4441,7 @@ msgstr[1] "%d awr" msgstr[2] "%d o oriau" msgstr[3] "%d awr" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d cefnogwr" -msgstr[1] "%d gefnogwr" -msgstr[2] "%d o gefnogwyr" -msgstr[3] "%d cefnogwr" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4447,25 +4450,16 @@ msgstr[1] "%d funud" msgstr[2] "%d o funudau" msgstr[3] "%d munud" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, perl-format -msgid "We do not yet have details for the council that covers this location." -msgid_plural "We do not yet have details for the councils that cover this location." -msgstr[0] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn." -msgstr[1] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn." -msgstr[2] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn." -msgstr[3] "Nid oes gennym fanylion am y cynghorau sy'n rheoli'r lleoliad hwn." +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d cefnogwr" +msgstr[1] "%d gefnogwr" +msgstr[2] "%d o gefnogwyr" +msgstr[3] "%d cefnogwr" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4474,6 +4468,15 @@ msgstr[1] "%d wythnos" msgstr[2] "%d o wythnosau" msgstr[3] "%d wythnos" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" @@ -4483,23 +4486,23 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/front/stats.html:19 +#: templates/web/base/front/stats.html:13 #, perl-format -msgid "<big>%s</big> fixed in past month" -msgid_plural "<big>%s</big> fixed in past month" +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d diwrnod" -msgstr[1] "%d ddiwrnod" -msgstr[2] "%d o ddiwrnodau" -msgstr[3] "%d diwrnod" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -4510,35 +4513,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#~ msgid "(public)" -#~ msgstr "(cyhoeddus)" - -#~ msgid "All the information you provide here will be sent to" -#~ msgstr "Anfonir yr holl wybodaeth a roddir yma at" - -#~ msgid "All the information you provide here will be sent to <strong>%s</strong>." -#~ msgstr "Anfonir yr holl wybodaeth a roddir yma at <strong>%s</strong>." - -#~ msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" -#~ msgstr "Esboniwch beth sy'n bod, ble'n union mae'r broblem, ac ers faint o amser mae hi yna..." - -#~ msgid "GeoRSS on Google Maps" -#~ msgstr "GeoRSS ar Google Maps" - -#~ msgid "One-line summary" -#~ msgstr "Crynodeb byr" - -#~ msgid "Survey" -#~ msgstr "Arolwg" - -#~ msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." -#~ msgstr "Bydd y crynodeb a'r disgrifiad yn gyhoeddus (gweler ein <a href=\"/privacy\">polisi preifatrwydd</a>)." - -#~ msgid "We never show your email" -#~ msgstr "Ni ddatgelir eich e-bost" - -#~ msgid "What’s the issue, and where is it?" -#~ msgstr "Beth yw'r broblem, a ble mae hi?" - -#~ msgid "You really want to resend?" -#~ msgstr "Ydych chi wir am ailanfon?" +#: templates/web/base/report/new/top_message_none.html:3 +#, perl-format +msgid "We do not yet have details for the council that covers this location." +msgid_plural "We do not yet have details for the councils that cover this location." +msgstr[0] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn." +msgstr[1] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn." +msgstr[2] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn." +msgstr[3] "Nid oes gennym fanylion am y cynghorau sy'n rheoli'r lleoliad hwn." |