diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2018-09-06 17:42:55 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2018-09-06 22:38:24 +0100 |
| commit | 0e3f2305285e0b90ef2b8464ccc9f6d53abc64c4 (patch) | |
| tree | 4f4bab8d10d14a738347ddaf666036e0e4c4db36 /locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po | |
| parent | 4bd649c5179eeb56f519e52e572489844d8221d2 (diff) | |
Version 2.4.v2.4
Diffstat (limited to 'locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po')
| -rw-r--r-- | locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po | 1021 |
1 files changed, 510 insertions, 511 deletions
diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index 84192b030..d8f622dc0 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-06-06 14:25+0100\n" +"POT-Creation-Date: 2018-09-06 21:17+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" @@ -24,6 +24,7 @@ msgstr "" msgid " and " msgstr "a" +#: templates/web/base/js/translation_strings.html:41 #: 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 @@ -33,7 +34,7 @@ msgstr "a" msgid " or " msgstr "neu" -#: templates/web/base/report/_inspect.html:163 +#: templates/web/base/report/_inspect.html:168 msgid "%d characters maximum" msgstr "" @@ -140,7 +141,7 @@ msgstr "" msgid "(fixed)" msgstr "(wedi trwsio)" -#: templates/web/base/admin/extra-metadata-form.html:53 +#: templates/web/base/admin/extra-metadata-form.html:63 msgid "(ignored if type is \"String\")" msgstr "" @@ -152,7 +153,7 @@ msgstr "" msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:71 +#: templates/web/base/report/_item.html:75 msgid "(not sent to council)" msgstr "(heb ei anfon at y cyngor)" @@ -161,12 +162,12 @@ msgstr "(heb ei anfon at y cyngor)" msgid "(optional)" msgstr "(dewisol)" -#: templates/web/base/report/_item.html:69 +#: templates/web/base/report/_item.html:73 #, fuzzy msgid "(sent to all)" msgstr "(anfonwyd i'r ddau)" -#: templates/web/base/report/_item.html:70 +#: templates/web/base/report/_item.html:74 msgid "(sent to both)" msgstr "(anfonwyd i'r ddau)" @@ -176,8 +177,8 @@ msgstr "(anfonwyd i'r ddau)" 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:688 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:701 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Dewiswch gategori --" @@ -191,10 +192,6 @@ msgstr "-- Dewiswch gategori --" msgid "--Choose a template--" msgstr "" -#: templates/web/base/report/new/form_title.html:6 -msgid "10 inch pothole on Example St, near post box" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -208,11 +205,11 @@ 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:58 +#: templates/web/base/reports/_list-filters.html:65 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s" msgstr "" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/js/translation_strings.html:92 msgid "<span>%s</span> saved." msgstr "" @@ -249,11 +246,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:188 +#: templates/web/base/report/_inspect.html:197 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:190 +#: templates/web/base/report/_inspect.html:199 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -299,7 +296,7 @@ msgstr "Eich cyfeiriad e-bost" msgid "Add extra fields" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:79 +#: templates/web/base/admin/extra-metadata-form.html:89 msgid "Add field" msgstr "" @@ -312,7 +309,7 @@ msgstr "" msgid "Add new category" msgstr "Ychwanegu categori newydd" -#: templates/web/base/admin/extra-metadata-form.html:72 +#: templates/web/base/admin/extra-metadata-form.html:82 #, fuzzy msgid "Add option" msgstr "(dewisol)" @@ -325,9 +322,9 @@ msgstr "Eich rhif ffôn" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:132 -#: templates/web/base/report/_main.html:15 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:28 msgid "Add to shortlist" msgstr "" @@ -337,16 +334,15 @@ msgstr "" msgid "Add user" msgstr "Ychwanegu defnyddiwr" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:742 msgid "Add/edit response templates" msgstr "" @@ -354,11 +350,11 @@ msgstr "" msgid "Added %s" msgstr "Ychwanegwyd %s" -#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:143 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" -#: templates/web/base/main_nav_items.html:47 +#: templates/web/base/main_nav_items.html:55 msgid "Admin" msgstr "" @@ -410,7 +406,7 @@ msgid "All languages" msgstr "" #: templates/web/base/main_nav_items.html:0 -#: templates/web/base/main_nav_items.html:27 +#: templates/web/base/main_nav_items.html:35 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats/index.html:11 #: templates/web/zurich/footer.html:20 @@ -459,13 +455,13 @@ msgstr "Dienw:" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:67 msgid "Are you sure you want to cancel this upload?" msgstr "" #: 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/js/translation_strings.html:87 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -476,7 +472,7 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:78 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -502,11 +498,11 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:184 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 msgid "Assigned to %s" msgstr "" @@ -518,8 +514,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:92 -#: templates/web/base/admin/user-form.html:93 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -532,6 +528,10 @@ msgstr "Ymateb cyhoeddus:" msgid "Auto-response:" msgstr "" +#: templates/web/base/admin/extra-metadata-form.html:14 +msgid "Automated" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -540,7 +540,7 @@ msgstr "" msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/report/new/after_photo.html:6 +#: templates/web/base/report/new/after_photo.html:7 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -553,7 +553,7 @@ msgstr "" msgid "Back" msgstr "Yn ôl" -#: templates/web/base/report/_main.html:2 +#: templates/web/base/report/_main.html:4 msgid "Back to all reports" msgstr "" @@ -562,11 +562,9 @@ msgstr "" msgid "Ban user" msgstr "Ychwanegu defnyddiwr" -#: perllib/FixMyStreet/Cobrand/Default.pm:651 -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:261 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:382 +#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -582,7 +580,7 @@ msgstr "Cyrff" msgid "Body" msgstr "Corff" -#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:50 msgid "Body:" msgstr "Corff:" @@ -590,7 +588,7 @@ msgstr "Corff:" msgid "CSV File" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:36 +#: templates/web/base/admin/extra-metadata-form.html:46 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 "" @@ -602,8 +600,7 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:651 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:261 +#: perllib/FixMyStreet/Cobrand/Default.pm:655 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -618,8 +615,8 @@ 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:65 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:69 +#: templates/web/base/report/_item.html:97 #: templates/web/base/report/new/category.html:14 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -636,7 +633,7 @@ msgstr "Categori" msgid "Category and State" msgstr "Categori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1026 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -696,11 +693,11 @@ 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:120 +#: templates/web/base/report/_inspect.html:124 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:86 msgid "Clear offline data" msgstr "" @@ -729,9 +726,8 @@ msgid "Click the link in that email to sign in." msgstr "" #: 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/Cobrand/Zurich.pm:158 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -770,19 +766,18 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/admin/extra-metadata-form.html:24 #: templates/web/base/auth/2faform.html:18 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:56 +#: templates/web/base/js/translation_strings.html:58 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:257 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:396 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:397 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -845,12 +840,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1963 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1992 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2008 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2037 msgid "Could not find user" msgstr "Methu dod o hyd i'r defnyddiwr" -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/js/translation_strings.html:44 msgid "Could not look up location" msgstr "Methu dod o hyd i'r lleoliad" @@ -886,7 +881,7 @@ msgstr "Crëwyd" msgid "Create a report" msgstr "Creu adroddiad" -#: templates/web/base/admin/contact-form.html:138 +#: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" msgstr "Creu categori" @@ -895,18 +890,15 @@ msgstr "Creu categori" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:149 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:150 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 +#: perllib/FixMyStreet/Cobrand/Default.pm:723 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -950,7 +942,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "Ar hyn o bryd does dim cyrff." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:845 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:846 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -978,11 +970,11 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:89 +#: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1162 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1175 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -994,12 +986,12 @@ msgstr "" msgid "Deleted" msgstr "Dilëwyd" -#: templates/web/base/report/_main.html:110 -#: templates/web/base/report/update.html:52 +#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/update.html:51 msgid "Describe why you are moderating this" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:32 +#: templates/web/base/admin/extra-metadata-form.html:42 #: templates/web/base/admin/responsepriorities/list.html:7 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 @@ -1011,7 +1003,7 @@ msgstr "Disgrifiad" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:372 +#: perllib/FixMyStreet/App/Controller/Report.pm:370 msgid "Detailed information is limited to %d characters." msgstr "" @@ -1044,7 +1036,7 @@ msgstr "" msgid "Diligency prize league table" msgstr "" -#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/_main.html:116 #: templates/web/base/report/update.html:54 msgid "Discard changes" msgstr "" @@ -1062,7 +1054,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:104 +#: templates/web/base/report/_inspect.html:108 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1078,15 +1070,15 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:64 +#: templates/web/base/js/translation_strings.html:66 msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" -#: templates/web/base/report/_inspect.html:115 +#: templates/web/base/report/_inspect.html:119 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:129 msgid "Duplicates" msgstr "" @@ -1099,7 +1091,7 @@ msgid "" msgstr "" #: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:84 +#: templates/web/base/report/_item.html:88 msgid "Easting/Northing:" msgstr "" @@ -1119,29 +1111,23 @@ msgstr "Golygu" msgid "Edit body details" msgstr "Golygu manylion y corff" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 -msgid "Edit other users' details" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:147 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:146 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Edit users' details/search for their reports" msgstr "" @@ -1203,7 +1189,7 @@ msgstr "Crëwyd hysbysiad e-bost" msgid "Email alert deleted" msgstr "Dilëwyd hysbysiad e-bost" -#: templates/web/base/admin/user-form.html:21 +#: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1268,7 +1254,7 @@ msgstr "Dyddiad dod i ben:" msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:81 msgid "Enter a Zürich street name" msgstr "" @@ -1287,13 +1273,6 @@ msgstr "Rhowch god post, neu enw stryd ac ardal" 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:33 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:20 -#: templates/web/zurich/auth/general.html:58 -msgid "Enter a password" -msgstr "Rhowch gyfrinair" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Rhowch fanylion am y broblem" @@ -1307,8 +1286,8 @@ msgstr "Rhowch fanylion am y broblem" msgid "Error" msgstr "Gwall" -#: templates/web/base/reports/_list-filters.html:40 -#: templates/web/base/reports/_list-filters.html:49 +#: templates/web/base/reports/_list-filters.html:47 +#: templates/web/base/reports/_list-filters.html:56 msgid "Everything" msgstr "" @@ -1329,7 +1308,7 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:57 msgid "Expand map" msgstr "" @@ -1367,20 +1346,20 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 +#: perllib/FixMyStreet/Cobrand/Default.pm:679 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy msgid "Extra Fields" msgstr "Data ychwanegol:" -#: templates/web/base/admin/contact-form.html:141 +#: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:128 msgid "Extra data:" msgstr "Data ychwanegol:" -#: templates/web/base/report/_inspect.html:161 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:165 +#: templates/web/base/report/_item.html:113 msgid "Extra details" msgstr "" @@ -1413,7 +1392,6 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: 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 @@ -1438,7 +1416,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "" @@ -1447,7 +1425,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:108 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1456,7 +1434,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:149 -#: templates/web/base/admin/user-form.html:115 +#: templates/web/base/admin/user-form.html:119 msgid "Flagged:" msgstr "" @@ -1464,11 +1442,11 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/base/report/new/after_photo.html:3 +#: templates/web/base/report/new/after_photo.html:4 msgid "For best results include a close-up and a wide shot" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:52 +#: templates/web/base/admin/extra-metadata-form.html:62 msgid "For each option, <strong>Key</strong> is the value which is stored in the database for that option and <strong>Name</strong> is the value displayed to the user." msgstr "" @@ -1482,11 +1460,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Wedi anghofio eich cyfrinair?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:760 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:761 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:761 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:762 msgid "Forwarded wish to external body" msgstr "" @@ -1530,10 +1508,11 @@ msgstr "Mae'n dda gennym glywed y cafodd ei drwsio!" #: templates/web/base/admin/index.html:28 #: templates/web/base/admin/index.html:34 #: 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:59 -#: templates/web/base/reports/_list-filters.html:74 +#: templates/web/base/alert/index.html:37 +#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/reports/_list-filters.html:66 +#: templates/web/base/reports/_list-filters.html:81 +#: templates/web/base/reports/_list-filters.html:87 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1543,7 +1522,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:733 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Grant access to the admin" msgstr "" @@ -1551,6 +1530,11 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" +#: templates/web/base/admin/contact-form.html:134 +#, fuzzy +msgid "Group" +msgstr "gan %s" + #: templates/web/base/dashboard/index.html:94 #, fuzzy msgid "Group by %s" @@ -1568,7 +1552,7 @@ msgstr "Gafodd y broblem ei thrwsio?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Ydych chi wedi adrodd problem at y cyngor o'r blaen, neu ai dyma eich tro cyntaf?" -#: templates/web/base/main_nav_items.html:40 +#: templates/web/base/main_nav_items.html:48 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1596,12 +1580,17 @@ msgstr "Helo %s" msgid "Hidden" msgstr "Cudd" -#: templates/web/base/admin/user-form.html:197 +#: templates/web/base/admin/extra-metadata-form.html:18 +#, fuzzy +msgid "Hidden Field" +msgstr "Cudd" + +#: templates/web/base/admin/user-form.html:202 #, fuzzy msgid "Hide all reports and updates" msgstr "Rhestru'r holl broblemau a adroddwyd" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:107 msgid "Hide entire report" msgstr "" @@ -1624,11 +1613,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:63 msgid "Hide pins" msgstr "Cuddio'r piniau" -#: templates/web/base/report/update.html:14 +#: templates/web/base/report/update.html:15 msgid "Hide update completely?" msgstr "" @@ -1637,7 +1626,7 @@ msgstr "" msgid "Hide your name?" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:38 +#: templates/web/base/admin/extra-metadata-form.html:48 msgid "Hint" msgstr "" @@ -1657,8 +1646,8 @@ msgstr "Sut i adrodd problem" msgid "How to send successful reports" msgstr "Sut i anfon adroddiadau llwyddiannus" -#: templates/web/base/tokens/confirm_problem.html:36 -#: templates/web/base/tokens/confirm_problem.html:41 +#: templates/web/base/tokens/confirm_problem.html:46 +#: templates/web/base/tokens/confirm_problem.html:51 msgid "I just reported a problem on @fixmystreet" msgstr "Dwi newydd adrodd problem ar @fixmystreet" @@ -1667,7 +1656,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:92 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:86 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1698,7 +1687,7 @@ msgstr "" msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here." msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:24 +#: templates/web/base/admin/extra-metadata-form.html:34 msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" @@ -1778,7 +1767,7 @@ msgid "" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:146 +#: perllib/FixMyStreet/App/Controller/Contact.pm:141 msgid "Illegal ID" msgstr "ID annerbynniol" @@ -1823,7 +1812,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Instruct contractors to fix problems" msgstr "" @@ -1843,7 +1832,7 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:445 +#: perllib/FixMyStreet/App/Controller/Report.pm:439 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1851,7 +1840,7 @@ msgstr "" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" -#: templates/web/base/tokens/confirm_problem.html:27 +#: templates/web/base/tokens/confirm_problem.html:31 msgid "It’s on its way to the council right now." msgstr "Mae ar y ffordd i'r cyngor y funud hon." @@ -1862,7 +1851,7 @@ msgstr "Mae ar y ffordd i'r cyngor y funud hon." msgid "Keep me signed in on this computer" msgstr "Cadw fi wedi mewngofnodi ar y cyfrifiadur hwn" -#: templates/web/base/admin/extra-metadata-form.html:61 +#: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1902,11 +1891,11 @@ msgid "Last update:" msgstr "Diweddariad diwethaf:" #: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:89 +#: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:78 msgid "Least recently updated" msgstr "" @@ -1914,7 +1903,7 @@ msgstr "" msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:47 +#: templates/web/base/admin/extra-metadata-form.html:57 msgid "List" msgstr "" @@ -1931,8 +1920,8 @@ msgstr "Eich adroddiadau" 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:2 +#: templates/web/base/alert/choose.html:2 +#: templates/web/base/alert/choose.html:4 templates/web/base/alert/index.html:2 #: templates/web/base/alert/index.html:4 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 @@ -1944,8 +1933,8 @@ msgstr "Ffrydiau RSS lleol a hysbysiadau e-bost" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Ffrydiau RSS lleol a hysbysiadau e-bost ar gyfer '%s'" -#: templates/web/base/main_nav_items.html:31 -#: templates/web/base/main_nav_items.html:37 +#: templates/web/base/main_nav_items.html:39 +#: templates/web/base/main_nav_items.html:45 msgid "Local alerts" msgstr "Hysbysiadau lleol" @@ -1965,15 +1954,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:73 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:71 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/user-form.html:200 msgid "Log out of all sessions" msgstr "" @@ -1981,23 +1970,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:52 msgid "MAP" msgstr "MAP" -#: templates/web/base/admin/user-form.html:196 +#: templates/web/base/admin/user-form.html:201 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:66 +#: templates/web/base/reports/_list-filters.html:73 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:54 msgid "Map" msgstr "Map" @@ -2005,11 +1994,11 @@ msgstr "Map" msgid "Mark as sent" msgstr "Nodi ei fod wedi'i anfon" -#: templates/web/base/admin/user-form.html:106 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Markup problem details" msgstr "" @@ -2033,24 +2022,23 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "jurisdiction_id coll" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:128 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:145 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:128 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:11 +#: templates/web/base/report/update.html:12 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/_main.html:71 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2059,23 +2047,18 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:109 -#: 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:72 +#: templates/web/base/reports/_list-filters.html:79 msgid "Most commented" msgstr "" #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/body-form.html:24 -#: templates/web/base/admin/extra-metadata-form.html:65 +#: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 #: templates/web/base/admin/index.html:62 @@ -2089,9 +2072,7 @@ msgstr "" #: 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_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 #: templates/web/zurich/report/new/fill_in_details_form.html:59 @@ -2122,12 +2103,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:570 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:341 +#: perllib/FixMyStreet/Script/Alerts.pm:344 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2146,15 +2127,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 -msgid "New" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Admin.pm:237 +#: perllib/FixMyStreet/App/Controller/Admin.pm:242 msgid "New body added" msgstr "Ychwanegwyd corff newydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:368 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "" @@ -2225,7 +2202,7 @@ msgstr "" msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:68 +#: templates/web/base/reports/_list-filters.html:75 msgid "Newest" msgstr "" @@ -2233,7 +2210,7 @@ msgstr "" msgid "Next" msgstr "Nesaf" -#: perllib/FixMyStreet/Cobrand/Default.pm:1199 +#: perllib/FixMyStreet/Cobrand/Default.pm:1203 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2245,15 +2222,15 @@ msgstr "Nesaf" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:109 +#: templates/web/base/report/_inspect.html:113 msgid "No" msgstr "" -#: templates/web/base/admin/user-form.html:80 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:48 +#: templates/web/base/admin/user-form.html:52 msgid "No body" msgstr "Dim corff" @@ -2290,7 +2267,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:45 msgid "No result returned" msgstr "Dim canlyniadau" @@ -2312,15 +2289,15 @@ msgstr "Dim cefnogwyr" msgid "None" msgstr "Dim" -#: templates/web/base/admin/user-form.html:72 -#: templates/web/base/admin/user-form.html:73 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-form.html:77 msgid "" "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:38 -#: templates/web/base/admin/user-form.html:39 +#: templates/web/base/admin/user-form.html:42 +#: templates/web/base/admin/user-form.html:43 msgid "" "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n" " Authorised staff users can be associated with the body they represent.<br>\n" @@ -2358,7 +2335,7 @@ msgstr "Nodyn: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:26 +#: templates/web/base/admin/extra-metadata-form.html:36 msgid "Notice" msgstr "" @@ -2380,15 +2357,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:51 msgid "OK" msgstr "Iawn" -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:85 msgid "Offline update data saved" msgstr "" @@ -2396,16 +2373,16 @@ msgstr "" msgid "Old state" msgstr "Hen gyflwr" -#: templates/web/base/reports/_list-filters.html:69 +#: templates/web/base/reports/_list-filters.html:76 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:89 +#: perllib/FixMyStreet/SendReport/Email.pm:91 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:155 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2436,7 +2413,7 @@ msgstr "gwefan menter Open311" msgid "Open311 specification" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:53 +#: templates/web/base/admin/extra-metadata-form.html:63 msgid "Options" msgstr "" @@ -2448,11 +2425,11 @@ msgstr "" msgid "Order" msgstr "" -#: 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/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1322 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:702 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:703 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:738 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:741 #: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: perllib/FixMyStreet/DB/Result/Problem.pm:607 #: perllib/FixMyStreet/DB/Result/Problem.pm:622 @@ -2501,15 +2478,11 @@ msgstr "Rhannol" msgid "Password (optional)" msgstr "Cyfrinair (dewisol)" -#: templates/web/base/auth/general.html:83 -msgid "Password:" -msgstr "Cyfrinair:" - -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:60 msgid "Permalink" msgstr "Dolen barhaol" -#: templates/web/base/admin/user-form.html:164 +#: templates/web/base/admin/user-form.html:168 msgid "Permissions:" msgstr "" @@ -2533,12 +2506,12 @@ msgstr "Rhif ffôn" msgid "Phone number (optional)" msgstr "Rhif ffôn (dewisol)" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" #: 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/base/admin/user-form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Ffôn:" @@ -2612,29 +2585,29 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/DB/Result/User.pm:219 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1408 #: perllib/FixMyStreet/DB/Result/User.pm:220 +#: perllib/FixMyStreet/DB/Result/User.pm:221 #: 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:310 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:931 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 +#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:947 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:982 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 #: templates/web/base/js/translation_strings.html:13 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:383 -#: perllib/FixMyStreet/App/Controller/Auth.pm:409 +#: perllib/FixMyStreet/App/Controller/Auth.pm:379 +#: perllib/FixMyStreet/App/Controller/Auth.pm:405 msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 #: 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" @@ -2651,27 +2624,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:311 +#: perllib/FixMyStreet/App/Controller/Admin.pm:316 #: 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:1392 -#: perllib/FixMyStreet/DB/Result/User.pm:222 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1406 #: perllib/FixMyStreet/DB/Result/User.pm:223 +#: perllib/FixMyStreet/DB/Result/User.pm:224 #: 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:1425 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1529 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1549 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:490 +#: perllib/FixMyStreet/App/Controller/Admin.pm:501 msgid "Please enter a name for this body" msgstr "" @@ -2681,28 +2654,28 @@ msgstr "" msgid "Please enter a password" msgstr "Rhowch gyfrinair" -#: perllib/FixMyStreet/App/Controller/Contact.pm:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:122 #: 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:1422 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1520 -#: perllib/FixMyStreet/App/Controller/Admin.pm:324 -#: perllib/FixMyStreet/DB/Result/User.pm:212 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1540 +#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/DB/Result/User.pm:213 #: 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:137 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Please enter a valid email address" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1416 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1514 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1437 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1534 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Rhowch eich rhif ffôn" @@ -2712,8 +2685,8 @@ msgstr "Rhowch eich rhif ffôn" msgid "Please enter some details" msgstr "Rhowch fanylion" -#: perllib/FixMyStreet/App/Controller/Contact.pm:126 -#: perllib/FixMyStreet/DB/Result/User.pm:210 +#: perllib/FixMyStreet/App/Controller/Contact.pm:121 +#: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 @@ -2723,23 +2696,19 @@ msgstr "Rhowch fanylion" msgid "Please enter your email" msgstr "Rhowch eich e-bost" -#: templates/web/zurich/report/new/fill_in_details_form.html:57 -msgid "Please enter your email address" -msgstr "Rhowch eich cyfeiriad e-bost" - #: templates/web/base/js/translation_strings.html:32 msgid "Please enter your first name" msgstr "Rhowch eich enw cyntaf" -#: perllib/FixMyStreet/Cobrand/UK.pm:322 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 #: 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:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:120 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:205 +#: perllib/FixMyStreet/DB/Result/User.pm:206 #: templates/web/base/js/translation_strings.html:10 msgid "Please enter your name" msgstr "Rhowch eich enw" @@ -2768,10 +2737,6 @@ msgstr "Croeso i chi <a href=\"%s\">ailfewngofnodi</a>, neu fynd yn ôl i'r <a h msgid "Please fill in details of the problem below." msgstr "Rhowch fanylion am y broblem isod." -#: templates/web/zurich/report/new/fill_in_details_form.html:49 -msgid "Please fill in details of the problem." -msgstr "Rhowch fanylion am y broblem." - #: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/sidebar.html:14 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." @@ -2781,11 +2746,11 @@ msgstr "" msgid "Please generate a two-factor code and enter it below:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:406 +#: perllib/FixMyStreet/App/Controller/Auth.pm:402 #: templates/web/base/js/translation_strings.html:26 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2812,24 +2777,24 @@ msgstr "" msgid "Please note:" msgstr "Noder:" -#: perllib/FixMyStreet/App/Controller/Report.pm:407 +#: perllib/FixMyStreet/App/Controller/Report.pm:399 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:389 +#: perllib/FixMyStreet/App/Controller/Report.pm:381 msgid "Please provide a public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:262 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:269 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 msgid "Please provide some text as well as a photo" msgstr "Rhowch destun yn ogystal â llun" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:120 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:255 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 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" @@ -2845,36 +2810,37 @@ 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:251 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 msgid "Please state whether or not the problem has been fixed" msgstr "Dywedwch a gafodd y broblem ei thrwsio" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:122 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:158 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:68 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1419 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1517 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1440 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1537 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:128 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please write a message" msgstr "Ysgrifennwch neges" -#: templates/web/base/report/update/form_update.html:36 -msgid "Please write your update here" -msgstr "Ysgrifennwch eich diweddariad yma" - #: 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" msgstr "" +#: templates/web/base/alert/index.html:33 +#, fuzzy +msgid "Postcode or street name and area" +msgstr "Rhowch god post, neu enw stryd ac ardal" + #: perllib/FixMyStreet/DB/Result/Comment.pm:211 msgid "Posted anonymously at %s" msgstr "Postiwyd yn ddienw am %s" @@ -2899,16 +2865,16 @@ msgstr "" msgid "Previous" msgstr "Blaenorol" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Default.pm:670 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:140 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_item.html:105 msgid "Priority" msgstr "" -#: templates/web/base/main_nav_items.html:43 +#: templates/web/base/main_nav_items.html:51 msgid "Privacy" msgstr "Preifatrwydd" @@ -2930,7 +2896,7 @@ msgstr "Preifat" msgid "Private details" msgstr "" -#: templates/web/base/maps/pin.html:13 +#: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -2952,7 +2918,7 @@ msgstr "Anfonwyd y broblem %s at y cyngor" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1350 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1364 msgid "Problem marked as open." msgstr "" @@ -2960,8 +2926,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:144 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemau" @@ -2988,18 +2953,18 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "Problemau yn %s" -#: 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:844 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 +#: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 +#: perllib/FixMyStreet/Cobrand/UK.pm:270 msgid "Problems within %s" msgstr "Problemau yn %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:225 +#: perllib/FixMyStreet/Cobrand/UK.pm:227 msgid "Problems within %s ward" msgstr "Problemau yn ward %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:259 perllib/FixMyStreet/Cobrand/UK.pm:271 +#: perllib/FixMyStreet/Cobrand/UK.pm:264 perllib/FixMyStreet/Cobrand/UK.pm:276 #, fuzzy msgid "Problems within %s ward, %s" msgstr "Problemau yn ward %s" @@ -3014,7 +2979,7 @@ msgstr "" msgid "Property address:" msgstr "Cyfeiriad yr eiddo:" -#: templates/web/base/report/display.html:57 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" @@ -3042,7 +3007,7 @@ msgstr "" msgid "Public response:" msgstr "Ymateb cyhoeddus:" -#: templates/web/base/report/_inspect.html:180 +#: templates/web/base/report/_inspect.html:189 msgid "Public update:" msgstr "" @@ -3066,7 +3031,7 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:211 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 msgid "Questionnaire filled in by problem reporter" msgstr "" @@ -3078,23 +3043,23 @@ msgstr "" msgid "RSS feed" msgstr "Ffrwd RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:254 perllib/FixMyStreet/Cobrand/UK.pm:266 +#: perllib/FixMyStreet/Cobrand/UK.pm:259 perllib/FixMyStreet/Cobrand/UK.pm:271 msgid "RSS feed for %s" msgstr "Ffrwd RSS ar gyfer %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 msgid "RSS feed for %s ward, %s" msgstr "Ffrwd RSS ar gyfer ward %s, %s" -#: 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 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:157 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 msgid "RSS feed of %s" msgstr "Ffrwd RSS %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 msgid "RSS feed of %s, within %s ward" msgstr "Ffrwd RSS %s, o fewn ward %s" @@ -3102,13 +3067,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:841 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 -#: perllib/FixMyStreet/Cobrand/UK.pm:218 +#: perllib/FixMyStreet/Cobrand/Default.pm:845 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" msgstr "Ffrwd RSS o broblemau yn %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:226 msgid "RSS feed of problems within %s ward" msgstr "Ffrwd RSS o broblemau o fewn ward %s" @@ -3141,11 +3106,11 @@ msgstr "" msgid "Recently reported problems" msgstr "Problemau a adroddwyd yn ddiweddar" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:77 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:57 +#: templates/web/base/report/_inspect.html:60 #, fuzzy msgid "Reject report" msgstr "Ailanfon adrodd" @@ -3154,11 +3119,11 @@ msgstr "Ailanfon adrodd" 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/extra-metadata-form.html:68 +#: templates/web/base/admin/extra-metadata-form.html:78 msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:198 +#: templates/web/base/admin/user-form.html:203 msgid "Remove account details" msgstr "" @@ -3172,9 +3137,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:130 -#: templates/web/base/report/_main.html:14 -#: templates/web/base/report/_main.html:22 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:24 msgid "Remove from shortlist" msgstr "" @@ -3201,21 +3166,36 @@ msgid "Report" msgstr "" #: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:79 +#: templates/web/base/report/_item.html:83 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:18 +#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/main_nav_items.html:6 +#: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Adrodd problem" +#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/main_nav_items.html:4 +#, fuzzy +msgid "Report a problem here" +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/js/translation_strings.html:79 +#: templates/web/base/main_nav_items.html:2 +#: templates/web/base/tokens/confirm_problem.html:40 +#, fuzzy +msgid "Report another problem here" +msgstr "Adrodd problem" + #: templates/web/base/report/new/form_user_loggedin.html:17 msgid "Report as" msgstr "" @@ -3299,22 +3279,21 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Adrodd problem" -#: perllib/FixMyStreet/Cobrand/Default.pm:656 -#: perllib/FixMyStreet/Cobrand/Default.pm:670 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:266 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:374 +#: perllib/FixMyStreet/Cobrand/Default.pm:660 +#: perllib/FixMyStreet/Cobrand/Default.pm:674 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:375 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Adroddiadau" -#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -3327,7 +3306,7 @@ msgstr "" msgid "Reports by destination" msgstr "Adroddwyd gan %s am %s" -#: templates/web/base/admin/user-form.html:124 +#: templates/web/base/admin/user-form.html:128 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3339,16 +3318,16 @@ msgstr "" msgid "Reports published" msgstr "Adroddiadau a gyhoeddwyd" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:89 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:279 perllib/FixMyStreet/Cobrand/UK.pm:291 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 #, fuzzy msgid "Reports sent to %s" msgstr "Adroddwyd ar %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 #, fuzzy msgid "Reports sent to %s, within %s ward" msgstr "Ffrwd RSS %s, o fewn ward %s" @@ -3365,7 +3344,7 @@ msgstr "" msgid "Reputation threshold" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:20 +#: templates/web/base/admin/extra-metadata-form.html:30 msgid "Required" msgstr "" @@ -3401,20 +3380,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:38 +#: templates/web/base/report/update.html:39 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:95 +#: templates/web/base/report/_main.html:97 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:46 +#: templates/web/base/report/_main.html:48 msgid "Revert to original title" msgstr "" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:48 msgid "Right place?" msgstr "Y lle cywir?" @@ -3426,15 +3405,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2037 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2082 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2086 #: 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:2037 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2082 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3445,21 +3424,21 @@ msgstr "Cylchdroi i'r dde" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:55 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:200 +#: templates/web/base/report/_inspect.html:209 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:138 +#: templates/web/base/admin/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: 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/_inspect.html:209 +#: templates/web/base/report/_main.html:115 #: templates/web/base/report/update.html:53 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 @@ -3470,19 +3449,15 @@ msgstr "Cadw'r newidiadau" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:176 +#: templates/web/base/report/_inspect.html:185 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:90 msgid "Saving reports offline" msgstr "" -#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 -msgid "Scheduled" -msgstr "" - #: templates/web/base/admin/index.html:26 #: templates/web/base/admin/reports.html:1 #: templates/web/zurich/admin/reports.html:1 @@ -3524,8 +3499,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:151 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "See user detail for reports created as the council" msgstr "" @@ -3563,12 +3537,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/admin/user-form.html:22 +msgid "Send login email" +msgstr "" + #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:5 msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:846 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:847 msgid "Sent report back" msgstr "" @@ -3580,6 +3558,10 @@ msgstr "" msgid "Sent:" msgstr "Anfonwyd:" +#: templates/web/base/admin/extra-metadata-form.html:17 +msgid "Server Set" +msgstr "" + #: templates/web/base/admin/report_edit.html:91 #: templates/web/zurich/admin/stats/index.html:66 msgid "Service:" @@ -3599,10 +3581,10 @@ msgstr "" msgid "Share" msgstr "Rhannu" -#: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:132 -#: templates/web/base/report/_main.html:17 -#: templates/web/base/report/_main.html:25 +#: templates/web/base/main_nav_items.html:18 +#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:19 +#: templates/web/base/report/_main.html:27 msgid "Shortlist" msgstr "" @@ -3610,19 +3592,19 @@ msgstr "" msgid "Shortlist all visible" 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:18 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:18 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:140 +#: templates/web/base/report/_main.html:142 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:19 +#: templates/web/base/report/update.html:20 msgid "Show Photo?" msgstr "" @@ -3634,21 +3616,31 @@ msgstr "" msgid "Show my name publicly" msgstr "Dangos fy enw yn gyhoeddus" -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Show name publicly?" msgstr "" -#: templates/web/base/report/_main.html:79 +#: templates/web/base/pagination.html:12 +#, fuzzy +msgid "Show older" +msgstr "Dangos yr hen rai" + +#: templates/web/base/reports/_list-filters.html:85 +#, fuzzy +msgid "Show older reports" +msgstr "Chwilio am adroddiadau" + +#: templates/web/base/report/_main.html:81 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:62 msgid "Show pins" msgstr "Dangos piniau" -#: templates/web/base/report/_main.html:56 +#: templates/web/base/report/_main.html:58 msgid "Show reporter’s name" msgstr "" @@ -3659,7 +3651,7 @@ msgstr "" #: templates/web/base/auth/general.html:129 #: templates/web/base/auth/general.html:3 #: templates/web/base/auth/general.html:87 -#: templates/web/base/main_nav_items.html:6 +#: templates/web/base/main_nav_items.html:14 #: templates/web/zurich/auth/general.html:25 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" @@ -3694,7 +3686,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:44 msgid "Some photos of recent reports" msgstr "Lluniau o adroddiadau diweddar" @@ -3703,23 +3695,10 @@ msgstr "Lluniau o adroddiadau diweddar" msgid "Some text to localize" msgstr "Testun i'w leoleiddio" -#: 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/KiitC.pm:131 -msgid "Sorry, that appears to be a Northern Irish postcode, which we don't cover." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/KiitC.pm:123 -msgid "Sorry, that appears to be a Scottish postcode, which we don't cover." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/KiitC.pm:127 -msgid "Sorry, that appears to be a Welsh postcode, which we don't cover." -msgstr "" - #: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" @@ -3733,7 +3712,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:242 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: 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." @@ -3761,19 +3740,19 @@ msgid "" "page wasn’t found or there was a server error. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Root.pm:124 +#: perllib/FixMyStreet/App/Controller/Root.pm:125 msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:63 +#: templates/web/base/reports/_list-filters.html:70 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:58 +#: templates/web/base/admin/user-form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/user-form.html:66 msgid "Staff:" msgstr "" @@ -3792,15 +3771,15 @@ msgstr "Dyddiad cychwyn:" #: 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:99 -#: templates/web/base/report/_item.html:97 +#: templates/web/base/report/_inspect.html:103 +#: templates/web/base/report/_item.html:101 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Cyflwr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1180 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1181 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3819,16 +3798,15 @@ msgstr "Cadw'r newidiadau" msgid "State:" msgstr "Cyflwr:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:256 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:395 +#: perllib/FixMyStreet/Cobrand/Default.pm:649 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Cyflwr" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:377 +#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:378 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3854,11 +3832,7 @@ 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 +#: templates/web/base/admin/extra-metadata-form.html:56 msgid "String" msgstr "" @@ -3893,7 +3867,7 @@ msgstr "Cyflwyno" #: 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/base/admin/user-form.html:195 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3927,13 +3901,12 @@ msgstr "Tanysgrifio i hysbysiad e-bost" msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:130 +#: templates/web/base/admin/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:250 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:373 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:374 #: 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 @@ -3955,11 +3928,11 @@ msgstr "Adroddiadau" msgid "Summary statistics" msgstr "Adroddiadau" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:155 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:147 +#: templates/web/base/admin/user-form.html:151 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin." msgstr "" @@ -3972,8 +3945,8 @@ msgstr "Canlyniadau arolwg" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:662 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:384 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:385 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -3995,7 +3968,7 @@ msgstr "Fersiwn testun yn unig" msgid "Text:" msgstr "Testun:" -#: templates/web/base/tokens/confirm_problem.html:25 +#: templates/web/base/tokens/confirm_problem.html:29 msgid "Thank you for reporting this issue!" msgstr "Diolch am adrodd y broblem hon!" @@ -4037,16 +4010,15 @@ msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arn #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: 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:903 +#: perllib/FixMyStreet/App/Controller/Admin.pm:916 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 msgid "That problem will now be resent." msgstr "Ailanfonir y broblem nawr." @@ -4058,20 +4030,20 @@ msgstr "Ni ellir gweld yr adroddiad hwnnw ar %s." msgid "That report has been removed from FixMyStreet." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1891 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1911 #, fuzzy msgid "That user has been logged out." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1898 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1918 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1921 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1966 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1912 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4088,6 +4060,13 @@ msgid "" " when sending reports to this body." msgstr "" +#: templates/web/base/admin/contact-form.html:126 +#: templates/web/base/admin/contact-form.html:127 +msgid "" +"The <strong>group</strong> is used for the top-level category field when\n" +" subcategory grouping is enabled." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:27 #: templates/web/base/admin/open311-form-fields.html:28 msgid "" @@ -4115,7 +4094,7 @@ msgid "" " and may be displayed publically." msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:12 +#: templates/web/base/admin/extra-metadata-form.html:22 msgid "The code used to store this field value in the database. e.g. <code>address</code> would be available as <code>problem.extra.address</code> in the templates." msgstr "" @@ -4134,7 +4113,7 @@ msgstr "" msgid "The error was: %s" msgstr "Y gwall oedd: %s" -#: templates/web/base/admin/extra-metadata-form.html:30 +#: templates/web/base/admin/extra-metadata-form.html:40 msgid "The field name as shown to the user on the report form." msgstr "" @@ -4192,7 +4171,7 @@ msgstr "Nid yw'r cyfrineiriau'n cyfateb" msgid "The requested URL '%s' was not found on this server" msgstr "Ni chanfuwyd yr URL '%s' ar y gweinydd hwn" -#: templates/web/base/admin/extra-metadata-form.html:42 +#: templates/web/base/admin/extra-metadata-form.html:52 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 "" @@ -4204,6 +4183,11 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1957 +#, fuzzy +msgid "The user has been sent a login email" +msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." + #: templates/web/base/admin/user-form.html:10 #: templates/web/base/admin/user-form.html:11 msgid "" @@ -4211,13 +4195,13 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:20 +#: templates/web/base/around/_on_map_empty.html:1 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Nid oes unrhyw adroddiadau i'w dangos." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1208 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1221 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4225,7 +4209,7 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:150 +#: perllib/FixMyStreet/App/Controller/Contact.pm:145 #: 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." @@ -4234,7 +4218,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:818 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:835 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 #: templates/web/base/auth/general.html:51 #: templates/web/zurich/auth/general.html:18 @@ -4246,7 +4230,7 @@ msgstr "Bu problem gyda'r e-bost neu gyfrinair. Os na allwch gofio eich cyfrinai 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:154 +#: perllib/FixMyStreet/App/Controller/Contact.pm:149 msgid "There were problems with your report. Please see below." msgstr "Bu gwallau gyda'r adroddiad. Gwelwch isod." @@ -4317,10 +4301,10 @@ 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: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/App/Controller/Report/New.pm:1057 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1120 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:996 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Mae'r wybodaeth hon yn ofynnol" @@ -4341,10 +4325,6 @@ msgstr "" 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_state_checkbox.html:14 msgid "This problem has been fixed" msgstr "Trwsiwyd y broblem hon" @@ -4361,8 +4341,8 @@ msgstr "" msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 #: templates/web/zurich/report/_main.html:12 msgid "This report is awaiting moderation." msgstr "" @@ -4379,6 +4359,11 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" +#: templates/web/base/report/display.html:59 +#, fuzzy +msgid "This report is now closed to updates." +msgstr "Rhestru'r holl broblemau a adroddwyd" + #: 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." @@ -4390,13 +4375,12 @@ 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/Default.pm:638 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:251 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Llinell amser" -#: templates/web/base/report/new/after_photo.html:1 +#: templates/web/base/report/new/after_photo.html:2 msgid "Tips for perfect photos" msgstr "" @@ -4458,8 +4442,8 @@ msgstr "" msgid "Total" msgstr "Cyfanswm" -#: templates/web/base/report/_inspect.html:151 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:155 +#: templates/web/base/report/_item.html:109 msgid "Traffic management required?" msgstr "" @@ -4471,15 +4455,15 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/user-form.html:132 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:136 +#: templates/web/base/admin/user-form.html:140 msgid "Trusted:" msgstr "" @@ -4501,13 +4485,13 @@ msgstr "" msgid "Two-factor authentication has been deactivated" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:44 +#: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:30 +#: templates/web/base/admin/user-form.html:34 msgid "Unban" msgstr "" @@ -4529,24 +4513,26 @@ msgid "Unknown alert type" msgstr "" #: perllib/FixMyStreet/App/Controller/Photo.pm:109 -#: perllib/FixMyStreet/App/Controller/Root.pm:141 -#: templates/web/base/js/translation_strings.html:44 +#: perllib/FixMyStreet/App/Controller/Root.pm:142 +#: templates/web/base/js/translation_strings.html:46 msgid "Unknown error" msgstr "Gwall anhysbys" -#: perllib/FixMyStreet/App/Controller/My.pm:199 +#: perllib/FixMyStreet/App/Controller/Develop.pm:159 +#: perllib/FixMyStreet/App/Controller/Develop.pm:178 +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: 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 "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:99 +#: perllib/FixMyStreet/App/Controller/Contact.pm:94 #, fuzzy msgid "Unknown update ID" msgstr "Gwall anhysbys" -#: templates/web/base/reports/_list-filters.html:19 +#: templates/web/base/reports/_list-filters.html:25 msgid "Unshortlisted" msgstr "" @@ -4617,18 +4603,18 @@ 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: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 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1358 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1679 +#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:780 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:878 msgid "Updated!" msgstr "Diweddarwyd!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 +#: templates/web/base/report/update.html:4 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Diweddariadau" @@ -4671,7 +4657,7 @@ msgstr "" msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:125 +#: templates/web/base/admin/contact-form.html:143 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 "" @@ -4688,33 +4674,33 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1868 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1888 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1898 #, fuzzy msgid "User added to abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1436 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1541 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1451 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1561 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1865 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1885 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1895 #, fuzzy msgid "User already in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1996 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1967 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2012 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:30 +#: templates/web/base/admin/user-form.html:34 #: templates/web/base/admin/users.html:32 msgid "User in abuse table" msgstr "" @@ -4729,22 +4715,20 @@ msgstr "" msgid "User:" msgstr "Defnyddwyr" -#: 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:675 +#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:390 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Defnyddwyr" -#: templates/web/base/admin/user-form.html:161 +#: templates/web/base/admin/user-form.html:165 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:363 -#: perllib/FixMyStreet/App/Controller/Admin.pm:399 -#: perllib/FixMyStreet/App/Controller/Admin.pm:426 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:437 msgid "Values updated" msgstr "" @@ -4798,7 +4782,7 @@ msgstr "" msgid "Wards of this council" msgstr "Wardiau'r cyngor hwn" -#: templates/web/base/alert/choose.html:6 +#: templates/web/base/alert/choose.html:7 #: templates/web/base/around/_error_multiple.html:6 #, fuzzy msgid "We found more than one match for that location." @@ -4826,7 +4810,7 @@ msgstr "" msgid "We send it to the council on your behalf" msgstr "" -#: templates/web/base/alert/choose.html:12 +#: templates/web/base/alert/choose.html:13 #: 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 "" @@ -4848,10 +4832,6 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "Ymatebwn cyn gynted â phosib." -#: templates/web/base/questionnaire/index.html:73 -msgid "What was your experience of getting the problem fixed?" -msgstr "" - #: templates/web/base/admin/category_edit.html:27 #: templates/web/zurich/admin/body.html:18 msgid "When edited" @@ -4861,7 +4841,11 @@ msgstr "" msgid "When sent" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:18 +#: templates/web/base/admin/extra-metadata-form.html:12 +msgid "Whether the field is displayed to the user, included as a hidden field and automatically populated, or set by the server upon Open311 submission. This field is usually set automatically." +msgstr "" + +#: templates/web/base/admin/extra-metadata-form.html:28 msgid "Whether the user is required to provide a value for this field." msgstr "" @@ -4869,11 +4853,11 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:116 +#: templates/web/base/report/_inspect.html:120 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:65 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4905,7 +4889,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:1198 +#: perllib/FixMyStreet/Cobrand/Default.pm:1202 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4920,20 +4904,15 @@ msgstr "Lleoliad anghywir? Cliciwch ar y map eto." #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:107 +#: templates/web/base/report/_inspect.html:111 msgid "Yes" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 -msgid "Yes I have a password" -msgstr "Oes, mae gen i gyfrinair" - #: templates/web/base/contact/index.html:45 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:91 msgid "You are offline" msgstr "" @@ -4945,12 +4924,17 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" +#: templates/web/base/report/display.html:60 +#, fuzzy +msgid "You can <a href=\"%s\">make a new report in the same location</a>." +msgstr "Gallwch <a href=\"%s%s\">weld y broblem ar y wefan hon</a>." + #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "Gallwch <a href=\"%s%s\">weld y broblem ar y wefan hon</a>." -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4980,15 +4964,15 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:43 msgid "You declined; please fill in the box above" msgstr "Gwrthodoch chi; llenwch y blwch uchod" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:93 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:39 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 "" @@ -5069,16 +5053,14 @@ msgstr "Eich adroddiadau" #: templates/web/base/auth/generate_token.html:15 #: templates/web/base/auth/generate_token.html:26 #: templates/web/base/auth/generate_token.html:34 -#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 +#: templates/web/base/main_nav_items.html:12 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/alert/updates.html:22 #: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: 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:6 #: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 @@ -5086,8 +5068,6 @@ msgid "Your email" msgstr "Eich e-bost" #: templates/web/base/auth/change_email.html:15 -#: templates/web/zurich/auth/general.html:20 -#: templates/web/zurich/auth/general.html:48 msgid "Your email address" msgstr "Eich cyfeiriad e-bost" @@ -5102,11 +5082,9 @@ msgstr "Eich cyfeiriad e-bost" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:116 +#: templates/web/base/auth/general.html:115 #: templates/web/base/contact/index.html:74 -#: 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 +#: templates/web/base/report/update/form_name.html:27 msgid "Your name" msgstr "Eich enw" @@ -5114,22 +5092,21 @@ 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:271 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:267 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:83 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:86 -#: templates/web/base/report/new/form_user_loggedout_password.html:10 -#: templates/web/base/report/update/form_user_loggedout_password.html:9 -#: templates/web/zurich/auth/general.html:24 +#: templates/web/base/auth/general.html:83 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Your password" msgstr "Eich cyfrinair" @@ -5147,7 +5124,6 @@ msgstr "" #: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Eich rhif ffôn" @@ -5169,7 +5145,7 @@ msgstr "" msgid "Your token has been generated" msgstr "Newidiwyd eich cyfrinair" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:84 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5195,12 +5171,12 @@ msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:171 +#: templates/web/base/admin/user-form.html:175 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:960 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/App/Controller/Admin.pm:973 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:88 #: perllib/FixMyStreet/DB/Result/Comment.pm:216 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 msgid "an administrator" @@ -5224,10 +5200,18 @@ msgid "didn't use map" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:14 +#: templates/web/base/around/postcode_form.html:13 msgid "e.g. ‘%s’ or ‘%s’" msgstr "e.e. '%s' neu '%s'" +#: templates/web/base/report/new/form_title.html:2 +msgid "e.g. ‘10 inch pothole on Example St, near post box’" +msgstr "" + +#: templates/web/base/report/new/form_report.html:56 +msgid "e.g. ‘This pothole has been here for two months and…’" +msgstr "" + #: templates/web/base/admin/flagged.html:51 #: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" @@ -5238,7 +5222,7 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:63 +#: templates/web/base/report/_item.html:67 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "diweddarwyd ddiwethaf %s" @@ -5247,14 +5231,14 @@ msgstr "diweddarwyd ddiwethaf %s" msgid "less than a minute" msgstr "llai na munud" -#: perllib/FixMyStreet/App/Controller/Admin.pm:122 +#: perllib/FixMyStreet/App/Controller/Admin.pm:123 #: templates/web/base/admin/stats/questionnaire.html:15 #: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "ddim yn berthnasol" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:172 +#: templates/web/base/admin/user-form.html:176 msgid "none" msgstr "" @@ -5262,8 +5246,8 @@ msgstr "" msgid "not the council's responsibility" msgstr "" -#: templates/web/base/alert/index.html:38 -#: templates/web/base/around/postcode_form.html:26 +#: templates/web/base/alert/index.html:40 +#: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" msgstr "neu dewch o hyd i fi'n awtomatig" @@ -5320,11 +5304,11 @@ msgstr "" msgid "today" msgstr "heddiw" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:94 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:95 msgid "updates" msgstr "" @@ -5340,12 +5324,12 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1940 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1985 #, fuzzy msgid "user not in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1938 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1983 #, fuzzy msgid "user removed from abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" @@ -5508,7 +5492,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/buckinghamshire/report/_item.html:51 +#: templates/web/base/report/_item.html:55 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5535,7 +5519,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/buckinghamshire/report/_item.html:61 +#: templates/web/base/report/_item.html:65 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" @@ -5562,6 +5546,24 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#~ msgid "Enter a password" +#~ msgstr "Rhowch gyfrinair" + +#~ msgid "Password:" +#~ msgstr "Cyfrinair:" + +#~ msgid "Please enter your email address" +#~ msgstr "Rhowch eich cyfeiriad e-bost" + +#~ msgid "Please fill in details of the problem." +#~ msgstr "Rhowch fanylion am y broblem." + +#~ msgid "Please write your update here" +#~ msgstr "Ysgrifennwch eich diweddariad yma" + +#~ msgid "Yes I have a password" +#~ msgstr "Oes, mae gen i gyfrinair" + #~ msgid "Category: %s" #~ msgstr "Categori: %s" @@ -5601,9 +5603,6 @@ msgstr[3] "" #~ msgid "No council" #~ msgstr "Dim cyngor" -#~ msgid "Show old" -#~ msgstr "Dangos yr hen rai" - #~ msgid "Year" #~ msgstr "Blwyddyn" |