diff options
Diffstat (limited to 'locale/cy.UTF-8')
| -rw-r--r-- | locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po | 608 |
1 files changed, 252 insertions, 356 deletions
diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index 14f1829f5..4a46062e7 100644 --- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Welsh (http://www.transifex.com/mysociety/fixmystreet/language/cy/)\n" "Language: cy\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "a" @@ -52,9 +52,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Cyrff" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -62,9 +61,8 @@ msgstr "%s hysbysiad wedi ei gadarnhau, %s heb ei gadarnhau" #: templates/web/base/status/stats.html:27 #: templates/web/zurich/admin/index.html:6 -#, fuzzy msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%s hysbysiad wedi ei gadarnhau, %s heb ei gadarnhau" +msgstr "" #. ("%s is the site name") #: templates/web/base/alert/index.html:7 @@ -90,7 +88,7 @@ msgstr "%s diweddariad byw" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -109,10 +107,6 @@ msgstr "" msgid "%s ward, %s" msgstr "ward %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, adroddwyd am %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, o fewn ward %s" @@ -167,7 +161,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(heb ei anfon at y cyngor)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(dewisol)" @@ -179,12 +173,11 @@ msgstr "(cyhoeddus)" msgid "(sent to both)" msgstr "(anfonwyd i'r ddau)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Dewiswch gategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -216,26 +209,21 @@ msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r adroddiad drwy e-bost msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bost" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Oes</strong>, mae gen i gyfrinair" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Amdanom" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -266,7 +254,7 @@ msgstr "Ychwanegu categori newydd" msgid "Add user" msgstr "Ychwanegu defnyddiwr" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Ychwanegwyd %s" @@ -286,7 +274,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "Analluogwyd yr hysbysiad %d (créwyd %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Rhoi gwybod am ddiweddariadau i ddod" @@ -299,7 +287,7 @@ msgstr "Pob adroddiad" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -398,7 +386,7 @@ msgstr "Yn ôl" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -429,7 +417,7 @@ msgstr "" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -444,7 +432,7 @@ msgstr "Categori" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -464,19 +452,19 @@ msgstr "Categori: %s" msgid "Change password" msgstr "Newid cyfrinair" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -487,7 +475,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." @@ -528,8 +516,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -538,7 +526,7 @@ msgstr "" msgid "Closed" msgstr "Ar gau" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Caewyd gan y cyngor" @@ -564,7 +552,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -583,9 +571,8 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Cadarnhewch drwy e-bost isod, gan ddarparu cyfrinair newydd bryd hynny. Diweddarir eich cyfrinair pan fyddwch yn cadarnhau." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -595,7 +582,7 @@ msgstr "Cadarnhewch drwy e-bost isod, gan ddarparu cyfrinair newydd bryd hynny. msgid "Confirmation" msgstr "" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -614,7 +601,7 @@ msgid "Confirmed:" msgstr "Cadarnhawyd:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -633,8 +620,8 @@ msgstr "Cysylltu â'r tîm" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Methu dod o hyd i'r defnyddiwr" @@ -652,7 +639,7 @@ msgstr "Cyngor" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -671,7 +658,7 @@ msgstr "" msgid "Create a report" msgstr "Creu adroddiad" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Creu categori" @@ -715,20 +702,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Dilëwyd" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -736,7 +723,7 @@ msgid "Description" msgstr "Disgrifiad" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Manylion" @@ -761,11 +748,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -783,8 +770,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Lluosogi" @@ -804,7 +791,7 @@ msgstr "" msgid "Edit" msgstr "Golygu" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Golygu manylion y corff" @@ -834,7 +821,7 @@ msgstr "Golygydd" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -842,11 +829,11 @@ msgstr "Golygydd" msgid "Email" msgstr "E-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Cyfeiriad e-bost:" @@ -858,19 +845,14 @@ msgstr "Crëwyd hysbysiad e-bost" msgid "Email alert deleted" msgstr "Dilëwyd hysbysiad e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Rhoi gwybod i fi am broblemau lleol newydd drwy e-bost" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-bost:" @@ -879,26 +861,6 @@ msgstr "E-bost:" msgid "Email: %s" msgstr "E-bost: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Fflat wag" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Tŷ neu fyngalo gwag" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Swyddfa neu adeilad masnachol arall gwag" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Tafarn neu far gwag" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -942,18 +904,14 @@ msgstr "Rhowch god post, neu enw stryd ac ardal" msgid "Enter a nearby street name and area" msgstr "Rhowch enw stryd ac ardal gerllaw" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Rhowch enw stryd ac ardal gerllaw, cod post neu ardal yn Delhi" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Rhowch gyfrinair" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Rhowch fanylion am y broblem" @@ -979,7 +937,7 @@ msgstr "Cod post enghreifftiol %s" msgid "Examples:" msgstr "Enghraifft:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Esboniwch beth sy'n bod, ble'n union mae'r broblem, ac ers faint o amser mae hi yna..." @@ -1016,19 +974,15 @@ msgstr "Tro cyntaf" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "" @@ -1055,7 +1009,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1077,8 +1031,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1109,18 +1062,18 @@ msgstr "Cwestiynau a ofynnir yn aml" msgid "GeoRSS on Google Maps" msgstr "GeoRSS ar Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Derbyn diweddariadau" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Derbyn diweddariadau am broblemau %s" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1133,7 +1086,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "Mae'n dda gennym glywed y cafodd ei drwsio!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1159,7 +1112,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/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1170,8 +1123,7 @@ msgstr "Cymorth" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Dyma'r mathau o hysbysiadau problemau lleol ar gyfer ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Helo %s" @@ -1187,11 +1139,11 @@ msgstr "Helo %s" msgid "Hidden" msgstr "Cudd" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Cuddio'r hen rai" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Cuddio'r piniau" @@ -1211,10 +1163,6 @@ msgstr "Sut i adrodd problem" msgid "How to send successful reports" msgstr "Sut i anfon adroddiadau llwyddiannus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Yn anffodus, ni allwch gadarnhau adroddiadau heb eu cadarnhau." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1225,7 +1173,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:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1247,7 +1195,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." @@ -1268,7 +1216,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1303,10 +1251,10 @@ msgstr "ID annerbynniol" msgid "Illegal feed selection" msgstr "" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Ar y gweill" @@ -1357,7 +1305,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Dyddiad dod i ben annilys" @@ -1365,16 +1313,16 @@ msgstr "Dyddiad dod i ben annilys" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Dyddiad cychwyn annilys" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "" @@ -1396,7 +1344,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1434,7 +1382,6 @@ msgstr "Wrthi'n llwytho..." #: 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 -#: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Ffrydiau RSS lleol a hysbysiadau e-bost" @@ -1443,11 +1390,11 @@ 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/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Hysbysiadau lleol" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lleoli'r broblem ar fap o'r ardal" @@ -1507,14 +1454,14 @@ msgstr "Mis" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Enw" @@ -1538,8 +1485,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1561,7 +1508,7 @@ msgstr "Problemau <br>newydd" msgid "New body added" msgstr "Ychwanegwyd corff newydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1626,7 +1573,7 @@ msgstr "Nesaf" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "" @@ -1691,8 +1638,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1725,7 +1672,7 @@ msgstr "Nodyn" msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" msgstr "" -#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1739,15 +1686,15 @@ msgstr "Nodyn: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Nawr i gyflwyno eich adroddiad…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Nawr i gyflwyno eich diweddariad…" @@ -1781,8 +1728,8 @@ msgstr "Crynodeb byr" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1817,13 +1764,13 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Neu gallwch danysgrifio i hysbysiad yn seiliedig ar eich ward neu etholaeth:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1848,7 +1795,7 @@ msgstr "Rhiant" msgid "Partial" msgstr "Rhannol" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1857,7 +1804,7 @@ msgid "Password (optional)" msgstr "Cyfrinair (dewisol)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Cyfrinair:" @@ -1865,7 +1812,7 @@ msgstr "Cyfrinair:" msgid "Permalink" msgstr "Dolen barhaol" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Rhif ffôn" @@ -1881,13 +1828,21 @@ msgid "Phone:" msgstr "Ffôn:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Llun" @@ -1911,8 +1866,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1928,16 +1883,16 @@ msgstr "Byddwch yn gwrtais, yn gryno ac yn berthnasol." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1947,7 +1902,7 @@ msgstr "" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1968,11 +1923,10 @@ msgstr "Peidiwch â bod yn sarhaus — byddai sarhau eich cyngor yn dib msgid "Please enter a message" msgstr "Rhowch neges" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Rhowch eich enw" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1986,10 +1940,10 @@ msgstr "Rhowch gyfrinair" msgid "Please enter a subject" msgstr "Rhowch bwnc" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2006,9 +1960,9 @@ msgid "Please enter some details" msgstr "Rhowch fanylion" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2017,7 +1971,7 @@ msgid "Please enter your email" msgstr "Rhowch eich e-bost" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Rhowch eich cyfeiriad e-bost" @@ -2033,7 +1987,7 @@ msgstr "Rhowch eich enw llawn, mae angen y wybodaeth hon ar y cyngor – os na h #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Rhowch eich enw" @@ -2060,7 +2014,7 @@ 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:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Rhowch fanylion am y broblem." @@ -2069,7 +2023,7 @@ msgstr "Rhowch fanylion am y broblem." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2095,16 +2049,16 @@ msgstr "" msgid "Please note:" msgstr "Noder:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Rhowch destun yn ogystal â llun" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 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" @@ -2120,22 +2074,23 @@ 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:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 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:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Uwchlwythwch lun JPEG yn unig" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Ysgrifennwch neges" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Ysgrifennwch eich diweddariad yma" @@ -2166,7 +2121,7 @@ msgstr "" msgid "Previous" msgstr "Blaenorol" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Preifatrwydd" @@ -2176,7 +2131,7 @@ msgstr "Preifatrwydd" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2205,7 +2160,7 @@ msgstr "Anfonwyd y broblem %s at y cyngor" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "" @@ -2217,10 +2172,6 @@ msgstr "" msgid "Problems" msgstr "Problemau" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemau yn yr ardal hon" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemau gerllaw" @@ -2238,13 +2189,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemau yn %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemau yn ward %s" @@ -2263,15 +2212,11 @@ msgstr "Problemau o fewn ffiniau:" msgid "Property address:" msgstr "Cyfeiriad yr eiddo:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Math o eiddo:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Darparu diweddariad" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Mae darparu enw a chyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau." @@ -2305,16 +2250,15 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "Ffrwd RSS" @@ -2342,18 +2286,12 @@ msgstr "Ffrwd RSS %s, o fewn ward %s" msgid "RSS feed of nearby problems" msgstr "Ffrwd RSS o broblemau gerllaw" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Ffrwd RSS o broblemau yn %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Ffrwd RSS o broblemau o fewn ward %s" @@ -2363,14 +2301,13 @@ msgstr "Ffrwd RSS o broblemau o fewn ward %s" msgid "RSS feed of recent local problems" msgstr "Ffrwd RSS o broblemau lleol diweddar" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Derbyn e-bost pan fydd diweddariadau i'r broblem hon." @@ -2406,12 +2343,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2421,7 +2357,7 @@ msgstr "Adrodd problem" msgid "Report abuse" msgstr "Adrodd camddefnydd" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Adroddwyd ar %s" @@ -2436,7 +2372,7 @@ msgstr "Adrodd eich problem" msgid "Report, view, or discuss local problems" msgstr "Adrodd, gweld, neu drafod problemau lleol" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddienw am %s" @@ -2446,7 +2382,7 @@ msgstr "Adroddwyd yn ddienw am %s" msgid "Reported before" msgstr "Adroddwyd eisoes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" @@ -2460,27 +2396,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddwyd yn y categori %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Adroddwyd drwy %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Adroddwyd drwy %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Adroddwyd drwy %s yn y categori %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Adroddwyd drwy %s yn y categori %s am %s" @@ -2501,7 +2437,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Adrodd problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2544,15 +2480,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Cylchdroi i'r chwith" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2567,7 +2503,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2623,7 +2559,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2642,21 +2578,21 @@ msgstr "Rhannu" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Dangos fy enw yn gyhoeddus" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Dangos yr hen rai" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Dangos piniau" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2724,15 +2660,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Dyddiad cychwyn:" @@ -2741,7 +2672,7 @@ msgstr "Dyddiad cychwyn:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Cyflwr" @@ -2754,7 +2685,7 @@ msgstr "Cyflwr" msgid "State:" msgstr "Cyflwr:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2794,10 +2725,10 @@ msgid "Subject:" msgstr "Pwnc:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Cyflwyno" @@ -2825,9 +2756,8 @@ msgstr "Cyflwyno'r holiadur" msgid "Submitted" msgstr "Cyflwynwyd" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Tanysgrifio" @@ -2835,7 +2765,7 @@ msgstr "Tanysgrifio" msgid "Subscribe me to an email alert" msgstr "Tanysgrifio i hysbysiad e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2854,7 +2784,7 @@ msgstr "Crynodeb" msgid "Summary reports" msgstr "Adroddiadau" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Arolwg" @@ -2911,7 +2841,7 @@ msgstr "Diolch am uwchlwytho eich llun. Nawr mae'n rhaid i ni leoli eich problem msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Diolch, mae'n dda gennym glywed y cafodd ei drwsio! Gawn ni ofyn a ydych wedi adrodd problem i gyngor o'r blaen?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Ni uwchlwythwyd y llun yn gywir (%s), ceisiwch eto." @@ -2919,7 +2849,7 @@ msgstr "Ni uwchlwythwyd y llun yn gywir (%s), ceisiwch eto." msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arni." @@ -2929,11 +2859,11 @@ msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arn msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Ailanfonir y broblem nawr." @@ -2945,7 +2875,7 @@ msgstr "Ni ellir gweld yr adroddiad hwnnw ar %s." msgid "That report has been removed from FixMyStreet." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3085,9 +3015,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "Bu problem gyda'r e-bost neu gyfrinair. Os na allwch gofio eich cyfrinair, neu os nad oes un gennych, llenwch ddarn ‘mewngofnodi drwy e-bost’ y ffurflen." @@ -3148,9 +3078,9 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Mae'r wybodaeth hon yn ofynnol" @@ -3163,11 +3093,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "Dyma grynodeb o'r holl adroddiadau ar y wefan hon." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Trwsiwyd y broblem hon" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Ni thrwsiwyd y broblem hon" @@ -3204,7 +3134,7 @@ 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/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Llinell amser" @@ -3249,8 +3179,8 @@ msgstr "Ceisiwch anfon e-bost atom yn uniongyrchol:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Methu trwsio" @@ -3267,7 +3197,7 @@ msgstr "Heb ei gadarnhau" msgid "Unknown" msgstr "Anhysbys" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3282,7 +3212,7 @@ msgstr "Gwall anhysbys" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3334,10 +3264,10 @@ msgstr "" msgid "Updated" msgstr "Diweddarwyd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3364,7 +3294,7 @@ msgstr "Diweddariadau ar {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "Defnyddiwch y <strong>nodyn</strong> i gofnodi manylion a ddangosir yma yn unig. Ni ddangosir nodiadau'n gyhoeddus, ac ni chânt eu hanfon at y corff." @@ -3373,11 +3303,11 @@ msgstr "Defnyddiwch y <strong>nodyn</strong> i gofnodi manylion a ddangosir yma msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3385,16 +3315,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Defnyddwyr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3431,16 +3361,15 @@ msgstr "" #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "(ni ddatgelir eich cyfeiriad e-bost na rhif ffôn)" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Ni ddatgelir eich e-bost" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -3449,7 +3378,7 @@ msgstr "" msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3487,10 +3416,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3510,7 +3435,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Hoffech chi dderbyn holiadur arall ymhen 4 wythnos, i'ch atgoffa i wirio'r statws?" @@ -3540,8 +3465,8 @@ msgstr "Blwyddyn" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" @@ -3655,19 +3580,19 @@ msgid "Your Reports" msgstr "Eich adroddiadau" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Eich e-bost" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3678,17 +3603,17 @@ 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:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Eich enw" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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:34 @@ -3701,20 +3626,19 @@ msgstr "Newidiwyd eich cyfrinair" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Eich rhif ffôn" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Eich adroddiadau" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Eich adroddiadau" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Eich diweddariadau" @@ -3740,7 +3664,7 @@ msgid "didn't use map" msgstr "" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "e.e. '%s' neu '%s'" @@ -3846,8 +3770,7 @@ msgstr "ardaloedd eraill:" msgid "reopened" msgstr "ailagorwyd" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "allgofnodi" @@ -3935,7 +3858,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3989,68 +3912,41 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#~ msgid "(we never show your email)" -#~ msgstr "(ni ddatgelir eich e-bost)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r adroddiad drwy e-bost:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bost:" - -#~ msgid "Email me updates" -#~ msgstr "Anfon diweddariadau ataf drwy e-bost" - -#~ msgid "Enter a new password:" -#~ msgstr "Rhowch gyfrinair newydd:" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Os ydych chi'n defnyddio e-bost drwy'r we neu os oes gennych chi hidlydd sothach, gwiriwch eich plygellau e-bost sothach: o bryd i'w gilydd, deuir o hyd i'n negeseuon yno." - -#~ msgid "Message:" -#~ msgstr "Neges:" - -#~ msgid "More problems nearby" -#~ msgstr "Rhagor o broblemau gerllaw" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Bron yna! Nawr gwiriwch eich e-bost..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Sarhaus? Anaddas? Dywedwch wrthym" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, adroddwyd am %s" -#~ msgid "Photo:" -#~ msgstr "Llun:" +#~ msgid "About us" +#~ msgstr "Amdanom" -#~ msgid "This problem has been closed" -#~ msgstr "Caewyd y broblem hon" +#~ msgid "Email me new local problems" +#~ msgstr "Rhoi gwybod i fi am broblemau lleol newydd drwy e-bost" -#~ msgid "This problem is in progress" -#~ msgstr "Mae'r broblem hon ar y gweill" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Fflat wag" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "mae'r broblem hon yn hen a'i statws yn anhysbys." +#~ msgid "Empty house or bungalow" +#~ msgstr "Tŷ neu fyngalo gwag" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Doedd hi ddim yn bosib i ni gadarnhau eich cyfrif - mae'n ddrwg gennym." +#~ msgid "Empty office or other commercial" +#~ msgstr "Swyddfa neu adeilad masnachol arall gwag" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Rydym wedi anfon e-bost atoch sy'n cynnwys dolen i gadarnhau eich cyfrif." +#~ msgid "Empty pub or bar" +#~ msgstr "Tafarn neu far gwag" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "Carem glywed eich barn am y wefan hon. Llenwch y ffurflen, neu anfonwch e-bost at <a href='mailto:%s'>%s</a>:" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Rydych wedi atodi llun i'r adroddiad hwn eisoes, byddai atodi un arall yn ei amnewid." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Rhowch enw stryd ac ardal gerllaw, cod post neu ardal yn Delhi" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Rydych wedi atodi llun i'r diweddariad hwn eisoes, byddai atodi un arall yn ei amnewid." +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "Your email:" -#~ msgstr "Eich e-bost:" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Yn anffodus, ni allwch gadarnhau adroddiadau heb eu cadarnhau." -#~ msgid "Your name:" -#~ msgstr "Eich enw:" +#~ msgid "Problems in this area" +#~ msgstr "Problemau yn yr ardal hon" -#~ msgid "Your email:" -#~ msgstr "Eich e-bost:" +#~ msgid "Property type:" +#~ msgstr "Math o eiddo:" |