diff options
Diffstat (limited to 'locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po')
| -rw-r--r-- | locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 2487 |
1 files changed, 1248 insertions, 1239 deletions
diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 491acbee9..bd6dc04ca 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2014-05-16 17:30+0100\n" +"POT-Creation-Date: 2014-11-13 12:57+0000\n" "PO-Revision-Date: 2013-05-03 09:41-0000\n" "Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n" "Language-Team: mySociety\n" @@ -21,156 +21,153 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Poedit 1.5.5\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:604 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid " and " msgstr " and " -#: templates/web/default/tokens/confirm_problem.html:15 -#: templates/web/default/tokens/confirm_problem.html:17 -msgid " and <strong>we will now send it to the council</strong>" -msgstr " a <strong>byddwn nawr yn ei anfon at y cyngor</strong>" - -#: templates/web/default/report/new/councils_text_all.html:12 -#: templates/web/default/report/new/councils_text_all.html:19 -#: templates/web/default/report/new/councils_text_all.html:5 -#: templates/web/default/report/new/councils_text_none.html:19 -#: templates/web/default/report/new/councils_text_none.html:21 -#: templates/web/default/report/new/councils_text_some.html:21 -#: templates/web/default/report/new/councils_text_some.html:23 -#: templates/web/default/report/new/councils_text_some.html:5 +#: templates/web/base/report/new/councils_text_all.html:12 +#: templates/web/base/report/new/councils_text_all.html:19 +#: templates/web/base/report/new/councils_text_all.html:5 +#: templates/web/base/report/new/councils_text_none.html:19 +#: templates/web/base/report/new/councils_text_none.html:21 +#: templates/web/base/report/new/councils_text_some.html:21 +#: templates/web/base/report/new/councils_text_some.html:23 +#: templates/web/base/report/new/councils_text_some.html:5 #: templates/web/emptyhomes/report/new/councils_text_all.html:3 msgid " or " msgstr "neu" -#: templates/web/default/admin/bodies.html:46 -msgid "%d addresses" -msgstr "%d addresses" - -#: templates/web/default/admin/index.html:25 +#: templates/web/base/admin/index.html:25 msgid "%d confirmed alerts, %d unconfirmed" msgstr "%d confirmed alerts, %d unconfirmed" -#: templates/web/default/admin/index.html:27 +#: templates/web/base/admin/index.html:27 #: templates/web/zurich/admin/index.html:6 msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "%d council contacts – %d confirmed, %d unconfirmed" -#: templates/web/default/admin/edit-league.html:12 +#: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d edits by %s" -#: templates/web/default/admin/index.html:24 +#: templates/web/base/admin/index.html:24 msgid "%d live updates" msgstr "%d live updates" -#: templates/web/default/admin/index.html:26 +#: templates/web/base/admin/index.html:26 msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "%d questionnaires sent – %d answered (%s%%)" -#: templates/web/default/pagination.html:10 +#: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "%d to %d of %d" -#: templates/web/default/reports/body.html:0 -#: templates/web/default/reports/body.html:22 +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:23 msgid "%s - Summary reports" msgstr "%s - Adroddiadau cryno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:653 +#: perllib/FixMyStreet/DB/Result/Problem.pm:667 msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282 +#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 msgid "%s ward, %s" msgstr "%s ward, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:540 +#: perllib/FixMyStreet/DB/Result/Problem.pm:554 msgid "%s, reported at %s" msgstr "%s, reported at %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309 +#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "%s, within %s ward" msgstr "%s, within %s ward" -#: templates/web/default/email_sent.html:29 +#: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "(Don't worry — we'll hang on to your alert while you're checking your email.)" -#: templates/web/default/email_sent.html:25 +#: templates/web/base/email_sent.html:25 msgid "(Don't worry — we'll hang on to your empty property report while you're checking your email.)" msgstr "(Peidiwch â phoeni — byddwn ni’n cadw’ch adroddiad am broblem tra byddwch chi’n edrych ar eich negeseuon e-bost.)" -#: templates/web/default/email_sent.html:27 +#: templates/web/base/email_sent.html:27 msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" msgstr "(Don't worry — we'll hang on to your update while you're checking your email.)" -#: templates/web/default/admin/report_blocks.html:11 -#: templates/web/default/admin/users.html:29 +#: templates/web/base/admin/report_blocks.html:11 +#: templates/web/base/admin/users.html:29 msgid "(Email in abuse table)" msgstr "(Email in abuse table)" -#: templates/web/default/alert/_list.html:20 +#: templates/web/base/alert/_list.html:20 #: 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:25 +#: templates/web/base/alert/_list.html:25 #: 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:12 -#: templates/web/default/around/on_map_list_items.html:9 +#: templates/web/base/around/around_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:9 #: templates/web/fixmystreet/report/_item.html:27 #: templates/web/zurich/report/_item.html:21 msgid "(closed)" msgstr "(closed)" -#: templates/web/default/around/around_map_list_items.html:10 -#: templates/web/default/around/on_map_list_items.html:7 +#: templates/web/base/around/around_map_list_items.html:10 +#: templates/web/base/around/on_map_list_items.html:7 #: templates/web/fixmystreet/report/_item.html:25 #: templates/web/zurich/report/_item.html:19 msgid "(returned to use)" msgstr "(wedi'i adfer i'w ddefnyddio)" -#: templates/web/default/index.html:12 templates/web/default/index.html:9 +#: templates/web/base/index.html:9 #: templates/web/fixmystreet/around/intro.html:2 msgid " " msgstr " " -#: templates/web/default/reports/_list-entry.html:4 +#: templates/web/base/reports/_list-entry.html:4 #: templates/web/fixmystreet/report/_item.html:21 msgid "(not sent to council)" msgstr "(not sent to council)" -#: templates/web/default/report/new/fill_in_details_form.html:217 +#: templates/web/base/report/new/fill_in_details_form.html:218 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:140 -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "(optional)" msgstr "(dewisol)" -#: templates/web/default/reports/_list-entry.html:2 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:56 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 +#, fuzzy +msgid "(public)" +msgstr "Public" + +#: templates/web/base/reports/_list-entry.html:2 #: templates/web/fixmystreet/report/_item.html:20 msgid "(sent to both)" msgstr "(sent to both)" -#: templates/web/default/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:212 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/update-form.html:158 +#: templates/web/base/report/update-form.html:158 msgid "(we never show your email)" msgstr "(we never show your email)" #: perllib/FixMyStreet/App/Controller/Report/New.pm:635 #: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:379 +#: perllib/FixMyStreet/DB/Result/Problem.pm:393 msgid "-- Pick a category --" msgstr "-- Pick a category --" #: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:385 +#: perllib/FixMyStreet/DB/Result/Problem.pm:399 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -178,15 +175,15 @@ msgstr "-- Dewiswch fath o eiddo --" msgid "<big>%s</big> reports" msgstr "<big>%s</big> adroddiadau" -#: templates/web/default/admin/body-form.html:42 -#: templates/web/default/admin/body-form.html:43 +#: templates/web/base/admin/body-form.html:42 +#: templates/web/base/admin/body-form.html:43 msgid "" "<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br>\n" " This is probably why \"area covered\" is empty (below).<br>\n" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/default/questionnaire/completed.html:20 +#: templates/web/base/questionnaire/completed.html:20 msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been returned to use.</p>" msgstr "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been returned to use.</p>" @@ -206,28 +203,13 @@ msgstr "" "<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" "</p>" -#: templates/web/fixmystreet/questionnaire/completed-open.html:25 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n" -"to your councillor(s)</a> or, if it’s an empty property that could be returned to use by\n" -"local people working together, why not\n" -"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n" -"to your councillor(s)</a> or, if it’s an empty property that could be returned to use by\n" -"local people working together, why not\n" -"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" - -#: templates/web/default/questionnaire/completed-open.html:6 +#: templates/web/base/questionnaire/completed-open.html:6 +#, fuzzy msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representative or, if it’s\n" -"an empty property that could be returned to use by local people working together, why not\n" -"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" +"suggestions: why not try writing to your local representatives or, if\n" +"it’s an empty property that could be returned to use by local people working together, why\n" +"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" "</p>" msgstr "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" @@ -236,47 +218,7 @@ msgstr "" "<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" "</p>" -#: templates/web/default/questionnaire/index.html:35 -msgid "" -"<p>Getting empty homes back into use can be difficult, but by now a good council\n" -"will have made a lot of progress and reported what they have done on the\n" -"website. Even so properties can remain empty for many months if the owner is\n" -"unwilling or the property is in very poor repair. If nothing has happened or\n" -"you are not satisfied with the progress the council is making, now is the right\n" -"time to say so. We think it’s a good idea to contact some other people who\n" -"may be able to help or put pressure on the council For advice on how to do\n" -"this and other useful information please go to <a\n" -"href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" -msgstr "" -"<p>Getting empty homes back into use can be difficult, but by now a good council\n" -"will have made a lot of progress and reported what they have done on the\n" -"website. Even so properties can remain empty for many months if the owner is\n" -"unwilling or the property is in very poor repair. If nothing has happened or\n" -"you are not satisfied with the progress the council is making, now is the right\n" -"time to say so. We think it’s a good idea to contact some other people who\n" -"may be able to help or put pressure on the council For advice on how to do\n" -"this and other useful information please go to <a\n" -"href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" - -#: templates/web/default/questionnaire/index.html:26 -msgid "" -"<p>Getting empty homes back into use can be difficult. You shouldn’t expect\n" -"the property to be back into use yet. But a good council will have started work\n" -"and should have reported what they have done on the website. If you are not\n" -"satisfied with progress or information from the council, now is the right time\n" -"to say. You may also want to try contacting some other people who may be able\n" -"to help. For advice on how to do this and other useful information please\n" -"go to <a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" -msgstr "" -"<p>Getting empty homes back into use can be difficult. You shouldn’t expect\n" -"the property to be back into use yet. But a good council will have started work\n" -"and should have reported what they have done on the website. If you are not\n" -"satisfied with progress or information from the council, now is the right time\n" -"to say. You may also want to try contacting some other people who may be able\n" -"to help. For advice on how to do this and other useful information please\n" -"go to <a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" - -#: templates/web/default/questionnaire/completed.html:9 +#: templates/web/base/questionnaire/completed.html:9 msgid "" "<p>Thank you very much for filling in our questionnaire; if you\n" "get some more information about the status of your empty property, please come back to the\n" @@ -286,21 +228,21 @@ msgstr "" "get some more information about the status of your empty property, please come back to the\n" "site and leave an update.</p>" -#: templates/web/default/around/_report_banner.html:4 -#: templates/web/default/around/_report_banner.html:5 +#: templates/web/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:5 msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" msgstr "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#: templates/web/default/admin/index.html:22 +#: templates/web/base/admin/index.html:22 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%d</strong> live empty properties" msgstr "<strong>%d</strong> live empty properties" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:183 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>No</strong> Let me confirm my report by email" -#: templates/web/fixmystreet/report/update-form.html:110 +#: templates/web/fixmystreet/report/update-form.html:112 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>No</strong> Let me confirm my update by email" @@ -309,30 +251,36 @@ msgstr "<strong>No</strong> Let me confirm my update by email" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>No</strong> let me sign in by email" -#: templates/web/default/auth/general.html:55 +#: templates/web/base/auth/general.html:55 msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>No</strong>, I do not, let me sign in by email:" -#: templates/web/default/report/new/fill_in_details_form.html:162 +#: templates/web/base/report/new/fill_in_details_form.html:163 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>No</strong>, let me confirm my report by email:" -#: templates/web/default/report/update-form.html:117 +#: templates/web/base/report/update-form.html:117 msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>No</strong>, let me confirm my update by email:" -#: templates/web/default/auth/general.html:37 -#: templates/web/default/report/new/fill_in_details_form.html:140 -#: templates/web/default/report/update-form.html:95 +#: templates/web/base/tokens/confirm_problem.html:19 +#: templates/web/base/tokens/confirm_problem.html:20 +#, fuzzy +msgid "<strong>We will now send it to the council</strong>." +msgstr " a <strong>byddwn nawr yn ei anfon at y cyngor</strong>" + +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:36 #: templates/web/fixmystreet/auth/general.html:38 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159 -#: templates/web/fixmystreet/report/update-form.html:87 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 +#: templates/web/fixmystreet/report/update-form.html:89 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Yes</strong> I have a password" -#: templates/web/default/static/about-en-gb.html:1 -#: templates/web/default/static/about-en-gb.html:3 +#: templates/web/base/static/about-en-gb.html:1 +#: templates/web/base/static/about-en-gb.html:3 #: templates/web/emptyhomes/header.html:34 #: templates/web/emptyhomes/static/about-cy.html:1 #: templates/web/emptyhomes/static/about-cy.html:3 @@ -341,77 +289,75 @@ msgstr "<strong>Yes</strong> I have a password" msgid "About us" msgstr "Amdanom ni" -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:39 -#: templates/web/default/report/update-form.html:30 -#: templates/web/default/report/update-form.html:31 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:29 msgid "Action Scheduled" msgstr "Action Scheduled" -#: templates/web/default/admin/body-form.html:3 -#: templates/web/default/admin/body-form.html:4 +#: templates/web/base/admin/body-form.html:3 +#: templates/web/base/admin/body-form.html:4 msgid "" "Add a <strong>body</strong> for each administrative body, such as a council or department\n" " to which empty property reports can be sent. You can add one or more contacts (for different\n" " categories of empty property) to each body." msgstr "" -#: templates/web/default/admin/body.html:45 +#: templates/web/base/admin/body.html:48 msgid "Add a contact using the form below." msgstr "" -#: templates/web/default/admin/bodies.html:65 -#: templates/web/default/admin/bodies.html:70 -#: templates/web/default/admin/body-form.html:233 +#: templates/web/base/admin/bodies.html:67 +#: templates/web/base/admin/body-form.html:233 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Add body" -#: templates/web/default/admin/body.html:88 +#: templates/web/base/admin/body.html:104 #: templates/web/zurich/admin/body.html:30 msgid "Add new category" msgstr "Add new category" -#: templates/web/default/admin/users.html:45 +#: templates/web/base/admin/users.html:45 msgid "Add user" msgstr "Add user" -#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 msgid "Added %s" msgstr "Added %s" -#: templates/web/default/auth/change_password.html:29 +#: templates/web/base/auth/change_password.html:29 msgid "Again:" msgstr "Again:" -#: templates/web/default/admin/timeline.html:35 +#: templates/web/base/admin/timeline.html:35 msgid "Alert %d created for %s, type %s, parameters %s / %s" msgstr "Alert %d created for %s, type %s, parameters %s / %s" -#: templates/web/default/admin/timeline.html:37 +#: templates/web/base/admin/timeline.html:37 msgid "Alert %d disabled (created %s)" msgstr "Alert %d disabled (created %s)" -#: templates/web/default/report/update-form.html:163 -#: templates/web/fixmystreet/report/update-form.html:148 +#: templates/web/base/report/update-form.html:163 +#: templates/web/fixmystreet/report/update-form.html:150 msgid "Alert me to future updates" msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" -#: templates/web/default/reports/index.html:3 +#: templates/web/base/reports/index.html:3 #: templates/web/fixmybarangay/reports/index.html:3 #: templates/web/zurich/admin/stats.html:5 #: templates/web/zurich/reports/index.html:15 msgid "All Reports" msgstr "All Reports" -#: templates/web/default/footer.html:11 -#: templates/web/emptyhomes/header.html:32 -#: templates/web/fiksgatami/footer.html:7 -#: templates/web/fiksgatami/nn/footer.html:7 +#: templates/web/base/footer.html:11 templates/web/emptyhomes/header.html:32 +#: templates/web/fiksgatami/footer.html:23 +#: templates/web/fiksgatami/nn/footer.html:23 #: templates/web/fixmybarangay/footer.html:20 -#: templates/web/fixmystreet/footer.html:51 +#: templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -419,66 +365,63 @@ msgstr "All Reports" msgid "All reports" msgstr "Pob adroddiad" -#: templates/web/default/admin/stats.html:5 +#: templates/web/base/admin/stats.html:5 #: templates/web/zurich/admin/stats.html:8 msgid "All reports between %s and %s" msgstr "All reports between %s and %s" -#: templates/web/default/report/new/councils_text_some.html:2 +#: templates/web/base/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "All the information you provide here will be sent to" -#: templates/web/default/report/new/councils_text_all.html:12 -#: templates/web/default/report/new/councils_text_all.html:13 +#: templates/web/base/report/new/councils_text_all.html:12 +#: templates/web/base/report/new/councils_text_all.html:13 msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>." msgstr "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>." -#: templates/web/default/report/new/councils_text_all.html:5 -#: templates/web/default/report/new/councils_text_all.html:6 +#: templates/web/base/report/new/councils_text_all.html:5 +#: templates/web/base/report/new/councils_text_all.html:6 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 "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." -#: templates/web/default/report/new/councils_text_all.html:19 -#: templates/web/default/report/new/councils_text_all.html:20 -#: templates/web/default/report/new/fill_in_details_form.html:12 -#: templates/web/default/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:19 +#: templates/web/base/report/new/councils_text_all.html:20 +#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/emptyhomes/report/new/councils_text_all.html:3 #: templates/web/emptyhomes/report/new/councils_text_all.html:4 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:12 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:13 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "Bydd yr holl wybodaeth a ddarparwch fan hyn yn cael ei hanfon at <strong>%s</strong>." -#: templates/web/default/questionnaire/index.html:60 -#: templates/web/fixmystreet/questionnaire/index.html:54 +#: templates/web/base/questionnaire/index.html:36 +#: templates/web/fixmystreet/questionnaire/index.html:55 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 ddefnyddio." -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/problem_row.html:20 +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Di-enw" -#: templates/web/default/admin/report_edit.html:62 -#: templates/web/default/admin/update_edit.html:23 +#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonymous:" -#: templates/web/default/footer.html:26 +#: templates/web/base/footer.html:26 msgid "Are you a <strong>developer</strong>? Would you like to contribute to reportemptyhomes.com?" msgstr "Are you a <strong>developer</strong>? Would you like to contribute to reportemptyhomes.com?" -#: templates/web/fixmystreet/footer.html:19 +#: templates/web/fiksgatami/front/footer-marketing.html:14 +#: templates/web/fixmystreet/front/footer-marketing.html:14 msgid "Are you a developer?" msgstr "Are you a developer?" -#: templates/web/fixmystreet/footer.html:23 -msgid "Are you from a council?" -msgstr "Are you from a council?" - -#: templates/web/default/admin/body-form.html:69 +#: templates/web/base/admin/body-form.html:69 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "Area covered" @@ -502,24 +445,24 @@ msgstr "Assign to subdivision:" msgid "Assigned to %s" msgstr "Assigned to %s" -#: templates/web/default/open311/index.html:86 +#: templates/web/base/open311/index.html:86 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." -#: templates/web/default/open311/index.html:78 +#: templates/web/base/open311/index.html:78 msgid "At the moment only searching for and looking at reports work." msgstr "At the moment only searching for and looking at reports work." -#: perllib/FixMyStreet/DB/Result/Problem.pm:334 +#: perllib/FixMyStreet/DB/Result/Problem.pm:348 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Awaiting moderation" -#: templates/web/default/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:32 msgid "Back" msgstr "Back" -#: templates/web/default/admin/report_blocks.html:11 +#: templates/web/base/admin/report_blocks.html:11 msgid "Ban email address" msgstr "Ban email address" @@ -527,29 +470,23 @@ msgstr "Ban email address" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "Be sure to choose the right category, because we use that to determine to whom the report is sent." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1185 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:297 -#: templates/web/default/admin/bodies.html:1 -#: templates/web/zurich/header.html:64 +#: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "Bodies" -#: templates/web/default/admin/flagged.html:17 -#: templates/web/default/admin/reports.html:14 -#: templates/web/default/admin/users.html:17 +#: templates/web/base/admin/flagged.html:17 +#: templates/web/base/admin/reports.html:14 +#: templates/web/base/admin/users.html:17 msgid "Body" msgstr "Body" -#: templates/web/default/admin/user-form.html:32 +#: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "Body:" -#: 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>" -msgstr "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained by <a href=\"http://www.nuug.no/\">NUUG</a>" - -#: templates/web/default/admin/stats.html:80 +#: templates/web/base/admin/stats.html:80 msgid "By Date" msgstr "By Date" @@ -558,11 +495,10 @@ msgstr "By Date" msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" msgstr "Os na allwch weld y map, gallwch <a href='%s' rel='nofollow'>hepgor y cam hwn</a>" -#: templates/web/default/admin/bodies.html:20 -#: templates/web/default/admin/body.html:53 -#: templates/web/default/admin/index.html:44 -#: templates/web/default/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 +#: templates/web/base/admin/body.html:56 +#: templates/web/base/admin/index.html:44 +#: templates/web/base/report/new/category.html:10 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:85 #: templates/web/zurich/admin/body.html:13 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 @@ -572,14 +508,14 @@ msgstr "Os na allwch weld y map, gallwch <a href='%s' rel='nofollow'>hepgor y c msgid "Category" msgstr "Category" -#: templates/web/default/admin/index.html:42 +#: templates/web/base/admin/index.html:42 msgid "Category fix rate for empty properties > 4 weeks old" msgstr "Category fix rate for empty properties > 4 weeks old" -#: templates/web/default/admin/body.html:109 -#: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:61 -#: templates/web/default/report/new/fill_in_details_form.html:67 +#: templates/web/base/admin/body.html:126 +#: templates/web/base/admin/body_edit.html:23 +#: templates/web/base/admin/report_edit.html:61 +#: templates/web/base/report/new/fill_in_details_form.html:68 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:45 @@ -591,25 +527,30 @@ msgstr "Categori:" msgid "Category: %s" msgstr "Category: %s" -#: 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/base/auth/change_password.html:1 +#: templates/web/base/auth/change_password.html:3 +#: templates/web/base/auth/change_password.html:33 msgid "Change Password" msgstr "Change Password" -#: templates/web/default/admin/body.html:131 +#: templates/web/base/my/my.html:17 templates/web/fixmystreet/my/my.html:17 +#, fuzzy +msgid "Change password" +msgstr "Change Password" + +#: templates/web/base/admin/body.html:148 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/default/admin/body.html:142 +#: templates/web/base/admin/body.html:159 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-empty property page." msgstr "" -#: templates/web/default/admin/body.html:162 +#: templates/web/base/admin/body.html:179 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -620,28 +561,28 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/default/admin/body.html:101 +#: templates/web/base/admin/body.html:118 msgid "" "Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-empty property page." msgstr "" -#: templates/web/default/admin/stats.html:65 -#: templates/web/default/admin/stats.html:71 +#: templates/web/base/admin/stats.html:65 +#: templates/web/base/admin/stats.html:71 msgid "Click here or enter as dd/mm/yyyy" msgstr "" -#: templates/web/default/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:47 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" #: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:45 -#: templates/web/default/admin/report_edit.html:47 -#: templates/web/default/dashboard/index.html:142 -#: templates/web/default/dashboard/index.html:144 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:45 +#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 @@ -653,74 +594,72 @@ msgstr "Sut i roi gwybod am eiddo gwag" msgid "Closed" msgstr "Closed" -#: perllib/FixMyStreet/DB/Result/Problem.pm:748 +#: perllib/FixMyStreet/DB/Result/Problem.pm:762 msgid "Closed by council" msgstr "Closed by council" -#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43 +#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 msgid "Closed reports" msgstr "Closed reports" -#: templates/web/default/admin/problem_row.html:38 +#: templates/web/base/admin/problem_row.html:38 msgid "Closed:" msgstr "Closed:" -#: templates/web/default/around/tabbed_lists.html:11 -#: templates/web/default/around/tabbed_lists.html:12 +#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby empty properties <small>(within %skm)</small>" msgstr "Yr eiddo gwag cyfagos agosaf <small>(within %skm)</small>" -#: templates/web/default/admin/report_edit.html:23 +#: templates/web/base/admin/report_edit.html:23 #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:49 msgid "Co-ordinates:" msgstr "Co-ordinates:" -#: templates/web/default/admin/list_updates.html:10 +#: templates/web/base/admin/list_updates.html:10 msgid "Cobrand" msgstr "Cobrand" -#: templates/web/default/admin/report_edit.html:75 -#: templates/web/default/admin/update_edit.html:50 +#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Cobrand data:" -#: templates/web/default/admin/report_edit.html:74 -#: templates/web/default/admin/update_edit.html:49 +#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Cobrand:" -#: templates/web/default/admin/config_page.html:1 +#: templates/web/base/admin/config_page.html:1 #, fuzzy msgid "Configuration" msgstr "Cadarnhau" -#: perllib/FixMyStreet/App/Controller/Admin.pm:421 +#: perllib/FixMyStreet/App/Controller/Admin.pm:430 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Configuration updated - contacts will be generated automatically later" -#: templates/web/default/admin/body_edit.html:47 +#: templates/web/base/admin/body_edit.html:47 msgid "Configure Endpoint" msgstr "Configure Endpoint" -#: templates/web/default/admin/body.html:62 +#: templates/web/base/admin/body.html:60 msgid "Confirm" msgstr "Confirm" -#: templates/web/default/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Confirm account" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:177 -#: templates/web/fixmystreet/report/update-form.html:105 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 +#: templates/web/fixmystreet/report/update-form.html:107 msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." msgstr "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." -#: templates/web/default/questionnaire/creator_fixed.html:1 -#: templates/web/default/tokens/confirm_problem.html:1 -#: templates/web/default/tokens/confirm_problem.html:3 -#: templates/web/default/tokens/confirm_update.html:1 -#: templates/web/default/tokens/confirm_update.html:3 +#: templates/web/base/questionnaire/creator_fixed.html:1 +#: templates/web/base/tokens/confirm_problem.html:1 +#: templates/web/base/tokens/confirm_update.html:1 #: templates/web/emptyhomes/tokens/confirm_problem.html:1 #: templates/web/emptyhomes/tokens/confirm_problem.html:3 #: templates/web/zurich/tokens/confirm_problem.html:1 @@ -728,113 +667,108 @@ msgstr "Confirm by email below, providing a new password at that point. When you msgid "Confirmation" msgstr "Cadarnhau" -#: templates/web/default/admin/body.html:137 -#: templates/web/default/admin/body.html:55 -#: templates/web/default/admin/body_edit.html:32 -#: templates/web/default/admin/body_edit.html:84 +#: templates/web/base/admin/body.html:154 +#: templates/web/base/admin/body.html:67 +#: templates/web/base/admin/body_edit.html:32 +#: templates/web/base/admin/body_edit.html:84 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Confirmed" -#: templates/web/default/admin/stats.html:5 +#: templates/web/base/admin/stats.html:5 msgid "Confirmed reports between %s and %s" msgstr "Confirmed reports between %s and %s" -#: templates/web/default/admin/list_updates.html:39 -#: templates/web/default/admin/problem_row.html:36 -#: templates/web/default/admin/report_edit.html:70 +#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/problem_row.html:36 +#: templates/web/base/admin/report_edit.html:70 msgid "Confirmed:" msgstr "Confirmed:" -#: templates/web/fiksgatami/footer.html:10 -#: templates/web/fiksgatami/nn/footer.html:10 -msgid "Contact" -msgstr "Cysylltu" - -#: templates/web/default/footer.html:24 +#: templates/web/base/footer.html:24 msgid "Contact reportemptyhomes.com" msgstr "Cysylltwch â 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/base/contact/index.html:1 +#: templates/web/base/contact/index.html:2 +#: templates/web/base/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/base/contact/index.html:6 +#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:22 msgid "Contact the team" msgstr "Cysylltu â'r tîm" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1319 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1347 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1328 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 msgid "Could not find user" msgstr "Could not find user" -#: templates/web/default/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:37 msgid "Could not look up location" msgstr "Could not look up location" -#: templates/web/default/admin/list_updates.html:9 +#: templates/web/base/admin/list_updates.html:9 msgid "Council" msgstr "Council" -#: templates/web/default/admin/body.html:1 -#: templates/web/default/admin/body_edit.html:1 +#: templates/web/base/admin/body.html:1 +#: templates/web/base/admin/body_edit.html:1 #: templates/web/zurich/admin/body.html:1 msgid "Council contacts for %s" msgstr "Council contacts for %s" -#: templates/web/default/admin/stats.html:84 +#: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "Council:" -#: templates/web/default/admin/stats.html:12 -#: templates/web/default/admin/stats.html:32 +#: templates/web/base/admin/stats.html:12 +#: templates/web/base/admin/stats.html:32 #: templates/web/zurich/admin/stats.html:45 #: templates/web/zurich/admin/stats.html:50 msgid "Count" msgstr "Count" -#: templates/web/default/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Create a report" -#: templates/web/default/admin/body.html:179 +#: templates/web/base/admin/body.html:196 #: templates/web/zurich/admin/body.html:53 msgid "Create category" msgstr "Create category" -#: templates/web/default/admin/problem_row.html:34 +#: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/list_updates.html:29 #: templates/web/zurich/admin/list_updates.html:8 msgid "Created" msgstr "Created" -#: templates/web/default/admin/list_updates.html:38 -#: templates/web/default/admin/report_edit.html:69 -#: templates/web/default/admin/update_edit.html:51 +#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:64 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Created:" -#: templates/web/default/admin/stats.html:31 +#: templates/web/base/admin/stats.html:31 msgid "Current state" msgstr "Current state" -#: templates/web/default/admin/bodies.html:7 -#: templates/web/default/admin/index.html:5 +#: templates/web/base/admin/bodies.html:5 +#: templates/web/base/admin/index.html:5 #, fuzzy msgid "Currently no bodies have been created." msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag." -#: templates/web/default/dashboard/index.html:6 -#: templates/web/default/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "Dashboard" @@ -842,28 +776,28 @@ msgstr "Dashboard" msgid "Dealt with by subdivision within 5 working days" msgstr "Dealt with by subdivision within 5 working days" -#: templates/web/default/admin/bodies.html:22 -#: templates/web/default/admin/body.html:148 -#: templates/web/default/admin/body.html:56 -#: templates/web/default/admin/body_edit.html:37 -#: templates/web/default/admin/body_edit.html:85 +#: templates/web/base/admin/bodies.html:20 +#: templates/web/base/admin/body.html:165 +#: templates/web/base/admin/body.html:69 +#: templates/web/base/admin/body_edit.html:37 +#: templates/web/base/admin/body_edit.html:85 msgid "Deleted" msgstr "Deleted" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 msgid "Description" msgstr "Description" -#: templates/web/default/js/translation_strings.html:34 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 +#: templates/web/base/js/translation_strings.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:42 msgid "Details" msgstr "Manylion" -#: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/report/new/fill_in_details_form.html:61 +#: templates/web/base/admin/report_edit.html:20 +#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 #: templates/web/zurich/admin/report_edit-sdm.html:28 #: templates/web/zurich/admin/report_edit.html:28 @@ -871,11 +805,11 @@ msgstr "Manylion" msgid "Details:" msgstr "Manylion:" -#: templates/web/default/admin/body.html:57 +#: templates/web/base/admin/body.html:75 msgid "Devolved" msgstr "Devolved" -#: templates/web/default/admin/edit-league.html:8 +#: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Diligency prize league table" @@ -883,32 +817,32 @@ msgstr "Diligency prize league table" msgid "Do you have a FixMyBarangay password?" msgstr "Do you have a FixMyBarangay password?" -#: templates/web/default/auth/general.html:32 +#: templates/web/base/auth/general.html:32 #: templates/web/fixmystreet/auth/general.html:32 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:155 -#: templates/web/fixmystreet/report/update-form.html:84 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 +#: templates/web/fixmystreet/report/update-form.html:86 msgid "Do you have a reportemptyhomes.com password?" msgstr "Do you have a reportemptyhomes.com password?" -#: templates/web/default/questionnaire/index.html:70 -#: templates/web/fixmystreet/questionnaire/index.html:64 +#: templates/web/base/questionnaire/index.html:46 +#: templates/web/fixmystreet/questionnaire/index.html:65 msgid "Don’t know" msgstr "Ddim yn gwybod" -#: templates/web/fixmystreet/contact/index.html:115 +#: templates/web/fixmystreet/contact/index.html:119 msgid "Don't like forms?" msgstr "" -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:47 -#: templates/web/default/report/update-form.html:30 -#: templates/web/default/report/update-form.html:32 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:30 msgid "Duplicate" msgstr "Duplicate" -#: templates/web/default/admin/body.html:90 +#: templates/web/base/admin/body.html:94 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories <strong>can have the same contact</strong> (email address).\n" @@ -916,19 +850,19 @@ msgid "" " " msgstr "" -#: templates/web/default/admin/list_updates.html:42 -#: templates/web/default/admin/problem_row.html:41 -#: templates/web/default/admin/users.html:31 +#: templates/web/base/admin/list_updates.html:42 +#: templates/web/base/admin/problem_row.html:41 +#: templates/web/base/admin/users.html:31 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "Edit" -#: templates/web/default/admin/body.html:189 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:64 msgid "Edit body details" msgstr "Edit body details" -#: templates/web/default/admin/report_edit.html:1 +#: templates/web/base/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:2 @@ -936,26 +870,24 @@ msgstr "Edit body details" msgid "Editing empty property %d" msgstr "Editing empty property %d" -#: templates/web/default/admin/update_edit.html:1 +#: templates/web/base/admin/update_edit.html:1 #: templates/web/zurich/admin/update_edit.html:1 msgid "Editing update %d" msgstr "Editing update %d" -#: templates/web/default/admin/user_edit.html:1 +#: templates/web/base/admin/user_edit.html:1 msgid "Editing user %d" msgstr "Editing user %d" -#: templates/web/default/admin/body_edit.html:86 +#: templates/web/base/admin/body_edit.html:86 msgid "Editor" msgstr "Editor" -#: templates/web/default/admin/bodies.html:18 -#: templates/web/default/admin/body.html:54 -#: templates/web/default/admin/body_edit.html:83 -#: templates/web/default/admin/flagged.html:38 -#: templates/web/default/admin/users.html:16 +#: templates/web/base/admin/bodies.html:16 +#: templates/web/base/admin/body_edit.html:83 +#: templates/web/base/admin/flagged.html:38 +#: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:20 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/auth/general.html:24 @@ -963,33 +895,33 @@ msgstr "Editor" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1295 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1304 msgid "Email added to abuse list" msgstr "Email added to abuse list" -#: templates/web/default/admin/body.html:126 +#: templates/web/base/admin/body.html:143 #, fuzzy msgid "Email address:" msgstr "Your email address:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email already in abuse list" msgstr "Email already in abuse list" -#: templates/web/default/around/_updates.html:5 +#: templates/web/base/around/_updates.html:5 msgid "Email me new local empty properties" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" -#: templates/web/default/report/display.html:34 +#: templates/web/base/report/display.html:34 msgid "Email me updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:67 -#: templates/web/default/admin/update_edit.html:33 -#: templates/web/default/admin/user-form.html:20 -#: templates/web/default/alert/updates.html:13 -#: templates/web/default/report/display.html:38 +#: templates/web/base/admin/body_edit.html:26 +#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/update_edit.html:33 +#: templates/web/base/admin/user-form.html:20 +#: templates/web/base/alert/updates.html:13 +#: templates/web/base/report/display.html:38 #: templates/web/zurich/admin/body.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:60 @@ -1024,29 +956,29 @@ msgstr "Tafarn neu far gwag" msgid "Empty public building - school, hospital, etc." msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." -#: templates/web/default/admin/body-form.html:158 -#: templates/web/default/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:158 +#: templates/web/base/admin/body-form.html:159 msgid "" "Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" " For more information, see \n" -" <a href='http://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." +" <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/default/admin/body-form.html:215 -#: templates/web/default/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:215 +#: templates/web/base/admin/body-form.html:216 msgid "" "Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " empty property must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/default/admin/stats.html:70 +#: templates/web/base/admin/stats.html:70 #, fuzzy msgid "End Date:" msgstr "End day:" -#: templates/web/default/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:126 msgid "Endpoint" msgstr "Endpoint" @@ -1054,16 +986,16 @@ msgstr "Endpoint" msgid "Enter a Zürich street name" msgstr "Enter a Zürich street name" -#: perllib/FixMyStreet/Cobrand/UK.pm:18 +#: perllib/FixMyStreet/Cobrand/UK.pm:13 msgid "Enter a nearby UK postcode, or street name and area" msgstr "Cofnodwch god post gerllaw yn y DU, neu enw stryd ac ardal" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:29 msgid "Enter a nearby postcode, or street name and area" msgstr "Enter a nearby postcode, or street name and area" -#: templates/web/default/around/postcode_form.html:2 +#: templates/web/base/around/postcode_form.html:2 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "Cofnodwch god post gerllaw yn y DU, neu enw stryd ac ardal" @@ -1073,47 +1005,51 @@ msgstr "Cofnodwch god post gerllaw yn y DU, neu enw stryd ac ardal" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "Cofnodwch god post gerllaw yn y DU, neu enw stryd ac ardal" -#: templates/web/default/auth/general.html:64 -#: templates/web/default/report/new/fill_in_details_form.html:169 -#: templates/web/default/report/update-form.html:124 +#: templates/web/base/auth/general.html:64 +#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "Enter a new password:" -#: templates/web/fixmystreet/auth/general.html:61 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 -#: templates/web/fixmystreet/report/update-form.html:122 +#: templates/web/fixmystreet/auth/general.html:62 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:69 +#: templates/web/fixmystreet/report/update-form.html:123 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Enter a password" -#: templates/web/default/index-steps.html:26 +#: templates/web/base/index-steps.html:33 msgid "Enter details of the empty property" msgstr "Rhowch fanylion yr eiddo gwag" -#: templates/web/default/auth/token.html:5 -#: templates/web/default/errors/generic.html:1 -#: templates/web/default/errors/generic.html:3 -#: templates/web/default/tokens/abuse.html:1 -#: templates/web/default/tokens/abuse.html:3 -#: templates/web/default/tokens/error.html:1 -#: templates/web/default/tokens/error.html:3 +#: templates/web/base/auth/token.html:5 +#: templates/web/base/errors/generic.html:1 +#: templates/web/base/errors/generic.html:3 +#: templates/web/base/tokens/abuse.html:1 +#: templates/web/base/tokens/abuse.html:3 +#: templates/web/base/tokens/error.html:1 +#: templates/web/base/tokens/error.html:3 msgid "Error" msgstr "Gwall" -#: templates/web/default/admin/body.html:11 -#: templates/web/default/admin/body_edit.html:18 +#: templates/web/base/admin/body.html:14 +#: templates/web/base/admin/body_edit.html:18 msgid "Example postcode %s" msgstr "Example postcode %s" -#: templates/web/default/open311/index.html:96 +#: templates/web/base/open311/index.html:96 msgid "Examples:" msgstr "Examples:" -#: templates/web/default/admin/report_edit.html:76 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 +msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" +msgstr "" + +#: templates/web/base/admin/report_edit.html:76 msgid "Extra data:" msgstr "Extra data:" -#: templates/web/default/contact/submit.html:15 +#: templates/web/base/contact/submit.html:15 msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." msgstr "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." @@ -1126,29 +1062,24 @@ msgstr "Filter report list" msgid "Find latest local and national news" msgstr "Dod o hyd i’r newyddion lleol a chenedlaethol diweddaraf" -#: templates/web/default/questionnaire/index.html:79 -#: templates/web/fixmystreet/questionnaire/index.html:73 +#: templates/web/base/questionnaire/index.html:55 +#: templates/web/fixmystreet/questionnaire/index.html:74 msgid "First time" msgstr "Y tro cyntaf" -#: templates/web/default/admin/body.html:37 +#: templates/web/base/admin/body.html:40 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/fiksgatami/header.html:16 -#: 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 +#: templates/web/base/header.html:24 msgid "reportemptyhomes.com" msgstr "reportemptyhomes.com" -#: templates/web/default/admin/header.html:10 +#: templates/web/base/admin/header.html:10 msgid "reportemptyhomes.com admin:" msgstr "reportemptyhomes.com admin:" -#: templates/web/default/alert/index.html:11 +#: templates/web/base/alert/index.html:11 msgid "" "reportemptyhomes.com has a variety of RSS feeds and email alerts for local empty properties, including\n" "alerts for all empty properties within a particular ward or council, or all empty properties\n" @@ -1158,7 +1089,7 @@ msgstr "" "gan gynnwys hysbysiadau am bob eiddo gwag mewn ward neu gyngor penodol, neu bob eiddo gwag\n" "o fewn pellter penodol o leoliad penodol." -#: templates/web/default/alert/_list.html:71 +#: templates/web/base/alert/_list.html:71 #: templates/web/fixmystreet/alert/_list.html:73 msgid "" "reportemptyhomes.com sends different categories of empty property\n" @@ -1175,88 +1106,88 @@ 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." -#: templates/web/default/admin/index.html:44 -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:41 -#: templates/web/default/admin/report_edit.html:42 -#: templates/web/default/dashboard/index.html:142 -#: templates/web/default/dashboard/index.html:144 -#: templates/web/default/report/update-form.html:30 -#: templates/web/default/report/update-form.html:34 +#: templates/web/base/admin/index.html:44 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:41 +#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:144 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/report/update-form.html:34 #: templates/web/fixmystreet/report/banner.html:12 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:32 msgid "Fixed" msgstr "Fixed" -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:43 msgid "Fixed - Council" msgstr "Fixed - Council" -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:42 msgid "Fixed - User" msgstr "Fixed - User" -#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38 +#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 msgid "Fixed reports" msgstr "Fixed reports" -#: templates/web/default/admin/problem_row.html:37 +#: templates/web/base/admin/problem_row.html:37 msgid "Fixed:" msgstr "Fixed:" -#: templates/web/default/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:84 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "" -#: templates/web/default/admin/report_blocks.html:16 +#: templates/web/base/admin/report_blocks.html:16 msgid "Flag user" msgstr "Flag user" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1190 -#: templates/web/default/admin/users.html:19 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Flagged" -#: templates/web/default/admin/flagged.html:1 +#: templates/web/base/admin/flagged.html:1 msgid "Flagged reports and users" msgstr "" -#: templates/web/default/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:45 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" -#: templates/web/default/admin/flagged.html:31 +#: templates/web/base/admin/flagged.html:31 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/default/admin/report_edit.html:78 -#: templates/web/default/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:78 +#: templates/web/base/admin/user-form.html:51 msgid "Flagged:" msgstr "Flagged:" -#: templates/web/default/reports/_ward-list.html:3 +#: templates/web/base/reports/_ward-list.html:3 #: templates/web/fixmystreet/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Follow a ward link to view only reports within that ward." -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:30 msgid "For council(s):" msgstr "For council(s):" -#: templates/web/default/admin/body-form.html:65 -msgid "For more information, see <a href='http://code.fixmystreet.com/customising/fms_and_mapit' class='admin-offsite-link'>How reportemptyhomes.com uses Mapit</a>." +#: templates/web/base/admin/body-form.html:65 +msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How reportemptyhomes.com uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 -#: templates/web/fixmystreet/report/update-form.html:104 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 +#: templates/web/fixmystreet/report/update-form.html:106 msgid "Forgotten your password?" msgstr "Forgotten your password?" -#: templates/web/default/faq/faq-en-gb.html:1 +#: templates/web/base/faq/faq-en-gb.html:1 #: 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 @@ -1267,7 +1198,7 @@ msgstr "Forgotten your password?" msgid "Frequently Asked Questions" msgstr "Cwestiynau Cyffredin" -#: templates/web/default/open311/index.html:138 +#: templates/web/base/open311/index.html:138 msgid "GeoRSS on Google Maps" msgstr "GeoRSS on Google Maps" @@ -1286,68 +1217,68 @@ msgstr "Get updates of %s empty properties" msgid "Get updates of empty properties in this %s" msgstr "Get updates of empty properties in this %s" -#: templates/web/default/alert/_list.html:83 +#: templates/web/base/alert/_list.html:83 #: templates/web/fixmybarangay/alert/_list.html:28 #: templates/web/fixmystreet/alert/_list.html:82 msgid "Give me an RSS feed" msgstr "Rhowch borthiant RSS i mi" -#: templates/web/default/alert/index.html:34 -#: templates/web/default/around/postcode_form.html:8 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 #: templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "Ewch" -#: templates/web/default/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:77 msgid "Going to send questionnaire?" msgstr "Going to send questionnaire?" -#: templates/web/default/admin/index.html:32 +#: templates/web/base/admin/index.html:32 msgid "Graph of empty property creation by status over time" msgstr "Graph of empty property creation by status over time" -#: templates/web/default/reports/index.html:8 +#: templates/web/base/reports/index.html:9 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:61 -#: templates/web/fixmystreet/questionnaire/index.html:55 +#: templates/web/base/questionnaire/index.html:37 +#: templates/web/fixmystreet/questionnaire/index.html:56 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:74 -#: templates/web/fixmystreet/questionnaire/index.html:68 +#: templates/web/base/questionnaire/index.html:50 +#: templates/web/fixmystreet/questionnaire/index.html:69 msgid "Have you ever reported an empty property to a council before, or is this your first time?" 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:15 -#: templates/web/emptyhomes/header.html:33 -#: templates/web/fiksgatami/footer.html:9 -#: templates/web/fiksgatami/nn/footer.html:9 +#: templates/web/base/footer.html:15 templates/web/emptyhomes/header.html:33 +#: templates/web/fiksgatami/footer.html:27 +#: templates/web/fiksgatami/nn/footer.html:27 #: templates/web/fixmybarangay/footer.html:24 -#: templates/web/fixmystreet/footer.html:55 +#: templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 msgid "FAQs" msgstr "Cwestiynau Cyffredin" -#: templates/web/default/alert/_list.html:6 +#: templates/web/base/alert/_list.html:6 #: 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/fiksgatami/header.html:48 #: templates/web/fixmybarangay/header.html:66 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:52 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hi %s" -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:50 -#: templates/web/default/admin/report_edit.html:51 -#: templates/web/default/admin/update_edit.html:28 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:50 +#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/header.html:11 #: templates/web/zurich/admin/header.html:2 #: templates/web/zurich/admin/report_edit.html:89 @@ -1357,31 +1288,31 @@ msgstr "Hi %s" msgid "Hidden" msgstr "Hidden" -#: templates/web/default/around/display_location.html:67 +#: templates/web/base/around/display_location.html:67 msgid "Hide old" msgstr "Hide old" -#: templates/web/default/around/display_location.html:62 +#: templates/web/base/around/display_location.html:62 msgid "Hide pins" msgstr "Cuddio pinnau" -#: templates/web/default/admin/body_edit.html:79 +#: templates/web/base/admin/body_edit.html:79 msgid "History" msgstr "History" -#: templates/web/default/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:31 msgid "Home" msgstr "Home" -#: templates/web/default/index-steps.html:1 +#: templates/web/base/index-steps.html:1 msgid "How to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: templates/web/default/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:33 msgid "How to send successful reports" msgstr "How to send successful reports" -#: perllib/FixMyStreet/App/Controller/Admin.pm:733 +#: perllib/FixMyStreet/App/Controller/Admin.pm:742 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "I am afraid you cannot confirm unconfirmed reports." @@ -1397,9 +1328,9 @@ msgstr "I'm afraid we couldn't validate that token, as the report was made too l msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" msgstr "Yn anffodus, ni fu modd i ni ddilysu'r dynodiad hwnnw. Os ydych wedi copïo'r URL o neges e-bost, gwnewch yn siwr eich bod wedi'i gopïo'n union.\n" -#: templates/web/default/admin/flagged.html:14 -#: templates/web/default/admin/list_updates.html:6 -#: templates/web/default/admin/reports.html:11 +#: templates/web/base/admin/flagged.html:14 +#: templates/web/base/admin/list_updates.html:6 +#: templates/web/base/admin/reports.html:11 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:28 @@ -1408,32 +1339,32 @@ msgstr "Yn anffodus, ni fu modd i ni ddilysu'r dynodiad hwnnw. Os ydych wedi cop msgid "ID" msgstr "ID" -#: templates/web/default/admin/body-form.html:24 -#: templates/web/default/admin/body-form.html:25 +#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/body-form.html:25 msgid "" "Identify a <strong>parent</strong> if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/default/admin/body.html:104 +#: templates/web/base/admin/body.html:121 msgid "" "If two or more bodies serve the same location, reportemptyhomes.com combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/default/email_sent.html:19 +#: templates/web/base/email_sent.html:19 msgid "If you do not, your alert will not be activated." msgstr "If you do not, your alert will not be activated." -#: templates/web/default/email_sent.html:15 +#: templates/web/base/email_sent.html:15 msgid "If you do not, your empty property will not be posted." msgstr "Os na wnewch chi hyn, ni fydd eich problem yn cael ei phostio." -#: templates/web/default/email_sent.html:17 +#: templates/web/base/email_sent.html:17 msgid "If you do not, your update will not be posted." msgstr "If you do not, your update will not be posted." -#: templates/web/default/report/new/councils_text_none.html:9 +#: templates/web/base/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 "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." @@ -1445,13 +1376,12 @@ msgstr "" "ni fydd yn cael ei adrodd i'r cyngor – gadewch eich adroddiad o hyd, fel y gallwn\n" "ddangos i'r cyngor y gweithgarwch yn ei ardal." -#: templates/web/default/auth/token.html:22 -#: templates/web/default/email_sent.html:9 +#: templates/web/base/auth/token.html:22 templates/web/base/email_sent.html:9 msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." msgstr "Os ydych yn defnyddio e-bost drwy’r we neu os oes gennych hidlyddion ‘post sothach’, efallai y byddwch am edrych yn eich ffolderi post torfol/sbam: weithiau, bydd ein negeseuon yn cael eu marcio felly." -#: templates/web/default/questionnaire/index.html:86 -#: templates/web/fixmystreet/questionnaire/index.html:77 +#: templates/web/base/questionnaire/index.html:59 +#: templates/web/fixmystreet/questionnaire/index.html:78 msgid "" "If you wish to leave a public update on the empty property, please enter it here\n" "(please note it will not be sent to the council). For example, what was\n" @@ -1461,34 +1391,34 @@ msgstr "" "(sylwer na fydd yn cael ei anfon at y cyngor). Er enghraifft, beth oedd eich profiad\n" "o gael yr eiddo gwag yn ôl mewn defnydd?" -#: templates/web/default/admin/body.html:120 +#: templates/web/base/admin/body.html:137 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/default/admin/body-form.html:200 -#: templates/web/default/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:200 +#: templates/web/base/admin/body-form.html:201 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/default/admin/body-form.html:187 -#: templates/web/default/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:187 +#: templates/web/base/admin/body-form.html:188 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/default/admin/body-form.html:173 -#: templates/web/default/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:173 +#: templates/web/base/admin/body-form.html:174 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " reportemptyhomes.com <strong>user</strong> will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:116 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Illegal ID" msgstr "ID Anghyfreithlon" @@ -1496,27 +1426,27 @@ msgstr "ID Anghyfreithlon" msgid "Illegal feed selection" msgstr "Dewis porthiant annilys" -#: templates/web/default/dashboard/index.html:142 -#: templates/web/default/dashboard/index.html:144 -#: templates/web/default/report/update-form.html:30 -#: templates/web/default/report/update-form.html:32 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:144 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:30 msgid "In Progress" msgstr "In Progress" -#: templates/web/default/admin/flagged.html:39 +#: templates/web/base/admin/flagged.html:39 #, fuzzy msgid "In abuse table?" msgstr "(Email in abuse table)" -#: templates/web/default/open311/index.html:90 +#: templates/web/base/open311/index.html:90 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:38 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:2 #: templates/web/zurich/admin/header.html:8 @@ -1529,7 +1459,7 @@ msgstr "In progress" msgid "Include reporter personal details" msgstr "Include reporter personal details" -#: templates/web/default/admin/stats.html:76 +#: templates/web/base/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "Include unconfirmed reports" @@ -1542,8 +1472,8 @@ msgstr "Incorrect has_photo value \"%s\"" msgid "Internal notes" msgstr "Internal notes:" -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:48 #, fuzzy msgid "Internal referral" msgstr "Internal notes:" @@ -1552,7 +1482,7 @@ msgstr "Internal notes:" msgid "Invalid agency_responsible value %s" msgstr "Invalid agency_responsible value %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1105 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 msgid "Invalid end date" msgstr "Invalid end date" @@ -1560,16 +1490,16 @@ msgstr "Invalid end date" msgid "Invalid format %s specified." msgstr "Invalid format %s specified." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1101 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 msgid "Invalid start date" msgstr "Invalid start date" -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:37 -#: templates/web/default/dashboard/index.html:142 -#: templates/web/default/dashboard/index.html:143 -#: templates/web/default/report/update-form.html:30 -#: templates/web/default/report/update-form.html:31 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:29 msgid "Investigating" @@ -1586,54 +1516,51 @@ msgstr "" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" -#: templates/web/default/auth/general.html:44 -#: templates/web/default/report/new/fill_in_details_form.html:149 -#: templates/web/default/report/update-form.html:104 +#: templates/web/base/auth/general.html:44 +#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:46 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 -#: templates/web/fixmystreet/report/update-form.html:100 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 +#: templates/web/fixmystreet/report/update-form.html:102 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Keep me signed in on this computer" -#: templates/web/default/admin/body.html:58 +#: templates/web/base/admin/body.html:58 #: templates/web/zurich/admin/body.html:15 msgid "Last editor" msgstr "Last editor" -#: templates/web/default/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:72 msgid "Last update:" msgstr "Last update:" -#: templates/web/default/admin/problem_row.html:39 +#: templates/web/base/admin/problem_row.html:39 msgid "Last update:" msgstr "Last update:" -#: templates/web/default/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:222 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/default/admin/body.html:14 -#: templates/web/default/admin/body.html:16 +#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 msgid "List all reported empty properties" msgstr "List all reported empty properties" -#: templates/web/default/report/new/fill_in_details_form.html:68 +#: templates/web/base/report/new/fill_in_details_form.html:69 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:51 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:86 #: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Loading..." msgstr "Llwytho…" -#: templates/web/default/alert/choose.html:1 -#: templates/web/default/alert/choose.html:3 -#: templates/web/default/alert/index.html:1 -#: templates/web/default/alert/index.html:3 -#: templates/web/default/alert/list.html:2 -#: templates/web/default/alert/list.html:5 -#: 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/base/alert/choose.html:1 +#: templates/web/base/alert/choose.html:3 +#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 +#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/updates.html:1 +#: templates/web/base/tokens/confirm_alert.html:1 +#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/emptyhomes/alert/index.html:1 #: templates/web/emptyhomes/alert/index.html:3 #: templates/web/fixmybarangay/alert/index.html:1 @@ -1642,25 +1569,23 @@ msgstr "Llwytho…" msgid "Local RSS feeds and email alerts" msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" -#: templates/web/default/alert/list.html:13 -#: templates/web/default/alert/list.html:14 -#: templates/web/default/alert/list.html:2 -#: templates/web/default/alert/list.html:3 +#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 +#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Local RSS feeds and email alerts for ‘%s’" -#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8 -#: templates/web/fiksgatami/nn/footer.html:8 +#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 +#: templates/web/fiksgatami/nn/footer.html:25 #: templates/web/fixmybarangay/footer.html:22 -#: templates/web/fixmystreet/footer.html:53 +#: templates/web/fixmystreet/footer.html:28 msgid "Get local reports" msgstr "Gweld adroddiadau lleol" -#: templates/web/default/index-steps.html:25 +#: templates/web/base/index-steps.html:31 msgid "Locate the empty property on a map of the area" msgstr "Chwiliwch am leoliad yr eiddo gwag ar fap o'r ardal" -#: templates/web/default/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:43 msgid "MAP" msgstr "MAP" @@ -1668,15 +1593,15 @@ msgstr "MAP" msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" -#: templates/web/default/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:43 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" -#: templates/web/fixmystreet/contact/index.html:103 +#: templates/web/fixmystreet/contact/index.html:107 msgid "Message" msgstr "Message" -#: templates/web/default/contact/index.html:92 +#: templates/web/base/contact/index.html:96 msgid "Message:" msgstr "Neges:" @@ -1688,39 +1613,37 @@ msgstr "Missing jurisdiction_id" msgid "Moderated by division within one working day" msgstr "Moderated by division within one working day" -#: templates/web/default/admin/stats.html:11 +#: templates/web/base/admin/stats.html:11 msgid "Month" msgstr "Month" -#: templates/web/default/report/display.html:30 +#: templates/web/base/report/display.html:30 msgid "More empty properties nearby" msgstr "Mwy o eiddo gwag cyfagos" -#: templates/web/default/admin/bodies.html:16 -#: templates/web/default/admin/body-form.html:18 -#: templates/web/default/admin/flagged.html:16 -#: templates/web/default/admin/flagged.html:37 -#: templates/web/default/admin/list_updates.html:7 -#: templates/web/default/admin/reports.html:13 -#: templates/web/default/admin/users.html:15 -#: templates/web/default/reports/index.html:15 +#: templates/web/base/admin/bodies.html:14 +#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/flagged.html:16 +#: templates/web/base/admin/flagged.html:37 +#: templates/web/base/admin/list_updates.html:7 +#: templates/web/base/admin/reports.html:13 +#: templates/web/base/admin/users.html:15 +#: templates/web/base/reports/index.html:17 #: templates/web/emptyhomes/reports/index.html:9 -#: templates/web/fiksgatami/nn/reports/index.html:9 -#: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmybarangay/reports/index.html:15 -#: templates/web/fixmystreet/auth/general.html:56 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:120 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:187 -#: templates/web/fixmystreet/report/update-form.html:136 +#: templates/web/fixmystreet/auth/general.html:52 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:8 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:43 +#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Name" msgstr "Enw" -#: templates/web/default/admin/report_edit.html:66 -#: templates/web/default/admin/update_edit.html:32 -#: templates/web/default/admin/user-form.html:18 +#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/update_edit.html:32 +#: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:59 #: templates/web/zurich/admin/stats.html:41 @@ -1731,17 +1654,12 @@ msgstr "Enw:" msgid "Name: %s" msgstr "Enw: %s" -#: templates/web/fiksgatami/footer.html:3 -#: templates/web/fiksgatami/nn/footer.html:3 -msgid "Navigation" -msgstr "Mordwyo " - #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188 #: perllib/FixMyStreet/Geocode/OSM.pm:166 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:137 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" @@ -1750,7 +1668,7 @@ msgstr "Nearest postcode to the pin placed on the map (automatically generated): msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1758,11 +1676,11 @@ msgstr "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" -#: templates/web/default/email_sent.html:3 +#: templates/web/base/email_sent.html:3 msgid "Nearly Done! Now check your email..." msgstr "Bron â gorffen! Nawr, ewch at eich negeseuon e-bost..." -#: templates/web/default/reports/index.html:16 +#: templates/web/base/reports/index.html:18 #: templates/web/fixmybarangay/reports/index.html:16 msgid "New <br>empty properties" msgstr "New <br>empty properties" @@ -1771,7 +1689,7 @@ msgstr "New <br>empty properties" msgid "New body added" msgstr "New body added" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "New category contact added" @@ -1790,8 +1708,6 @@ msgid "New local reports on reportemptyhomes.com" msgstr "Adroddiadau lleol newydd ar reportemptyhomes.com" #: templates/web/emptyhomes/reports/index.html:10 -#: 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" @@ -1839,7 +1755,7 @@ msgstr "Adroddiadau newydd i gyngor {{COUNCIL}} ar reportemptyhomes.com" msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" msgstr "Adroddiadau newydd o fewn ffin {{NAME}} ar reportemptyhomes.com" -#: templates/web/default/admin/questionnaire.html:24 +#: templates/web/base/admin/questionnaire.html:24 msgid "New state" msgstr "New state" @@ -1847,57 +1763,50 @@ msgstr "New state" msgid "New update:" msgstr "New update:" -#: 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/pagination.html:13 +#: templates/web/base/pagination.html:13 msgid "Next" msgstr "Next" -#: templates/web/default/admin/body.html:68 -#: templates/web/default/admin/body.html:69 -#: templates/web/default/admin/body.html:70 -#: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:34 -#: templates/web/default/admin/list_updates.html:35 -#: templates/web/default/admin/problem_row.html:20 -#: templates/web/default/admin/report_edit.html:64 -#: templates/web/default/admin/report_edit.html:77 -#: templates/web/default/admin/update_edit.html:25 -#: templates/web/default/questionnaire/creator_fixed.html:16 -#: templates/web/default/questionnaire/index.html:111 -#: templates/web/default/questionnaire/index.html:68 -#: templates/web/fixmystreet/questionnaire/index.html:101 -#: templates/web/fixmystreet/questionnaire/index.html:62 +#: templates/web/base/admin/body.html:68 templates/web/base/admin/body.html:70 +#: templates/web/base/admin/body.html:74 templates/web/base/admin/body.html:76 +#: templates/web/base/admin/body_edit.html:4 +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/problem_row.html:20 +#: templates/web/base/admin/report_edit.html:64 +#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/update_edit.html:25 +#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:44 +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/fixmystreet/questionnaire/index.html:102 +#: templates/web/fixmystreet/questionnaire/index.html:63 msgid "No" msgstr "Dim" -#: templates/web/default/admin/user-form.html:33 +#: templates/web/base/admin/user-form.html:33 msgid "No body" msgstr "No body" -#: templates/web/default/admin/stats.html:85 +#: templates/web/base/admin/stats.html:85 msgid "No council" msgstr "No council" -#: perllib/FixMyStreet/DB/Result/Problem.pm:362 +#: perllib/FixMyStreet/DB/Result/Problem.pm:376 msgid "No council selected" msgstr "Ni ddewiswyd cyngor" -#: templates/web/default/admin/edit-league.html:17 +#: templates/web/base/admin/edit-league.html:17 msgid "No edits have yet been made." msgstr "No edits have yet been made." -#: templates/web/default/admin/flagged.html:25 +#: templates/web/base/admin/flagged.html:25 #, fuzzy msgid "No flagged empty properties found." msgstr "No flagged empty properties found" -#: templates/web/default/admin/flagged.html:58 +#: templates/web/base/admin/flagged.html:58 #, fuzzy msgid "No flagged users found." msgstr "No flagged users found" @@ -1906,44 +1815,40 @@ msgstr "No flagged users found" msgid "No further updates" msgstr "No further updates" -#: templates/web/default/around/around_map_list_items.html:17 +#: templates/web/base/around/around_map_list_items.html:17 #: templates/web/fixmystreet/around/around_map_list_items.html:8 msgid "No empty properties found." msgstr "Ni ddaethpwyd o hyd i unrhyw eiddo gwag." -#: templates/web/default/around/on_map_list_items.html:14 +#: templates/web/base/around/on_map_list_items.html:14 #: templates/web/fixmystreet/around/on_map_list_items.html:6 msgid "No empty properties have been reported yet." msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag." -#: templates/web/default/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:38 msgid "No result returned" msgstr "No result returned" -#: templates/web/default/admin/body-form.html:60 -#: templates/web/default/admin/body-form.html:61 +#: templates/web/base/admin/body-form.html:60 +#: templates/web/base/admin/body-form.html:61 msgid "" "No specific areas are currently available, because the <code>MAPIT_URL</code> in\n" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/default/report/_support.html:3 -#: templates/web/default/report/_support.html:4 +#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "No supporters" -#: templates/web/default/admin/body.html:73 -msgid "Non Public" -msgstr "Non Public" - -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:49 #: templates/web/zurich/admin/report_edit.html:63 msgid "None" msgstr "None" -#: templates/web/default/admin/user-form.html:24 -#: templates/web/default/admin/user-form.html:25 +#: templates/web/base/admin/user-form.html:24 +#: templates/web/base/admin/user-form.html:25 msgid "" "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n" " Authorised staff users can be associated with the body they represent.<br>\n" @@ -1951,10 +1856,10 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:46 -#: templates/web/default/report/update-form.html:30 -#: templates/web/default/report/update-form.html:33 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:31 msgid "Not Responsible" @@ -1964,101 +1869,93 @@ msgstr "Not Responsible" msgid "Not for my subdivision" msgstr "Not for my subdivision" -#: templates/web/default/admin/questionnaire.html:6 +#: templates/web/base/admin/questionnaire.html:6 msgid "Not reported before" msgstr "Not reported before" -#: templates/web/default/report/_main.html:10 +#: templates/web/base/report/_main.html:61 msgid "Not reported to council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: templates/web/default/admin/body.html:59 -#: templates/web/default/admin/body_edit.html:87 +#: templates/web/base/admin/body.html:59 +#: templates/web/base/admin/body_edit.html:87 #: templates/web/zurich/admin/body.html:16 msgid "Note" msgstr "Note" -#: templates/web/default/admin/stats.html:51 +#: templates/web/base/admin/stats.html:51 msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" msgstr "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -#: templates/web/default/admin/body.html:157 -#: templates/web/default/admin/body_edit.html:44 +#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body_edit.html:44 #: templates/web/zurich/admin/body.html:47 msgid "Note:" msgstr "Note:" -#: templates/web/default/open311/index.html:75 +#: templates/web/base/open311/index.html:75 msgid "Note: <strong>%s</strong>" msgstr "Note: <strong>%s</strong>" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 msgid "Now to submit your report…" msgstr "Now to submit your report…" -#: templates/web/default/report/new/fill_in_details_form.html:131 +#: templates/web/base/report/new/fill_in_details_form.html:132 msgid "Now to submit your report… do you have a reportemptyhomes.com password?" msgstr "Now to submit your report… do you have a reportemptyhomes.com password?" -#: templates/web/fixmystreet/report/update-form.html:83 +#: templates/web/fixmystreet/report/update-form.html:85 msgid "Now to submit your update…" msgstr "Now to submit your update…" -#: templates/web/default/report/update-form.html:86 +#: templates/web/base/report/update-form.html:86 msgid "Now to submit your update… do you have a reportemptyhomes.com password?" msgstr "Now to submit your update… do you have a reportemptyhomes.com password?" -#: templates/web/default/js/translation_strings.html:42 +#: templates/web/base/js/translation_strings.html:42 msgid "OK" msgstr "OK" -#: templates/web/default/report/display.html:24 -#: templates/web/default/report/update.html:16 +#: templates/web/base/report/display.html:24 +#: templates/web/base/report/update.html:16 msgid "Offensive? Unsuitable? Tell us" msgstr "Sarhaus? Anaddas? Rhowch wybod i ni" -#: templates/web/default/reports/index.html:18 +#: templates/web/base/reports/index.html:20 #: templates/web/fixmybarangay/reports/index.html:18 msgid "Old / unknown <br>empty properties" msgstr "Eiddo gwag hen anhysbys" -#: 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" - -#: templates/web/default/admin/questionnaire.html:24 +#: templates/web/base/admin/questionnaire.html:24 msgid "Old state" msgstr "Old state" -#: templates/web/default/reports/index.html:20 +#: templates/web/base/reports/index.html:22 #: templates/web/fixmybarangay/reports/index.html:20 msgid "Older <br>returned to use" msgstr "Wedi'u hadfer i'w defnyddio ers amser" -#: templates/web/default/reports/index.html:17 +#: templates/web/base/reports/index.html:19 #: templates/web/fixmybarangay/reports/index.html:17 msgid "Older <br>empty properties" msgstr "Adroddiadau hŷn o eiddo gwag" -#: 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/emptyhomes/reports/index.html:11 -#: 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/fixmystreet/report/new/fill_in_details_form.html:56 +msgid "One-line summary" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:36 -#: templates/web/default/admin/report_edit.html:37 -#: templates/web/default/admin/update_edit.html:28 -#: templates/web/default/dashboard/index.html:142 -#: templates/web/default/report/update-form.html:30 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:36 +#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/update_edit.html:28 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:2 #: templates/web/zurich/admin/header.html:7 @@ -2069,28 +1966,28 @@ msgstr "Adroddiadau hŷn o eiddo gwag" msgid "Open" msgstr "Open" -#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33 +#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 msgid "Open reports" msgstr "Open reports" -#: templates/web/default/open311/index.html:72 +#: templates/web/base/open311/index.html:72 msgid "Open311 API for the mySociety reportemptyhomes.com server" msgstr "Open311 API for the mySociety reportemptyhomes.com server" -#: templates/web/default/open311/index.html:82 +#: templates/web/base/open311/index.html:82 msgid "Open311 initiative web page" msgstr "Open311 initiative web page" -#: templates/web/default/open311/index.html:83 +#: templates/web/base/open311/index.html:83 msgid "Open311 specification" msgstr "Open311 specification" -#: templates/web/default/alert/_list.html:58 +#: templates/web/base/alert/_list.html:58 #: templates/web/fixmystreet/alert/_list.html:60 msgid "Or empty properties reported to:" msgstr "Neu eiddo gwag y rhoddwyd gwybod amdanynt i:" -#: templates/web/default/alert/_list.html:33 +#: templates/web/base/alert/_list.html:33 #: templates/web/fixmystreet/alert/_list.html:36 msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn byw ynddo:" @@ -2098,67 +1995,67 @@ msgstr "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych #: perllib/FixMyStreet/App/Controller/Report/New.pm:1057 #: perllib/FixMyStreet/App/Controller/Report/New.pm:662 #: perllib/FixMyStreet/App/Controller/Report/New.pm:663 -#: perllib/FixMyStreet/DB/Result/Problem.pm:546 -#: perllib/FixMyStreet/DB/Result/Problem.pm:556 -#: perllib/FixMyStreet/DB/Result/Problem.pm:566 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 +#: perllib/FixMyStreet/DB/Result/Problem.pm:560 +#: perllib/FixMyStreet/DB/Result/Problem.pm:570 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/DB/Result/Problem.pm:592 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384 msgid "Other" msgstr "Arall" -#: templates/web/default/footer.html:27 +#: templates/web/base/footer.html:27 msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." msgstr "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#: templates/web/default/admin/list_updates.html:8 +#: templates/web/base/admin/list_updates.html:8 msgid "Owner" msgstr "Owner" -#: templates/web/default/errors/page_error_404_not_found.html:1 -#: templates/web/default/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:1 +#: templates/web/base/errors/page_error_404_not_found.html:3 msgid "Page Not Found" msgstr "Page Not Found" -#: templates/web/default/admin/body-form.html:31 +#: templates/web/base/admin/body-form.html:31 #: templates/web/zurich/admin/body-form.html:14 msgid "Parent" msgstr "Parent" -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:51 msgid "Partial" msgstr "Partial" -#: templates/web/fixmystreet/auth/general.html:59 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/fixmystreet/auth/general.html:55 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/fixmystreet/report/update-form.html:116 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Password (optional)" -#: templates/web/default/auth/change_password.html:25 +#: templates/web/base/auth/change_password.html:25 msgid "Password:" msgstr "Password:" -#: templates/web/default/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:45 msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:106 +#: templates/web/zurich/report/new/fill_in_details_form.html:100 #, fuzzy msgid "Phone number" msgstr "Your phone number" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:20 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:56 msgid "Phone number (optional)" msgstr "Phone number (optional)" #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 -#: templates/web/default/admin/report_edit.html:68 -#: templates/web/default/report/new/fill_in_details_form.html:215 +#: templates/web/base/admin/report_edit.html:68 +#: templates/web/base/report/new/fill_in_details_form.html:216 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 #: templates/web/zurich/admin/report_edit-sdm.html:49 #: templates/web/zurich/admin/report_edit.html:63 @@ -2166,7 +2063,7 @@ msgstr "Phone number (optional)" msgid "Phone:" msgstr "Rhif ffôn:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:102 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 @@ -2176,26 +2073,26 @@ msgstr "Rhif ffôn:" msgid "Photo" msgstr "Ffotograff" -#: templates/web/default/questionnaire/index.html:99 -#: templates/web/default/report/new/fill_in_details_form.html:102 -#: templates/web/default/report/update-form.html:62 +#: templates/web/base/questionnaire/index.html:71 +#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/update-form.html:62 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:99 -#: templates/web/fixmystreet/questionnaire/index.html:90 +#: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" msgstr "Ffotograff:" -#: templates/web/default/alert/list.html:26 +#: templates/web/base/alert/list.html:26 msgid "Photos of recent nearby reports" msgstr "Ffotograffau o adroddiadau cyfagos diweddar" -#: templates/web/default/js/translation_strings.html:30 +#: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Place pin on map" -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:38 -#: templates/web/default/dashboard/index.html:142 -#: templates/web/default/dashboard/index.html:143 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:2 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -2204,26 +2101,26 @@ msgstr "Place pin on map" msgid "Planned" msgstr "Planned" -#: templates/web/fixmystreet/questionnaire/index.html:44 +#: templates/web/fixmystreet/questionnaire/index.html:45 msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." msgstr "<a class=\"tab_link\" href=\"#report\">Ewch i fwrw golwg</a> ar y diweddariadau sydd wedi cael eu gadael." -#: templates/web/default/report/new/notes.html:6 +#: templates/web/base/report/new/notes.html:6 #: templates/web/fixmystreet/report/new/notes.html:6 msgid "Please be polite, concise and to the point." msgstr "Please be polite, concise and to the point." -#: templates/web/default/auth/change_password.html:12 -#: templates/web/default/auth/change_password.html:17 +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:17 msgid "Please check the passwords and try again" msgstr "Please check the passwords and try again" -#: templates/web/default/auth/token.html:14 +#: templates/web/base/auth/token.html:14 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/base/auth/general.html:14 +#: templates/web/base/auth/general.html:8 #: templates/web/fixmystreet/auth/general.html:15 #: templates/web/fixmystreet/auth/general.html:9 #: templates/web/zurich/auth/general.html:3 @@ -2231,19 +2128,25 @@ msgstr "Rhowch eich cyfeiriad e-bost" msgid "Please check your email address is correct" msgstr "Rhowch gyfeiriad e-bost dilys" +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 #: perllib/FixMyStreet/App/Controller/Report/New.pm:859 #: perllib/FixMyStreet/App/Controller/Report/New.pm:878 #: perllib/FixMyStreet/App/Controller/Report/New.pm:921 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 -#: templates/web/default/js/translation_strings.html:9 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 +#: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Dewiswch gategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:387 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "Please choose a property type" msgstr "Dewiswch fath o eiddo" -#: templates/web/default/contact/blurb.html:2 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#, fuzzy +msgid "Please correct the errors below" +msgstr "Dewiswch y porthiant rydych chi eisiau ei gael" + +#: templates/web/base/contact/blurb.html:2 #: templates/web/fixmystreet/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report empty properties through this form; messages go to\n" @@ -2254,7 +2157,7 @@ msgstr "" "bydd y negeseuon yn mynd at y tîm sydd y tu ôl i reportemptyhomes.com, nid at gyngor.\n" "I roi gwybod am eiddo gwag <a href=\"/\">ewch i'r dudalen flaen</a> a dilynwch y cyfarwyddiadau." -#: templates/web/default/report/new/notes.html:7 +#: templates/web/base/report/new/notes.html:7 #: templates/web/fixmystreet/report/new/notes.html:7 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Please do not be abusive — abusing your council devalues the service for all users." @@ -2263,47 +2166,49 @@ msgstr "Please do not be abusive — abusing your council devalues the msgid "Please do not give address or personal information in this section." msgstr "Peidiwch â rhoi cyfeiriad na gwybodaeth bersonol yn yr adran hon" -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 -#: templates/web/default/js/translation_strings.html:2 +#: perllib/FixMyStreet/App/Controller/Admin.pm:352 +#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: templates/web/base/js/translation_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/default/js/translation_strings.html:19 +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:15 +#: templates/web/base/js/translation_strings.html:19 msgid "Please enter a password" msgstr "Please enter a password" -#: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:356 -#: templates/web/default/js/translation_strings.html:3 +#: perllib/FixMyStreet/App/Controller/Contact.pm:115 +#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Rhowch enw'r pwnc" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 -#: perllib/FixMyStreet/App/Controller/Admin.pm:988 -#: perllib/FixMyStreet/DB/Result/User.pm:115 -#: templates/web/default/js/translation_strings.html:12 -#: templates/web/default/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 +#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: templates/web/base/js/translation_strings.html:12 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" msgstr "Cofnodwch gyfeiriad e-bost dilys" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:125 msgid "Please enter a valid email address" msgstr "Cofnodwch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/DB/Result/Problem.pm:359 -#: templates/web/default/js/translation_strings.html:4 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Cofnodwch fanylion" -#: perllib/FixMyStreet/App/Controller/Contact.pm:96 -#: perllib/FixMyStreet/DB/Result/User.pm:112 -#: templates/web/default/auth/general.html:13 -#: templates/web/default/auth/general.html:8 -#: templates/web/default/js/translation_strings.html:11 -#: templates/web/default/js/translation_strings.html:15 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 +#: perllib/FixMyStreet/DB/Result/User.pm:124 +#: templates/web/base/auth/general.html:13 +#: templates/web/base/auth/general.html:8 +#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:15 #: templates/web/fixmystreet/auth/general.html:14 #: templates/web/fixmystreet/auth/general.html:9 #: templates/web/zurich/auth/general.html:3 @@ -2311,42 +2216,42 @@ msgstr "Cofnodwch fanylion" msgid "Please enter your email" msgstr "Cofnodwch eich cyfeiriad e-bost" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Please enter your email address" msgstr "Cofnodwch eich cyfeiriad e-bost" -#: templates/web/default/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your first name" msgstr "Cofnodwch eich enw" -#: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/default/js/translation_strings.html:7 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "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:123 -#: perllib/FixMyStreet/DB/Result/Problem.pm:367 -#: perllib/FixMyStreet/DB/Result/User.pm:108 -#: templates/web/default/js/translation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Comment.pm:130 +#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Cofnodwch eich enw" -#: templates/web/default/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:22 #, fuzzy msgid "Please enter your phone number" msgstr "Please enter your second name" -#: templates/web/default/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your second name" msgstr "Please enter your second name" -#: templates/web/default/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:24 msgid "Please enter your title" msgstr "Please enter your title" -#: templates/web/default/auth/sign_out.html:5 +#: templates/web/base/auth/sign_out.html:5 #: templates/web/zurich/auth/sign_out.html:5 msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." @@ -2367,8 +2272,8 @@ msgstr "" " neges gyfan gan ddefnyddio priflythrennau yn ei gwneud hi’n anodd ei darllen, felly \n" " hefyd diffyg atalnodi." -#: templates/web/default/report/new/fill_in_details_text.html:11 -#: templates/web/default/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:11 +#: templates/web/base/report/new/fill_in_details_text.html:2 #: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10 #: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:2 @@ -2387,8 +2292,8 @@ msgstr "" "and if possible describe the exact location of\n" "the empty property (e.g. if there is a streetlight number or road name)." -#: templates/web/default/report/new/fill_in_details_text.html:2 -#: templates/web/default/report/new/fill_in_details_text.html:3 +#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:3 msgid "" "Please fill in details of the empty property below. The council won't be able\n" "to help unless you leave as much detail as you can, so please describe the exact location of\n" @@ -2400,12 +2305,11 @@ msgstr "" "the empty property (e.g. on a wall), what it is, how long it has been there, a description (and a\n" "photo of the empty property if you have one), etc." -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 #: templates/web/zurich/report/new/fill_in_details_form.html:46 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/base/report/new/fill_in_details_form.html:28 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:26 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:35 #: templates/web/zurich/report/new/fill_in_details_form.html:20 @@ -2420,18 +2324,19 @@ msgstr "Nodwch a fyddech chi'n hoffi derbyn holiadur arall" msgid "Please note that updates are not sent to the council." msgstr "Sylwer nad yw diweddariadau'n cael eu hanfon at y cyngor." -#: templates/web/default/report/update-form.html:7 +#: templates/web/base/report/update-form.html:7 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 <a href=\"/faq#privacy\">privacy policy</a>" msgstr "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 <a href=\"/faq#privacy\">privacy policy</a>" -#: templates/web/default/report/new/fill_in_details_form.html:5 -#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26 +#: templates/web/base/report/new/fill_in_details_form.html:7 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "Sylwch, <strong>nid yw eich adroddiad wedi’i anfon eto.</strong> Dewiswch gategori ac ychwanegwch wybodaeth bellach isod, yna’i gyflwyno." -#: templates/web/default/report/new/notes.html:1 +#: templates/web/base/report/new/notes.html:1 #: templates/web/fixmybarangay/report/new/notes.html:1 #: templates/web/fixmystreet/report/new/notes.html:1 msgid "Please note:" @@ -2462,7 +2367,7 @@ msgstr "Dewiswch y math o hysbysiad rydych chi eisiau ei gael" 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:50 +#: templates/web/base/questionnaire/index.html:26 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." @@ -2474,7 +2379,7 @@ msgstr "Dim ond llun JPEG y dylech lwytho i fyny." msgid "Please upload a JPEG image only\n" msgstr "Please upload a JPEG image only\n" -#: perllib/FixMyStreet/App/Controller/Contact.pm:98 +#: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Ysgrifennwch neges" @@ -2482,36 +2387,42 @@ msgstr "Ysgrifennwch neges" msgid "Please write your update here" msgstr "Please write your update here" -#: templates/web/default/contact/index.html:95 -#: templates/web/default/report/update-form.html:109 -#: templates/web/default/report/update-form.html:131 -#: templates/web/default/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:110 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/contact/index.html:99 +#: templates/web/base/report/update-form.html:109 +#: templates/web/base/report/update-form.html:131 +#: templates/web/base/report/update-form.html:72 +#: templates/web/fixmystreet/contact/index.html:114 +#: templates/web/fixmystreet/report/update-form.html:124 #: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:95 +#: templates/web/fixmystreet/report/update-form.html:97 msgid "Post" msgstr "Postio" -#: templates/web/default/report/updates.html:15 +#: templates/web/base/report/updates.html:15 msgid "Posted anonymously at %s" msgstr "Cofnodwyd yn ddi-enw am %s" -#: templates/web/default/report/updates.html:22 +#: templates/web/base/report/updates.html:22 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Postiwyd gan%s (<strong>%s</strong>) yn %s" -#: templates/web/default/report/updates.html:24 +#: templates/web/base/report/updates.html:24 msgid "Posted by %s at %s" msgstr "Cofnodwyd gan %s am %s" -#: templates/web/default/pagination.html:7 +#: templates/web/base/pagination.html:7 msgid "Previous" msgstr "Previous" -#: templates/web/default/admin/body.html:173 -#: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:79 +#: templates/web/fixmystreet/footer.html:32 +#, fuzzy +msgid "Privacy" +msgstr "Private" + +#: templates/web/base/admin/body.html:190 +#: templates/web/base/admin/body.html:73 +#: templates/web/base/admin/body_edit.html:40 +#: templates/web/base/admin/report_edit.html:79 msgid "Private" msgstr "Private" @@ -2519,40 +2430,40 @@ msgstr "Private" msgid "Private information (not shown on site)" msgstr "Gwybodaeth breifat (ni chaiff ei dangos ar y safle)" -#: templates/web/default/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:86 msgid "Empty property" msgstr "Eiddo gwag" -#: templates/web/default/admin/timeline.html:22 +#: templates/web/base/admin/timeline.html:22 msgid "Empty property %d created" msgstr "Empty property %d created" -#: templates/web/default/admin/timeline.html:24 +#: templates/web/base/admin/timeline.html:24 msgid "Empty property %s confirmed" msgstr "Empty property %s confirmed" -#: templates/web/default/admin/timeline.html:26 +#: templates/web/base/admin/timeline.html:26 msgid "Empty property %s sent to council %s" msgstr "Empty property %s sent to council %s" -#: templates/web/default/admin/index.html:36 +#: templates/web/base/admin/index.html:36 #: templates/web/zurich/admin/index.html:9 msgid "Empty property breakdown by state" msgstr "Empty property breakdown by state" -#: perllib/FixMyStreet/App/Controller/Admin.pm:959 +#: perllib/FixMyStreet/App/Controller/Admin.pm:968 msgid "Empty property marked as open." msgstr "Ewch i fwrw golwg " -#: templates/web/default/admin/questionnaire.html:21 +#: templates/web/base/admin/questionnaire.html:21 msgid "Empty property state change based on survey results" msgstr "Empty property state change based on survey results" -#: templates/web/default/admin/flagged.html:10 +#: templates/web/base/admin/flagged.html:10 msgid "Empty properties" msgstr "Eiddo gwag" -#: templates/web/default/around/_updates.html:1 +#: templates/web/base/around/_updates.html:1 msgid "Empty properties in this area" msgstr "Eiddo gwag yn yr ardal hon" @@ -2570,30 +2481,30 @@ msgstr "Eiddo gwag yn yr ardal hon" msgid "Empty properties recently reported returned to use on reportemptyhomes.com" msgstr "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael eu hadfer i'w defnyddio" -#: templates/web/default/alert/_list.html:19 +#: templates/web/base/alert/_list.html:19 #: templates/web/fixmystreet/alert/_list.html:21 msgid "Empty properties within %.1fkm of this location" msgstr "Empty properties within %.1fkm of this location" #: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184 -#: perllib/FixMyStreet/Cobrand/UK.pm:222 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Cobrand/UK.pm:217 msgid "Empty properties within %s" msgstr "Eiddo gwag yn %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 -#: perllib/FixMyStreet/Cobrand/UK.pm:236 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 +#: perllib/FixMyStreet/Cobrand/UK.pm:231 msgid "Empty properties within %s ward" msgstr "Eiddo gwag yn ward %s" -#: templates/web/default/reports/body.html:0 -#: templates/web/default/reports/body.html:24 +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:24 msgid "Empty properties within %s, reportemptyhomes.com" msgstr "Eiddo gwag o fewn %s, reportemptyhomes.com" -#: templates/web/default/alert/_list.html:40 +#: templates/web/base/alert/_list.html:40 #: templates/web/fixmybarangay/alert/_list.html:13 #: templates/web/fixmystreet/alert/_list.html:42 msgid "Empty properties within the boundary of:" @@ -2603,41 +2514,32 @@ msgstr "Eiddo gwag o fewn ffiniau:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael eu hadfer i'w defnyddio" -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 msgid "Property address:" msgstr "Cyfeiriad yr eiddo:" -#: templates/web/default/report/new/category.html:8 +#: templates/web/base/report/new/category.html:8 msgid "Property type:" msgstr "Math o eiddo:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 -msgid "Provide a title" -msgstr "Provide a title" - -#: templates/web/default/report/update-form.html:3 +#: templates/web/base/report/update-form.html:3 #: templates/web/fixmystreet/report/update-form.html:4 msgid "Provide an update" msgstr "Rhowch ddiweddariad" -#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/auth/general.html:58 #, fuzzy msgid "Providing a name and password is optional, but doing so will allow you to more easily report empty properties, leave updates and manage your reports." msgstr "Providing a password is optional, but doing so will allow you to more easily report empty properties, leave updates and manage your reports." -#: templates/web/default/report/new/fill_in_details_form.html:173 -#: templates/web/default/report/update-form.html:128 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/update-form.html:128 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/fixmystreet/report/update-form.html:119 msgid "Providing a password is optional, but doing so will allow you to more easily report empty properties, leave updates and manage your reports." msgstr "Providing a password is optional, but doing so will allow you to more easily report empty properties, leave updates and manage your reports." -#: templates/web/default/admin/body.html:60 -#: templates/web/default/admin/body.html:73 -msgid "Public" -msgstr "Public" - #: templates/web/emptyhomes/report/new/fill_in_details_form.html:44 msgid "Public information (shown on site)" msgstr "Gwybodaeth gyhoeddus (caiff ei dangos ar y safle)" @@ -2656,22 +2558,22 @@ msgstr "Publish photo" msgid "Publish the response" msgstr "Publish the response" -#: templates/web/default/questionnaire/completed.html:2 -#: templates/web/default/questionnaire/index.html:0 -#: templates/web/default/questionnaire/index.html:14 -#: templates/web/default/questionnaire/index.html:4 +#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/index.html:0 +#: templates/web/base/questionnaire/index.html:14 +#: templates/web/base/questionnaire/index.html:4 #: templates/web/fixmystreet/questionnaire/index.html:0 -#: templates/web/fixmystreet/questionnaire/index.html:14 -#: templates/web/fixmystreet/questionnaire/index.html:32 -#: templates/web/fixmystreet/questionnaire/index.html:4 +#: templates/web/fixmystreet/questionnaire/index.html:15 +#: templates/web/fixmystreet/questionnaire/index.html:33 +#: templates/web/fixmystreet/questionnaire/index.html:5 msgid "Questionnaire" msgstr "Holiadur" -#: templates/web/default/admin/timeline.html:30 +#: templates/web/base/admin/timeline.html:30 msgid "Questionnaire %d answered for empty property %d, %s to %s" msgstr "Questionnaire %d answered for empty property %d, %s to %s" -#: templates/web/default/admin/timeline.html:28 +#: templates/web/base/admin/timeline.html:28 msgid "Questionnaire %d sent for empty property %d" msgstr "Questionnaire %d sent for empty property %d" @@ -2679,101 +2581,96 @@ msgstr "Questionnaire %d sent for empty property %d" 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:21 -#: templates/web/default/around/display_location.html:3 -#: templates/web/default/report/display.html:46 -#: templates/web/default/reports/_rss.html:1 +#: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:3 +#: templates/web/base/report/display.html:46 +#: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/_list.html:22 #: templates/web/fixmystreet/alert/updates.html:9 #: templates/web/fixmystreet/report/display.html:61 msgid "RSS feed" msgstr "Porthiant RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 msgid "RSS feed for %s" msgstr "RSS feed for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 +#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 msgid "RSS feed for %s ward, %s" msgstr "RSS feed for %s ward, %s" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226 -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:201 +#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "RSS feed of %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 msgid "RSS feed of %s, within %s ward" msgstr "RSS feed of %s, within %s ward" -#: templates/web/default/alert/_list.html:21 +#: templates/web/base/alert/_list.html:21 #: 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/_rss.html:1 +#: templates/web/base/reports/_rss.html:1 msgid "RSS feed of empty properties in this %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" #: perllib/FixMyStreet/Cobrand/Default.pm:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:229 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:158 +#: perllib/FixMyStreet/Cobrand/UK.pm:224 msgid "RSS feed of empty properties within %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 -#: perllib/FixMyStreet/Cobrand/UK.pm:235 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 +#: perllib/FixMyStreet/Cobrand/UK.pm:230 msgid "RSS feed of empty properties within %s ward" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: templates/web/default/around/display_location.html:3 -#: templates/web/default/around/display_location.html:4 +#: templates/web/base/around/display_location.html:3 +#: templates/web/base/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:46 +#: templates/web/base/report/display.html:46 #: templates/web/fixmystreet/alert/updates.html:9 #: templates/web/fixmystreet/report/display.html:61 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:37 +#: templates/web/base/alert/updates.html:9 +#: templates/web/base/report/display.html:37 #: templates/web/fixmystreet/alert/updates.html:14 #: templates/web/fixmystreet/report/display.html:63 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 hwn." -#: templates/web/default/around/display_location.html:0 -#: templates/web/default/around/display_location.html:32 +#: templates/web/base/around/display_location.html:0 +#: templates/web/base/around/display_location.html:33 msgid "Recent local empty properties, reportemptyhomes.com" msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com" -#: templates/web/default/reports/index.html:19 +#: templates/web/base/reports/index.html:21 #: templates/web/fixmybarangay/reports/index.html:19 msgid "Recently <br>returned to use" msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" -#: 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:35 templates/web/emptyhomes/index.html:24 -#: templates/web/fixmystreet/index.html:49 +#: templates/web/base/index.html:30 templates/web/emptyhomes/index.html:26 +#: templates/web/fixmystreet/front/recent.html:11 msgid "Recently reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" -#: templates/web/default/report/new/notes.html:9 +#: templates/web/base/report/new/notes.html:9 #: templates/web/fixmystreet/report/new/notes.html:10 msgid "Remember that reportemptyhomes.com is primarily for reporting physical empty properties that can be returned to use. If your empty property is not appropriate for submission via this site remember that you can contact your council directly using their own website." msgstr "Cofiwch mai prif ddiben reportemptyhomes.com yw rhoi gwybod am eiddo gwag a allai gael eu hadfer i’w defnyddio eto. Os nad yw eich eiddo gwag yn briodol i’w gyflwyno drwy’r wefan hon, cofiwch y gallwch gysylltu â’ch cyngor yn uniongyrchol gan ddefnyddio’u gwefan eu hunain." @@ -2782,12 +2679,12 @@ msgstr "Cofiwch mai prif ddiben reportemptyhomes.com yw rhoi gwybod am eiddo gwa msgid "Remember that, for the pilot project, FixMyBarangay is only for reporting potholes and streetlights in bgy. Luz or Basak San Nicolas." msgstr "Remember that, for the pilot project, FixMyBarangay is only for reporting potholes and streetlights in bgy. Luz or Basak San Nicolas." -#: templates/web/default/admin/report_blocks.html:16 +#: templates/web/base/admin/report_blocks.html:16 msgid "Remove flag" msgstr "Remove flag" -#: templates/web/default/admin/report_edit.html:94 -#: templates/web/default/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Remove photo (can't be undone!)" @@ -2796,10 +2693,10 @@ msgstr "Remove photo (can't be undone!)" msgid "Report Empty Homes" msgstr "Rhoi gwybod am eiddo gwag" -#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31 -#: templates/web/fiksgatami/footer.html:5 -#: templates/web/fiksgatami/nn/footer.html:5 -#: templates/web/fixmystreet/footer.html:47 +#: templates/web/base/footer.html:7 templates/web/emptyhomes/header.html:31 +#: templates/web/fiksgatami/footer.html:19 +#: templates/web/fiksgatami/nn/footer.html:19 +#: templates/web/fixmystreet/footer.html:22 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a property" @@ -2809,8 +2706,8 @@ msgstr "Rhoi gwybod am eiddo gwag" msgid "Report abuse" msgstr "Report abuse" -#: templates/web/default/report_created.html:1 -#: templates/web/default/report_created.html:3 +#: templates/web/base/report_created.html:1 +#: templates/web/base/report_created.html:3 msgid "Report created" msgstr "Report created" @@ -2818,35 +2715,42 @@ msgstr "Report created" msgid "Report on %s" msgstr "Report on %s" -#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 +#: templates/web/base/report/new/fill_in_details_form.html:1 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#, fuzzy +msgid "Report your empty property" +msgstr "Adrodd am eiddo gwag" + +#: templates/web/base/index.html:11 templates/web/emptyhomes/index.html:6 #: templates/web/fixmystreet/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 msgid "Report and view empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/default/my/my.html:79 +#: templates/web/base/my/my.html:82 msgid "Reported %s" msgstr "Reported %s" -#: templates/web/default/my/my.html:77 +#: templates/web/base/my/my.html:80 msgid "Reported %s, to %s" msgstr "Reported %s, to %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 -#: templates/web/default/contact/index.html:45 -#: templates/web/fixmystreet/contact/index.html:62 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: templates/web/base/contact/index.html:49 +#: templates/web/fixmystreet/contact/index.html:66 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:77 -#: templates/web/fixmystreet/questionnaire/index.html:71 +#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/questionnaire/index.html:53 +#: templates/web/fixmystreet/questionnaire/index.html:72 msgid "Reported before" msgstr "Wedi adrodd o'r blaen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 -#: templates/web/default/contact/index.html:47 -#: templates/web/fixmystreet/contact/index.html:64 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: templates/web/base/contact/index.html:51 +#: templates/web/fixmystreet/contact/index.html:68 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" @@ -2854,52 +2758,50 @@ msgstr "Adroddwyd gan %s am %s" msgid "Reported in the %s category" msgstr "Reported in the %s category" -#: perllib/FixMyStreet/DB/Result/Problem.pm:557 +#: perllib/FixMyStreet/DB/Result/Problem.pm:571 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:579 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:553 +#: perllib/FixMyStreet/DB/Result/Problem.pm:567 msgid "Reported via %s anonymously at %s" msgstr "Adroddwyd gan %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:589 msgid "Reported via %s by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:549 +#: perllib/FixMyStreet/DB/Result/Problem.pm:563 msgid "Reported via %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:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:583 msgid "Reported via %s in the %s category by %s at %s" msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" -#: templates/web/default/around/around_index.html:1 -#: templates/web/default/js/translation_strings.html:41 -#: 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/emptyhomes/report/new/fill_in_details_form.html:1 +#: templates/web/base/around/around_index.html:2 +#: templates/web/base/around/around_index.html:3 +#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/report/new/fill_in_details.html:0 +#: templates/web/base/report/new/fill_in_details.html:3 #: templates/web/fixmystreet/around/around_index.html:2 #: 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 #: templates/web/zurich/report/new/fill_in_details_form.html:2 msgid "Reporting an empty property" msgstr "Adrodd am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1186 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 #: perllib/FixMyStreet/Cobrand/Zurich.pm:290 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Adroddiadau" -#: perllib/FixMyStreet/DB/Result/Problem.pm:395 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/DB/Result/Problem.pm:409 +#: perllib/FixMyStreet/DB/Result/Problem.pm:413 #, fuzzy msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Reports are limited to 2000 characters in length. Please shorten your report" @@ -2908,7 +2810,7 @@ msgstr "Reports are limited to 2000 characters in length. Please shorten your re msgid "Reports awaiting approval" msgstr "Reports awaiting approval" -#: templates/web/default/around/tabbed_lists.html:3 +#: templates/web/base/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Adroddiadau ar ac yng nghyffiniau'r map" @@ -2916,11 +2818,11 @@ msgstr "Adroddiadau ar ac yng nghyffiniau'r map" msgid "Reports published" msgstr "Reports published" -#: templates/web/default/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:71 msgid "Resend report" msgstr "Resend report" -#: templates/web/default/js/translation_strings.html:28 +#: templates/web/base/js/translation_strings.html:28 msgid "Right place?" msgstr "Right place?" @@ -2934,29 +2836,30 @@ msgstr "Road operator for this named road (derived from road reference number an msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Road operator for this named road (from OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1386 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1397 -#: templates/web/default/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1406 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/zurich/admin/report_edit.html:76 msgid "Rotate Left" msgstr "Rotate Left" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1386 -#: templates/web/default/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1395 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/zurich/admin/report_edit.html:77 msgid "Rotate Right" msgstr "Rotate Right" -#: templates/web/default/admin/body_edit.html:76 +#: templates/web/base/admin/body.html:196 +#: templates/web/base/admin/body_edit.html:76 msgid "Save changes" msgstr "Save changes" -#: templates/web/default/admin/reports.html:1 +#: templates/web/base/admin/reports.html:1 #: templates/web/zurich/admin/reports.html:1 msgid "Search Reports" msgstr "Search Reports" -#: templates/web/default/admin/users.html:1 +#: templates/web/base/admin/users.html:1 msgid "Search Users" msgstr "Search Users" @@ -2964,45 +2867,45 @@ msgstr "Search Users" msgid "Search reports" msgstr "Search reports" -#: templates/web/default/admin/reports.html:5 -#: templates/web/default/admin/users.html:8 +#: templates/web/base/admin/reports.html:5 +#: templates/web/base/admin/users.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Search:" -#: templates/web/default/admin/reports.html:26 +#: templates/web/base/admin/reports.html:26 #, fuzzy msgid "Searching found no reports." msgstr "Search reports" -#: templates/web/default/admin/users.html:39 +#: templates/web/base/admin/users.html:39 msgid "Searching found no users." msgstr "" -#: templates/web/default/admin/body-form.html:33 +#: templates/web/base/admin/body-form.html:33 #: templates/web/zurich/admin/body-form.html:16 msgid "Select a body" msgstr "Select a body" -#: templates/web/default/admin/body-form.html:71 +#: templates/web/base/admin/body-form.html:71 #: templates/web/zurich/admin/body-form.html:26 msgid "Select an area" msgstr "Select an area" -#: templates/web/default/alert/_list.html:8 +#: templates/web/base/alert/_list.html:8 #: templates/web/fixmystreet/alert/_list.html:10 msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." msgstr "Dewiswch y math o hysbysiad yr hoffech ei gael a chliciwch y botwm ar gyfer porthiant RSS,neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" -#: templates/web/default/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:71 msgid "Sent:" msgstr "Sent:" -#: templates/web/default/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:73 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Service:" @@ -3011,74 +2914,67 @@ msgstr "Service:" msgid "Share" msgstr "Share" -#: templates/web/default/report/new/fill_in_details_form.html:210 -#: templates/web/default/report/update-form.html:157 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 -#: templates/web/fixmystreet/report/update-form.html:144 +#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/update-form.html:157 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:17 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:53 +#: templates/web/fixmystreet/report/update-form.html:146 msgid "Show my name publicly" msgstr "Show my name publicly" -#: templates/web/default/around/display_location.html:69 +#: templates/web/base/around/display_location.html:69 msgid "Show old" msgstr "Show old" -#: templates/web/default/around/display_location.html:60 +#: templates/web/base/around/display_location.html:60 msgid "Show pins" msgstr "Dangos pinnau" -#: templates/web/default/auth/general.html:3 -#: templates/web/default/auth/general.html:49 +#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/general.html:49 #: templates/web/fixmybarangay/header.html:70 #: templates/web/fixmystreet/auth/general.html:3 #: templates/web/fixmystreet/auth/general.html:42 -#: templates/web/fixmystreet/auth/general.html:62 -#: templates/web/fixmystreet/header.html:57 +#: templates/web/fixmystreet/auth/general.html:63 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" msgstr "Sign in" -#: templates/web/default/auth/general.html:74 +#: templates/web/base/auth/general.html:74 msgid "Sign in by email" msgstr "Sign in by email" -#: templates/web/default/auth/general.html:1 +#: templates/web/base/auth/general.html:1 #: templates/web/fixmystreet/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Sign in or create an account" -#: templates/web/default/auth/sign_out.html:1 -#: templates/web/default/header.html:30 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/header.html:30 #: templates/web/emptyhomes/header.html:46 -#: templates/web/fiksgatami/header.html:22 -#: templates/web/fiksgatami/nn/header.html:22 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Allgofnodi" -#: templates/web/default/header.html:29 -#: templates/web/emptyhomes/header.html:45 -#: templates/web/fiksgatami/header.html:21 -#: templates/web/fiksgatami/nn/header.html:21 +#: templates/web/base/header.html:29 templates/web/emptyhomes/header.html:45 msgid "Signed in as %s" msgstr "Rydych chi wedi mewngofnodi fel" -#: templates/web/default/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:2 #: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:2 msgid "Some categories may require additional information." msgstr "Some categories may require additional information." -#: templates/web/default/admin/body-form.html:145 -#: templates/web/default/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:145 +#: templates/web/base/admin/body-form.html:146 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your reportemptyhomes.com installation." msgstr "" -#: templates/web/default/alert/index.html:42 +#: templates/web/base/alert/index.html:42 #: templates/web/fixmybarangay/alert/index.html:32 msgid "Some photos of recent reports" msgstr "Rhai ffotograffau o adroddiadau diweddar" @@ -3088,11 +2984,11 @@ msgstr "Rhai ffotograffau o adroddiadau diweddar" msgid "Some text to localize" msgstr "Some text to localize" -#: perllib/FixMyStreet/Cobrand/UK.pm:93 +#: perllib/FixMyStreet/Cobrand/UK.pm:88 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Sorry, that appears to be a Crown dependency postcode, which we don't cover." -#: templates/web/default/tokens/abuse.html:5 +#: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your empty property." msgstr "Sori, bu gwall wrth gadarnhau eich eiddo gwag." @@ -3107,39 +3003,35 @@ msgstr "Sori, ni fu modd i ni ddod o hyd i'r lleoliad hwnnw." #: perllib/FixMyStreet/Geocode/Bing.pm:53 #: perllib/FixMyStreet/Geocode/Google.pm:69 -#: perllib/FixMyStreet/Geocode/Zurich.pm:88 +#: perllib/FixMyStreet/Geocode/Zurich.pm:89 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 "Source code" - -#: templates/web/default/admin/stats.html:64 +#: templates/web/base/admin/stats.html:64 #, fuzzy msgid "Start Date:" msgstr "Start day:" -#: templates/web/default/admin/flagged.html:18 -#: templates/web/default/admin/list_updates.html:11 -#: templates/web/default/admin/reports.html:15 +#: templates/web/base/admin/body.html:57 +#: templates/web/base/admin/flagged.html:18 +#: templates/web/base/admin/list_updates.html:11 +#: templates/web/base/admin/reports.html:15 #: templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "State" -#: templates/web/default/admin/report_edit.html:34 -#: templates/web/default/admin/update_edit.html:27 -#: templates/web/default/report/update-form.html:28 +#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/update_edit.html:27 +#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:56 #: templates/web/zurich/admin/report_edit.html:87 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "State:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 #: perllib/FixMyStreet/Cobrand/Zurich.pm:305 -#: templates/web/default/admin/stats.html:1 +#: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" msgstr "Stats" @@ -3150,7 +3042,7 @@ msgstr "Stats" msgid "Status" msgstr "Status" -#: templates/web/default/report/updates.html:10 +#: templates/web/base/report/updates.html:10 msgid "Still open, via questionnaire, %s" msgstr "Still open, via questionnaire, %s" @@ -3162,42 +3054,41 @@ msgstr "Subcategory: %s" msgid "Subdivision/Body" msgstr "Subdivision/Body" -#: templates/web/fixmystreet/contact/index.html:95 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 +#: templates/web/fixmystreet/contact/index.html:99 msgid "Subject" msgstr "Subject" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/contact/index.html:83 -#: templates/web/default/report/new/fill_in_details_form.html:52 +#: templates/web/base/admin/report_edit.html:19 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 #: templates/web/zurich/admin/report_edit.html:37 msgid "Subject:" msgstr "Pwnc:" -#: templates/web/default/questionnaire/creator_fixed.html:19 -#: 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/base/questionnaire/creator_fixed.html:19 +#: templates/web/base/report/new/fill_in_details_form.html:115 +#: templates/web/base/report/new/fill_in_details_form.html:155 +#: templates/web/base/report/new/fill_in_details_form.html:177 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:144 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212 -#: templates/web/zurich/report/new/fill_in_details_form.html:114 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:30 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:70 +#: templates/web/zurich/report/new/fill_in_details_form.html:108 msgid "Submit" msgstr "Anfon" -#: templates/web/default/admin/report_edit.html:97 -#: templates/web/default/admin/update_edit.html:65 -#: templates/web/default/admin/user-form.html:55 +#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/user-form.html:55 #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:224 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Submit changes" -#: templates/web/default/questionnaire/index.html:116 -#: templates/web/fixmystreet/questionnaire/index.html:105 +#: templates/web/base/questionnaire/index.html:88 +#: templates/web/fixmystreet/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Anfon yr holiadur" @@ -3214,14 +3105,14 @@ msgstr "Anfon yr holiadur" msgid "Submitted" msgstr "Submitted" -#: templates/web/default/alert/updates.html:17 -#: templates/web/default/report/display.html:42 +#: templates/web/base/alert/updates.html:17 +#: templates/web/base/report/display.html:42 #: templates/web/fixmystreet/alert/updates.html:23 #: templates/web/fixmystreet/report/display.html:68 msgid "Subscribe" msgstr "Tanysgrifio" -#: templates/web/default/alert/_list.html:97 +#: templates/web/base/alert/_list.html:97 #: templates/web/fixmybarangay/alert/_list.html:42 #: templates/web/fixmystreet/alert/_list.html:92 msgid "Subscribe me to an email alert" @@ -3231,9 +3122,10 @@ msgstr "Dymunaf danysgrifio i rybuddion drwy e-bost" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "Subscribe to an alert based upon what baranagay you’re in:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1184 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 #: perllib/FixMyStreet/Cobrand/Zurich.pm:289 -#: templates/web/default/admin/index.html:1 +#: templates/web/base/admin/bodies.html:18 +#: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 @@ -3241,40 +3133,38 @@ msgstr "Subscribe to an alert based upon what baranagay you’re in:" msgid "Summary" msgstr "Summary" -#: templates/web/default/reports/index.html:1 +#: templates/web/base/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 #: templates/web/fixmybarangay/reports/index.html:1 #: templates/web/zurich/reports/index.html:0 #: templates/web/zurich/reports/index.html:4 msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1188 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 msgid "Survey" msgstr "Survey" -#: templates/web/default/admin/questionnaire.html:1 +#: templates/web/base/admin/questionnaire.html:1 msgid "Survey Results" msgstr "Survey Results" -#: templates/web/default/admin/list_updates.html:12 +#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/list_updates.html:10 #: templates/web/zurich/admin/list_updates.html:31 msgid "Text" msgstr "Text" -#: templates/web/default/admin/body.html:18 +#: templates/web/base/admin/body.html:21 msgid "Text only version" msgstr "Text only version" -#: templates/web/default/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "Text:" -#: templates/web/default/tokens/confirm_update.html:8 +#: templates/web/base/tokens/confirm_update.html:9 msgid "Thank you — you can <a href=\"%s\">view your updated empty property</a> on the site." msgstr "Diolch — gallwch <a href=\"%s\">weld diweddariad eich eiddo gwag</a> ar y safle." @@ -3295,7 +3185,11 @@ msgid "" "as possible will be covered." msgstr "Diolch am roi gwybod am eiddo gwag ar ReportEmptyHomes.com." -#: templates/web/default/tokens/error.html:7 +#: templates/web/base/tokens/confirm_problem.html:18 +msgid "Thank you for reporting this issue" +msgstr "" + +#: templates/web/base/tokens/error.html:7 msgid "Thank you for trying to confirm your update or empty property. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" "Diolch am geisio cadarnhau eich diweddariad neu eich eiddo gwag. Fodd bynnag, \n" @@ -3309,15 +3203,15 @@ msgstr "" "Diolch am ddefnyddio ReportEmptyHomes.com. Mae eich gweithred eisoes yn helpu i \n" "ddatrys argyfwng tai gwag y DU." -#: templates/web/fixmystreet/around/around_index.html:27 +#: templates/web/fixmystreet/around/around_index.html:28 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 above :" msgstr "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 above :" -#: templates/web/default/contact/submit.html:8 +#: templates/web/base/contact/submit.html:8 msgid "Thanks for your feedback. We'll get back to you as soon as we can!" msgstr "Diolch am eich adborth. Byddwn yn eich ateb cyn gynted ag y gallwn!" -#: templates/web/default/questionnaire/creator_fixed.html:9 +#: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been returned to use! Could we just ask if you have ever reported an empty property to a council before?" msgstr "Diolch, falch o glywed ei fod wedi cael ei adfer i'w ddefnyddio! Fyddai modd i ni'ch holi chi, a ydych erioed wedi rhoi gwybod i'r cyngor am eiddo gwag cyn hyn?" @@ -3333,13 +3227,13 @@ msgstr "That location does not appear to be covered by a council; perhaps it is msgid "That location does not appear to be in the UK; please try again." msgstr "That location does not appear to be in the UK; please try again." -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79 -#: perllib/FixMyStreet/Cobrand/UK.pm:86 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:81 msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/FixMyStreet/App/Controller/Admin.pm:704 +#: perllib/FixMyStreet/App/Controller/Admin.pm:713 msgid "That empty property will now be resent." msgstr "That empty property will now be resent." @@ -3351,46 +3245,45 @@ msgstr "That report cannot be viewed on %s." 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/admin/body.html:115 +#: templates/web/base/admin/body.html:132 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/default/admin/body-form.html:119 -#: templates/web/default/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:119 +#: templates/web/base/admin/body-form.html:120 msgid "" "The <strong>endpoint</strong> is the URL of the service that reportemptyhomes.com will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/default/admin/body-form.html:132 -#: templates/web/default/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:132 +#: templates/web/base/admin/body-form.html:133 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/default/admin/body-form.html:90 -#: templates/web/default/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:90 +#: templates/web/base/admin/body-form.html:91 msgid "" "The <strong>send method</strong> determines how empty property reports will be sent to the body.\n" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/default/open311/index.html:92 +#: templates/web/base/open311/index.html:92 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the empty property report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "The Open311 v2 attribute agency_responsible is used to list the administrations that received the empty property report, which is not quite the way the attribute is defined in the Open311 v2 specification." -#: templates/web/default/admin/body-form.html:11 -#: templates/web/default/admin/body-form.html:12 +#: templates/web/base/admin/body-form.html:11 +#: templates/web/base/admin/body-form.html:12 msgid "" "The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n" " and may be displayed publically." msgstr "" -#: templates/web/default/auth/token.html:19 -#: templates/web/default/email_sent.html:6 +#: templates/web/base/auth/token.html:19 templates/web/base/email_sent.html:6 msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "<strong>Gall</strong> y neges e-bost o gadarnhad gymryd ychydig funudau i gyrraedd — byddwch yn amyneddgar, <em>os gwelwch yn dda</em>." @@ -3399,16 +3292,16 @@ msgstr "<strong>Gall</strong> y neges e-bost o gadarnhad gymryd ychydig funudau msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the empty property (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the empty property if you have one), etc." msgstr "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the empty property (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the empty property if you have one), etc." -#: templates/web/fixmystreet/questionnaire/index.html:43 +#: templates/web/fixmystreet/questionnaire/index.html:44 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 +#: templates/web/base/questionnaire/index.html:25 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." -#: templates/web/default/admin/edit-league.html:3 -#: templates/web/default/admin/edit-league.html:4 +#: templates/web/base/admin/edit-league.html:3 +#: templates/web/base/admin/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" @@ -3417,7 +3310,7 @@ msgstr "" msgid "The error was: %s" msgstr "The error was: %s" -#: templates/web/default/open311/index.html:88 +#: templates/web/base/open311/index.html:88 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." @@ -3471,38 +3364,42 @@ msgstr "Yr adroddiadau diweddaraf ar gyfer cyngor {{COUNCIL}}, yn ward {{WARD}} msgid "The latest reports within {{NAME}}'s boundary reported by users" msgstr "Yr adroddiadau diweddaraf o fewn ffin {{NAME}} y mae defnyddwyr wedi rhoi gwybod amdanynt" -#: templates/web/default/admin/body-form.html:58 +#: templates/web/base/admin/body-form.html:58 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" -#: templates/web/default/auth/change_password.html:12 -#: templates/web/default/auth/change_password.html:16 +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:16 msgid "The passwords do not match" msgstr "The passwords do not match" -#: templates/web/default/errors/page_error_404_not_found.html:11 -#: templates/web/default/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "The requested URL '%s' was not found on this server" -#: templates/web/default/alert/_list.html:14 +#: templates/web/base/alert/_list.html:14 #: templates/web/fixmystreet/alert/_list.html:16 msgid "The simplest alert is our geographic one:" msgstr "Yr hysbysiad symlaf yw ein hysbysiad daearyddol:" -#: templates/web/default/report/new/councils_extra_text.html:1 -#: 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/fill_in_details_form.html:12 +#: templates/web/base/report/new/councils_extra_text.html:1 +#: templates/web/base/report/new/councils_text_some.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:18 msgid "The subject and details of the empty property will be public, plus your name if you give us permission." msgstr "The subject and details of the empty property will be public, plus your name if you give us permission." +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#, fuzzy +msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." +msgstr "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" + #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296 msgid "The user could not locate the empty property on a map, but to see the area around the location they entered" msgstr "Ni allai'r defnyddiwr leoli'r eiddo gwag ar fap, ond i weld yr ardal o gwmpas y lleoliad a gofnodwyd ganddynt " -#: templates/web/default/admin/user-form.html:12 -#: templates/web/default/admin/user-form.html:13 +#: templates/web/base/admin/user-form.html:12 +#: templates/web/base/admin/user-form.html:13 msgid "" "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n" " Names are not necessarily unique." @@ -3512,14 +3409,14 @@ msgstr "" msgid "There was an empty property showing the All Reports page. Please try again later." msgstr "There was an empty property showing the All Reports page. Please try again later." -#: perllib/FixMyStreet/App/Controller/Contact.pm:121 +#: perllib/FixMyStreet/App/Controller/Contact.pm:139 #: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 msgid "There was an empty property showing this page. Please try again later." msgstr "There was an empty property showing this page. Please try again later." #: perllib/FixMyStreet/App/Controller/Report/New.pm:755 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/default/auth/general.html:23 +#: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 #: templates/web/zurich/auth/general.html:28 msgid "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." @@ -3533,7 +3430,7 @@ msgstr "There was an empty property with your email/password combination. Please msgid "There was an empty property with your update. Please try again." msgstr "There was an empty property with your update. Please try again." -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "There were problems with your report. Please see below." msgstr "Cafwyd anhawsterau gyda'ch adroddiad. Gweler isod." @@ -3541,33 +3438,33 @@ msgstr "Cafwyd anhawsterau gyda'ch adroddiad. Gweler isod." msgid "There were problems with your update. Please see below." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" -#: templates/web/default/admin/body-form.html:108 -#: templates/web/default/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:108 +#: templates/web/base/admin/body-form.html:109 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive empty property reports.<br>\n" " <strong>You don't need to set them if the Send Method is email.</strong>.\n" " For more information on Open311, see \n" -" <a href='http://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n" +" <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n" " " msgstr "" -#: templates/web/default/open311/index.html:79 +#: templates/web/base/open311/index.html:79 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." -#: templates/web/default/admin/body.html:33 +#: templates/web/base/admin/body.html:36 msgid "" "This body covers no area. This means that it has no jurisdiction over empty properties reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report empty properties.\n" " Currently, users <strong>cannot report empty properties to this body</strong>." msgstr "" -#: templates/web/default/admin/body.html:43 +#: templates/web/base/admin/body.html:46 msgid "This body has no contacts. This means that currently empty properties reported to this body <strong>will not be sent</strong>." msgstr "" -#: templates/web/default/admin/body-form.html:52 -#: templates/web/default/admin/body-form.html:53 +#: templates/web/base/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:53 msgid "" "This body will only be sent reports for empty properties that are located in the <strong>area covered</strong>.\n" " A body will not receive any reports unless it covers at least one area." @@ -3583,12 +3480,12 @@ msgstr "This email has been sent to several councils covering the location of th #: perllib/FixMyStreet/App/Controller/Report/New.pm:898 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 -#: perllib/FixMyStreet/Cobrand/UK.pm:58 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:136 +#: perllib/FixMyStreet/Cobrand/UK.pm:53 msgid "This information is required" msgstr "Mae’r wybodaeth hon yn ofynnol" -#: templates/web/default/debug_header.html:3 +#: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "This is a developer site; things might break at any time, and the database will be periodically deleted." @@ -3601,37 +3498,35 @@ msgstr "This is a summary of all reports on this site; select a particular baran msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area." msgstr "Dyma grynodeb o'r holl adroddiadau ar y safle hwn; dewiswch gyngor penodol i weld yr adroddiadau a anfonwyd ato." -#: templates/web/default/reports/index.html:7 -#: templates/web/fiksgatami/nn/reports/index.html:4 -#: templates/web/fiksgatami/reports/index.html:4 +#: templates/web/base/reports/index.html:7 msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." msgstr "Dyma grynodeb o'r holl adroddiadau ar y safle hwn; dewiswch gyngor penodol i weld yr adroddiadau a anfonwyd ato." -#: templates/web/default/auth/token.html:9 +#: templates/web/base/auth/token.html:9 msgid "This may be because the link is too old or already used, or the address was not copied correctly." msgstr "This may be because the link is too old or already used, or the address was not copied correctly." -#: templates/web/default/report/banner.html:15 +#: templates/web/base/report/banner.html:15 msgid "This empty property has been closed" msgstr "This empty property has been closed" -#: templates/web/default/report/banner.html:12 -#: templates/web/default/report/update-form.html:48 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update-form.html:48 #: templates/web/emptyhomes/report/banner.html:3 #: templates/web/fixmystreet/report/update-form.html:46 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/update-form.html:43 +#: templates/web/base/report/update-form.html:43 #: templates/web/fixmystreet/report/update-form.html:40 msgid "This empty property has not been returned to use" msgstr "This empty property has not been returned to use" -#: templates/web/default/report/banner.html:19 +#: templates/web/base/report/banner.html:19 msgid "This empty property is in progress" msgstr "This empty property is in progress" -#: templates/web/default/report/banner.html:9 +#: templates/web/base/report/banner.html:9 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." @@ -3661,21 +3556,21 @@ msgstr "Cyflwynwyd yr adroddiad hwn yn ddi-enw" msgid "This web page also contains a photo of the empty property, provided by the user." 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:1187 -#: templates/web/default/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Timeline" -#: templates/web/default/admin/flagged.html:15 -#: templates/web/default/admin/reports.html:12 +#: templates/web/base/admin/flagged.html:15 +#: templates/web/base/admin/reports.html:12 msgid "Title" msgstr "Title" -#: templates/web/default/around/_report_banner.html:2 +#: templates/web/base/around/_report_banner.html:2 msgid "To <strong>report an empty property</strong>, click on the map at the correct location." msgstr "I <strong> roi gwybod am broblem</strong>, cliciwch ar y lleoliad cywir ar y map" -#: templates/web/default/alert/index.html:27 +#: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have in your area, council or ward, please enter your postcode or street name and area" msgstr "To find out what local alerts we have in your area, council or ward, please enter your postcode or street name and area" @@ -3683,30 +3578,30 @@ msgstr "To find out what local alerts we have in your area, council or ward, ple msgid "To view a map of the precise location of this issue" msgstr "Gweld map o union leoliad y broblem hon" -#: templates/web/default/admin/index.html:44 -#: templates/web/default/admin/questionnaire.html:24 -#: templates/web/default/admin/stats.html:24 -#: templates/web/default/admin/stats.html:43 +#: templates/web/base/admin/index.html:44 +#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats.html:24 +#: templates/web/base/admin/stats.html:43 #: templates/web/zurich/admin/stats.html:30 msgid "Total" msgstr "Total" -#: templates/web/default/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Try again" -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:46 -#: templates/web/default/report/update-form.html:30 -#: templates/web/default/report/update-form.html:33 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:31 msgid "Unable to fix" msgstr "Unable to fix" -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:51 -#: templates/web/default/admin/update_edit.html:28 +#: templates/web/base/admin/report_edit.html:35 +#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/update_edit.html:18 @@ -3721,7 +3616,7 @@ msgstr "Unknown" msgid "Unknown alert type" msgstr "Unknown alert type" -#: templates/web/default/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "Unknown error" @@ -3733,26 +3628,26 @@ msgstr "ID eiddo gwag anhysbys" msgid "Update" msgstr "Update" -#: templates/web/default/admin/timeline.html:33 +#: templates/web/base/admin/timeline.html:33 msgid "Update %s created for empty property %d; by %s" msgstr "Update %s created for empty property %d; by %s" -#: templates/web/default/contact/index.html:21 +#: templates/web/base/contact/index.html:21 #: templates/web/fixmystreet/contact/index.html:38 msgid "Update below added anonymously at %s" msgstr "Update below added anonymously at %s" -#: templates/web/default/contact/index.html:23 +#: templates/web/base/contact/index.html:23 #: templates/web/fixmystreet/contact/index.html:40 msgid "Update below added by %s at %s" msgstr "Update below added by %s at %s" -#: templates/web/default/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:233 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Update body" -#: templates/web/default/admin/index.html:38 +#: templates/web/base/admin/index.html:38 msgid "Update breakdown by state" msgstr "Update breakdown by state" @@ -3760,24 +3655,24 @@ msgstr "Update breakdown by state" msgid "Update by {{name}}" msgstr "Diweddariadau yn ôl {{name}}" -#: templates/web/default/admin/update_edit.html:42 +#: templates/web/base/admin/update_edit.html:42 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed empty property state to %s" msgstr "Update changed empty property state to %s" -#: templates/web/default/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:44 msgid "Update marked empty property as returned to use" msgstr "Update marked empty property as returned to use" -#: templates/web/default/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:46 msgid "Update reopened empty property" msgstr "Update reopened empty property" -#: templates/web/default/admin/body.html:83 +#: templates/web/base/admin/body.html:89 msgid "Update statuses" msgstr "Update statuses" -#: templates/web/default/report/update-form.html:22 +#: templates/web/base/report/update-form.html:22 msgid "Update:" msgstr "Diweddariad:" @@ -3787,24 +3682,24 @@ msgstr "Diweddariad:" msgid "Updated" msgstr "Updated" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1007 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1051 -#: perllib/FixMyStreet/App/Controller/Admin.pm:801 -#: perllib/FixMyStreet/App/Controller/Admin.pm:949 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 +#: perllib/FixMyStreet/App/Controller/Admin.pm:810 +#: perllib/FixMyStreet/App/Controller/Admin.pm:958 #: perllib/FixMyStreet/Cobrand/Zurich.pm:550 #: perllib/FixMyStreet/Cobrand/Zurich.pm:619 msgid "Updated!" msgstr "Updated!" -#: templates/web/default/admin/list_updates.html:2 -#: templates/web/default/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:3 +#: templates/web/base/admin/list_updates.html:2 +#: templates/web/base/report/update.html:3 +#: templates/web/fixmystreet/report/update.html:5 #: templates/web/zurich/admin/list_updates.html:24 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Diweddariadau" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:139 #, fuzzy msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Updates are limited to 2000 characters in length. Please shorten your update" @@ -3813,14 +3708,14 @@ msgstr "Updates are limited to 2000 characters in length. Please shorten your up msgid "Updates on {{title}}" msgstr "Diweddariadau am {{title}}" -#: templates/web/default/report/display.html:0 -#: templates/web/default/report/display.html:5 +#: templates/web/base/report/display.html:0 +#: templates/web/base/report/display.html:5 #: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:8 +#: templates/web/fixmystreet/report/display.html:9 msgid "Updates to this empty property, reportemptyhomes.com" msgstr "Diweddariadau i'r eiddo gwag hwn, reportemptyhomes.com" -#: templates/web/default/admin/body.html:153 +#: templates/web/base/admin/body.html:170 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -3830,39 +3725,39 @@ msgstr "" msgid "User" msgstr "Users" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1360 msgid "User flag removed" msgstr "User flag removed" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1323 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 msgid "User flagged" msgstr "User flagged" -#: templates/web/default/admin/users.html:5 +#: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1189 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 #: perllib/FixMyStreet/Cobrand/Zurich.pm:304 -#: templates/web/default/admin/flagged.html:29 +#: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Users" -#: perllib/FixMyStreet/App/Controller/Admin.pm:371 -#: perllib/FixMyStreet/App/Controller/Admin.pm:401 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 msgid "Values updated" msgstr "Values updated" -#: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/update_edit.html:18 +#: templates/web/base/admin/report_edit.html:18 +#: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:24 #: templates/web/zurich/admin/report_edit.html:23 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "View report on site" -#: templates/web/default/reports/body.html:14 +#: templates/web/base/reports/body.html:14 msgid "View reports by ward" msgstr "View reports by ward" @@ -3870,31 +3765,31 @@ msgstr "View reports by ward" msgid "View your report" msgstr "Gweld eich adroddiad" -#: templates/web/default/around/display_location.html:0 -#: templates/web/default/around/display_location.html:34 +#: templates/web/base/around/display_location.html:0 +#: templates/web/base/around/display_location.html:35 msgid "Viewing a location" msgstr "Gweld lleoliad" -#: templates/web/default/report/display.html:0 +#: templates/web/base/report/display.html:0 #: templates/web/fixmystreet/report/display.html:0 msgid "Viewing an empty property" msgstr "Gweld eiddo gwag" -#: templates/web/default/reports/body.html:16 +#: templates/web/base/reports/body.html:16 msgid "Wards of this council" msgstr "Wards of this council" -#: templates/web/default/alert/choose.html:6 -#: templates/web/default/around/around_index.html:13 -#: templates/web/fixmystreet/around/around_index.html:16 +#: templates/web/base/alert/choose.html:6 +#: templates/web/base/around/around_index.html:16 +#: templates/web/fixmystreet/around/around_index.html:17 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." msgstr "Darganfuom fwy nag un man sy'n cyfateb i'r lleoliad hwnnw. Rydym yn dangos hyd at ddeg cyfatebiaeth, rhowch gynnig ar chwiliad gwahanol os nad yw'ch lleoliad chi yno." -#: templates/web/default/auth/token.html:8 +#: templates/web/base/auth/token.html:8 msgid "We have not been able to confirm your account - sorry." msgstr "We have not been able to confirm your account - sorry." -#: templates/web/default/auth/token.html:16 +#: templates/web/base/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." msgstr "We have sent you an email containing a link to confirm your account." @@ -3903,13 +3798,13 @@ msgstr "We have sent you an email containing a link to confirm your account." msgid "We may contact you periodically to ask if anything has changed with the property you reported." msgstr "Efallai y cysylltwn â chi o bryd i’w gilydd i ofyn a fu unrhyw newid i sefyllfa’r eiddo rydych chi wedi rhoi gwybod amdano." -#: templates/web/fixmystreet/report/update-form.html:115 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 +#: templates/web/fixmystreet/report/update-form.html:77 msgid "We never show your email" msgstr "We never show your email" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:25 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 msgid "We never show your email address or phone number." msgstr "We never show your email address or phone number." @@ -3917,11 +3812,11 @@ msgstr "We never show your email address or phone number." 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 "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." -#: templates/web/default/index-steps.html:31 +#: templates/web/base/index-steps.html:38 msgid "The details will be sent directly to the right person in the local council for them to take action" msgstr "Caiff y manylion eu hanfon yn uniongyrchol at yr unigolyn cywir yn y cyngor lleol er mwyn iddynt weithredu" -#: templates/web/default/report/new/notes.html:5 +#: templates/web/base/report/new/notes.html:5 #: templates/web/fixmybarangay/report/new/notes.html:5 msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>" msgstr "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>" @@ -3937,17 +3832,20 @@ msgstr "" "Dim ond llenwi'r ffurflen sydd angen i chi ei wneud. Peidiwch â defnyddio hwn i gysylltu â ni am dai gwag unigol;\n" "defnyddiwch y blwch sydd i'w gael ar y <a href=\"/\">dudalen flaen</a>." -#: templates/web/default/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" msgstr "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/body.html:61 -#: templates/web/default/admin/body_edit.html:82 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 +msgid "What’s the issue, and where is it?" +msgstr "" + +#: templates/web/base/admin/body_edit.html:82 #: templates/web/zurich/admin/body.html:17 msgid "When edited" msgstr "When edited" -#: templates/web/default/admin/problem_row.html:35 +#: templates/web/base/admin/problem_row.html:35 msgid "When sent" msgstr "When sent" @@ -3955,104 +3853,112 @@ msgstr "When sent" msgid "Whole block of empty flats" msgstr "Bloc cyfan o fflatiau gwag" -#: templates/web/default/open311/index.html:94 +#: templates/web/base/open311/index.html:94 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." -#: templates/web/fixmystreet/footer.html:24 -msgid "Would you like better integration with reportemptyhomes.com? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about reportemptyhomes.com for councils</a>." -msgstr "Would you like better integration with reportemptyhomes.com? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about reportemptyhomes.com for councils</a>." - -#: templates/web/fixmystreet/footer.html:20 -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>." +#: templates/web/fiksgatami/front/footer-marketing.html:15 +#: templates/web/fixmystreet/front/footer-marketing.html:15 +#, fuzzy +msgid "Would you like to contribute to reportemptyhomes.com? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "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>." -#: templates/web/default/questionnaire/index.html:106 -#: templates/web/fixmystreet/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:78 +#: templates/web/fixmystreet/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" -#: templates/web/default/report/new/notes.html:8 +#: templates/web/base/report/new/notes.html:8 #: templates/web/fixmybarangay/report/new/notes.html:8 #: templates/web/fixmystreet/report/new/notes.html:8 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." -#: templates/web/default/admin/stats.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:4 +#: templates/web/emptyhomes/report/new/fill_in_details_form.html:4 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 +msgid "Wrong location? Just click again on the map." +msgstr "" + +#: templates/web/base/admin/stats.html:10 msgid "Year" msgstr "Year" -#: templates/web/default/admin/bodies.html:57 -#: templates/web/default/admin/body.html:68 -#: templates/web/default/admin/body.html:69 -#: templates/web/default/admin/body.html:70 -#: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/flagged.html:47 -#: templates/web/default/admin/list_updates.html:32 -#: templates/web/default/admin/list_updates.html:34 -#: templates/web/default/admin/list_updates.html:35 -#: templates/web/default/admin/problem_row.html:20 -#: templates/web/default/admin/report_edit.html:63 -#: templates/web/default/admin/report_edit.html:77 -#: templates/web/default/admin/update_edit.html:24 -#: templates/web/default/admin/users.html:29 -#: templates/web/default/questionnaire/creator_fixed.html:14 -#: templates/web/default/questionnaire/index.html:109 -#: templates/web/default/questionnaire/index.html:66 -#: templates/web/fixmystreet/questionnaire/index.html:60 -#: templates/web/fixmystreet/questionnaire/index.html:99 +#: templates/web/base/admin/bodies.html:59 +#: templates/web/base/admin/body.html:68 templates/web/base/admin/body.html:70 +#: templates/web/base/admin/body.html:74 templates/web/base/admin/body.html:76 +#: templates/web/base/admin/body_edit.html:5 +#: templates/web/base/admin/flagged.html:47 +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/problem_row.html:20 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/update_edit.html:24 +#: templates/web/base/admin/users.html:29 +#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:42 +#: templates/web/base/questionnaire/index.html:81 +#: templates/web/fixmystreet/questionnaire/index.html:100 +#: templates/web/fixmystreet/questionnaire/index.html:61 msgid "Yes" msgstr "Ydw" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 +#: templates/web/fixmystreet/report/update-form.html:91 msgid "Yes I have a password" msgstr "Yes I have a password" -#: templates/web/default/contact/index.html:37 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:38 +#: templates/web/fixmystreet/contact/index.html:55 +msgid "You are complaining that this empty property report was unnecessarily moderated:" +msgstr "" + +#: templates/web/base/contact/index.html:40 +#: templates/web/fixmystreet/contact/index.html:57 msgid "You are reporting the following empty property report for being abusive, containing personal information, or similar:" msgstr "Rydych yn cwyno am yr adroddiad canlynol am eiddo gwag gan ei fod yn sarhaus, neu'n cynnwys gwybodaeth bersonol, neu debyg:" -#: templates/web/default/contact/index.html:15 +#: templates/web/base/contact/index.html:15 #: templates/web/fixmystreet/contact/index.html:32 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "You are reporting the following update for being abusive, containing personal information, or similar:" -#: templates/web/default/tokens/confirm_problem.html:20 -#: templates/web/default/tokens/confirm_problem.html:21 +#: templates/web/base/tokens/confirm_problem.html:25 +#: templates/web/base/tokens/confirm_problem.html:26 #: templates/web/zurich/tokens/confirm_problem.html:6 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%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/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:47 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/fixmystreet/contact/index.html:122 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" -#: templates/web/default/admin/flagged.html:5 +#: templates/web/base/admin/flagged.html:5 msgid "" "You can flag any report or user by editing them, and they will be listed on this page.\n" " For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n" " reports in the past." msgstr "" -#: templates/web/default/report/new/councils_text_none.html:19 -#: templates/web/default/report/new/councils_text_none.html:20 -#: templates/web/default/report/new/councils_text_some.html:21 -#: templates/web/default/report/new/councils_text_some.html:22 +#: templates/web/base/report/new/councils_text_none.html:19 +#: templates/web/base/report/new/councils_text_none.html:20 +#: templates/web/base/report/new/councils_text_some.html:21 +#: templates/web/base/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>." msgstr "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>." -#: templates/web/default/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:81 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/default/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:36 msgid "You declined; please fill in the box above" msgstr "You declined; please fill in the box above" @@ -4060,33 +3966,30 @@ msgstr "You declined; please fill in the box above" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your 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" -#: templates/web/default/questionnaire/index.html:96 -#: templates/web/default/report/new/fill_in_details_form.html:93 +#: templates/web/base/questionnaire/index.html:68 +#: templates/web/base/report/new/fill_in_details_form.html:94 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:90 -#: templates/web/fixmystreet/questionnaire/index.html:87 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99 +#: templates/web/fixmystreet/questionnaire/index.html:88 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:109 #: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "Rydych chi eisoes wedi atodi ffotograff wrth yr adroddiad hwn. Bydd atodi llun arall yn disodli’r ffotograff hwnnw." -#: templates/web/default/report/update-form.html:59 +#: templates/web/base/report/update-form.html:59 #: templates/web/fixmystreet/report/update-form.html:56 msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "You have already attached a photo to this update, attaching another one will replace it." -#: templates/web/default/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:3 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "You have been signed out" -#: templates/web/default/report/new/fill_in_details_form.html:7 -#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 #: templates/web/zurich/report/new/fill_in_details_form.html:13 msgid "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 dangos lleoliad y broblem wrth y pin gwyrdd ar y map. Os nad dyma’r lleoliad cywir, cliciwch ar y map unwaith eto." -#: templates/web/default/tokens/confirm_alert.html:7 +#: templates/web/base/tokens/confirm_alert.html:8 msgid "You have successfully confirmed your alert." msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus." @@ -4094,19 +3997,15 @@ msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus." msgid "You have successfully confirmed your email address." msgstr "You have successfully confirmed your email address." -#: templates/web/default/tokens/confirm_problem.html:15 -msgid "You have successfully confirmed your empty property" -msgstr "Rydych wedi cadarnhau eich eiddo gwag yn llwyddiannus" - -#: templates/web/default/tokens/confirm_update.html:12 +#: templates/web/base/tokens/confirm_update.html:14 msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." msgstr "Rydych wedi cadarnhau eich diweddariad yn llwyddiannus ac nawr gallwch <a href=\"%s\">weld hwn ar y safle</a>." -#: templates/web/default/tokens/confirm_alert.html:11 +#: templates/web/base/tokens/confirm_alert.html:12 msgid "You have successfully created your alert." msgstr "You have successfully created your alert." -#: templates/web/default/tokens/confirm_alert.html:9 +#: templates/web/base/tokens/confirm_alert.html:10 msgid "You have successfully deleted your alert." msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." @@ -4115,62 +4014,63 @@ msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "You have successfully signed in; please check and confirm your details are accurate:" -#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17 +#: templates/web/base/my/my.html:20 templates/web/fixmystreet/my/my.html:20 msgid "You haven’t created any reports yet. <a href=\"%s\">Report a property now.</a>" msgstr "" -#: templates/web/default/email_sent.html:13 +#: templates/web/base/email_sent.html:13 msgid "You must now click the link in the email we've just sent you." msgstr "Rhaid i chi nawr glicio ar y ddolen yn y neges e-bost rydym newydd ei hanfon atoch chi." -#: templates/web/default/admin/index.html:7 +#: templates/web/base/admin/index.html:7 msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/default/admin/bodies.html:9 +#: templates/web/base/admin/bodies.html:7 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of empty properties they can handle (such as potholes or streetlights) and the\n" " contacts (such as an email address) to which reports are sent." msgstr "" -#: templates/web/default/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:71 msgid "You really want to resend?" msgstr "You really want to resend?" -#: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14 -#: 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 +#: templates/web/base/my/my.html:0 templates/web/base/my/my.html:15 +#: templates/web/base/my/my.html:4 templates/web/fixmystreet/my/my.html:0 +#: templates/web/fixmystreet/my/my.html:15 +#: templates/web/fixmystreet/my/my.html:4 msgid "Your Reports" msgstr "Your Reports" #: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:88 +#: templates/web/fixmystreet/contact/index.html:92 #: templates/web/fixmystreet/report/display.html:65 #: templates/web/fixmystreet/report/display.html:67 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:147 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 +#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your email" msgstr "Your email" #: templates/web/fixmystreet/auth/general.html:26 -#: templates/web/fixmystreet/report/update-form.html:80 +#: templates/web/fixmystreet/report/update-form.html:82 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Your email address" -#: templates/web/default/auth/general.html:27 +#: templates/web/base/auth/general.html:27 msgid "Your email address:" msgstr "Your email address:" -#: templates/web/default/alert/_list.html:92 -#: templates/web/default/report/new/fill_in_details_form.html:124 -#: templates/web/default/report/update-form.html:81 +#: templates/web/base/alert/_list.html:92 +#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/update-form.html:81 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:133 #: templates/web/fixmybarangay/alert/_list.html:37 msgid "Your email:" @@ -4180,93 +4080,103 @@ msgstr "Eich cyfeiriad e-bost:" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" -#: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/contact/index.html:81 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 -#: templates/web/fixmystreet/report/update-form.html:140 +#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/contact/index.html:85 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:12 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:48 +#: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Your name" msgstr "Your name" -#: templates/web/default/auth/general.html:59 -#: templates/web/default/contact/index.html:68 -#: templates/web/default/report/new/fill_in_details_form.html:203 -#: templates/web/default/report/update-form.html:151 +#: templates/web/base/auth/general.html:59 +#: templates/web/base/contact/index.html:72 +#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/update-form.html:151 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:124 msgid "Your name:" msgstr "Eich enw:" #: templates/web/fixmystreet/auth/general.html:41 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 -#: templates/web/fixmystreet/report/update-form.html:94 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 +#: templates/web/fixmystreet/report/update-form.html:96 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Your password" -#: templates/web/default/auth/change_password.html:6 +#: templates/web/base/auth/change_password.html:6 msgid "Your password has been changed" msgstr "Your password has been changed" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206 -#: templates/web/zurich/report/new/fill_in_details_form.html:110 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:21 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:57 +#: templates/web/zurich/report/new/fill_in_details_form.html:104 msgid "Your phone number" msgstr "Your phone number" -#: templates/web/fixmystreet/questionnaire/index.html:15 +#: templates/web/base/tokens/confirm_problem.html:4 +#, fuzzy +msgid "Your empty property has been confirmed!" +msgstr "This empty property has been closed" + +#: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Your report" -#: templates/web/default/report_created.html:6 +#: templates/web/base/report_created.html:6 msgid "Your report has been created and will shortly be sent." msgstr "Your report has been created and will shortly be sent." -#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6 -#: templates/web/fiksgatami/nn/footer.html:6 -#: templates/web/fixmystreet/footer.html:49 +#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 +#: templates/web/fiksgatami/nn/footer.html:21 +#: templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Your reports" -#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56 +#: templates/web/base/tokens/confirm_update.html:4 +#, fuzzy +msgid "Your update has been confirmed!" +msgstr "Your password has been changed" + +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 msgid "Your updates" msgstr "Your updates" -#: templates/web/default/contact/index.html:76 +#: templates/web/base/contact/index.html:80 msgid "Your email:" msgstr "Eich cyfeiriad e-bost:" -#: templates/web/default/admin/timeline.html:4 +#: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "by %s" -#: templates/web/default/reports/body.html:6 -#: templates/web/default/reports/body.html:7 +#: templates/web/base/reports/body.html:6 +#: templates/web/base/reports/body.html:7 msgid "council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:651 +#: perllib/FixMyStreet/DB/Result/Problem.pm:665 msgid "council ref: %s" msgstr "council ref: %s" -#: templates/web/default/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:43 #: templates/web/zurich/admin/report_edit.html:57 msgid "didn't use map" msgstr "didn't use map" -#: templates/web/default/alert/index.html:33 +#: templates/web/base/alert/index.html:33 #: templates/web/fixmystreet/around/postcode_form.html:20 msgid "e.g. ‘%s’ or ‘%s’" msgstr "e.g. ‘%s’ or ‘%s’" -#: templates/web/default/admin/flagged.html:51 +#: templates/web/base/admin/flagged.html:51 #, fuzzy msgid "edit user" msgstr "Add user" -#: templates/web/default/admin/index.html:23 +#: templates/web/base/admin/index.html:23 #: templates/web/zurich/admin/index.html:5 msgid "from %d different users" msgstr "from %d different users" @@ -4276,78 +4186,78 @@ msgstr "from %d different users" msgid "last updated %s" msgstr "last updated %s" -#: perllib/Utils.pm:265 +#: perllib/Utils.pm:266 msgid "less than a minute" msgstr "llai na munud" -#: templates/web/default/report/updates.html:57 +#: templates/web/base/report/updates.html:57 #, fuzzy msgid "marked as a duplicate report" msgstr "duplicate report" -#: templates/web/default/report/updates.html:47 +#: templates/web/base/report/updates.html:47 #, fuzzy msgid "marked as action scheduled" msgstr "Action Scheduled" -#: templates/web/default/report/updates.html:59 +#: templates/web/base/report/updates.html:59 #, fuzzy msgid "marked as an internal referral" msgstr "Internal notes:" -#: templates/web/default/report/updates.html:49 +#: templates/web/base/report/updates.html:49 #, fuzzy msgid "marked as closed" msgstr "marked as %s" -#: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:51 +#: templates/web/base/report/updates.html:28 +#: templates/web/base/report/updates.html:51 msgid "marked as returned to use" msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" -#: templates/web/default/report/updates.html:45 +#: templates/web/base/report/updates.html:45 #, fuzzy msgid "marked as in progress" msgstr "marked as %s" -#: templates/web/default/report/updates.html:41 +#: templates/web/base/report/updates.html:41 #, fuzzy msgid "marked as investigating" msgstr "Investigating" -#: templates/web/default/report/updates.html:55 +#: templates/web/base/report/updates.html:55 #, fuzzy msgid "marked as not the council's responsibility" msgstr "not the council's responsibility" -#: templates/web/default/report/updates.html:43 +#: templates/web/base/report/updates.html:43 #, fuzzy msgid "marked as planned" msgstr "marked as %s" -#: templates/web/default/report/updates.html:53 +#: templates/web/base/report/updates.html:53 #, fuzzy msgid "marked as unable to fix" msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" #: perllib/FixMyStreet/App/Controller/Admin.pm:130 -#: templates/web/default/admin/questionnaire.html:15 -#: templates/web/default/admin/questionnaire.html:16 +#: templates/web/base/admin/questionnaire.html:15 +#: templates/web/base/admin/questionnaire.html:16 msgid "n/a" msgstr "n/a" -#: templates/web/default/alert/_list.html:87 +#: templates/web/base/alert/_list.html:87 #: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 msgid "or" msgstr "neu" -#: templates/web/default/js/translation_strings.html:27 +#: templates/web/base/js/translation_strings.html:27 msgid "or locate me automatically" msgstr "neu dewch o hyd i mi’n awtomatig" -#: templates/web/default/admin/report_edit.html:25 -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/base/admin/report_edit.html:25 +#: templates/web/base/admin/report_edit.html:26 #: templates/web/zurich/admin/report_edit-sdm.html:31 #: templates/web/zurich/admin/report_edit-sdm.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 @@ -4361,31 +4271,32 @@ msgstr "neu dewch o hyd i mi’n awtomatig" msgid "originally entered: “%s”" msgstr "originally entered: “%s”" -#: templates/web/default/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:30 msgid "other areas:" msgstr "other areas:" -#: templates/web/default/report/updates.html:29 -#: templates/web/default/report/updates.html:39 +#: templates/web/base/report/updates.html:29 +#: templates/web/base/report/updates.html:39 msgid "reopened" msgstr "wedi'i ailagor" +#: templates/web/fiksgatami/header.html:49 #: templates/web/fixmybarangay/header.html:67 -#: templates/web/fixmystreet/header.html:54 +#: templates/web/fixmystreet/header.html:53 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "sign out" -#: templates/web/default/report/new/fill_in_details_form.html:12 -#: templates/web/default/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:12 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 msgid "the local council" msgstr "y cyngor lleol" -#: templates/web/default/report/_main.html:6 +#: templates/web/base/report/_main.html:57 #: templates/web/zurich/report/_main.html:5 msgid "there is no pin shown as the user did not use the map" msgstr "there is no pin shown as the user did not use the map" @@ -4394,58 +4305,58 @@ msgstr "there is no pin shown as the user did not use the map" msgid "this type of local empty property" msgstr "math hwn o eiddo gwag lleol" -#: perllib/Utils.pm:237 +#: perllib/Utils.pm:238 msgid "today" msgstr "heddiw" -#: templates/web/default/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:43 #: templates/web/zurich/admin/report_edit.html:57 msgid "used map" msgstr "used map" -#: templates/web/default/admin/update_edit.html:35 +#: templates/web/base/admin/update_edit.html:35 msgid "user is from same council as empty property - %d" msgstr "user is from same council as empty property - %d" -#: templates/web/default/admin/update_edit.html:38 +#: templates/web/base/admin/update_edit.html:38 msgid "user is empty property owner" msgstr "user is empty property owner" -#: templates/web/default/reports/body.html:0 -#: templates/web/default/reports/body.html:3 +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:3 msgid "ward" msgstr "ward" -#: templates/web/default/front/stats.html:17 +#: templates/web/base/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" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:285 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d awr" msgstr[1] "%d awr" -#: templates/web/default/report/_support.html:6 +#: templates/web/base/report/_support.html:6 #, perl-format msgid "%d supporter" msgid_plural "%d supporters" msgstr[0] "%d supporter" msgstr[1] "%d supporters" -#: perllib/Utils.pm:286 +#: perllib/Utils.pm:287 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d munud" msgstr[1] "%d munud" -#: templates/web/default/front/stats.html:29 +#: templates/web/base/front/stats.html:29 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4459,41 +4370,139 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "Ar hyn o bryd, nid oes gennym fanylion y cyngor sy’n gyfrifol am y lleoliad hwn. Os byddwch yn cyflwyno adroddiad fan hyn, caiff ei adael ar y safle, ond ni fydd y cyngor yn cael gwybod amdano – gadewch eich adroddiad serch hynny, fel y gallwn ddangos i’r cyngor pa weithgarwch sydd yn ei ardal." msgstr[1] "Ar hyn o bryd, nid oes gennym fanylion y cyngor sy’n gyfrifol am y lleoliad hwn. Os byddwch yn cyflwyno adroddiad fan hyn, caiff ei adael ar y safle, ond ni fydd y cyngor yn cael gwybod amdano – gadewch eich adroddiad serch hynny, fel y gallwn ddangos i’r cyngor pa weithgarwch sydd yn ei ardal." -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:281 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d wythnos" msgstr[1] "%d wythnos" -#: templates/web/default/front/stats.html:12 +#: templates/web/base/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> adroddiad o fewn yr wythnos ddiwethaf" msgstr[1] "<big>%s</big> o adroddiadau o fewn yr wythnos ddiwethaf" -#: templates/web/default/front/stats.html:23 +#: templates/web/base/front/stats.html:23 #, perl-format msgid "<big>%s</big> returned to use in past month" msgid_plural "<big>%s</big> returned to use in past month" msgstr[0] "Dychwelwyd <big>%s</big> i'w ddefnyddio yn y mis diwethaf" msgstr[1] "Dychwelwyd <big>%s</big> i'w defnyddio yn y mis diwethaf" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:283 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d diwrnod" msgstr[1] "%d diwrnod" -#: templates/web/default/report/new/councils_text_some.html:14 +#: templates/web/base/report/new/councils_text_some.html:14 #, perl-format msgid "We do <strong>not</strong> yet have details for the other council that covers this location." msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "We do <strong>not</strong> yet have details for the other council that covers this location." msgstr[1] "We do <strong>not</strong> yet have details for the other councils that cover this location." +#~ msgid "%d addresses" +#~ msgstr "%d addresses" + +#~ msgid "" +#~ "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +#~ "suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n" +#~ "to your councillor(s)</a> or, if it’s an empty property that could be returned to use by\n" +#~ "local people working together, why not\n" +#~ "<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" +#~ "</p>" +#~ msgstr "" +#~ "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +#~ "suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n" +#~ "to your councillor(s)</a> or, if it’s an empty property that could be returned to use by\n" +#~ "local people working together, why not\n" +#~ "<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" +#~ "</p>" + +#~ msgid "" +#~ "<p>Getting empty homes back into use can be difficult, but by now a good council\n" +#~ "will have made a lot of progress and reported what they have done on the\n" +#~ "website. Even so properties can remain empty for many months if the owner is\n" +#~ "unwilling or the property is in very poor repair. If nothing has happened or\n" +#~ "you are not satisfied with the progress the council is making, now is the right\n" +#~ "time to say so. We think it’s a good idea to contact some other people who\n" +#~ "may be able to help or put pressure on the council For advice on how to do\n" +#~ "this and other useful information please go to <a\n" +#~ "href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" +#~ msgstr "" +#~ "<p>Getting empty homes back into use can be difficult, but by now a good council\n" +#~ "will have made a lot of progress and reported what they have done on the\n" +#~ "website. Even so properties can remain empty for many months if the owner is\n" +#~ "unwilling or the property is in very poor repair. If nothing has happened or\n" +#~ "you are not satisfied with the progress the council is making, now is the right\n" +#~ "time to say so. We think it’s a good idea to contact some other people who\n" +#~ "may be able to help or put pressure on the council For advice on how to do\n" +#~ "this and other useful information please go to <a\n" +#~ "href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" + +#~ msgid "" +#~ "<p>Getting empty homes back into use can be difficult. You shouldn’t expect\n" +#~ "the property to be back into use yet. But a good council will have started work\n" +#~ "and should have reported what they have done on the website. If you are not\n" +#~ "satisfied with progress or information from the council, now is the right time\n" +#~ "to say. You may also want to try contacting some other people who may be able\n" +#~ "to help. For advice on how to do this and other useful information please\n" +#~ "go to <a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" +#~ msgstr "" +#~ "<p>Getting empty homes back into use can be difficult. You shouldn’t expect\n" +#~ "the property to be back into use yet. But a good council will have started work\n" +#~ "and should have reported what they have done on the website. If you are not\n" +#~ "satisfied with progress or information from the council, now is the right time\n" +#~ "to say. You may also want to try contacting some other people who may be able\n" +#~ "to help. For advice on how to do this and other useful information please\n" +#~ "go to <a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" + +#~ msgid "Are you from a council?" +#~ msgstr "Are you from a council?" + +#~ msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained by <a href=\"http://www.nuug.no/\">NUUG</a>" +#~ msgstr "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained by <a href=\"http://www.nuug.no/\">NUUG</a>" + +#~ msgid "Contact" +#~ msgstr "Cysylltu" + +#~ msgid "Fix<span id=\"my\">My</span>Street" +#~ msgstr "Trwsio<span id=\"my\">Fy</span>Stryd" + +#~ msgid "Navigation" +#~ msgstr "Mordwyo " + +#~ msgid "New!" +#~ msgstr "Newydd!" + +#~ msgid "Non Public" +#~ msgstr "Non Public" + +#~ msgid "Old empty properties,<br>state unknown" +#~ msgstr "Hen eiddo gwag,<br>cyflwr anhysbys" + +#~ msgid "Older returned to use" +#~ msgstr "Wedi'u hadfer i'w defnyddio ers amser" + +#~ msgid "Provide a title" +#~ msgstr "Provide a title" + +#~ msgid "Recently returned to use" +#~ msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" + +#~ msgid "Source code" +#~ msgstr "Source code" + +#~ msgid "Would you like better integration with reportemptyhomes.com? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about reportemptyhomes.com for councils</a>." +#~ msgstr "Would you like better integration with reportemptyhomes.com? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about reportemptyhomes.com for councils</a>." + +#~ msgid "You have successfully confirmed your empty property" +#~ msgstr "Rydych wedi cadarnhau eich eiddo gwag yn llwyddiannus" + #, fuzzy #~ msgid "Click on the map to report an empty property" #~ msgstr "Sut i roi gwybod am eiddo gwag" |