diff options
Diffstat (limited to 'locale/cy.UTF-8')
| -rw-r--r-- | locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po | 406 |
1 files changed, 256 insertions, 150 deletions
diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index cc498cb17..a54670ca4 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-10-01 11:47+0100\n" +"POT-Creation-Date: 2018-11-06 12:38+0000\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" @@ -94,8 +94,8 @@ msgstr "" msgid "%s live updates" msgstr "%s diweddariad byw" -#: templates/web/base/dashboard/index.html:160 #: templates/web/base/dashboard/index.html:164 +#: templates/web/base/dashboard/index.html:168 msgid "%s opened, %s closed, %s fixed" msgstr "" @@ -178,7 +178,7 @@ msgid "(we also have RSS feeds for problems within %s)" msgstr "Ffrwd RSS o broblemau yn %s" #: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:707 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Dewiswch gategori --" @@ -335,6 +335,7 @@ msgid "Add user" msgstr "Ychwanegu defnyddiwr" #: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 msgid "Add/edit problem categories" msgstr "" @@ -374,6 +375,10 @@ msgstr "Analluogwyd yr hysbysiad %d (créwyd %s)" msgid "Alert me to future updates" msgstr "Rhoi gwybod am ddiweddariadau i ddod" +#: templates/web/base/admin/report_edit.html:91 +msgid "Alerts:" +msgstr "" + #: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 @@ -445,7 +450,7 @@ msgstr "Dienw" msgid "Anonymous user" msgstr "Dienw" -#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:130 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Dienw:" @@ -564,6 +569,8 @@ msgstr "Ychwanegu defnyddiwr" #: perllib/FixMyStreet/Cobrand/Default.pm:655 #: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: perllib/FixMyStreet/Cobrand/Zurich.pm:408 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 @@ -601,6 +608,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -633,7 +641,7 @@ msgstr "Categori" msgid "Category and State" msgstr "Categori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -642,7 +650,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/report_edit.html:125 +#: templates/web/base/admin/report_edit.html:126 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -732,7 +740,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 #: templates/web/base/admin/states/index.html:33 -#: templates/web/base/dashboard/index.html:113 +#: templates/web/base/dashboard/index.html:117 #: templates/web/zurich/admin/stats/index.html:52 msgid "Closed" msgstr "Ar gau" @@ -741,7 +749,7 @@ msgstr "Ar gau" msgid "Closed by council" msgstr "Caewyd gan y cyngor" -#: templates/web/base/admin/report_edit.html:175 +#: templates/web/base/admin/report_edit.html:176 #, fuzzy msgid "Closed to updates" msgstr "Derbyn diweddariadau" @@ -756,12 +764,12 @@ msgstr "Cyfesurynnau:" msgid "Cobrand" msgstr "" -#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/report_edit.html:94 #: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "" -#: templates/web/base/admin/report_edit.html:92 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "" @@ -777,6 +785,7 @@ msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" @@ -805,6 +814,7 @@ msgid "Confirmation" msgstr "" #: templates/web/base/admin/contact-form.html:56 +#: templates/web/base/admin/user-alerts.html:10 #: templates/web/zurich/admin/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" @@ -840,8 +850,8 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2009 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2038 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 msgid "Could not find user" msgstr "Methu dod o hyd i'r defnyddiwr" @@ -891,14 +901,17 @@ msgid "Create priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 msgid "Create reports/updates as anonymous user" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 msgid "Create reports/updates as the council" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -974,7 +987,12 @@ msgstr "" msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1175 +#: templates/web/base/admin/user-alerts.html:15 +#, fuzzy +msgid "Delete" +msgstr "Dilëwyd" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1003,16 +1021,17 @@ msgstr "Disgrifiad" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:370 +#: perllib/FixMyStreet/App/Controller/Report.pm:354 msgid "Detailed information is limited to %d characters." msgstr "" +#: templates/web/base/admin/user-alerts.html:12 #: templates/web/base/js/translation_strings.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Manylion" -#: templates/web/base/admin/report_edit.html:118 +#: templates/web/base/admin/report_edit.html:119 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1036,6 +1055,14 @@ msgstr "" msgid "Diligency prize league table" msgstr "" +#: templates/web/base/admin/user-alerts.html:14 +msgid "Disable" +msgstr "" + +#: templates/web/base/admin/user-alerts.html:23 +msgid "Disabled:" +msgstr "" + #: templates/web/base/report/_main.html:120 #: templates/web/base/report/update.html:54 msgid "Discard changes" @@ -1111,11 +1138,18 @@ msgstr "Golygu" msgid "Edit body details" msgstr "Golygu manylion y corff" +#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 +#, fuzzy +msgid "Edit other users' details" +msgstr "Golygu manylion y corff" + #: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" @@ -1124,6 +1158,7 @@ msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" @@ -1193,12 +1228,16 @@ msgstr "Dilëwyd hysbysiad e-bost" msgid "Email verified:" msgstr "" -#: templates/web/base/admin/report_edit.html:145 +#: templates/web/base/admin/report_edit.html:146 #: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/contact-form.html:18 msgid "Email:" msgstr "E-bost:" +#: templates/web/base/admin/user-alerts.html:13 +msgid "Enable" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:156 #: templates/web/base/admin/open311-form-fields.html:157 msgid "" @@ -1262,17 +1301,26 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Rhowch god post DU, neu enw stryd ac ardal" +#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 +#, fuzzy +msgid "Enter a nearby UK postcode, street name and area, or asset name" +msgstr "Rhowch god post DU, neu enw stryd ac ardal" + #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" msgstr "Rhowch god post, neu enw stryd ac ardal" -#: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 #: templates/web/base/around/postcode_form.html:7 #: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Rhowch enw stryd ac ardal gerllaw" +#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 +#, fuzzy +msgid "Enter a street, area, or landmark" +msgstr "Rhowch enw stryd ac ardal gerllaw" + #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Rhowch fanylion am y broblem" @@ -1312,15 +1360,15 @@ msgstr "" msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:51 +#: templates/web/base/report/new/form_report.html:52 msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:105 +#: templates/web/base/dashboard/index.html:106 msgid "Export as CSV" msgstr "" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:98 #: templates/web/base/admin/responsepriorities/edit.html:27 msgid "External ID" msgstr "" @@ -1329,11 +1377,11 @@ msgstr "" msgid "External URL" msgstr "URL allanol" -#: templates/web/base/admin/report_edit.html:99 +#: templates/web/base/admin/report_edit.html:100 msgid "External body" msgstr "" -#: templates/web/base/admin/report_edit.html:106 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/base/admin/template_edit.html:66 msgid "External status code" msgstr "" @@ -1342,7 +1390,7 @@ msgstr "" msgid "External status code:" msgstr "" -#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/report_edit.html:102 msgid "External team" msgstr "" @@ -1354,7 +1402,7 @@ msgid "Extra Fields" msgstr "Data ychwanegol:" #: templates/web/base/admin/contact-form.html:159 -#: templates/web/base/admin/report_edit.html:128 +#: templates/web/base/admin/report_edit.html:129 msgid "Extra data:" msgstr "Data ychwanegol:" @@ -1394,7 +1442,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:179 #: templates/web/base/admin/states/index.html:29 #: templates/web/base/admin/stats/fix_rate.html:4 -#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:118 msgid "Fixed" msgstr "" @@ -1433,7 +1481,7 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:149 +#: templates/web/base/admin/report_edit.html:150 #: templates/web/base/admin/user-form.html:119 msgid "Flagged:" msgstr "" @@ -1518,7 +1566,7 @@ msgstr "Mae'n dda gennym glywed y cafodd ei drwsio!" msgid "Go" msgstr "" -#: templates/web/base/admin/report_edit.html:95 +#: templates/web/base/admin/report_edit.html:96 msgid "Going to send questionnaire?" msgstr "" @@ -1664,6 +1712,7 @@ msgstr "" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 +#: templates/web/base/admin/user-alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1767,7 +1816,7 @@ msgid "" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:141 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Illegal ID" msgstr "ID annerbynniol" @@ -1832,7 +1881,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:439 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -2027,6 +2077,7 @@ msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" @@ -2079,7 +2130,7 @@ msgstr "" msgid "Name" msgstr "Enw" -#: templates/web/base/admin/report_edit.html:134 +#: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 #: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 @@ -2166,10 +2217,35 @@ msgstr "Eich rhif ffôn" msgid "New priority" msgstr "" +#: templates/web/base/admin/user-alerts.html:44 +#, fuzzy +msgid "New problems for %s" +msgstr "Problemau newydd ar FixMyStreet" + +#: templates/web/base/admin/user-alerts.html:42 +msgid "New problems for <a href=\"%s\">%s</a>" +msgstr "" + +#: templates/web/base/admin/user-alerts.html:35 +msgid "New problems for <a href=\"%s\">%s</a> ward in <a href=\"%s\">%s</a>" +msgstr "" + +#: templates/web/base/admin/user-alerts.html:47 +msgid "New problems for area id <a href=\"%s\">%s</a>" +msgstr "" + +#: templates/web/base/admin/user-alerts.html:37 +msgid "New problems for ward id %s in body id %s" +msgstr "" + #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Problemau newydd i {{COUNCIL}} o fewn ward {{WARD}} ar FixMyStreet" +#: templates/web/base/admin/user-alerts.html:30 +msgid "New problems near <a href=\"%s\">%s,%s</a>" +msgstr "" + #: db/alert_types.pl:26 db/alert_types.pl:30 msgid "New problems near {{POSTCODE}} on FixMyStreet" msgstr "Problemau newydd gerllaw {{POSTCODE}} ar FixMyStreet" @@ -2202,6 +2278,10 @@ msgstr "" msgid "New template" msgstr "" +#: templates/web/base/admin/user-alerts.html:28 +msgid "New updates on report <a href=\"%s\">%s</a>" +msgstr "" + #: templates/web/base/reports/_list-filters.html:75 msgid "Newest" msgstr "" @@ -2210,15 +2290,16 @@ msgstr "" msgid "Next" msgstr "Nesaf" -#: perllib/FixMyStreet/Cobrand/Default.pm:1203 +#: perllib/FixMyStreet/Cobrand/Default.pm:1211 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:132 -#: templates/web/base/admin/report_edit.html:95 +#: templates/web/base/admin/report_edit.html:133 +#: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 +#: templates/web/base/admin/user-alerts.html:21 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 @@ -2284,8 +2365,8 @@ msgid "No supporters" msgstr "Dim cefnogwyr" #: templates/web/base/admin/report_edit.html:67 -#: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/report_edit.html:92 +#: templates/web/base/admin/report_edit.html:94 msgid "None" msgstr "Dim" @@ -2388,7 +2469,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:25 #: templates/web/base/admin/states/index.html:32 #: templates/web/base/admin/update_edit.html:30 -#: templates/web/base/dashboard/index.html:112 +#: templates/web/base/dashboard/index.html:116 #: templates/web/zurich/admin/update_edit.html:18 msgid "Open" msgstr "Ar agor" @@ -2425,11 +2506,11 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:708 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:709 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:712 #: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: perllib/FixMyStreet/DB/Result/Problem.pm:607 #: perllib/FixMyStreet/DB/Result/Problem.pm:622 @@ -2510,7 +2591,7 @@ msgstr "Rhif ffôn (dewisol)" msgid "Phone verified:" msgstr "" -#: templates/web/base/admin/report_edit.html:142 +#: templates/web/base/admin/report_edit.html:143 #: 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:" @@ -2519,9 +2600,9 @@ msgstr "Ffôn:" #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:27 -#: templates/web/base/report/new/form_report.html:42 -#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:43 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2535,7 +2616,7 @@ msgstr "Ffôn:" msgid "Photo" msgstr "Llun" -#: perllib/FixMyStreet/App/Controller/Photo.pm:192 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "Photo is required." msgstr "" @@ -2543,12 +2624,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:109 +#: perllib/FixMyStreet/App/Controller/Photo.pm:112 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:27 +#: templates/web/base/report/new/form_report.html:28 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2589,7 +2670,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1408 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2599,8 +2680,8 @@ msgid "Please check your phone number is correct" msgstr "Rhowch eich rhif ffôn" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:989 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 #: templates/web/base/js/translation_strings.html:13 msgid "Please choose a category" @@ -2629,12 +2710,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Peidiwch â bod yn sarhaus — byddai sarhau eich cyngor yn dibrisio'r gwasanaeth i bawb." #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:128 +#: perllib/FixMyStreet/DB/Result/Comment.pm:148 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Rhowch neges" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1406 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2643,8 +2724,8 @@ msgstr "Rhowch neges" msgid "Please enter a mobile number" msgstr "Rhowch eich rhif ffôn" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1549 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 msgid "Please enter a name" msgstr "" @@ -2658,14 +2739,14 @@ msgstr "" msgid "Please enter a password" msgstr "Rhowch gyfrinair" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:124 #: 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:1430 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1540 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 #: templates/web/base/js/translation_strings.html:16 @@ -2674,12 +2755,12 @@ msgid "Please enter a valid email" msgstr "Rhowch e-bost dilys" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:132 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please enter a valid email address" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1437 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1534 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Rhowch eich rhif ffôn" @@ -2689,7 +2770,7 @@ msgstr "Rhowch eich rhif ffôn" msgid "Please enter some details" msgstr "Rhowch fanylion" -#: perllib/FixMyStreet/App/Controller/Contact.pm:121 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 @@ -2709,8 +2790,8 @@ msgstr "Rhowch eich enw cyntaf" 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:120 -#: perllib/FixMyStreet/DB/Result/Comment.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/DB/Result/Comment.pm:145 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 #: perllib/FixMyStreet/DB/Result/User.pm:206 #: templates/web/base/js/translation_strings.html:10 @@ -2781,11 +2862,11 @@ msgstr "" msgid "Please note:" msgstr "Noder:" -#: perllib/FixMyStreet/App/Controller/Report.pm:399 +#: perllib/FixMyStreet/App/Controller/Report.pm:383 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:381 +#: perllib/FixMyStreet/App/Controller/Report.pm:365 msgid "Please provide a public update for this report." msgstr "" @@ -2825,12 +2906,12 @@ msgstr "Dywedwch a gafodd y broblem ei thrwsio" msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1440 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1537 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:125 msgid "Please write a message" msgstr "Ysgrifennwch neges" @@ -2845,19 +2926,19 @@ msgstr "" msgid "Postcode or street name and area" msgstr "Rhowch god post, neu enw stryd ac ardal" -#: perllib/FixMyStreet/DB/Result/Comment.pm:211 +#: perllib/FixMyStreet/DB/Result/Comment.pm:231 msgid "Posted anonymously at %s" msgstr "Postiwyd yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:246 +#: perllib/FixMyStreet/DB/Result/Comment.pm:268 msgid "Posted by %s at %s" msgstr "Postiwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:234 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by <strong>%s</strong> (%s) at %s" msgstr "Postiwyd gan <strong>%s</strong> (%s) am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by <strong>%s</strong> at %s" msgstr "Postiwyd gan <strong>%s</strong> am %s" @@ -2890,13 +2971,13 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:151 +#: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 #: templates/web/base/report/new/form_user_loggedin.html:63 msgid "Private" msgstr "Preifat" -#: templates/web/base/report/new/form_user.html:1 +#: templates/web/base/report/new/form_user.html:2 msgid "Private details" msgstr "" @@ -2922,7 +3003,7 @@ msgstr "Anfonwyd y broblem %s at y cyngor" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1364 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 msgid "Problem marked as open." msgstr "" @@ -2931,6 +3012,7 @@ msgid "Problem state change based on survey results" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemau" @@ -2957,7 +3039,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "Problemau yn %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:844 +#: perllib/FixMyStreet/Cobrand/Default.pm:852 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3002,7 +3084,7 @@ msgstr "Mae darparu enw a chyfrinair yn ddewisol, ond bydd yn eich galluogi i ad msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Mae darparu cyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau." -#: templates/web/base/report/new/form_report.html:11 +#: templates/web/base/report/new/form_report.html:12 msgid "Public details" msgstr "" @@ -3071,7 +3153,7 @@ msgstr "Ffrwd RSS %s, o fewn ward %s" msgid "RSS feed of nearby problems" msgstr "Ffrwd RSS o broblemau gerllaw" -#: perllib/FixMyStreet/Cobrand/Default.pm:845 +#: perllib/FixMyStreet/Cobrand/Default.pm:853 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3151,7 +3233,7 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:168 +#: templates/web/base/admin/report_edit.html:169 #: templates/web/base/admin/update_edit.html:74 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" @@ -3292,7 +3374,9 @@ msgstr "Adrodd problem" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Adroddiadau" @@ -3409,16 +3493,16 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 -#: templates/web/base/admin/report_edit.html:165 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: templates/web/base/admin/report_edit.html:166 #: 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:2083 -#: templates/web/base/admin/report_edit.html:166 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" @@ -3499,11 +3583,12 @@ msgid "Security" msgstr "" #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:5 +#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 msgid "See user detail for reports created as the council" msgstr "" @@ -3566,7 +3651,7 @@ msgstr "Anfonwyd:" msgid "Server Set" msgstr "" -#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/report_edit.html:92 #: templates/web/zurich/admin/stats/index.html:66 msgid "Service:" msgstr "Gwasanaeth:" @@ -3775,6 +3860,7 @@ msgstr "Dyddiad cychwyn:" #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 +#: templates/web/base/admin/user-alerts.html:11 #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 @@ -3783,8 +3869,8 @@ msgstr "Dyddiad cychwyn:" msgid "State" msgstr "Cyflwr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3794,7 +3880,7 @@ msgstr "" msgid "State changed to:" msgstr "Cadw'r newidiadau" -#: templates/web/base/admin/report_edit.html:122 +#: templates/web/base/admin/report_edit.html:123 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:75 #: templates/web/zurich/admin/report_edit.html:103 @@ -3804,6 +3890,7 @@ msgid "State:" msgstr "Cyflwr:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 #: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 #, fuzzy @@ -3854,7 +3941,7 @@ msgstr "" msgid "Subject" msgstr "Pwnc" -#: templates/web/base/admin/report_edit.html:116 +#: templates/web/base/admin/report_edit.html:117 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Pwnc:" @@ -3869,7 +3956,7 @@ msgstr "Pwnc:" msgid "Submit" msgstr "Cyflwyno" -#: templates/web/base/admin/report_edit.html:179 +#: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 #: templates/web/base/admin/user-form.html:195 @@ -3902,6 +3989,11 @@ msgstr "Tanysgrifio" msgid "Subscribe by email" msgstr "Tanysgrifio i hysbysiad e-bost" +#: templates/web/base/admin/user-alerts.html:22 +#, fuzzy +msgid "Subscribed:" +msgstr "Tanysgrifio" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" @@ -3911,6 +4003,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -4015,40 +4108,41 @@ 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:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:916 +#: perllib/FixMyStreet/App/Controller/Admin.pm:918 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Admin.pm:911 msgid "That problem will now be resent." msgstr "Ailanfonir y broblem nawr." -#: perllib/FixMyStreet/App/Controller/Report.pm:137 +#: perllib/FixMyStreet/App/Controller/Report.pm:138 msgid "That report cannot be viewed on %s." msgstr "Ni ellir gweld yr adroddiad hwnnw ar %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:127 +#: perllib/FixMyStreet/App/Controller/Report.pm:128 msgid "That report has been removed from FixMyStreet." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1912 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #, fuzzy msgid "That user has been logged out." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1919 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1967 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1933 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4188,7 +4282,7 @@ 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:1958 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 #, fuzzy msgid "The user has been sent a login email" msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." @@ -4206,7 +4300,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Nid oes unrhyw adroddiadau i'w dangos." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1221 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4214,7 +4308,7 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:145 +#: perllib/FixMyStreet/App/Controller/Contact.pm:147 #: 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." @@ -4223,7 +4317,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:843 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 #: templates/web/base/auth/general.html:51 #: templates/web/zurich/auth/general.html:18 @@ -4235,7 +4329,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:149 +#: perllib/FixMyStreet/App/Controller/Contact.pm:151 msgid "There were problems with your report. Please see below." msgstr "Bu gwallau gyda'r adroddiad. Gwelwch isod." @@ -4268,7 +4362,7 @@ msgid "These will be sent to <strong>%s</strong> and also published online for o msgstr "" #: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:4 +#: templates/web/base/report/new/form_user.html:5 msgid "These will be sent to the council, but will never be shown online." msgstr "" @@ -4306,10 +4400,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:1003 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1013 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Mae'r wybodaeth hon yn ofynnol" @@ -4381,6 +4475,7 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Llinell amser" @@ -4440,9 +4535,9 @@ msgstr "" #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/admin/stats/questionnaire.html:24 -#: templates/web/base/dashboard/index.html:115 -#: templates/web/base/dashboard/index.html:120 -#: templates/web/base/dashboard/index.html:144 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:124 +#: templates/web/base/dashboard/index.html:148 #: templates/web/zurich/admin/stats/index.html:51 msgid "Total" msgstr "Cyfanswm" @@ -4493,6 +4588,7 @@ msgstr "" #: 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 +#: templates/web/base/admin/user-alerts.html:9 msgid "Type" msgstr "" @@ -4517,7 +4613,7 @@ msgstr "Anhysbys" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:115 +#: perllib/FixMyStreet/App/Controller/Photo.pm:118 #: perllib/FixMyStreet/App/Controller/Root.pm:142 #: templates/web/base/js/translation_strings.html:46 msgid "Unknown error" @@ -4526,9 +4622,9 @@ msgstr "Gwall anhysbys" #: 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 +#: perllib/FixMyStreet/App/Controller/Report.pm:113 +#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:122 msgid "Unknown problem ID" msgstr "" @@ -4546,6 +4642,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 +#: templates/web/base/admin/user-alerts.html:58 #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "" @@ -4598,20 +4695,21 @@ msgstr "" msgid "Updated" msgstr "Diweddarwyd" -#: perllib/FixMyStreet/DB/Result/Comment.pm:240 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by <strong>%s</strong> (%s) at %s" msgstr "Postiwyd gan <strong>%s</strong> (%s) am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:242 +#: perllib/FixMyStreet/DB/Result/Comment.pm:264 #, fuzzy msgid "Updated by <strong>%s</strong> at %s" msgstr "Postiwyd gan <strong>%s</strong> am %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1358 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1680 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:999 #: perllib/FixMyStreet/Cobrand/Zurich.pm:805 #: perllib/FixMyStreet/Cobrand/Zurich.pm:830 #: perllib/FixMyStreet/Cobrand/Zurich.pm:903 @@ -4619,12 +4717,13 @@ msgid "Updated!" msgstr "Diweddarwyd!" #: templates/web/base/admin/list_updates.html:2 +#: templates/web/base/dashboard/index.html:108 #: templates/web/base/report/update.html:4 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Diweddariadau" -#: perllib/FixMyStreet/DB/Result/Comment.pm:134 +#: perllib/FixMyStreet/DB/Result/Comment.pm:154 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4679,28 +4778,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1889 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1899 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 #, fuzzy msgid "User added to abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1451 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1561 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1886 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 #, fuzzy msgid "User already in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2013 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 msgid "User flagged" msgstr "" @@ -4714,7 +4813,11 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/report_edit.html:136 +#: templates/web/base/admin/user-alerts.html:2 +msgid "User's alerts" +msgstr "" + +#: templates/web/base/admin/report_edit.html:137 #: templates/web/base/admin/update_edit.html:36 #, fuzzy msgid "User:" @@ -4722,6 +4825,8 @@ msgstr "Defnyddwyr" #: perllib/FixMyStreet/Cobrand/Default.pm:675 #: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 +#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 #: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" @@ -4829,7 +4934,7 @@ msgstr "Rydym ond yn defnyddio eich gwybodaeth bersonol yn unol â'n <a href=\" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:118 +#: templates/web/base/dashboard/index.html:122 msgid "Website" msgstr "" @@ -4874,7 +4979,7 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" -#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 msgid "Within the specified timeframe:" msgstr "" @@ -4894,7 +4999,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:1202 +#: perllib/FixMyStreet/Cobrand/Default.pm:1210 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4902,9 +5007,10 @@ msgstr "Lleoliad anghywir? Cliciwch ar y map eto." #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:131 -#: templates/web/base/admin/report_edit.html:95 +#: templates/web/base/admin/report_edit.html:132 +#: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 +#: templates/web/base/admin/user-alerts.html:21 #: templates/web/base/admin/users.html:32 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 @@ -4981,7 +5087,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:36 +#: templates/web/base/report/new/form_report.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:30 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" @@ -5180,14 +5286,14 @@ msgstr "" msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:973 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:90 -#: perllib/FixMyStreet/DB/Result/Comment.pm:216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:250 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "and a defect raised" msgstr "" @@ -5213,7 +5319,7 @@ msgstr "e.e. '%s' neu '%s'" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:56 +#: templates/web/base/report/new/form_report.html:57 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5287,7 +5393,7 @@ msgstr "allgofnodi" msgid "the database id of the body to associate that user with, e.g. <code>2217</code> for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:14 +#: templates/web/base/report/new/form_report.html:15 msgid "the local council" msgstr "y cyngor lleol" @@ -5329,12 +5435,12 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 #, fuzzy msgid "user not in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 #, fuzzy msgid "user removed from abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" @@ -5416,7 +5522,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/fixmystreet.com/reports/summary.html:153 +#: templates/web/base/reports/index.html:120 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -5443,7 +5549,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/fixmystreet.com/reports/summary.html:168 +#: templates/web/base/reports/index.html:136 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -5533,7 +5639,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/email/default/inactive-account.txt:8 +#: templates/email/default/inactive-account.html:18 #, fuzzy, perl-format msgid "month" msgid_plural "months" @@ -5542,7 +5648,7 @@ msgstr[1] "Mis" msgstr[2] "Mis" msgstr[3] "Mis" -#: templates/email/warwickshire/archive.txt:9 +#: templates/email/bathnes/archive.html:25 #, perl-format msgid "report" msgid_plural "reports" |