diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2012-03-28 19:25:16 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2012-03-28 19:25:16 +0100 |
| commit | 73dca20252802977159009cfbde992828125e0ae (patch) | |
| tree | 48d75c24d39b7840d32138aa6142fad3a9815c87 /locale/cy_GB.UTF-8 | |
| parent | dcb5ae5447aa7223cc430736025f9ea984846107 (diff) | |
.po updates with new design text.
Diffstat (limited to 'locale/cy_GB.UTF-8')
| -rw-r--r-- | locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 1458 |
1 files changed, 1038 insertions, 420 deletions
diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 0e6f7ecac..a021bf46c 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -10,16 +10,17 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-10-21 15:56+0100\n" +"POT-Creation-Date: 2012-03-28 19:23+0100\n" "PO-Revision-Date: 2009-07-10 14:20-0000\n" "Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n" "Language-Team: mySociety\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: bin/send-reports:183 perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: bin/send-reports:184 perllib/FixMyStreet/DB/Result/Problem.pm:549 msgid " and " msgstr "" @@ -35,7 +36,14 @@ msgstr " a <strong>byddwn nawr yn ei anfon at y cyngor</strong>" #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:23 #: templates/web/default/report/new/councils_text_some.html:5 -#: templates/web/emptyhomes/report/new/all_councils_text.html:2 +#: templates/web/emptyhomes/report/new/councils_text_all.html:2 +#: templates/web/fixmystreet/report/new/councils_text_all.html:10 +#: templates/web/fixmystreet/report/new/councils_text_all.html:3 +#: templates/web/fixmystreet/report/new/councils_text_none.html:12 +#: templates/web/fixmystreet/report/new/councils_text_none.html:15 +#: templates/web/fixmystreet/report/new/councils_text_some.html:20 +#: templates/web/fixmystreet/report/new/councils_text_some.html:23 +#: templates/web/fixmystreet/report/new/councils_text_some.html:5 #, fuzzy msgid " or " msgstr "neu" @@ -108,24 +116,26 @@ msgstr "wythnos" #: templates/web/default/reports/council.html:0 #: templates/web/default/reports/council.html:14 +#: templates/web/emptyhomes/reports/council.html:11 +#: templates/web/emptyhomes/reports/council.html:13 msgid "%s - Summary reports" msgstr "%s - Adroddiadau cryno" -#: perllib/FixMyStreet/Cobrand/Default.pm:844 -#: perllib/FixMyStreet/Cobrand/Default.pm:858 +#: perllib/FixMyStreet/Cobrand/Default.pm:792 +#: perllib/FixMyStreet/Cobrand/Default.pm:806 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:466 +#: perllib/FixMyStreet/DB/Result/Problem.pm:480 msgid "%s, reported anonymously at %s" msgstr "Rhoddodd %s wybod yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:468 +#: perllib/FixMyStreet/DB/Result/Problem.pm:482 msgid "%s, reported by %s at %s" msgstr "Adroddwyd am %s gan %s am %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:875 -#: perllib/FixMyStreet/Cobrand/Default.pm:889 +#: perllib/FixMyStreet/Cobrand/Default.pm:823 +#: perllib/FixMyStreet/Cobrand/Default.pm:837 #, fuzzy msgid "%s, within %s ward" msgstr "Eiddo gwag yn ward %s" @@ -143,24 +153,31 @@ msgstr "" msgid "(Email in abuse table)" msgstr "" -#: templates/web/default/alert/list.html:53 +#: templates/web/default/alert/list.html:51 +#: templates/web/fixmystreet/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" msgstr "(pellter rhagosodedig sy'n cynnwys tua 200,000 o bobl)" -#: templates/web/default/alert/list.html:58 +#: templates/web/default/alert/list.html:56 +#: templates/web/fixmystreet/alert/_list.html:28 msgid "(alternatively the RSS feed can be customised, within" msgstr "(fel arall, gellir addasu'r porthiant RSS yn bersonol, o fewn" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 +#: templates/web/default/reports/council.html:134 +#: templates/web/fixmystreet/around/around_map_list_items.html:12 +#: templates/web/fixmystreet/around/on_map_list_items.html:9 msgid "(returned to use)" msgstr "(wedi'i adfer i'w ddefnyddio)" #: templates/web/default/index.html:12 templates/web/default/index.html:8 +#: templates/web/fixmystreet/index.html:30 msgid " " msgstr " " -#: templates/web/default/reports/council.html:133 +#: templates/web/default/reports/council.html:131 +#: templates/web/default/reports/council.html:152 #, fuzzy msgid "(not sent to council)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -169,7 +186,8 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" msgid "(optional)" msgstr "(dewisol)" -#: templates/web/default/reports/council.html:131 +#: templates/web/default/reports/council.html:130 +#: templates/web/default/reports/council.html:150 #, fuzzy msgid "(sent to both)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -178,24 +196,24 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" msgid "(we never show your email address or phone number)" msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" -#: templates/web/default/report/display.html:217 +#: templates/web/default/report/display.html:214 #, fuzzy msgid "(we never show your email)" msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:281 msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:534 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:566 -#: perllib/FixMyStreet/DB/Result/Problem.pm:314 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:549 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:337 #, fuzzy msgid "-- Pick a category --" msgstr "-- Dewiswch fath o eiddo --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:520 -#: perllib/FixMyStreet/DB/Result/Problem.pm:320 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:535 +#: perllib/FixMyStreet/DB/Result/Problem.pm:343 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -204,16 +222,6 @@ msgstr "-- Dewiswch fath o eiddo --" msgid ". You can <a href=\"%s\">view the empty property on this site</a>." msgstr ". Gallwch <a href=\"%s\">weld yr eiddo gwag ar y safle hwn</a>." -#: templates/web/default/footer.html:13 templates/web/reading/footer.html:16 -msgid "" -"<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height=" -"\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id=" -"\"logoie\"></span></a>" -msgstr "" -"<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height=" -"\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id=" -"\"logoie\"></span></a>" - #: templates/web/default/questionnaire/completed.html:25 #, fuzzy msgid "" @@ -245,7 +253,7 @@ msgstr "" "chyhoeddi</a>?\n" "</p>\n" -#: templates/web/default/questionnaire/index.html:37 +#: templates/web/default/questionnaire/index.html:35 #, fuzzy msgid "" "<p>Getting empty homes back into use can be difficult, but by now a good " @@ -281,7 +289,7 @@ msgstr "" "href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www." "emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" -#: templates/web/default/questionnaire/index.html:28 +#: templates/web/default/questionnaire/index.html:26 #, fuzzy msgid "" "<p>Getting empty homes back into use can be difficult. You shouldn’t " @@ -323,8 +331,10 @@ msgstr "" "mwy o wybodaeth am statws eich eiddo gwag, dewch yn ôl i'r safle\n" "a rhowch ddiweddariad yno.</p>\n" -#: templates/web/default/around/display_location.html:71 -#: templates/web/default/around/display_location.html:73 +#: templates/web/default/around/display_location.html:70 +#: templates/web/default/around/display_location.html:72 +#: templates/web/emptyhomes/around/display_location.html:36 +#: templates/web/emptyhomes/around/display_location.html:38 #, fuzzy msgid "" "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this " @@ -338,6 +348,21 @@ msgstr "" msgid "<strong>%d</strong> live empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:169 +#, fuzzy +msgid "<strong>No</strong> Let me confirm my report by email" +msgstr "Adrodd am eiddo gwag a gweld y rhain" + +#: templates/web/fixmystreet/report/display.html:153 +#, fuzzy +msgid "<strong>No</strong> Let me confirm my update by email" +msgstr "Adrodd am eiddo gwag a gweld y rhain" + +#: templates/web/fixmystreet/auth/general.html:46 +#, fuzzy +msgid "<strong>No</strong> let me sign in by email" +msgstr "Adrodd am eiddo gwag a gweld y rhain" + #: templates/web/default/auth/general.html:55 msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "" @@ -347,35 +372,40 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/default/report/display.html:170 +#: templates/web/default/report/display.html:169 #, fuzzy msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "Adrodd am eiddo gwag a gweld y rhain" #: templates/web/default/auth/general.html:37 -#: templates/web/default/report/display.html:148 +#: templates/web/default/report/display.html:147 #: templates/web/default/report/new/fill_in_details_form.html:140 +#: templates/web/fixmystreet/auth/general.html:32 +#: templates/web/fixmystreet/auth/general.html:34 +#: templates/web/fixmystreet/report/display.html:136 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151 #, fuzzy -msgid "<strong>Yes</strong>, I have a password:" +msgid "<strong>Yes</strong> I have a password" msgstr "Adrodd am eiddo gwag a gweld y rhain" #: templates/web/default/static/about.html:1 #: templates/web/default/static/about.html:3 -#: templates/web/emptyhomes/header.html:31 +#: templates/web/emptyhomes/header.html:29 #: templates/web/emptyhomes/static/about.html:1 #: templates/web/emptyhomes/static/about.html:3 msgid "About us" msgstr "Amdanom ni" -#: templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/council_contacts.html:62 msgid "Add new category" msgstr "" -#: templates/web/default/my/my.html:56 +#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:56 msgid "Added %s" msgstr "" #: templates/web/default/auth/change_password.html:29 +#: templates/web/fixmystreet/auth/change_password.html:29 msgid "Again:" msgstr "" @@ -387,7 +417,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/default/report/display.html:222 +#: templates/web/default/report/display.html:219 +#: templates/web/fixmystreet/report/display.html:193 msgid "Alert me to future updates" msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" @@ -395,29 +426,40 @@ msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" msgid "All" msgstr "" +#: templates/web/default/reports/index.html:3 +#, fuzzy +msgid "All Reports" +msgstr "Adroddiadau" + #: templates/web/default/admin/council_list.html:44 msgid "All confirmed" msgstr "" -#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:28 -#: templates/web/fiksgatami/footer.html:7 templates/web/reading/footer.html:8 +#: templates/web/bromley/footer.html:37 templates/web/default/footer.html:11 +#: templates/web/fiksgatami/footer.html:7 +#: templates/web/fiksgatami/nn/footer.html:7 +#: templates/web/fixmystreet/footer.html:49 +#: templates/web/reading/footer.html:8 msgid "Reports" msgstr "Adroddiadau" #: templates/web/default/report/new/councils_text_some.html:2 +#: templates/web/fixmystreet/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "" #: templates/web/default/report/new/councils_text_all.html:3 #: templates/web/default/report/new/councils_text_all.html:5 +#: templates/web/fixmystreet/report/new/councils_text_all.html:3 +#: templates/web/fixmystreet/report/new/councils_text_all.html:5 #, fuzzy msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " "a relevant local body such as <strong>TfL</strong>, via the London Report-It " "system." msgstr "" -"Bydd yr holl wybodaeth a ddarperir gennych yma'n cael ei hanfon at <strong>%" -"s</strong>.\n" +"Bydd yr holl wybodaeth a ddarperir gennych yma'n cael ei hanfon at <strong>" +"%s</strong>.\n" "Ar y safle, byddwn yn dangos pwnc a manylion yr eiddo gwag,\n" "ynghyd â'ch enw os ydych yn rhoi caniatâd i ni." @@ -425,24 +467,29 @@ msgstr "" #: templates/web/default/report/new/councils_text_all.html:12 #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:13 +#: templates/web/fixmystreet/report/new/councils_text_all.html:10 +#: templates/web/fixmystreet/report/new/councils_text_all.html:12 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8 msgid "" "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" -#: templates/web/emptyhomes/report/new/all_councils_text.html:2 -#: templates/web/emptyhomes/report/new/all_councils_text.html:4 +#: templates/web/emptyhomes/report/new/councils_text_all.html:2 +#: templates/web/emptyhomes/report/new/councils_text_all.html:4 #, fuzzy msgid "" "All the information you provide here will be sent to <strong>%s</strong>. On " "the site, we will show the subject and details of the empty property, plus " "your name if you give us permission." msgstr "" -"Bydd yr holl wybodaeth a ddarperir gennych yma'n cael ei hanfon at <strong>%" -"s</strong>.\n" +"Bydd yr holl wybodaeth a ddarperir gennych yma'n cael ei hanfon at <strong>" +"%s</strong>.\n" "Ar y safle, byddwn yn dangos pwnc a manylion yr eiddo gwag,\n" "ynghyd â'ch enw os ydych yn rhoi caniatâd i ni." -#: templates/web/default/questionnaire/index.html:62 +#: templates/web/default/questionnaire/index.html:60 +#: templates/web/fixmystreet/questionnaire/index.html:54 msgid "An update marked this empty property as returned to use." msgstr "" "Fe wnaeth diweddariad gofnodi bod yr eiddo hwn wedi cael ei adfer i'w " @@ -454,23 +501,27 @@ msgstr "" msgid "Anonymous" msgstr "Di-enw" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:14 #, fuzzy msgid "Anonymous:" msgstr "Di-enw" -#: templates/web/default/footer.html:29 -msgid "" -"Are you a developer? Would you like to contribute to reportemptyhomes.com?" -msgstr "" - #: templates/web/default/footer.html:26 msgid "" -"Are you from a council? Would you like better integration with " +"Are you a <strong>developer</strong>? Would you like to contribute to " "reportemptyhomes.com?" msgstr "" +#: templates/web/fixmystreet/footer.html:18 +msgid "Are you a developer?" +msgstr "" + +#: templates/web/fixmystreet/footer.html:22 +#, fuzzy +msgid "Are you from a council?" +msgstr "Ni roddwyd gwybod i'r cyngor am hyn" + #: templates/web/default/open311/index.html:17 msgid "" "At most %d requests are returned in each query. The returned requests are " @@ -487,11 +538,8 @@ msgstr "" msgid "Ban email address" msgstr "Eich cyfeiriad e-bost:" -#: templates/web/default/footer.html:16 templates/web/reading/footer.html:14 -msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>" -msgstr "" - #: templates/web/fiksgatami/footer.html:16 +#: templates/web/fiksgatami/nn/footer.html:16 msgid "" "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained " "by <a href=\"http://www.nuug.no/\">NUUG</a>" @@ -501,10 +549,19 @@ msgstr "" msgid "By Date" msgstr "" -#: templates/web/default/admin/council_contacts.html:26 +#: templates/web/fixmystreet/around/display_location.html:75 +#: templates/web/fixmystreet/around/display_location.html:77 +#, fuzzy +msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" +msgstr "" +"<small>Os na allwch weld y map, <a href='%s' rel='nofollow'>ewch heibio\n" +" i'r cam hwn</a>.</small>" + +#: templates/web/default/admin/council_contacts.html:31 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 #, fuzzy msgid "Category" msgstr "Categori:" @@ -513,16 +570,16 @@ msgstr "Categori:" msgid "Category fix rate for empty properties > 4 weeks old" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:567 -#: templates/web/default/admin/council_contacts.html:63 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:552 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:582 +#: templates/web/default/admin/council_contacts.html:68 #: templates/web/default/admin/council_edit.html:23 -#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Categori:" -#: bin/send-reports:180 +#: bin/send-reports:181 #, fuzzy msgid "Category: %s" msgstr "Categori:" @@ -530,22 +587,33 @@ msgstr "Categori:" #: templates/web/default/auth/change_password.html:1 #: templates/web/default/auth/change_password.html:3 #: templates/web/default/auth/change_password.html:33 +#: templates/web/fixmystreet/auth/change_password.html:1 +#: templates/web/fixmystreet/auth/change_password.html:3 +#: templates/web/fixmystreet/auth/change_password.html:33 msgid "Change Password" msgstr "" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:24 -#: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:87 +#: templates/web/fixmystreet/around/display_location.html:72 +#, fuzzy +msgid "Click map to report an empty property" +msgstr "Sut i roi gwybod am eiddo gwag" + +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:24 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:81 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:641 #, fuzzy msgid "Closed by council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: templates/web/default/my/my.html:32 +#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:32 #, fuzzy msgid "Closed reports" msgstr "Cuddio hen adroddiadau " @@ -554,8 +622,8 @@ msgstr "Cuddio hen adroddiadau " msgid "Closed:" msgstr "" -#: templates/web/default/around/display_location.html:102 -#: templates/web/default/around/display_location.html:104 +#: templates/web/default/around/display_location.html:101 +#: templates/web/default/around/display_location.html:103 msgid "Closest nearby empty properties <small>(within %skm)</small>" msgstr "Yr eiddo gwag cyfagos agosaf <small>(within %skm)</small>" @@ -579,29 +647,30 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:351 #, fuzzy msgid "Configuration updated" msgstr "Cadarnhau" -#: perllib/FixMyStreet/App/Controller/Admin.pm:359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:361 msgid "Configuration updated - contacts will be generated automatically later" msgstr "" -#: templates/web/default/admin/council_contacts.html:119 +#: templates/web/default/admin/council_contacts.html:124 msgid "Configure Open311" msgstr "" -#: templates/web/default/admin/council_contacts.html:96 +#: templates/web/default/admin/council_contacts.html:101 msgid "Configure Open311 integration" msgstr "" -#: templates/web/default/admin/council_contacts.html:33 +#: templates/web/default/admin/council_contacts.html:38 #, fuzzy msgid "Confirm" msgstr "Cadarnhau" #: templates/web/default/auth/token.html:1 +#: templates/web/fixmystreet/auth/token.html:1 #, fuzzy msgid "Confirm account" msgstr "Cadarnhau" @@ -616,8 +685,8 @@ msgstr "Cadarnhau" msgid "Confirmation" msgstr "Cadarnhau" -#: templates/web/default/admin/council_contacts.html:28 -#: templates/web/default/admin/council_contacts.html:73 +#: templates/web/default/admin/council_contacts.html:33 +#: templates/web/default/admin/council_contacts.html:78 #: templates/web/default/admin/council_edit.html:28 #: templates/web/default/admin/council_edit.html:43 #: templates/web/default/admin/stats.html:5 @@ -632,10 +701,11 @@ msgid "Confirmed:" msgstr "Cadarnhau" #: templates/web/fiksgatami/footer.html:10 +#: templates/web/fiksgatami/nn/footer.html:10 msgid "Contact" msgstr "Cysylltu" -#: templates/web/default/footer.html:17 templates/web/reading/footer.html:15 +#: templates/web/default/footer.html:24 #, fuzzy msgid "Contact reportemptyhomes.com" msgstr "Adroddiadau newydd ar reportemptyhomes.com" @@ -643,16 +713,19 @@ msgstr "Adroddiadau newydd ar reportemptyhomes.com" #: templates/web/default/contact/index.html:1 #: templates/web/default/contact/index.html:2 #: templates/web/default/contact/submit.html:1 +#: templates/web/fixmystreet/contact/index.html:1 +#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Cysylltwch â Ni" #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 +#: templates/web/fixmystreet/contact/index.html:7 msgid "Contact the team" msgstr "Cysylltu â'r tîm" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1105 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 msgid "Could not find user" msgstr "" @@ -664,7 +737,7 @@ msgstr "" msgid "Council" msgstr "cyngor" -#: perllib/FixMyStreet/App/Controller/Admin.pm:977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:979 #: templates/web/default/admin/council_list.html:1 #, fuzzy msgid "Council contacts" @@ -697,7 +770,7 @@ msgstr "Cysylltu" msgid "Create a report" msgstr "Categori:" -#: templates/web/default/admin/council_contacts.html:87 +#: templates/web/default/admin/council_contacts.html:92 #, fuzzy msgid "Create category" msgstr "Categori:" @@ -721,13 +794,18 @@ msgstr "" msgid "Currently has 1+ deleted" msgstr "" -#: templates/web/default/admin/council_contacts.html:29 -#: templates/web/default/admin/council_contacts.html:76 +#: templates/web/default/admin/council_contacts.html:34 +#: templates/web/default/admin/council_contacts.html:81 #: templates/web/default/admin/council_edit.html:29 #: templates/web/default/admin/council_edit.html:44 msgid "Deleted" msgstr "" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 +#, fuzzy +msgid "Details" +msgstr "Manylion:" + #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 msgid "Details:" @@ -738,11 +816,15 @@ msgid "Diligency prize league table" msgstr "" #: templates/web/default/auth/general.html:32 +#: templates/web/fixmystreet/auth/general.html:29 +#: templates/web/fixmystreet/report/display.html:133 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:147 #, fuzzy msgid "Do you have a reportemptyhomes.com password?" msgstr "Diweddariadau i reportemptyhomes.com" -#: templates/web/default/questionnaire/index.html:72 +#: templates/web/default/questionnaire/index.html:70 +#: templates/web/fixmystreet/questionnaire/index.html:64 msgid "Don’t know" msgstr "Ddim yn gwybod" @@ -771,7 +853,7 @@ msgstr "Cyflwyno'ch diweddariad" msgid "Editor" msgstr "" -#: templates/web/default/admin/council_contacts.html:27 +#: templates/web/default/admin/council_contacts.html:32 #: templates/web/default/admin/council_edit.html:42 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 @@ -779,19 +861,21 @@ msgstr "" #: templates/web/default/admin/search_abuse.html:11 #: templates/web/default/admin/search_reports.html:15 #: templates/web/default/admin/search_users.html:13 +#: templates/web/fixmystreet/auth/general.html:20 +#: templates/web/fixmystreet/report/display.html:125 #, fuzzy msgid "Email" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1081 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1080 msgid "Email already in abuse list" msgstr "" -#: templates/web/default/around/display_location.html:84 +#: templates/web/default/around/display_location.html:83 msgid "Email me new local empty properties" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" @@ -799,7 +883,7 @@ msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" msgid "Email me updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: templates/web/default/admin/council_contacts.html:68 +#: templates/web/default/admin/council_contacts.html:73 #: templates/web/default/admin/council_edit.html:26 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 @@ -809,15 +893,15 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "Email:" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:522 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 msgid "Empty flat or maisonette" msgstr "Fflat neu fflat deulawr gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:521 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:536 msgid "Empty house or bungalow" msgstr "Tŷ neu fyngalo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:524 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:539 msgid "Empty office or other commercial" msgstr "Swyddfa wag neu fan masnachol gwag arall" @@ -825,11 +909,11 @@ msgstr "Swyddfa wag neu fan masnachol gwag arall" msgid "Empty property details form" msgstr "Ffurflen manylion eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:525 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:540 msgid "Empty pub or bar" msgstr "Tafarn neu far gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:526 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:541 msgid "Empty public building - school, hospital, etc." msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." @@ -849,6 +933,12 @@ msgstr "" #: templates/web/default/around/around_index.html:10 #: templates/web/default/around/around_index.html:13 #: templates/web/default/index.html:24 templates/web/default/index.html:27 +#: templates/web/emptyhomes/index.html:40 +#: templates/web/emptyhomes/index.html:43 +#: templates/web/fixmystreet/around/around_index.html:10 +#: templates/web/fixmystreet/around/around_index.html:13 +#: templates/web/fixmystreet/index.html:32 +#: templates/web/fixmystreet/index.html:35 msgid "Enter a nearby GB postcode, or street name and area" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw" @@ -858,13 +948,21 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" #: templates/web/default/auth/general.html:64 -#: templates/web/default/report/display.html:177 +#: templates/web/default/report/display.html:176 #: templates/web/default/report/new/fill_in_details_form.html:169 #, fuzzy msgid "Enter a new password:" msgstr "Ychwanegwch neges" -#: templates/web/default/index.html:45 +#: templates/web/fixmystreet/auth/general.html:57 +#: templates/web/fixmystreet/report/display.html:165 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 +#, fuzzy +msgid "Enter a password" +msgstr "Ychwanegwch neges" + +#: templates/web/default/index.html:44 templates/web/emptyhomes/index.html:60 +#: templates/web/fixmystreet/index.html:55 msgid "Enter details of the empty property" msgstr "Rhowch fanylion yr eiddo gwag" @@ -875,10 +973,11 @@ msgstr "Rhowch fanylion yr eiddo gwag" #: templates/web/default/tokens/abuse.html:3 #: templates/web/default/tokens/error.html:1 #: templates/web/default/tokens/error.html:3 +#: templates/web/fixmystreet/auth/token.html:5 msgid "Error" msgstr "Gwall" -#: templates/web/default/admin/council_contacts.html:9 +#: templates/web/default/admin/council_contacts.html:11 #: templates/web/default/admin/council_edit.html:18 msgid "Example postcode %s" msgstr "" @@ -896,21 +995,21 @@ msgstr "" "Rhowch gynnig eto'n ddiweddarach, neu <a href=\"mailto:%s\">anfonwch neges e-" "bost atom</a>i roi gwybod inni." -#: templates/web/default/footer.html:27 -#, fuzzy -msgid "Find out about reportemptyhomes.com for councils" -msgstr "Adroddiadau newydd ar reportemptyhomes.com" - -#: templates/web/default/questionnaire/index.html:81 +#: templates/web/default/questionnaire/index.html:79 +#: templates/web/fixmystreet/questionnaire/index.html:73 msgid "First time" msgstr "Y tro cyntaf" -#: templates/web/default/header.html:29 #: templates/web/fiksgatami/header.html:16 -#: templates/web/reading/header.html:31 +#: templates/web/fiksgatami/nn/header.html:16 msgid "Fix<span id=\"my\">My</span>Street" msgstr "Trwsio<span id=\"my\">Fy</span>Stryd" +#: templates/web/default/header.html:24 +#, fuzzy +msgid "reportemptyhomes.com" +msgstr "reportemptyhomes.com" + #: templates/web/default/admin/header.html:13 #, fuzzy msgid "reportemptyhomes.com admin:" @@ -921,7 +1020,13 @@ msgstr "reportemptyhomes.com" msgid "reportemptyhomes.com administration" msgstr "Diweddariadau i reportemptyhomes.com" +#: templates/web/fixmystreet/static/for_councils.html:1 +#, fuzzy +msgid "reportemptyhomes.com for Councils" +msgstr "Adroddiadau newydd ar reportemptyhomes.com" + #: templates/web/default/alert/index.html:6 +#: templates/web/fixmystreet/alert/index.html:6 msgid "" "reportemptyhomes.com has a variety of RSS feeds and email alerts for local " "empty properties, including\n" @@ -935,7 +1040,8 @@ msgstr "" "bob eiddo gwag\n" "o fewn pellter penodol o leoliad penodol." -#: templates/web/default/alert/list.html:100 +#: templates/web/default/alert/list.html:98 +#: templates/web/fixmystreet/alert/_list.html:69 msgid "" "reportemptyhomes.com sends different categories of empty property\n" "to the appropriate council, so empty properties within the boundary of a " @@ -958,27 +1064,30 @@ msgstr "" "rhanbarth a'r cyngor, ond dim ond yn yr hysbysiad \"O fewn y ffin\" \n" "y bydd yn ymddangos yn achos y cyngor sir." +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:20 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:24 -#: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:87 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:81 msgid "Fixed" msgstr "" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 #, fuzzy msgid "Fixed - Council" msgstr "cyngor" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 #, fuzzy msgid "Fixed - User" msgstr "Cuddio hen adroddiadau " -#: templates/web/default/my/my.html:27 +#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:27 #, fuzzy msgid "Fixed reports" msgstr "Cuddio hen adroddiadau " @@ -1000,7 +1109,9 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/default/reports/council.html:23 +#: templates/web/default/reports/council.html:24 +#: templates/web/default/reports/council.html:87 +#: templates/web/emptyhomes/reports/council.html:19 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1013,6 +1124,8 @@ msgstr "cyngor" #: templates/web/emptyhomes/faq/faq-cy.html:1 #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 +#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmystreet/faq/faq-en-gb.html:1 msgid "Frequently Asked Questions" msgstr "Cwestiynau Cyffredin" @@ -1024,13 +1137,27 @@ msgstr "" msgid "GeoRSS on Google Maps" msgstr "" -#: templates/web/default/alert/list.html:112 +#: templates/web/fixmystreet/report/display.html:28 +#, fuzzy +msgid "Get updates" +msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" + +#: templates/web/default/reports/council.html:72 +#, fuzzy +msgid "Get updates of empty properties in this %s" +msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" + +#: templates/web/default/alert/list.html:110 +#: templates/web/fixmystreet/alert/_list.html:78 msgid "Give me an RSS feed" msgstr "Rhowch borthiant RSS i mi" #: templates/web/default/alert/index.html:24 #: templates/web/default/around/around_index.html:17 -#: templates/web/default/index.html:33 +#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:49 +#: templates/web/fixmystreet/alert/index.html:25 +#: templates/web/fixmystreet/around/around_index.html:20 +#: templates/web/fixmystreet/index.html:42 msgid "Go" msgstr "Ewch" @@ -1043,16 +1170,18 @@ msgstr "Anfon yr holiadur" msgid "Graph of empty property creation by status over time" msgstr "" -#: templates/web/default/reports/index.html:5 +#: templates/web/default/reports/index.html:8 #: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "Mae'r llinellau mewn llwyd yn gynghorau nad ydynt yn bodoli mwyach." -#: templates/web/default/questionnaire/index.html:63 +#: templates/web/default/questionnaire/index.html:61 +#: templates/web/fixmystreet/questionnaire/index.html:55 msgid "Has this empty property been returned to use?" msgstr "A yw'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio?" -#: templates/web/default/questionnaire/index.html:76 +#: templates/web/default/questionnaire/index.html:74 +#: templates/web/fixmystreet/questionnaire/index.html:68 msgid "" "Have you ever reported an empty property to a council before, or is this " "your first time?" @@ -1060,41 +1189,53 @@ msgstr "" "Ydych chi wedi rhoi gwybod i gyngor am eiddo gwag erioed o'r blaen, neu ai " "dyma'ch tro cyntaf?" -#: templates/web/default/footer.html:10 -#: templates/web/emptyhomes/header.html:30 -#: templates/web/fiksgatami/footer.html:9 templates/web/reading/footer.html:10 +#: templates/web/bromley/footer.html:41 templates/web/default/footer.html:15 +#: templates/web/emptyhomes/header.html:28 +#: templates/web/fiksgatami/footer.html:9 +#: templates/web/fiksgatami/nn/footer.html:9 +#: templates/web/fixmystreet/footer.html:53 +#: templates/web/reading/footer.html:10 msgid "FAQs" msgstr "Cwestiynau Cyffredin" -#: templates/web/default/alert/list.html:39 +#: templates/web/default/alert/list.html:37 +#: templates/web/fixmystreet/alert/_list.html:8 msgid "Here are the types of local empty property alerts for ‘%s’." msgstr "" "Dyma'r mathau o hysbysiadau am eiddo gwag lleol ar gyfer ‘%s’." -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/bromley/header.html:46 +#: templates/web/fixmystreet/header.html:46 +msgid "Hi %s" +msgstr "" + +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/admin/update_edit.html:19 #, fuzzy msgid "Hidden" msgstr "Cuddio pinnau" -#: templates/web/default/around/display_location.html:54 +#: templates/web/default/around/display_location.html:58 +#: templates/web/fixmystreet/around/display_location.html:58 +msgid "Hide old" +msgstr "" + +#: templates/web/default/around/display_location.html:53 +#: templates/web/fixmystreet/around/display_location.html:54 msgid "Hide pins" msgstr "Cuddio pinnau" -#: templates/web/default/around/display_location.html:59 -msgid "Hide stale reports" -msgstr "Cuddio hen adroddiadau " - #: templates/web/default/admin/council_edit.html:38 msgid "History" msgstr "" -#: templates/web/default/index.html:40 +#: templates/web/default/index.html:39 templates/web/emptyhomes/index.html:55 +#: templates/web/fixmystreet/index.html:50 msgid "How to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:587 +#: perllib/FixMyStreet/App/Controller/Admin.pm:592 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1128,13 +1269,15 @@ msgstr "" #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:12 +#: templates/web/fixmystreet/report/new/councils_text_none.html:10 +#: templates/web/fixmystreet/report/new/councils_text_none.html:9 msgid "" "If you submit an empty property here the subject and details of the empty " "property will be public, but the empty property will <strong>not</strong> be " "reported to the council." msgstr "" -#: templates/web/emptyhomes/report/new/no_councils_text.html:9 +#: templates/web/emptyhomes/report/new/councils_text_none.html:9 #, fuzzy msgid "" "If you submit a report here it will be left on the site, but not reported to " @@ -1150,13 +1293,15 @@ msgstr "" #: templates/web/default/auth/token.html:23 #: templates/web/default/email_sent.html:24 +#: templates/web/fixmystreet/auth/token.html:23 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 "" -#: templates/web/default/questionnaire/index.html:85 +#: templates/web/default/questionnaire/index.html:83 +#: templates/web/fixmystreet/questionnaire/index.html:77 msgid "" "If you wish to leave a public update on the empty property, please enter it " "here\n" @@ -1173,14 +1318,16 @@ msgstr "" msgid "Illegal ID" msgstr "ID Anghyfreithlon" -#: perllib/FixMyStreet/App/Controller/Alert.pm:102 +#: perllib/FixMyStreet/App/Controller/Alert.pm:100 msgid "Illegal feed selection" msgstr "Dewis porthiant annilys" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:24 -#: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:87 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:81 msgid "In Progress" msgstr "" @@ -1192,9 +1339,9 @@ msgid "" "present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/default/around/display_location.html:61 -msgid "Include stale reports" -msgstr "Cynnwys hen adroddiadau" +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:29 +msgid "In progress" +msgstr "" #: templates/web/default/admin/stats.html:76 #, fuzzy @@ -1209,7 +1356,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:897 +#: perllib/FixMyStreet/App/Controller/Admin.pm:899 #, fuzzy msgid "Invalid end date" msgstr "Rhowch ddiweddariad" @@ -1218,14 +1365,16 @@ msgstr "Rhowch ddiweddariad" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:887 +#: perllib/FixMyStreet/App/Controller/Admin.pm:889 msgid "Invalid start date" msgstr "" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:23 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/report/display.html:84 #: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:80 #, fuzzy msgid "Investigating" msgstr "Mordwyo " @@ -1255,12 +1404,15 @@ msgstr "" "fel y gallwch weld beth sy'n digwydd." #: templates/web/default/auth/general.html:44 -#: templates/web/default/report/display.html:157 +#: templates/web/default/report/display.html:156 #: templates/web/default/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/report/display.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:164 msgid "Keep me signed in on this computer" msgstr "" -#: templates/web/default/admin/council_contacts.html:30 +#: templates/web/default/admin/council_contacts.html:35 msgid "Last editor" msgstr "" @@ -1273,16 +1425,17 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "Last update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:983 +#: perllib/FixMyStreet/App/Controller/Admin.pm:985 msgid "List Flagged" msgstr "" -#: templates/web/default/admin/council_contacts.html:11 +#: templates/web/default/admin/council_contacts.html:13 #, fuzzy msgid "List all reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" #: templates/web/default/report/new/fill_in_details_form.html:68 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 msgid "Loading..." msgstr "" @@ -1295,6 +1448,15 @@ msgstr "" #: templates/web/default/alert/updates.html:1 #: templates/web/default/tokens/confirm_alert.html:1 #: templates/web/default/tokens/confirm_alert.html:3 +#: templates/web/emptyhomes/alert/index.html:1 +#: templates/web/emptyhomes/alert/index.html:3 +#: templates/web/fixmystreet/alert/choose.html:1 +#: templates/web/fixmystreet/alert/choose.html:3 +#: templates/web/fixmystreet/alert/index.html:1 +#: templates/web/fixmystreet/alert/index.html:3 +#: templates/web/fixmystreet/alert/list.html:1 +#: templates/web/fixmystreet/alert/list.html:5 +#: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" @@ -1302,16 +1464,24 @@ msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" #: templates/web/default/alert/list.html:12 #: templates/web/default/alert/list.html:14 #: templates/web/default/alert/list.html:3 +#: templates/web/fixmystreet/alert/list.html:1 +#: templates/web/fixmystreet/alert/list.html:12 +#: templates/web/fixmystreet/alert/list.html:14 +#: templates/web/fixmystreet/alert/list.html:3 #, fuzzy msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" -#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:29 -#: templates/web/fiksgatami/footer.html:8 templates/web/reading/footer.html:9 +#: templates/web/bromley/footer.html:39 templates/web/default/footer.html:13 +#: templates/web/fiksgatami/footer.html:8 +#: templates/web/fiksgatami/nn/footer.html:8 +#: templates/web/fixmystreet/footer.html:51 +#: templates/web/reading/footer.html:9 msgid "Get local reports" msgstr "Gweld adroddiadau lleol" -#: templates/web/default/index.html:44 +#: templates/web/default/index.html:43 templates/web/emptyhomes/index.html:59 +#: templates/web/fixmystreet/index.html:54 msgid "Locate the empty property on a map of the area" msgstr "Chwiliwch am leoliad yr eiddo gwag ar fap o'r ardal" @@ -1322,6 +1492,11 @@ msgid "" "licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "" +#: templates/web/fixmystreet/contact/index.html:86 +#, fuzzy +msgid "Message" +msgstr "Neges:" + #: templates/web/default/contact/index.html:90 msgid "Message:" msgstr "Neges:" @@ -1344,9 +1519,14 @@ msgstr "Mwy o eiddo gwag cyfagos" #: templates/web/default/admin/list_updates.html:7 #: templates/web/default/admin/search_reports.html:14 #: templates/web/default/admin/search_users.html:12 -#: templates/web/default/reports/index.html:10 +#: templates/web/default/reports/index.html:15 #: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 +#: templates/web/fixmystreet/auth/general.html:52 +#: templates/web/fixmystreet/report/display.html:181 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:114 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 msgid "Name" msgstr "Enw" @@ -1356,7 +1536,8 @@ msgstr "Enw" msgid "Name:" msgstr "Enw:" -#: templates/web/default/footer.html:4 templates/web/fiksgatami/footer.html:3 +#: templates/web/fiksgatami/footer.html:3 +#: templates/web/fiksgatami/nn/footer.html:3 #: templates/web/reading/footer.html:4 msgid "Navigation" msgstr "Mordwyo " @@ -1367,24 +1548,36 @@ msgid "" "using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:564 +#: perllib/FixMyStreet/Cobrand/Default.pm:480 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:553 -#: perllib/FixMyStreet/Cobrand/Default.pm:588 +#: perllib/FixMyStreet/Cobrand/Default.pm:469 +#: perllib/FixMyStreet/Cobrand/Default.pm:520 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" msgstr "" +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:242 +msgid "" +"Nearest road to the pin placed on the map (automatically generated by Bing " +"Maps): %s\n" +"\n" +msgstr "" + #: templates/web/default/email_sent.html:20 msgid "Nearly Done! Now check your email..." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:309 +#: templates/web/default/reports/index.html:16 +#, fuzzy +msgid "New <br>empty properties" +msgstr "Adroddiadau newydd am eiddo gwag" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 msgid "New category contact added" msgstr "" @@ -1397,10 +1590,8 @@ msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com" msgid "New local reports on reportemptyhomes.com" msgstr "Adroddiadau lleol newydd ar reportemptyhomes.com" -#: templates/web/default/reports/council.html:92 -#: templates/web/default/reports/council.html:93 -#: templates/web/default/reports/index.html:11 #: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/fiksgatami/nn/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:10 msgid "New empty property reports" msgstr "Adroddiadau newydd am eiddo gwag" @@ -1463,24 +1654,27 @@ msgstr "Adroddiadau newydd o fewn ffin {{NAME}} ar reportemptyhomes.com" msgid "New state" msgstr "" -#: templates/web/default/front/news.html:8 #: templates/web/fiksgatami/front/news.html:9 +#: templates/web/fiksgatami/nn/front/news.html:9 +#: templates/web/fixmystreet/front/news.html:8 msgid "New!" msgstr "Newydd!" -#: templates/web/default/admin/council_contacts.html:39 -#: templates/web/default/admin/council_contacts.html:40 +#: templates/web/default/admin/council_contacts.html:44 +#: templates/web/default/admin/council_contacts.html:45 #: templates/web/default/admin/council_edit.html:4 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 -#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/default/admin/report_edit.html:40 #: templates/web/default/admin/update_edit.html:16 #: templates/web/default/questionnaire/creator_fixed.html:16 -#: templates/web/default/questionnaire/index.html:109 -#: templates/web/default/questionnaire/index.html:70 +#: templates/web/default/questionnaire/index.html:107 +#: templates/web/default/questionnaire/index.html:68 +#: templates/web/fixmystreet/questionnaire/index.html:101 +#: templates/web/fixmystreet/questionnaire/index.html:62 msgid "No" msgstr "Nac ydw" @@ -1490,7 +1684,7 @@ msgstr "Nac ydw" msgid "No council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:297 +#: perllib/FixMyStreet/DB/Result/Problem.pm:320 msgid "No council selected" msgstr "Ni ddewiswyd cyngor" @@ -1512,10 +1706,12 @@ msgid "No info at all" msgstr "" #: templates/web/default/around/around_map_list_items.html:15 +#: templates/web/fixmystreet/around/around_map_list_items.html:24 msgid "No empty properties found." msgstr "Ni ddaethpwyd o hyd i unrhyw eiddo gwag." #: templates/web/default/around/on_map_list_items.html:12 +#: templates/web/fixmystreet/around/on_map_list_items.html:21 msgid "No empty properties have been reported yet." msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag." @@ -1531,10 +1727,12 @@ msgid "Not reported before" msgstr "Wedi adrodd o'r blaen" #: templates/web/default/report/_main.html:9 +#: templates/web/emptyhomes/report/display.html:24 +#: templates/web/fixmystreet/report/_main.html:11 msgid "Not reported to council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: templates/web/default/admin/council_contacts.html:31 +#: templates/web/default/admin/council_contacts.html:36 #: templates/web/default/admin/council_edit.html:46 #, fuzzy msgid "Note" @@ -1547,7 +1745,7 @@ msgid "" "numbers may jump about a little" msgstr "" -#: templates/web/default/admin/council_contacts.html:80 +#: templates/web/default/admin/council_contacts.html:85 #: templates/web/default/admin/council_edit.html:31 #, fuzzy msgid "Note:" @@ -1557,34 +1755,37 @@ msgstr "Nac ydw" msgid "Note: <strong>%s</strong>" msgstr "" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +msgid "Now to submit your report…" +msgstr "" + #: templates/web/default/report/new/fill_in_details_form.html:131 msgid "" "Now to submit your report… do you have a reportemptyhomes.com " "password?" msgstr "" -#: templates/web/default/report/display.html:139 +#: templates/web/fixmystreet/report/display.html:132 +msgid "Now to submit your update…" +msgstr "" + +#: templates/web/default/report/display.html:138 msgid "" "Now to submit your update… do you have a reportemptyhomes.com " "password?" msgstr "" #: templates/web/default/report/display.html:26 -#: templates/web/default/report/updates.html:23 +#: templates/web/default/report/update.html:16 msgid "Offensive? Unsuitable? Tell us" msgstr "Sarhaus? Anaddas? Rhowch wybod i ni" -#: templates/web/default/reports/council.html:115 -#: templates/web/default/reports/council.html:116 -msgid "Old returned to use" -msgstr "Hen wedi'i adfer i'w ddefnyddio" - -#: templates/web/default/reports/council.html:109 -#: templates/web/default/reports/council.html:110 -msgid "Old empty properties, state unknown" -msgstr "Eiddo gwag hen, nid yw eu cyflwr yn hysbys" +#: templates/web/default/reports/index.html:18 +#, fuzzy +msgid "Old / unknown <br>empty properties" +msgstr "ID eiddo gwag anhysbys" -#: templates/web/default/reports/index.html:13 +#: templates/web/fiksgatami/nn/reports/index.html:12 #: templates/web/fiksgatami/reports/index.html:12 msgid "Old empty properties,<br>state unknown" msgstr "Hen eiddo gwag,<br>cyflwr anhysbys" @@ -1593,29 +1794,36 @@ msgstr "Hen eiddo gwag,<br>cyflwr anhysbys" msgid "Old state" msgstr "" -#: templates/web/default/reports/index.html:15 +#: templates/web/default/reports/index.html:20 +#, fuzzy +msgid "Older <br>returned to use" +msgstr "Wedi'u hadfer i'w defnyddio ers amser" + +#: templates/web/default/reports/index.html:17 +#, fuzzy +msgid "Older <br>empty properties" +msgstr "Adroddiadau hŷn o eiddo gwag" + #: templates/web/emptyhomes/reports/index.html:14 +#: templates/web/fiksgatami/nn/reports/index.html:14 #: templates/web/fiksgatami/reports/index.html:14 msgid "Older returned to use" msgstr "Wedi'u hadfer i'w defnyddio ers amser" -#: templates/web/default/reports/council.html:101 -#: templates/web/default/reports/council.html:105 -#: templates/web/default/reports/council.html:106 -#: templates/web/default/reports/council.html:99 -#: templates/web/default/reports/index.html:12 #: templates/web/emptyhomes/reports/index.html:12 +#: templates/web/fiksgatami/nn/reports/index.html:11 #: templates/web/fiksgatami/reports/index.html:11 msgid "Older empty property reports" msgstr "Adroddiadau hŷn o eiddo gwag" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/update_edit.html:19 -#: templates/web/default/report/display.html:85 +#: templates/web/default/report/display.html:84 +#: templates/web/fixmystreet/report/display.html:79 msgid "Open" msgstr "" -#: templates/web/default/my/my.html:22 +#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:22 #, fuzzy msgid "Open reports" msgstr "Cuddio hen adroddiadau " @@ -1633,11 +1841,13 @@ msgstr "" msgid "Open311 specification" msgstr "" -#: templates/web/default/alert/list.html:87 +#: templates/web/default/alert/list.html:85 +#: templates/web/fixmystreet/alert/_list.html:56 msgid "Or empty properties reported to:" msgstr "Neu eiddo gwag y rhoddwyd gwybod amdanynt i:" -#: templates/web/default/alert/list.html:63 +#: templates/web/default/alert/list.html:61 +#: templates/web/fixmystreet/alert/_list.html:33 msgid "" "Or you can subscribe to an alert based upon what ward or council you’" "re in:" @@ -1645,18 +1855,18 @@ msgstr "" "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " "byw ynddo:" -#: bin/send-reports:175 bin/send-reports:184 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:553 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:566 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:969 -#: perllib/FixMyStreet/DB/Result/Problem.pm:475 -#: perllib/FixMyStreet/DB/Result/Problem.pm:485 -#: perllib/FixMyStreet/DB/Result/Problem.pm:495 -#: perllib/FixMyStreet/DB/Result/Problem.pm:507 +#: bin/send-reports:176 bin/send-reports:185 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:568 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:581 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 +#: perllib/FixMyStreet/DB/Result/Problem.pm:489 +#: perllib/FixMyStreet/DB/Result/Problem.pm:499 +#: perllib/FixMyStreet/DB/Result/Problem.pm:509 +#: perllib/FixMyStreet/DB/Result/Problem.pm:521 msgid "Other" msgstr "Arall" -#: templates/web/default/footer.html:30 +#: templates/web/default/footer.html:27 msgid "" "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet" "\">available on GitHub</a>." @@ -1672,65 +1882,103 @@ msgstr "Arall" msgid "Page Not Found" msgstr "" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 msgid "Partial" msgstr "" +#: templates/web/fixmystreet/auth/general.html:55 +#: templates/web/fixmystreet/report/display.html:162 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#, fuzzy +msgid "Password (optional)" +msgstr "(dewisol)" + #: templates/web/default/auth/change_password.html:25 +#: templates/web/fixmystreet/auth/change_password.html:25 msgid "Password:" msgstr "" -#: bin/send-reports:69 templates/web/default/admin/report_edit.html:32 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:188 +#, fuzzy +msgid "Phone number (optional)" +msgstr "(dewisol)" + +#: bin/send-reports:70 templates/web/default/admin/report_edit.html:32 #: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" msgstr "Rhif ffôn:" -#: templates/web/default/questionnaire/index.html:97 -#: templates/web/default/report/display.html:115 +#: templates/web/fixmystreet/report/display.html:108 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:108 +#, fuzzy +msgid "Photo" +msgstr "Ffotograff:" + +#: templates/web/default/questionnaire/index.html:95 +#: templates/web/default/report/display.html:114 #: templates/web/default/report/new/fill_in_details_form.html:102 +#: templates/web/fixmystreet/questionnaire/index.html:90 msgid "Photo:" msgstr "Ffotograff:" -#: templates/web/default/alert/list.html:29 +#: templates/web/default/alert/list.html:27 +#: templates/web/fixmystreet/alert/list.html:27 msgid "Photos of recent nearby reports" msgstr "Ffotograffau o adroddiadau cyfagos diweddar" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:23 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/report/display.html:84 #: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:80 msgid "Planned" msgstr "" +#: templates/web/fixmystreet/questionnaire/index.html:44 +#, fuzzy +msgid "" +"Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates " +"that have been left." +msgstr "Ewch i fwrw golwg ar y diweddariadau sydd wedi cael eu gadael." + #: templates/web/default/report/new/notes.html:6 +#: templates/web/fixmystreet/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:17 +#: templates/web/fixmystreet/auth/change_password.html:12 +#: templates/web/fixmystreet/auth/change_password.html:17 msgid "Please check the passwords and try again" msgstr "" #: templates/web/default/auth/token.html:17 +#: templates/web/fixmystreet/auth/token.html:17 #, fuzzy msgid "Please check your email" msgstr "Rhowch eich cyfeiriad e-bost" #: templates/web/default/auth/general.html:14 #: templates/web/default/auth/general.html:8 +#: templates/web/fixmystreet/auth/general.html:15 +#: templates/web/fixmystreet/auth/general.html:9 #, fuzzy msgid "Please check your email address is correct" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:741 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 -#: perllib/FixMyStreet/DB/Result/Problem.pm:316 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:739 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:758 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:795 +#: perllib/FixMyStreet/DB/Result/Problem.pm:339 +#: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Dewiswch gategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:322 +#: perllib/FixMyStreet/DB/Result/Problem.pm:345 msgid "Please choose a property type" msgstr "Dewiswch fath o eiddo" @@ -1750,36 +1998,44 @@ msgstr "" "dilynwch y cyfarwyddiadau." #: templates/web/default/report/new/notes.html:7 +#: templates/web/fixmystreet/report/new/notes.html:6 msgid "" "Please do not be abusive — abusing your council devalues the service " "for all users." msgstr "" #: perllib/FixMyStreet/DB/Result/Comment.pm:113 +#: templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" msgstr "Ychwanegwch neges" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:15 +#: templates/web/fixmystreet/auth/change_password.html:12 +#: templates/web/fixmystreet/auth/change_password.html:15 #, fuzzy msgid "Please enter a password" msgstr "Ychwanegwch neges" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:291 +#: perllib/FixMyStreet/DB/Result/Problem.pm:314 +#: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Rhowch enw'r pwnc" #: perllib/FixMyStreet/DB/Result/User.pm:96 +#: templates/web/default/js/validation_strings.html:12 +#: templates/web/default/js/validation_strings.html:16 msgid "Please enter a valid email" msgstr "Cofnodwch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Alert.pm:345 +#: perllib/FixMyStreet/App/Controller/Alert.pm:342 #: perllib/FixMyStreet/App/Controller/Contact.pm:107 msgid "Please enter a valid email address" msgstr "Cofnodwch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/DB/Result/Problem.pm:294 +#: perllib/FixMyStreet/DB/Result/Problem.pm:317 +#: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Cofnodwch fanylion" @@ -1787,21 +2043,33 @@ msgstr "Cofnodwch fanylion" #: perllib/FixMyStreet/DB/Result/User.pm:93 #: templates/web/default/auth/general.html:13 #: templates/web/default/auth/general.html:8 +#: templates/web/default/js/validation_strings.html:11 +#: templates/web/default/js/validation_strings.html:15 +#: templates/web/fixmystreet/auth/general.html:14 +#: templates/web/fixmystreet/auth/general.html:9 msgid "Please enter your email" msgstr "Cofnodwch eich cyfeiriad e-bost" -#: perllib/FixMyStreet/DB/Result/Problem.pm:309 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:143 +#, fuzzy +msgid "Please enter your email address" +msgstr "Cofnodwch eich cyfeiriad e-bost" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:332 +#: templates/web/default/js/validation_strings.html:7 +#, fuzzy msgid "" -"Please enter your full name - if you do not wish your name to be shown on " -"the site, untick the box" +"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 "" "Cofnodwch eich enw llawn - os nad ydych yn dymuno bod eich enw'n cael ei " "ddangos ar y safle, cliciwch i ddileu'r tic o'r bocs" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 #: perllib/FixMyStreet/DB/Result/Comment.pm:110 -#: perllib/FixMyStreet/DB/Result/Problem.pm:302 +#: perllib/FixMyStreet/DB/Result/Problem.pm:325 #: perllib/FixMyStreet/DB/Result/User.pm:89 +#: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" msgstr "Cofnodwch eich enw" @@ -1827,6 +2095,8 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:11 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:11 msgid "Please fill in details of the empty property below." msgstr "Llenwch fanylion yr eiddo gwag isod." @@ -1842,7 +2112,13 @@ msgid "" "photo of the empty property if you have one), etc." msgstr "" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:68 +#, fuzzy +msgid "Please fill in details of the empty property." +msgstr "Llenwch fanylion yr eiddo gwag isod." + #: templates/web/default/report/new/fill_in_details_form.html:27 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:34 #, fuzzy msgid "" "Please fill in the form below with details of the empty property, and " @@ -1851,11 +2127,12 @@ msgstr "" "Llenwch y ffurflen isod gyda manylion yr eiddo gwag,\n" "a disgrifiwch y lleoliad mor fanwl ag y bo modd yn y blwch manylion." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Nodwch a fyddech chi'n hoffi derbyn holiadur arall" -#: templates/web/default/report/display.html:62 +#: templates/web/default/report/display.html:61 +#: templates/web/fixmystreet/report/display.html:59 msgid "" "Please note that updates are not sent to the council. If you leave your name " "it will be public. Your information will only be used in accordance with our " @@ -1863,25 +2140,27 @@ msgid "" msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:5 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:25 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." msgstr "" #: templates/web/default/report/new/notes.html:1 +#: templates/web/fixmystreet/report/new/notes.html:1 msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Rhowch ychydig o esboniad pam rydych yn ailagor yr adroddiad hwn" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please provide some text as well as a photo" msgstr "Rhowch rywfaint o destun yn ogystal â ffotograff" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:237 msgid "" "Please say whether you've ever reported an empty property to your council " "before" @@ -1889,24 +2168,24 @@ msgstr "" "Rhowch wybod a ydych chi wedi rhoi gwybod i'ch cyngor am eiddo gwag erioed " "o'r blaen" -#: perllib/FixMyStreet/App/Controller/Alert.pm:82 +#: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" msgstr "Dewiswch y porthiant rydych chi eisiau ei gael" -#: perllib/FixMyStreet/App/Controller/Alert.pm:120 +#: perllib/FixMyStreet/App/Controller/Alert.pm:118 msgid "Please select the type of alert you want" msgstr "Dewiswch y math o hysbysiad rydych chi eisiau ei gael" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:233 msgid "Please state whether or not the empty property has been returned to use" msgstr "" "Cofnodwch a yw'r eiddo gwag wedi cael ei adfer i'w ddefnyddio, ai peidio" -#: templates/web/default/questionnaire/index.html:52 +#: templates/web/default/questionnaire/index.html:50 msgid "Please take a look at the updates that have been left." msgstr "Ewch i fwrw golwg ar y diweddariadau sydd wedi cael eu gadael." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:830 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:843 msgid "Please upload a JPEG image only" msgstr "Dim ond llun JPEG y dylech lwytho i fyny." @@ -1914,27 +2193,36 @@ msgstr "Dim ond llun JPEG y dylech lwytho i fyny." msgid "Please write a message" msgstr "Ysgrifennwch neges" +#: templates/web/fixmystreet/report/display.html:74 +#, fuzzy +msgid "Please write your update here" +msgstr "Rhowch eich enw" + #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:125 -#: templates/web/default/report/display.html:162 -#: templates/web/default/report/display.html:184 +#: templates/web/default/report/display.html:124 +#: templates/web/default/report/display.html:161 +#: templates/web/default/report/display.html:183 +#: templates/web/fixmystreet/contact/index.html:93 +#: templates/web/fixmystreet/report/display.html:120 +#: templates/web/fixmystreet/report/display.html:144 +#: templates/web/fixmystreet/report/display.html:166 msgid "Post" msgstr "Postio" -#: templates/web/default/report/updates.html:8 +#: templates/web/default/report/updates.html:14 msgid "Posted anonymously at %s" msgstr "Cofnodwyd yn ddi-enw am %s" -#: templates/web/default/report/updates.html:11 +#: templates/web/default/report/updates.html:17 #, fuzzy msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Cofnodwyd gan %s am %s" -#: templates/web/default/report/updates.html:13 +#: templates/web/default/report/updates.html:19 msgid "Posted by %s at %s" msgstr "Cofnodwyd gan %s am %s" -#: templates/web/default/maps/openlayers.html:89 +#: templates/web/default/maps/openlayers.html:85 msgid "Empty property" msgstr "Eiddo gwag" @@ -1958,7 +2246,7 @@ msgstr "Eiddo gwag yn %s" msgid "Empty property breakdown by state" msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:774 +#: perllib/FixMyStreet/App/Controller/Admin.pm:776 #, fuzzy msgid "Empty property marked as open." msgstr "Ffurflen manylion eiddo gwag" @@ -1972,10 +2260,21 @@ msgstr "" msgid "Empty properties" msgstr "Eiddo gwag" -#: templates/web/default/around/display_location.html:80 +#: templates/web/default/around/display_location.html:79 msgid "Empty properties in this area" msgstr "Eiddo gwag yn yr ardal hon" +#: templates/web/fixmystreet/around/display_location.html:93 +#: templates/web/fixmystreet/report/display.html:29 +#, fuzzy +msgid "Empty properties nearby" +msgstr "Mwy o eiddo gwag cyfagos" + +#: templates/web/fixmystreet/around/display_location.html:92 +#, fuzzy +msgid "Empty properties on the map" +msgstr "Eiddo gwag yn yr ardal hon" + #: db/alert_types.pl:14 #, fuzzy msgid "" @@ -1984,28 +2283,30 @@ msgstr "" "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael " "eu hadfer i'w defnyddio" -#: templates/web/default/alert/list.html:52 +#: templates/web/default/alert/list.html:50 +#: templates/web/fixmystreet/alert/_list.html:21 #, fuzzy msgid "Empty properties within %.1fkm of this location" msgstr "Eiddo gwag o fewn %skm o'r lleoliad hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:800 +#: perllib/FixMyStreet/Cobrand/Default.pm:748 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:177 msgid "Empty properties within %s" msgstr "Eiddo gwag yn %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:809 +#: perllib/FixMyStreet/Cobrand/Default.pm:757 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:170 msgid "Empty properties within %s ward" msgstr "Eiddo gwag yn ward %s" #: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:16 +#: templates/web/default/reports/council.html:17 msgid "Empty properties within %s, reportemptyhomes.com" msgstr "Eiddo gwag o fewn %s, reportemptyhomes.com" -#: templates/web/default/alert/list.html:69 +#: templates/web/default/alert/list.html:67 +#: templates/web/fixmystreet/alert/_list.html:38 msgid "Empty properties within the boundary of:" msgstr "Eiddo gwag o fewn ffiniau:" @@ -2015,16 +2316,24 @@ msgstr "" "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael " "eu hadfer i'w defnyddio" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:528 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:543 msgid "Property type:" msgstr "Math o eiddo:" -#: templates/web/default/report/display.html:57 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 +#, fuzzy +msgid "Provide a title" +msgstr "Rhowch ddiweddariad" + +#: templates/web/default/report/display.html:56 +#: templates/web/fixmystreet/report/display.html:55 msgid "Provide an update" msgstr "Rhowch ddiweddariad" -#: templates/web/default/report/display.html:181 +#: templates/web/default/report/display.html:180 #: templates/web/default/report/new/fill_in_details_form.html:173 +#: templates/web/fixmystreet/report/display.html:159 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:185 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report empty properties, leave updates and manage your reports." @@ -2035,6 +2344,10 @@ msgstr "" #: templates/web/default/questionnaire/index.html:0 #: templates/web/default/questionnaire/index.html:14 #: templates/web/default/questionnaire/index.html:4 +#: templates/web/fixmystreet/questionnaire/index.html:0 +#: templates/web/fixmystreet/questionnaire/index.html:15 +#: templates/web/fixmystreet/questionnaire/index.html:3 +#: templates/web/fixmystreet/questionnaire/index.html:32 msgid "Questionnaire" msgstr "Holiadur" @@ -2052,28 +2365,38 @@ msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" msgid "Questionnaire filled in by empty property reporter" msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" -#: templates/web/default/alert/list.html:54 +#: templates/web/fixmystreet/static/for_councils_faq.html:1 +#, fuzzy +msgid "Questions and Answers :: reportemptyhomes.com for Councils" +msgstr "Adroddiadau newydd ar reportemptyhomes.com" + +#: templates/web/default/alert/list.html:52 #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:3 -#: templates/web/default/report/display.html:48 -#: templates/web/default/reports/council.html:61 +#: templates/web/default/report/display.html:47 +#: templates/web/default/reports/council.html:79 +#: templates/web/fixmystreet/alert/_list.html:22 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/around/display_location.html:1 +#: templates/web/fixmystreet/around/display_location.html:3 +#: templates/web/fixmystreet/report/display.html:35 msgid "RSS feed" msgstr "Porthiant RSS" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:786 +#: perllib/FixMyStreet/Cobrand/Default.pm:800 #, fuzzy msgid "RSS feed for %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:845 -#: perllib/FixMyStreet/Cobrand/Default.pm:859 +#: perllib/FixMyStreet/Cobrand/Default.pm:793 +#: perllib/FixMyStreet/Cobrand/Default.pm:807 #, fuzzy msgid "RSS feed for %s ward, %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:868 -#: perllib/FixMyStreet/Cobrand/Default.pm:882 +#: perllib/FixMyStreet/Cobrand/Default.pm:816 +#: perllib/FixMyStreet/Cobrand/Default.pm:830 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:193 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:201 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:211 @@ -2081,28 +2404,29 @@ msgstr "Porthiant RSS %s" msgid "RSS feed of %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:874 -#: perllib/FixMyStreet/Cobrand/Default.pm:888 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 +#: perllib/FixMyStreet/Cobrand/Default.pm:836 #, fuzzy msgid "RSS feed of %s, within %s ward" msgstr "Porthiant RSS %s" -#: templates/web/default/alert/list.html:54 +#: templates/web/default/alert/list.html:52 +#: templates/web/fixmystreet/alert/_list.html:22 msgid "RSS feed of nearby empty properties" msgstr "Porthiant RSS o eiddo gwag sydd gerllaw" -#: templates/web/default/reports/council.html:61 +#: templates/web/default/reports/council.html:79 msgid "RSS feed of empty properties in this %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:801 +#: perllib/FixMyStreet/Cobrand/Default.pm:749 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:176 #, fuzzy msgid "RSS feed of empty properties within %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:808 +#: perllib/FixMyStreet/Cobrand/Default.pm:756 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 #, fuzzy msgid "RSS feed of empty properties within %s ward" @@ -2110,15 +2434,21 @@ msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:4 +#: templates/web/fixmystreet/around/display_location.html:1 +#: templates/web/fixmystreet/around/display_location.html:4 msgid "RSS feed of recent local empty properties" msgstr "Porthiant RSS o eiddo gwag lleol diweddar" -#: templates/web/default/report/display.html:48 +#: templates/web/default/report/display.html:47 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/report/display.html:35 msgid "RSS feed of updates to this empty property" msgstr "Porthiant RSS o ddiweddariadau i'r eiddo gwag hwn" #: templates/web/default/alert/updates.html:9 #: templates/web/default/report/display.html:38 +#: templates/web/fixmystreet/alert/updates.html:14 +#: templates/web/fixmystreet/report/display.html:37 msgid "Receive email when updates are left on this empty property." msgstr "" "Derbyn neges e-bost pan fydd diweddariadau'n cael eu rhoi am yr eiddo gwag " @@ -2126,22 +2456,28 @@ msgstr "" #: templates/web/default/around/display_location.html:0 #: templates/web/default/around/display_location.html:34 +#: templates/web/fixmystreet/around/display_location.html:0 +#: templates/web/fixmystreet/around/display_location.html:34 msgid "Recent local empty properties, reportemptyhomes.com" msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com" -#: templates/web/default/reports/council.html:87 -#: templates/web/default/reports/council.html:88 -#: templates/web/default/reports/index.html:14 +#: templates/web/default/reports/index.html:19 +#, fuzzy +msgid "Recently <br>returned to use" +msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" + #: templates/web/emptyhomes/reports/index.html:13 +#: templates/web/fiksgatami/nn/reports/index.html:13 #: templates/web/fiksgatami/reports/index.html:13 msgid "Recently returned to use" msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" -#: templates/web/default/index.html:62 +#: templates/web/default/index.html:61 templates/web/fixmystreet/index.html:72 msgid "Recently reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" #: templates/web/default/report/new/notes.html:9 +#: templates/web/fixmystreet/report/new/notes.html:8 msgid "" "Remember that reportemptyhomes.com is primarily for reporting physical empty " "properties that can be returned to use. If your empty property is not " @@ -2153,7 +2489,7 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:52 #: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2162,66 +2498,83 @@ msgstr "" msgid "Report Empty Homes" msgstr "Adrodd am Eiddo Gwag" -#: templates/web/default/footer.html:6 templates/web/emptyhomes/header.html:27 -#: templates/web/fiksgatami/footer.html:5 templates/web/reading/footer.html:6 +#: templates/web/bromley/footer.html:33 templates/web/default/footer.html:7 +#: templates/web/emptyhomes/header.html:27 +#: templates/web/fiksgatami/footer.html:5 +#: templates/web/fiksgatami/nn/footer.html:5 +#: templates/web/fixmystreet/footer.html:45 +#: templates/web/reading/footer.html:6 msgid "Report a property" msgstr "Rhoi gwybod am eiddo" -#: perllib/FixMyStreet/App/Controller/Rss.pm:274 +#: templates/web/fixmystreet/report/display.html:27 +#, fuzzy +msgid "Report abuse" +msgstr "Adroddiadau" + +#: templates/web/emptyhomes/index.html:37 +#, fuzzy +msgid "Report empty properties" +msgstr "Adrodd am eiddo gwag a gweld y rhain" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:281 #, fuzzy msgid "Report on %s" msgstr "Adroddiadau" -#: templates/web/default/index.html:15 +#: templates/web/default/index.html:15 templates/web/fixmystreet/index.html:28 msgid "Report and view empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/default/my/my.html:74 +#: templates/web/default/my/my.html:74 templates/web/fixmystreet/my/my.html:77 #, fuzzy msgid "Reported %s" msgstr "Adroddiadau" -#: templates/web/default/my/my.html:72 +#: templates/web/default/my/my.html:72 templates/web/fixmystreet/my/my.html:75 #, fuzzy msgid "Reported %s, to %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:490 +#: perllib/FixMyStreet/DB/Result/Problem.pm:504 #: templates/web/default/contact/index.html:45 +#: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddi-enw am %s" #: templates/web/default/admin/questionnaire.html:5 -#: templates/web/default/questionnaire/index.html:79 +#: templates/web/default/questionnaire/index.html:77 +#: templates/web/fixmystreet/questionnaire/index.html:71 msgid "Reported before" msgstr "Wedi adrodd o'r blaen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:482 +#: perllib/FixMyStreet/DB/Result/Problem.pm:496 msgid "Reported by %s anonymously at %s" msgstr "Adroddwyd gan %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:513 +#: perllib/FixMyStreet/DB/Result/Problem.pm:527 #: templates/web/default/contact/index.html:47 +#: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:504 +#: perllib/FixMyStreet/DB/Result/Problem.pm:518 msgid "Reported by %s by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:478 +#: perllib/FixMyStreet/DB/Result/Problem.pm:492 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Adroddwyd am hyn gan %s yn y categori %s yn ddi-enw, am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:498 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "Reported by %s in the %s category by %s at %s" msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:486 +#: perllib/FixMyStreet/DB/Result/Problem.pm:500 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddiwyd yn y categori %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:522 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s gan %s am %s" @@ -2229,10 +2582,14 @@ msgstr "Adroddwyd yn y categori %s gan %s am %s" #: templates/web/default/report/new/fill_in_details.html:0 #: templates/web/default/report/new/fill_in_details.html:3 #: templates/web/default/report/new/fill_in_details_form.html:1 +#: templates/web/fixmystreet/around/around_index.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details.html:0 +#: templates/web/fixmystreet/report/new/fill_in_details.html:5 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 msgid "Reporting an empty property" msgstr "Adrodd am eiddo gwag" -#: templates/web/default/around/display_location.html:94 +#: templates/web/default/around/display_location.html:93 msgid "Reports on and around the map" msgstr "Adroddiadau ar ac yng nghyffiniau'r map" @@ -2255,7 +2612,7 @@ msgstr "" msgid "Save changes" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:982 +#: perllib/FixMyStreet/App/Controller/Admin.pm:984 #, fuzzy msgid "Search Abuse" msgstr "Adroddiadau cryno" @@ -2264,14 +2621,14 @@ msgstr "Adroddiadau cryno" msgid "Search Abuse Table" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:978 +#: perllib/FixMyStreet/App/Controller/Admin.pm:980 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 #, fuzzy msgid "Search Reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:981 +#: perllib/FixMyStreet/App/Controller/Admin.pm:983 #: templates/web/default/admin/search_users.html:1 #, fuzzy msgid "Search Users" @@ -2283,7 +2640,8 @@ msgstr "Adroddiadau cryno" msgid "Search:" msgstr "" -#: templates/web/default/alert/list.html:41 +#: templates/web/default/alert/list.html:39 +#: templates/web/fixmystreet/alert/_list.html:10 #, fuzzy msgid "" "Select which type of alert you'd like and click the button for an RSS feed, " @@ -2293,7 +2651,7 @@ msgstr "" "porthiant RSS,\n" "neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:555 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" @@ -2346,17 +2704,31 @@ msgstr "" "cat=20'>Gwybodaeth\n" "bellach am ein gwaith ar gartrefi gwag</a>.\n" -#: templates/web/default/report/display.html:216 +#: templates/web/default/report/display.html:213 #: templates/web/default/report/new/fill_in_details_form.html:210 +#: templates/web/fixmystreet/report/display.html:189 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:123 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:180 msgid "Show my name publicly" msgstr "" -#: templates/web/default/around/display_location.html:52 +#: templates/web/default/around/display_location.html:60 +#: templates/web/fixmystreet/around/display_location.html:60 +msgid "Show old" +msgstr "" + +#: templates/web/default/around/display_location.html:51 +#: templates/web/fixmystreet/around/display_location.html:52 msgid "Show pins" msgstr "Dangos pinnau" +#: templates/web/bromley/header.html:50 #: templates/web/default/auth/general.html:3 #: templates/web/default/auth/general.html:49 +#: templates/web/fixmystreet/auth/general.html:3 +#: templates/web/fixmystreet/auth/general.html:38 +#: templates/web/fixmystreet/auth/general.html:58 +#: templates/web/fixmystreet/header.html:50 msgid "Sign in" msgstr "" @@ -2365,31 +2737,37 @@ msgid "Sign in by email" msgstr "" #: templates/web/default/auth/general.html:1 +#: templates/web/fixmystreet/auth/general.html:1 msgid "Sign in or create an account" msgstr "" #: templates/web/default/auth/sign_out.html:1 -#: templates/web/default/header.html:35 -#: templates/web/emptyhomes/header.html:43 +#: templates/web/default/header.html:30 +#: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 +#: templates/web/fiksgatami/nn/header.html:22 +#: templates/web/fixmystreet/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 -#: templates/web/reading/header.html:37 +#: templates/web/reading/header.html:33 msgid "Sign out" msgstr "" -#: templates/web/default/header.html:34 -#: templates/web/emptyhomes/header.html:42 +#: templates/web/default/header.html:29 +#: templates/web/emptyhomes/header.html:40 #: templates/web/fiksgatami/header.html:21 +#: templates/web/fiksgatami/nn/header.html:21 #: templates/web/lichfielddc/header.html:177 -#: templates/web/reading/header.html:36 +#: templates/web/reading/header.html:32 msgid "Signed in as %s" msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" -#: templates/web/default/alert/index.html:31 +#: templates/web/default/alert/index.html:30 +#: templates/web/fixmystreet/alert/index.html:33 msgid "Some photos of recent reports" msgstr "Rhai ffotograffau o adroddiadau diweddar" @@ -2402,7 +2780,7 @@ msgstr "" msgid "Some unconfirmeds" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:517 +#: perllib/FixMyStreet/Cobrand/Default.pm:428 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2411,18 +2789,20 @@ msgstr "" msgid "Sorry, there has been an error confirming your empty property." msgstr "Sori, bu gwall wrth gadarnhau eich eiddo gwag." -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:52 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:147 +#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:53 #: perllib/FixMyStreet/Geocode/Google.pm:68 msgid "Sorry, we could not find that location." msgstr "Sori, ni fu modd i ni ddod o hyd i'r lleoliad hwnnw." -#: perllib/FixMyStreet/Geocode/Bing.pm:45 +#: perllib/FixMyStreet/Geocode/Bing.pm:46 #: perllib/FixMyStreet/Geocode/Google.pm:60 msgid "Sorry, we could not parse that location. Please try again." msgstr "" "Sori, ni fu modd i ni ddosrannu'r lleoliad hwnnw. Rhowch gynnig arall arni." #: templates/web/fiksgatami/footer.html:16 +#: templates/web/fiksgatami/nn/footer.html:16 msgid "Source code" msgstr "" @@ -2443,23 +2823,35 @@ msgstr "" #: templates/web/default/admin/list_flagged.html:18 #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/search_reports.html:21 +#: templates/web/fixmystreet/report/display.html:77 #, fuzzy msgid "State" msgstr "Diweddariad:" -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:17 #: templates/web/default/admin/update_edit.html:18 -#: templates/web/default/report/display.html:83 +#: templates/web/default/report/display.html:82 #, fuzzy msgid "State:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:986 #: templates/web/default/admin/stats.html:1 #, fuzzy msgid "Stats" msgstr "Diweddariad:" +#: templates/web/default/report/updates.html:9 +#, fuzzy +msgid "Still open, via questionnaire, %s" +msgstr "Anfon yr holiadur" + +#: templates/web/fixmystreet/contact/index.html:79 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:58 +#, fuzzy +msgid "Subject" +msgstr "Pwnc:" + #: templates/web/default/admin/report_edit.html:13 #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 @@ -2470,30 +2862,37 @@ msgstr "Pwnc:" #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 msgid "Submit" msgstr "Anfon" -#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:55 #: templates/web/default/admin/update_edit.html:51 #: templates/web/default/admin/user_edit.html:20 #, fuzzy msgid "Submit changes" msgstr "Anfon" -#: templates/web/default/questionnaire/index.html:114 +#: templates/web/default/questionnaire/index.html:112 +#: templates/web/fixmystreet/questionnaire/index.html:105 msgid "Submit questionnaire" msgstr "Anfon yr holiadur" #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:43 +#: templates/web/fixmystreet/alert/updates.html:23 +#: templates/web/fixmystreet/report/display.html:42 msgid "Subscribe" msgstr "Tanysgrifio" -#: templates/web/default/alert/list.html:128 +#: templates/web/default/alert/list.html:126 +#: templates/web/fixmystreet/alert/_list.html:88 msgid "Subscribe me to an email alert" msgstr "Dymunaf danysgrifio i rybuddion drwy e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:976 +#: perllib/FixMyStreet/App/Controller/Admin.pm:978 #: templates/web/default/admin/index.html:1 #, fuzzy msgid "Summary" @@ -2501,11 +2900,12 @@ msgstr "Adroddiadau cryno" #: templates/web/default/reports/index.html:1 #: templates/web/emptyhomes/reports/index.html:1 +#: templates/web/fiksgatami/nn/reports/index.html:1 #: templates/web/fiksgatami/reports/index.html:1 msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:980 +#: perllib/FixMyStreet/App/Controller/Admin.pm:982 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -2514,7 +2914,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/default/admin/council_contacts.html:12 +#: templates/web/default/admin/council_contacts.html:14 msgid "Text only version" msgstr "" @@ -2582,7 +2982,8 @@ msgstr "" "helpu i \n" "ddatrys argyfwng tai gwag y DU." -#: templates/web/default/around/around_index.html:44 +#: templates/web/default/around/around_index.html:43 +#: templates/web/fixmystreet/around/around_index.html:46 msgid "" "Thanks for uploading your photo. We now need to locate your empty property, " "so please enter a nearby street name or postcode in the box below :" @@ -2604,7 +3005,7 @@ msgstr "" "i ni'ch holi chi, a ydych erioed wedi rhoi gwybod i'r cyngor am eiddo gwag " "cyn hyn?" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:839 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2612,6 +3013,7 @@ msgstr "" "rhowch gynnig arni eto." #: templates/web/default/alert/index.html:12 +#: templates/web/fixmystreet/alert/index.html:12 msgid "" "That location does not appear to be covered by a council, perhaps it is " "offshore - please try somewhere more specific." @@ -2625,12 +3027,12 @@ msgstr "" "Nid yw'n ymddangos bod y lleoliad hwnnw ym Mhrydain; rhowch gynnig arall " "arni." -#: perllib/FixMyStreet/Cobrand/Default.pm:510 +#: perllib/FixMyStreet/Cobrand/Default.pm:421 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:78 msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/FixMyStreet/App/Controller/Admin.pm:558 +#: perllib/FixMyStreet/App/Controller/Admin.pm:560 #, fuzzy msgid "That empty property will now be resent." msgstr "ni fydd eich eiddo gwag yn cael ei bostio" @@ -2639,7 +3041,8 @@ msgstr "ni fydd eich eiddo gwag yn cael ei bostio" msgid "That report has been removed from reportemptyhomes.com." msgstr "Mae'r adroddiad hwnnw wedi cael ei dynnu oddi ar reportemptyhomes.com" -#: templates/web/default/around/around_index.html:27 +#: templates/web/default/around/around_index.html:26 +#: templates/web/fixmystreet/around/around_index.html:29 #, fuzzy msgid "" "That spot does not appear to be covered by a council. If you have tried to " @@ -2694,19 +3097,37 @@ msgstr "" #: templates/web/default/auth/token.html:21 #: templates/web/default/email_sent.html:22 +#: templates/web/fixmystreet/auth/token.html:21 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." msgstr "" -#: templates/web/default/questionnaire/index.html:51 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 +msgid "" +"The council won’t be able to help unless you leave as much\n" +"detail as you can. Please describe the exact location of the empty property " +"(e.g. on a\n" +"wall), what it is, how long it has been there, a description (and a photo " +"of\n" +"the empty property if you have one), etc." +msgstr "" + +#: templates/web/fixmystreet/questionnaire/index.html:43 +#, fuzzy +msgid "" +"The details of your empty property are available from the other tab above." +msgstr "Mae manylion eich eiddo gwag ar gael ar ochr dde'r dudalen hon." + +#: templates/web/default/questionnaire/index.html:49 msgid "" "The details of your empty property are available on the right hand side of " "this page." msgstr "Mae manylion eich eiddo gwag ar gael ar ochr dde'r dudalen hon." -#: perllib/FixMyStreet/App/Controller/Reports.pm:46 -#: perllib/FixMyStreet/App/Controller/Reports.pm:73 +#: perllib/FixMyStreet/App/Controller/Reports.pm:44 +#: perllib/FixMyStreet/App/Controller/Reports.pm:71 #, fuzzy msgid "The error was: %s" msgstr "Testun y gwall oedd:" @@ -2796,6 +3217,8 @@ msgstr "" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:16 +#: templates/web/fixmystreet/auth/change_password.html:12 +#: templates/web/fixmystreet/auth/change_password.html:16 msgid "The passwords do not match" msgstr "" @@ -2804,14 +3227,15 @@ msgstr "" msgid "The requested URL '%s' was not found on this server" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1179 -#: perllib/FixMyStreet/App/Controller/Admin.pm:538 -#: perllib/FixMyStreet/App/Controller/Admin.pm:701 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:540 +#: perllib/FixMyStreet/App/Controller/Admin.pm:703 msgid "The requested URL was not found on this server." msgstr "" -#: templates/web/default/alert/list.html:47 +#: templates/web/default/alert/list.html:45 +#: templates/web/fixmystreet/alert/_list.html:16 msgid "The simplest alert is our geographic one:" msgstr "Yr hysbysiad symlaf yw ein hysbysiad daearyddol:" @@ -2819,12 +3243,16 @@ msgstr "Yr hysbysiad symlaf yw ein hysbysiad daearyddol:" #: templates/web/default/report/new/councils_text_some.html:10 #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 +#: templates/web/fixmystreet/report/new/councils_text_all.html:18 +#: templates/web/fixmystreet/report/new/councils_text_some.html:10 +#: templates/web/fixmystreet/report/new/councils_text_some.html:11 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the empty property will be public, plus your name " "if you give us permission." msgstr "" -#: bin/send-reports:78 +#: bin/send-reports:79 msgid "" "The user could not locate the empty property on a map, but to see the area " "around the location they entered" @@ -2832,29 +3260,29 @@ msgstr "" "Ni allai'r defnyddiwr leoli'r eiddo gwag ar fap, ond i weld yr ardal o " "gwmpas y lleoliad a gofnodwyd ganddynt " -#: perllib/FixMyStreet/App/Controller/Reports.pm:72 +#: perllib/FixMyStreet/App/Controller/Reports.pm:70 msgid "" "There was an empty property showing the All Reports page. Please try again " "later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:125 #: templates/web/default/auth/general.html:23 +#: templates/web/fixmystreet/auth/general.html:24 msgid "" -"There was an empty property with your email/password combination. Passwords " -"and user accounts are a brand <strong>new</strong> service, so you probably " -"do not have one yet – please fill in the right hand side of this form " -"to get one." +"There was an empty property 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 "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:354 +#: perllib/FixMyStreet/App/Controller/Alert.pm:351 msgid "" "There was an empty property with your email/password combination. Please try " "again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:214 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:215 #, fuzzy msgid "There was an empty property with your update. Please try again." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" @@ -2863,7 +3291,7 @@ msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" msgid "There were problems with your report. Please see below." msgstr "Cafwyd anhawsterau gyda'ch adroddiad. Gweler isod." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:241 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:242 msgid "There were problems with your update. Please see below." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" @@ -2873,7 +3301,7 @@ msgid "" "change without warnings in the future." msgstr "" -#: bin/send-reports:185 +#: bin/send-reports:186 msgid "" "This email has been sent to both councils covering the location of the empty " "property, as the user did not categorise it; please ignore it if you're not " @@ -2881,14 +3309,14 @@ msgid "" "empty property this is so we can add it to our system." msgstr "" -#: bin/send-reports:188 +#: bin/send-reports:189 msgid "" "This email has been sent to several councils covering the location of the " "empty property, 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:761 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 msgid "This information is required" msgstr "" @@ -2899,16 +3327,17 @@ msgid "" "will be periodically deleted." msgstr "Safle datblygwr yw hwn; gallai pethau dorri unrhyw bryd." -#: templates/web/default/reports/council.html:65 +#: templates/web/emptyhomes/reports/council.html:58 msgid "This is a summary of all reports for one %s." msgstr "Dyma grynodeb o'r holl adroddiadau ar gyfer y %s." -#: templates/web/default/reports/council.html:67 +#: templates/web/emptyhomes/reports/council.html:60 msgid "This is a summary of all reports for this %s." msgstr "" -#: templates/web/default/reports/index.html:4 +#: templates/web/default/reports/index.html:7 #: templates/web/emptyhomes/reports/index.html:4 +#: templates/web/fiksgatami/nn/reports/index.html:4 #: templates/web/fiksgatami/reports/index.html:4 msgid "" "This is a summary of all reports on this site; select a particular council " @@ -2917,46 +3346,48 @@ msgstr "" "Dyma grynodeb o'r holl adroddiadau ar y safle hwn; dewiswch gyngor penodol i " "weld yr adroddiadau a anfonwyd ato." -#: perllib/FixMyStreet/Cobrand/Default.pm:926 +#: perllib/FixMyStreet/Cobrand/Default.pm:874 #, fuzzy msgid "This empty property has been closed" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/Cobrand/Default.pm:922 +#: perllib/FixMyStreet/Cobrand/Default.pm:870 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 -#: templates/web/default/report/display.html:101 +#: templates/web/default/report/display.html:100 +#: templates/web/fixmystreet/report/display.html:95 msgid "This empty property has been returned to use" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: templates/web/default/report/display.html:96 +#: templates/web/default/report/display.html:95 +#: templates/web/fixmystreet/report/display.html:89 #, fuzzy msgid "This empty property has not been returned to use" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/Cobrand/Default.pm:931 +#: perllib/FixMyStreet/Cobrand/Default.pm:879 #, fuzzy msgid "This empty property is in progress" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/Cobrand/Default.pm:918 +#: perllib/FixMyStreet/Cobrand/Default.pm:866 msgid "This empty property is old and of unknown status." msgstr "Mae'r eiddo gwag hwn yn hen ac nid yw ei statws yn hysbys." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 #, fuzzy msgid "This report is currently marked as closed." msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:77 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 #, fuzzy msgid "This report is currently marked as returned to use." msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 msgid "This report is currently marked as open." msgstr "" -#: bin/send-reports:71 +#: bin/send-reports:72 msgid "" "This web page also contains a photo of the empty property, provided by the " "user." @@ -2964,7 +3395,7 @@ msgstr "" "Mae'r dudalen we hon hefyd yn cynnwys ffotograff o'r eiddo gwag, wedi'i " "ddarparu gan y defnyddiwr." -#: perllib/FixMyStreet/App/Controller/Admin.pm:979 +#: perllib/FixMyStreet/App/Controller/Admin.pm:981 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -2974,7 +3405,16 @@ msgstr "" msgid "Title" msgstr "" -#: templates/web/default/around/display_location.html:70 +#: templates/web/default/around/display_location.html:69 +#, fuzzy +msgid "" +"To <strong>report an empty property</strong>, click on the map at the " +"correct location." +msgstr "" +"Er mwyn rhoi gwybod am eiddo gwag\n" +" <strong>cliciwch ar y map</strong> wrth y lleoliad cywir." + +#: templates/web/emptyhomes/around/display_location.html:35 #, fuzzy msgid "" "To <strong>report an empty property</strong>, simply click on the map at the " @@ -2983,6 +3423,17 @@ msgstr "" "Er mwyn rhoi gwybod am eiddo gwag\n" " <strong>cliciwch ar y map</strong> wrth y lleoliad cywir." +#: templates/web/fixmystreet/alert/index.html:19 +#, fuzzy +msgid "" +"To find out what local alerts we have in your area, council or ward, please " +"enter your GB\n" +" postcode or street name and area" +msgstr "" +"I gael gwybod pa hysbysiadau lleol sydd gennym yn eich ardal, cyngor neu " +"ward chi,\n" +"cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:" + #: templates/web/default/alert/index.html:21 msgid "" "To find out what local alerts we have in your area, council or ward, please " @@ -2993,7 +3444,7 @@ msgstr "" "ward chi,\n" "cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:" -#: bin/send-reports:77 +#: bin/send-reports:78 msgid "To view a map of the precise location of this issue" msgstr "Gweld map o union leoliad y broblem hon" @@ -3004,17 +3455,21 @@ msgstr "Gweld map o union leoliad y broblem hon" msgid "Total" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:45 +#: perllib/FixMyStreet/App/Controller/Reports.pm:43 msgid "Unable to look up areas in MaPit. Please try again later." msgstr "" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/admin/update_edit.html:19 msgid "Unconfirmed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:163 +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:16 +msgid "Unknown" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:164 #, fuzzy msgid "Unknown alert type" msgstr "ID eiddo gwag anhysbys" @@ -3023,16 +3478,23 @@ msgstr "ID eiddo gwag anhysbys" msgid "Unknown empty property ID" msgstr "ID eiddo gwag anhysbys" +#: templates/web/fixmystreet/report/display.html:70 +#, fuzzy +msgid "Update" +msgstr "Diweddariad:" + #: templates/web/default/admin/timeline.html:35 msgid "Update %s created for empty property %d; by %s" msgstr "" #: templates/web/default/contact/index.html:21 +#: templates/web/fixmystreet/contact/index.html:22 #, fuzzy msgid "Update below added anonymously at %s" msgstr "Adroddwyd yn ddi-enw am %s" #: templates/web/default/contact/index.html:23 +#: templates/web/fixmystreet/contact/index.html:24 #, fuzzy msgid "Update below added by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" @@ -3064,24 +3526,25 @@ msgstr "" msgid "Update reopened empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:58 #, fuzzy msgid "Update statuses" msgstr "Diweddariadau" -#: templates/web/default/report/display.html:77 +#: templates/web/default/report/display.html:76 msgid "Update:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:647 -#: perllib/FixMyStreet/App/Controller/Admin.pm:764 -#: perllib/FixMyStreet/App/Controller/Admin.pm:844 +#: perllib/FixMyStreet/App/Controller/Admin.pm:649 +#: perllib/FixMyStreet/App/Controller/Admin.pm:766 +#: perllib/FixMyStreet/App/Controller/Admin.pm:846 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" #: templates/web/default/admin/list_updates.html:1 -#: templates/web/default/report/updates.html:4 +#: templates/web/default/report/update.html:3 +#: templates/web/fixmystreet/report/update.html:3 msgid "Updates" msgstr "Diweddariadau" @@ -3091,14 +3554,16 @@ msgstr "Diweddariadau am {{title}}" #: templates/web/default/report/display.html:0 #: templates/web/default/report/display.html:7 +#: templates/web/fixmystreet/report/display.html:0 +#: templates/web/fixmystreet/report/display.html:7 msgid "Updates to this empty property, reportemptyhomes.com" msgstr "Diweddariadau i'r eiddo gwag hwn, reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1139 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1109 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1111 msgid "User flagged" msgstr "" @@ -3106,8 +3571,8 @@ msgstr "" msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:304 -#: perllib/FixMyStreet/App/Controller/Admin.pm:334 +#: perllib/FixMyStreet/App/Controller/Admin.pm:306 +#: perllib/FixMyStreet/App/Controller/Admin.pm:336 #, fuzzy msgid "Values updated" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -3124,25 +3589,37 @@ msgstr "Gweld eich adroddiad" #: templates/web/default/around/display_location.html:0 #: templates/web/default/around/display_location.html:33 +#: templates/web/emptyhomes/around/display_location.html:0 +#: templates/web/emptyhomes/around/display_location.html:16 +#: templates/web/fixmystreet/around/display_location.html:0 +#: templates/web/fixmystreet/around/display_location.html:33 msgid "Viewing a location" msgstr "Gweld lleoliad" #: templates/web/default/report/display.html:0 +#: templates/web/emptyhomes/report/display.html:1 +#: templates/web/emptyhomes/report/display.html:2 +#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing an empty property" msgstr "Gweld eiddo gwag" -#: templates/web/default/reports/council.html:22 +#: templates/web/default/reports/council.html:23 +#: templates/web/default/reports/council.html:74 +#: templates/web/default/reports/council.html:86 +#: templates/web/emptyhomes/reports/council.html:18 msgid "Wards of this council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:521 -#: perllib/FixMyStreet/Geocode/Bing.pm:47 +#: perllib/FixMyStreet/Cobrand/Default.pm:432 +#: perllib/FixMyStreet/Geocode/Bing.pm:48 #: perllib/FixMyStreet/Geocode/Google.pm:63 msgid "We do not currently cover Northern Ireland, I'm afraid." msgstr "" #: templates/web/default/alert/choose.html:6 -#: templates/web/default/around/around_index.html:33 +#: templates/web/default/around/around_index.html:32 +#: templates/web/fixmystreet/alert/choose.html:6 +#: templates/web/fixmystreet/around/around_index.html:35 msgid "" "We found more than one match for that location. We show up to ten matches, " "please try a different search if yours is not here." @@ -3152,6 +3629,7 @@ msgstr "" "lleoliad chi yno." #: templates/web/default/auth/token.html:19 +#: templates/web/fixmystreet/auth/token.html:19 msgid "We have sent you an email containing a link to confirm your account." msgstr "" @@ -3162,14 +3640,26 @@ msgid "" "property you reported." msgstr "" -#: bin/send-reports:195 +#: templates/web/fixmystreet/report/display.html:158 +#, fuzzy +msgid "We never show your email" +msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:127 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:184 +#, fuzzy +msgid "We never show your email address or phone number." +msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" + +#: bin/send-reports:196 msgid "" "We realise this empty property 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/default/index.html:46 +#: templates/web/default/index.html:45 templates/web/emptyhomes/index.html:61 +#: templates/web/fixmystreet/index.html:56 msgid "" "The details will be sent directly to the right person in the local council " "for them to take action" @@ -3178,6 +3668,7 @@ msgstr "" "lleol er mwyn iddynt weithredu" #: templates/web/default/report/new/notes.html:5 +#: templates/web/fixmystreet/report/new/notes.html:4 msgid "" "We will only use your personal information in accordance with our <a href=\"/" "faq#privacy\">privacy policy.</a>" @@ -3203,7 +3694,7 @@ msgstr "" "Byddai'n dda gennym glywed eich barn am y wefan hon. Llenwch y ffurflen, neu " "anfonwch neges e-bost at <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:32 +#: templates/web/default/admin/council_contacts.html:37 #: templates/web/default/admin/council_edit.html:41 msgid "When edited" msgstr "" @@ -3213,7 +3704,7 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:523 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:538 msgid "Whole block of empty flats" msgstr "Bloc cyfan o fflatiau gwag" @@ -3224,13 +3715,28 @@ msgid "" "term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" -#: templates/web/default/questionnaire/index.html:104 +#: templates/web/fixmystreet/footer.html:23 +msgid "" +"Would you like better integration with reportemptyhomes.com? <a href=\"/for-" +"councils\">Find out about reportemptyhomes.com for councils</a>." +msgstr "" + +#: templates/web/fixmystreet/footer.html:19 +msgid "" +"Would you like to contribute to reportemptyhomes.com? Our code is open " +"source and <a href=\"http://github.com/mysociety/fixmystreet\">available on " +"GitHub</a>." +msgstr "" + +#: templates/web/default/questionnaire/index.html:102 +#: templates/web/fixmystreet/questionnaire/index.html:96 msgid "" "Would you like to receive another questionnaire in 4 weeks, reminding you to " "check the status?" msgstr "" #: templates/web/default/report/new/notes.html:8 +#: templates/web/fixmystreet/report/new/notes.html:7 msgid "" "Writing your message entirely in block capitals makes it hard to read, as " "does a lack of punctuation." @@ -3240,24 +3746,33 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/default/admin/council_contacts.html:39 -#: templates/web/default/admin/council_contacts.html:40 +#: templates/web/default/admin/council_contacts.html:44 +#: templates/web/default/admin/council_contacts.html:45 #: templates/web/default/admin/council_edit.html:5 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 -#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:27 #: templates/web/default/admin/report_edit.html:40 #: templates/web/default/admin/search_users.html:23 #: templates/web/default/admin/update_edit.html:15 #: templates/web/default/questionnaire/creator_fixed.html:14 -#: templates/web/default/questionnaire/index.html:107 -#: templates/web/default/questionnaire/index.html:68 +#: templates/web/default/questionnaire/index.html:105 +#: templates/web/default/questionnaire/index.html:66 +#: templates/web/fixmystreet/questionnaire/index.html:60 +#: templates/web/fixmystreet/questionnaire/index.html:99 msgid "Yes" msgstr "Ydw" +#: templates/web/fixmystreet/report/display.html:138 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:153 +#, fuzzy +msgid "Yes I have a password" +msgstr "Adrodd am eiddo gwag a gweld y rhain" + #: templates/web/default/contact/index.html:37 +#: templates/web/fixmystreet/contact/index.html:38 msgid "" "You are reporting the following empty property report for being abusive, " "containing personal information, or similar:" @@ -3266,12 +3781,13 @@ msgstr "" "sarhaus, neu'n cynnwys gwybodaeth bersonol, neu debyg:" #: templates/web/default/contact/index.html:15 +#: templates/web/fixmystreet/contact/index.html:16 msgid "" "You are reporting the following update for being abusive, containing " "personal information, or similar:" msgstr "" -#: templates/web/default/reports/council.html:71 +#: templates/web/emptyhomes/reports/council.html:64 #, fuzzy msgid "" "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/" @@ -3280,7 +3796,7 @@ msgstr "" "Gallwch <a href=\"%s\">weld llai o fanylion</a> neu fynd yn ôl a <a href=\"/" "reports\">dangos pob cyngor</a>." -#: templates/web/default/reports/council.html:73 +#: templates/web/emptyhomes/reports/council.html:66 #, fuzzy msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "Gallwch <a href=\"%s\">weld mwy o fanylion</a>." @@ -3289,6 +3805,10 @@ msgstr "Gallwch <a href=\"%s\">weld mwy o fanylion</a>." #: templates/web/default/report/new/councils_text_none.html:16 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:22 +#: templates/web/fixmystreet/report/new/councils_text_none.html:12 +#: templates/web/fixmystreet/report/new/councils_text_none.html:14 +#: templates/web/fixmystreet/report/new/councils_text_some.html:20 +#: templates/web/fixmystreet/report/new/councils_text_some.html:22 msgid "" "You can help us by finding a contact email address for local empty " "properties for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3300,30 +3820,36 @@ msgid "" "<a href='%s'>get in touch</a>, or <a href='%s'>view your empty property</" "a>.\n" msgstr "" -"Rydych eisoes wedi ateb yr holiadur hwn. Os oes gennych gwestiwn, <a href='%" -"s'>cysylltwch â ni</a>, neu ewch i <a href='%s'>weld eich eiddo gwag</a>.\n" +"Rydych eisoes wedi ateb yr holiadur hwn. Os oes gennych gwestiwn, <a " +"href='%s'>cysylltwch â ni</a>, neu ewch i <a href='%s'>weld eich eiddo gwag</" +"a>.\n" -#: templates/web/default/questionnaire/index.html:94 +#: templates/web/default/questionnaire/index.html:92 #: templates/web/default/report/new/fill_in_details_form.html:93 +#: templates/web/fixmystreet/questionnaire/index.html:87 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:101 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." msgstr "" -#: templates/web/default/report/display.html:112 +#: templates/web/default/report/display.html:111 +#: templates/web/fixmystreet/report/display.html:105 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." msgstr "" #: templates/web/default/auth/sign_out.html:3 +#: templates/web/fixmystreet/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:7 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:27 #, fuzzy msgid "" -"You have located the empty property at the point marked with a purple pin on " +"You have located the empty property at the point marked with a green pin on " "the map. If this is not the correct location, simply click on the map again. " msgstr "" "Rydych wedi gosod lleoliad yr eiddo gwag wrth y pwynt sy'n cael ei ddangos " @@ -3357,7 +3883,7 @@ msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." msgid "You have successfully deleted your alert." msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:647 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:131 #, fuzzy msgid "" @@ -3376,40 +3902,89 @@ msgid "You really want to resend?" msgstr "" #: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14 -#: templates/web/default/my/my.html:3 +#: templates/web/default/my/my.html:3 templates/web/fixmystreet/my/my.html:0 +#: templates/web/fixmystreet/my/my.html:14 +#: templates/web/fixmystreet/my/my.html:3 #, fuzzy msgid "Your Reports" msgstr "Adroddiadau" +#: templates/web/fixmystreet/alert/_list.html:85 +#: templates/web/fixmystreet/alert/updates.html:19 +#: templates/web/fixmystreet/alert/updates.html:22 +#: templates/web/fixmystreet/contact/index.html:72 +#: templates/web/fixmystreet/report/display.html:39 +#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139 +#, fuzzy +msgid "Your email" +msgstr "Eich cyfeiriad e-bost:" + +#: templates/web/fixmystreet/auth/general.html:26 +#: templates/web/fixmystreet/report/display.html:129 +#, fuzzy +msgid "Your email address" +msgstr "Eich cyfeiriad e-bost:" + #: templates/web/default/auth/general.html:27 #, fuzzy msgid "Your email address:" msgstr "Eich cyfeiriad e-bost:" -#: templates/web/default/alert/list.html:122 -#: templates/web/default/report/display.html:134 +#: templates/web/default/alert/list.html:120 +#: templates/web/default/report/display.html:133 #: templates/web/default/report/new/fill_in_details_form.html:124 msgid "Your email:" msgstr "Eich cyfeiriad e-bost:" +#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/contact/index.html:65 +#: templates/web/fixmystreet/report/display.html:185 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:118 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:175 +#, fuzzy +msgid "Your name" +msgstr "Eich enw:" + #: templates/web/default/auth/general.html:59 #: templates/web/default/contact/index.html:68 -#: templates/web/default/report/display.html:210 +#: templates/web/default/report/display.html:207 #: templates/web/default/report/new/fill_in_details_form.html:203 msgid "Your name:" msgstr "Eich enw:" +#: templates/web/fixmystreet/auth/general.html:37 +#: templates/web/fixmystreet/report/display.html:143 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:158 +#, fuzzy +msgid "Your password" +msgstr "Adroddiadau" + #: templates/web/default/auth/change_password.html:6 +#: templates/web/fixmystreet/auth/change_password.html:6 msgid "Your password has been changed" msgstr "" -#: templates/web/default/footer.html:7 templates/web/fiksgatami/footer.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:131 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:189 +msgid "Your phone number" +msgstr "" + +#: templates/web/fixmystreet/questionnaire/index.html:16 +#, fuzzy +msgid "Your report" +msgstr "Adroddiadau" + +#: templates/web/bromley/footer.html:35 templates/web/default/footer.html:9 +#: templates/web/fiksgatami/footer.html:6 +#: templates/web/fiksgatami/nn/footer.html:6 +#: templates/web/fixmystreet/footer.html:47 #: templates/web/reading/footer.html:7 #, fuzzy msgid "Your reports" msgstr "Adroddiadau" -#: templates/web/default/my/my.html:45 +#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:45 #, fuzzy msgid "Your updates" msgstr "Adroddiadau" @@ -3424,6 +3999,8 @@ msgstr "" #: templates/web/default/reports/council.html:6 #: templates/web/default/reports/council.html:7 +#: templates/web/emptyhomes/reports/council.html:6 +#: templates/web/emptyhomes/reports/council.html:7 msgid "council" msgstr "cyngor" @@ -3431,6 +4008,11 @@ msgstr "cyngor" msgid "didn't use map" msgstr "" +#: templates/web/fixmystreet/alert/index.html:24 +#: templates/web/fixmystreet/index.html:41 +msgid "e.g. ‘%s’ or ‘%s’" +msgstr "" + #: templates/web/default/admin/index.html:15 msgid "from %d different users" msgstr "" @@ -3439,11 +4021,11 @@ msgstr "" msgid "less than a minute" msgstr "llai na munud" -#: templates/web/default/report/updates.html:18 +#: templates/web/default/report/updates.html:24 msgid "marked as %s" msgstr "" -#: templates/web/default/report/updates.html:16 +#: templates/web/default/report/updates.html:22 msgid "marked as returned to use" msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" @@ -3453,7 +4035,8 @@ msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" msgid "n/a" msgstr "" -#: templates/web/default/alert/list.html:116 +#: templates/web/default/alert/list.html:114 +#: templates/web/fixmystreet/alert/_list.html:81 msgid "or" msgstr "neu" @@ -3465,22 +4048,29 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/default/report/updates.html:17 +#: templates/web/default/report/updates.html:23 msgid "reopened" msgstr "wedi'i ailagor" +#: templates/web/bromley/header.html:47 +#: templates/web/fixmystreet/header.html:47 +msgid "sign out" +msgstr "" + #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:14 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9 #, fuzzy msgid "the local council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:534 msgid "the map was not used so pin location may be inaccurate" msgstr "" "ni ddefnyddiwyd y map felly mae'n bosibl na fydd lleoliad y pin yn gywir" -#: bin/send-reports:176 +#: bin/send-reports:177 #, fuzzy msgid "this type of local empty property" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" @@ -3504,6 +4094,8 @@ msgstr "Adroddiadau hŷn o eiddo gwag" #: templates/web/default/reports/council.html:0 #: templates/web/default/reports/council.html:3 +#: templates/web/emptyhomes/reports/council.html:0 +#: templates/web/emptyhomes/reports/council.html:3 msgid "ward" msgstr "" @@ -3540,14 +4132,14 @@ msgstr "ni fydd eich eiddo gwag yn cael ei bostio" msgid "your update will not be posted" msgstr "ni fydd eich diweddariad yn cael ei bostio" -#: templates/web/default/front/stats.html:17 +#: templates/web/emptyhomes/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> adroddiad yn ddiweddar" msgstr[1] "<big>%s</big> o adroddiadau yn ddiweddar" -#: templates/web/default/report/new/councils_text_none.html:5 +#: templates/web/emptyhomes/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 "" @@ -3555,7 +4147,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/web/default/front/stats.html:12 +#: templates/web/emptyhomes/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -3576,7 +4168,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> diweddariad ar adroddiadau" msgstr[1] "<big>%s</big> diweddariad ar adroddiadau" -#: templates/web/default/report/new/councils_text_some.html:14 +#: templates/web/fixmystreet/report/new/councils_text_some.html:14 #, perl-format msgid "" "We do <strong>not</strong> yet have details for the other council that " @@ -3587,6 +4179,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#, fuzzy +#~ msgid "<strong>Yes</strong>, I have a password" +#~ msgstr "Adrodd am eiddo gwag a gweld y rhain" + +#, fuzzy +#~ msgid "<strong>Yes</strong>, I have a password:" +#~ msgstr "Adrodd am eiddo gwag a gweld y rhain" + +#~ msgid "" +#~ "<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" " +#~ "height=\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org" +#~ "\"><span id=\"logoie\"></span></a>" +#~ msgstr "" +#~ "<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" " +#~ "height=\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org" +#~ "\"><span id=\"logoie\"></span></a>" + +#~ msgid "Hide stale reports" +#~ msgstr "Cuddio hen adroddiadau " + +#~ msgid "Include stale reports" +#~ msgstr "Cynnwys hen adroddiadau" + +#~ msgid "Old returned to use" +#~ msgstr "Hen wedi'i adfer i'w ddefnyddio" + +#~ msgid "Old empty properties, state unknown" +#~ msgstr "Eiddo gwag hen, nid yw eu cyflwr yn hysbys" + #~ msgid "reportemptyhomes.com updates" #~ msgstr "Diweddariadau i reportemptyhomes.com" @@ -3707,9 +4328,6 @@ msgstr[1] "" #~ msgid "We could not validate that alert." #~ msgstr "Ni allem ddilysu'r hysbysiad hwnnw." -#~ msgid "Please give your name" -#~ msgstr "Rhowch eich enw" - #~ msgid "Please give a subject" #~ msgstr "Rhowch destun" |