diff options
Diffstat (limited to 'locale/cy.UTF-8/LC_MESSAGES')
| -rw-r--r-- | locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po | 1004 |
1 files changed, 547 insertions, 457 deletions
diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index a54670ca4..3e948672d 100644 --- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety <transifex@mysociety.org>, 2017\n" "Language-Team: Welsh (https://www.transifex.com/mysociety/teams/12067/cy/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "a" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -157,7 +157,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(heb ei anfon at y cyngor)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(dewisol)" @@ -177,9 +177,9 @@ msgstr "(anfonwyd i'r ddau)" msgid "(we also have RSS feeds for problems within %s)" msgstr "Ffrwd RSS o broblemau yn %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Dewiswch gategori --" @@ -209,7 +209,7 @@ msgstr "" msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "<span>%s</span> saved." msgstr "" @@ -218,34 +218,24 @@ msgstr "" msgid "<strong>%s</strong> live problems" msgstr "<strong>%s</strong> o broblemau byw" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r adroddiad drwy e-bost" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "<strong>No</strong> Let me confirm my report by email/text" msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r adroddiad drwy e-bost" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bost" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "<strong>No</strong> Let me confirm my update by email/text" msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bost" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "<strong>No</strong> let me sign in by email" -msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "<strong>No</strong> let me sign in by email or text" -msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost" - #: templates/web/base/report/_inspect.html:197 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -254,12 +244,15 @@ msgstr "" msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Oes</strong>, mae gen i gyfrinair" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Adrodd problem" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -322,9 +315,9 @@ msgstr "Eich rhif ffôn" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -334,16 +327,15 @@ msgstr "" msgid "Add user" msgstr "Ychwanegu defnyddiwr" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -351,7 +343,7 @@ msgstr "" msgid "Added %s" msgstr "Ychwanegwyd %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -371,7 +363,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "Analluogwyd yr hysbysiad %d (créwyd %s)" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Rhoi gwybod am ddiweddariadau i ddod" @@ -439,34 +432,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Mae diweddariad wedi nodi'r broblem wedi ei thrwsio." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Dienw" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Dienw" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Dienw:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -503,7 +498,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -537,6 +532,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -549,12 +548,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Yn ôl" @@ -568,10 +567,8 @@ msgid "Ban user" msgstr "Ychwanegu defnyddiwr" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -608,7 +605,6 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -641,7 +637,7 @@ msgstr "Categori" msgid "Category and State" msgstr "Categori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -651,6 +647,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -705,7 +702,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -733,6 +730,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -745,7 +746,7 @@ msgstr "" msgid "Closed" msgstr "Ar gau" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Caewyd gan y cyngor" @@ -775,18 +776,17 @@ msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -800,8 +800,7 @@ msgstr "Cadarnhau" msgid "Confirm account" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -820,7 +819,7 @@ msgstr "" msgid "Confirmed" msgstr "Cadarnhawyd" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -831,16 +830,20 @@ msgstr "Cadarnhawyd:" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Cysylltu â ni" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Cysylltu â'r tîm" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -850,12 +853,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Methu dod o hyd i'r defnyddiwr" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Methu dod o hyd i'r lleoliad" @@ -891,6 +894,11 @@ msgstr "Crëwyd" msgid "Create a report" msgstr "Creu adroddiad" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Mewngofnodi neu greu cyfrif" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -900,18 +908,15 @@ msgstr "Creu categori" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -929,7 +934,7 @@ msgstr "Crëwyd" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -955,7 +960,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "Ar hyn o bryd does dim cyrff." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -983,6 +988,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -992,7 +1001,7 @@ msgstr "" msgid "Delete" msgstr "Dilëwyd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1004,8 +1013,8 @@ msgstr "" msgid "Deleted" msgstr "Dilëwyd" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1021,17 +1030,18 @@ msgstr "Disgrifiad" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Manylion" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1063,8 +1073,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1073,11 +1083,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1089,7 +1095,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -1097,7 +1103,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" @@ -1138,34 +1144,36 @@ msgstr "Golygu" msgid "Edit body details" msgstr "Golygu manylion y corff" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Golygu manylion y corff" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Golygu manylion y corff" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Eich diweddariadau" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1198,20 +1206,20 @@ msgstr "Golygydd" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-bost" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Cyfrinair (dewisol)" @@ -1224,6 +1232,14 @@ msgstr "Crëwyd hysbysiad e-bost" msgid "Email alert deleted" msgstr "Dilëwyd hysbysiad e-bost" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1301,11 +1317,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Rhowch god post DU, neu enw stryd ac ardal" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Rhowch god post DU, neu enw stryd ac ardal" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1356,11 +1367,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1403,6 +1414,8 @@ msgstr "Data ychwanegol:" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Data ychwanegol:" @@ -1425,6 +1438,11 @@ msgstr "Methodd anfon neges" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1502,17 +1520,22 @@ msgstr "" msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Eich cyfrinair" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Wedi anghofio eich cyfrinair?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1570,7 +1593,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1638,7 +1661,7 @@ msgstr "Cudd" msgid "Hide all reports and updates" msgstr "Rhestru'r holl broblemau a adroddwyd" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1661,11 +1684,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Cuddio'r piniau" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1690,7 +1713,7 @@ msgstr "Hafan" msgid "How to report a problem" msgstr "Sut i adrodd problem" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Sut i anfon adroddiadau llwyddiannus" @@ -1750,7 +1773,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1861,7 +1884,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1881,8 +1904,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1894,13 +1917,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "Mae ar y ffordd i'r cyngor y funud hon." -#: templates/web/base/auth/general.html:92 -#: templates/web/base/report/new/form_user_loggedout_password.html:16 -#: templates/web/base/report/update/form_user_loggedout_password.html:15 -#: templates/web/zurich/auth/general.html:30 -msgid "Keep me signed in on this computer" -msgstr "Cadw fi wedi mewngofnodi ar y cyfrifiadur hwn" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1940,6 +1956,7 @@ msgstr "Diweddariad diwethaf:" msgid "Last update:" msgstr "Diweddariad diwethaf:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1966,7 +1983,7 @@ msgstr "Rhestru'r holl broblemau a adroddwyd" msgid "Loading reports…" msgstr "Eich adroddiadau" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Wrthi'n llwytho..." @@ -1992,23 +2009,22 @@ msgstr "Hysbysiadau lleol" msgid "Locate the problem on a map of the area" msgstr "Lleoli'r broblem ar fap o'r ardal" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2020,7 +2036,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "MAP" @@ -2028,7 +2044,7 @@ msgstr "MAP" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2036,7 +2052,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Map" @@ -2048,11 +2064,11 @@ msgstr "Nodi ei fod wedi'i anfon" msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Neges" @@ -2072,24 +2088,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "jurisdiction_id coll" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2098,6 +2115,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2123,9 +2145,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Enw" @@ -2138,6 +2160,11 @@ msgstr "Enw" msgid "Name:" msgstr "Enw:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2204,6 +2231,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2290,11 +2319,18 @@ msgstr "" msgid "Next" msgstr "Nesaf" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Nesaf" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/category_edit.html:4 -#: templates/web/base/admin/list_updates.html:32 -#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2307,6 +2343,11 @@ msgstr "Nesaf" msgid "No" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Dim cyngor" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2315,7 +2356,7 @@ msgstr "" msgid "No body" msgstr "Dim corff" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "" @@ -2348,7 +2389,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Dim canlyniadau" @@ -2420,16 +2461,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "Nawr i gyflwyno eich adroddiad…" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Nawr i gyflwyno eich diweddariad…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2438,15 +2469,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "Iawn" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2498,6 +2529,14 @@ msgstr "" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or <a href=\"/\">search for a different location</a>" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2506,15 +2545,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2551,15 +2590,13 @@ msgstr "Rhiant" msgid "Partial" msgstr "Rhannol" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Cyfrinair (dewisol)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Dolen barhaol" @@ -2577,16 +2614,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Rhif ffôn" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Rhif ffôn (dewisol)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2597,12 +2639,14 @@ msgstr "" msgid "Phone:" msgstr "Ffôn:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2616,7 +2660,7 @@ msgstr "Ffôn:" msgid "Photo" msgstr "Llun" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2624,12 +2668,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2650,7 +2694,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "" @@ -2670,7 +2714,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2680,15 +2724,15 @@ msgid "Please check your phone number is correct" msgstr "Rhowch eich rhif ffôn" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2710,12 +2754,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Peidiwch â bod yn sarhaus — byddai sarhau eich cyngor yn dibrisio'r gwasanaeth i bawb." #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Rhowch neges" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2724,8 +2768,8 @@ msgstr "Rhowch neges" msgid "Please enter a mobile number" msgstr "Rhowch eich rhif ffôn" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2735,22 +2779,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Rhowch gyfrinair" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Rhowch bwnc" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Rhowch e-bost dilys" @@ -2759,14 +2803,14 @@ msgstr "Rhowch e-bost dilys" msgid "Please enter a valid email address" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Rhowch eich rhif ffôn" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Rhowch fanylion" @@ -2776,39 +2820,39 @@ msgstr "Rhowch fanylion" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Rhowch eich e-bost" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Rhowch eich enw cyntaf" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Rhowch eich enw llawn, mae angen y wybodaeth hon ar y cyngor – os na hoffech ddatgelu eich enw ar y wefan, dad-diciwch y blwch isod" #: perllib/FixMyStreet/App/Controller/Contact.pm:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Rhowch eich enw" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Rhowch eich rhif ffôn" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Rhowch eich cyfenw" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Rhowch eich teitl" @@ -2835,8 +2879,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2848,7 +2892,7 @@ msgstr "Noder na chaiff diweddariadau eu hanfon at y cyngor." msgid "Please note your report has <strong>not yet been sent</strong>." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" @@ -2862,11 +2906,11 @@ msgstr "" msgid "Please note:" msgstr "Noder:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2899,15 +2943,15 @@ msgstr "Dewiswch pa fath o hysbysiad hoffech chi ei gael" msgid "Please state whether or not the problem has been fixed" msgstr "Dywedwch a gafodd y broblem ei thrwsio" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2915,9 +2959,7 @@ msgstr "" msgid "Please write a message" msgstr "Ysgrifennwch neges" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "" @@ -2926,19 +2968,19 @@ msgstr "" msgid "Postcode or street name and area" msgstr "Rhowch god post, neu enw stryd ac ardal" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Postiwyd yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Postiwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by <strong>%s</strong> (%s) at %s" msgstr "Postiwyd gan <strong>%s</strong> (%s) am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by <strong>%s</strong> at %s" msgstr "Postiwyd gan <strong>%s</strong> am %s" @@ -2973,14 +3015,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Preifat" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -3003,7 +3041,7 @@ msgstr "Anfonwyd y broblem %s at y cyngor" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "" @@ -3012,7 +3050,6 @@ msgid "Problem state change based on survey results" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemau" @@ -3039,7 +3076,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "Problemau yn %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3065,26 +3102,26 @@ msgstr "" msgid "Property address:" msgstr "Cyfeiriad yr eiddo:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Darparu diweddariad" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." -msgstr "Mae darparu enw a chyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "Mae darparu cyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Mae darparu cyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3153,7 +3190,7 @@ msgstr "Ffrwd RSS %s, o fewn ward %s" msgid "RSS feed of nearby problems" msgstr "Ffrwd RSS o broblemau gerllaw" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3178,7 +3215,7 @@ msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon" msgid "Receive email when updates are left on this problem." msgstr "Derbyn e-bost pan fydd diweddariadau i'r broblem hon." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3223,9 +3260,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3257,14 +3294,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Adrodd problem" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3275,14 +3312,14 @@ msgstr "Adrodd problem" msgid "Report abuse" msgstr "Adrodd camddefnydd" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Adrodd problem" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3310,8 +3347,8 @@ msgstr "Adrodd, gweld, neu drafod problemau lleol" msgid "Report, view, or discuss local problems" msgstr "Adrodd, gweld, neu drafod problemau lleol" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddienw am %s" @@ -3320,8 +3357,8 @@ msgstr "Adroddwyd yn ddienw am %s" msgid "Reported before" msgstr "Adroddwyd eisoes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" @@ -3330,31 +3367,31 @@ msgstr "Adroddwyd gan %s am %s" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddwyd yn y categori %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Adroddwyd drwy %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Adroddwyd drwy %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Adroddwyd drwy %s yn y categori %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Adroddwyd drwy %s yn y categori %s am %s" @@ -3365,7 +3402,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3374,17 +3411,22 @@ msgstr "Adrodd problem" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Adroddiadau" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "" @@ -3406,7 +3448,7 @@ msgstr "" msgid "Reports published" msgstr "Adroddiadau a gyhoeddwyd" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3468,20 +3510,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Y lle cywir?" @@ -3493,15 +3535,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Cylchdroi i'r chwith" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3512,7 +3554,7 @@ msgstr "Cylchdroi i'r dde" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3526,8 +3568,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3542,7 +3584,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3582,13 +3624,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3618,7 +3659,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3635,11 +3676,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3672,9 +3713,9 @@ msgid "Share" msgstr "Rhannu" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3682,19 +3723,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3706,7 +3747,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Dangos fy enw yn gyhoeddus" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3720,17 +3761,17 @@ msgstr "Dangos yr hen rai" msgid "Show older reports" msgstr "Chwilio am adroddiadau" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Dangos piniau" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3738,20 +3779,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Mewngofnodi" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3760,6 +3801,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Mewngofnodi neu greu cyfrif" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Rhowch gyfrinair" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3802,15 +3848,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Mae'n ddrwg gennym, bu gwall tra'n cadarnhau eich problem." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Mae'n ddrwg gennym, ni allwn ddod o hyd i'r lleoliad hwnnw." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3820,7 +3866,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3864,13 +3910,13 @@ msgstr "Dyddiad cychwyn:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Cyflwr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3890,15 +3936,14 @@ msgid "State:" msgstr "Cyflwr:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Cyflwr" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3928,7 +3973,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Is-gategori: %s" @@ -3937,21 +3982,22 @@ msgstr "Is-gategori: %s" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Pwnc" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Pwnc:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Cyflwyno" @@ -4003,8 +4049,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4039,18 +4084,22 @@ msgstr "" msgid "Survey Results" msgstr "Canlyniadau arolwg" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Testun" @@ -4061,6 +4110,7 @@ msgstr "Fersiwn testun yn unig" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4094,7 +4144,7 @@ msgstr "Diolch am uwchlwytho eich llun. Nawr mae'n rhaid i ni leoli eich problem msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Diolch, mae'n dda gennym glywed y cafodd ei drwsio! Gawn ni ofyn a ydych wedi adrodd problem i gyngor o'r blaen?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Ni uwchlwythwyd y llun yn gywir (%s), ceisiwch eto." @@ -4108,7 +4158,6 @@ msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arn #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -4121,28 +4170,28 @@ msgstr "" msgid "That problem will now be resent." msgstr "Ailanfonir y broblem nawr." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Ni ellir gweld yr adroddiad hwnnw ar %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4282,7 +4331,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." @@ -4300,7 +4349,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Nid oes unrhyw adroddiadau i'w dangos." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4317,15 +4366,19 @@ msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen." msgid "There was a problem with your email/password combination. Please try again." msgstr "Bu gwall gyda'r e-bost neu'r cyfrinair. Rhowch gynnig arall arni." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Bu gwall gyda'r diweddariad. Rhowch gynnig arall arni." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "Bu problem gyda'r e-bost neu gyfrinair. Os na allwch gofio eich cyfrinair, neu os nad oes un gennych, llenwch ddarn ‘mewngofnodi drwy e-bost’ y ffurflen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Bu gwall gyda'r diweddariad. Rhowch gynnig arall arni." @@ -4333,10 +4386,19 @@ msgstr "Bu gwall gyda'r diweddariad. Rhowch gynnig arall arni." msgid "There were problems with your report. Please see below." msgstr "Bu gwallau gyda'r adroddiad. Gwelwch isod." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Bu gwallau gyda'r diweddariad. Gwelwch isod." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4361,15 +4423,6 @@ msgstr "" msgid "These will be sent to <strong>%s</strong> and also published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" @@ -4400,10 +4453,10 @@ msgstr "" msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Mae'r wybodaeth hon yn ofynnol" @@ -4442,7 +4495,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4458,7 +4511,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Rhestru'r holl broblemau a adroddwyd" @@ -4475,7 +4528,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Llinell amser" @@ -4559,7 +4611,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4569,7 +4621,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Ceisio eto" @@ -4605,7 +4657,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Heb ei gadarnhau" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Anhysbys" @@ -4613,18 +4665,18 @@ msgstr "Anhysbys" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Gwall anhysbys" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4643,7 +4695,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4651,11 +4703,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4695,24 +4747,24 @@ msgstr "" msgid "Updated" msgstr "Diweddarwyd" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by <strong>%s</strong> (%s) at %s" msgstr "Postiwyd gan <strong>%s</strong> (%s) am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by <strong>%s</strong> at %s" msgstr "Postiwyd gan <strong>%s</strong> am %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Diweddarwyd!" @@ -4723,7 +4775,7 @@ msgstr "Diweddarwyd!" msgid "Updates" msgstr "Diweddariadau" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4778,28 +4830,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4824,10 +4876,8 @@ msgid "User:" msgstr "Defnyddwyr" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Defnyddwyr" @@ -4875,6 +4925,10 @@ msgstr "Gweld adroddiadau yn ôl ward" msgid "View wards" msgstr "ardaloedd eraill:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4906,7 +4960,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4967,7 +5021,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4995,17 +5049,15 @@ msgstr "Hoffech chi dderbyn holiadur arall ymhen 4 wythnos, i'ch atgoffa i wirio msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Mae ysgrifennu eich holl neges mewn priflythrennau yn ei gwneud hi'n anodd i'w darllen, ac felly hefyd diffyg atalnodi." -#: templates/web/base/report/new/fill_in_details_form.html:4 -msgid "Wrong location? Just click again on the map." -msgstr "Lleoliad anghywir? Cliciwch ar y map eto." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5019,11 +5071,11 @@ msgstr "Lleoliad anghywir? Cliciwch ar y map eto." msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5031,11 +5083,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can <a href=\"%s\">make a new report in the same location</a>." msgstr "Gallwch <a href=\"%s%s\">weld y broblem ar y wefan hon</a>." @@ -5053,7 +5105,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "Gallwch gysylltu â'n tîm cymorth technegol drwy <a href='mailto:%s'>%s</a>" @@ -5075,11 +5127,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Gwrthodoch chi; llenwch y blwch uchod" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>." msgstr "" @@ -5087,7 +5139,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" @@ -5169,11 +5221,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Eich e-bost" @@ -5182,9 +5234,9 @@ msgstr "Eich e-bost" msgid "Your email address" msgstr "Eich cyfeiriad e-bost" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "Eich cyfeiriad e-bost" @@ -5193,9 +5245,7 @@ msgstr "Eich cyfeiriad e-bost" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Eich enw" @@ -5211,13 +5261,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Eich cyfrinair" @@ -5226,15 +5276,15 @@ msgstr "Eich cyfrinair" msgid "Your password has been changed" msgstr "Newidiwyd eich cyfrinair" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Eich rhif ffôn" @@ -5256,7 +5306,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Newidiwyd eich cyfrinair" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Eich diweddariadau" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5268,8 +5323,8 @@ msgstr "Eich diweddariadau" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5287,13 +5342,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5319,7 +5376,7 @@ msgstr "e.e. '%s' neu '%s'" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5357,6 +5414,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or <a href=\"%s\">create an account</a>" +msgstr "Mewngofnodi neu greu cyfrif" + +#: templates/web/base/auth/create.html:13 +msgid "or <a href=\"%s\">sign in</a>" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5393,12 +5459,12 @@ msgstr "allgofnodi" msgid "the database id of the body to associate that user with, e.g. <code>2217</code> for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "y cyngor lleol" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5415,11 +5481,11 @@ msgstr "" msgid "today" msgstr "heddiw" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5435,12 +5501,12 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" @@ -5657,8 +5723,35 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#~ msgid "Enter a password" -#~ msgstr "Rhowch gyfrinair" +#~ msgid "<strong>No</strong> let me sign in by email" +#~ msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost" + +#, fuzzy +#~ msgid "<strong>No</strong> let me sign in by email or text" +#~ msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "Golygu manylion y corff" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Rhowch god post DU, neu enw stryd ac ardal" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Cadw fi wedi mewngofnodi ar y cyfrifiadur hwn" + +#~ msgid "Now to submit your report…" +#~ msgstr "Nawr i gyflwyno eich adroddiad…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Nawr i gyflwyno eich diweddariad…" + +#~ msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." +#~ msgstr "Mae darparu enw a chyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Lleoliad anghywir? Cliciwch ar y map eto." #~ msgid "Password:" #~ msgstr "Cyfrinair:" @@ -5711,9 +5804,6 @@ msgstr[3] "" #~ msgid "Invalid start date" #~ msgstr "Dyddiad cychwyn annilys" -#~ msgid "No council" -#~ msgstr "Dim cyngor" - #~ msgid "Year" #~ msgstr "Blwyddyn" |