diff options
Diffstat (limited to 'locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po')
| -rw-r--r-- | locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po | 1606 |
1 files changed, 931 insertions, 675 deletions
diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index d8312a1bd..d1bb8473b 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: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+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,8 +18,8 @@ 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:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "a" @@ -32,6 +32,10 @@ msgstr "a" msgid " or " msgstr "neu" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s diweddariad byw" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" @@ -91,7 +100,7 @@ msgstr "" msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -138,7 +142,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -160,8 +164,8 @@ 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:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Dewiswch gategori --" @@ -174,14 +178,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -190,16 +186,16 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:48 +#: templates/web/base/reports/_list-filters.html:56 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "<span>%s</span> saved." msgstr "" @@ -208,33 +204,52 @@ 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:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 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/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, 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 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bost" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.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:110 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, 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:177 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:172 +#: templates/web/base/report/_inspect.html:179 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:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Oes</strong>, mae gen i gyfrinair" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -248,11 +263,17 @@ msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Ychwanegu corff" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Eich cyfeiriad e-bost" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -275,11 +296,17 @@ msgstr "Ychwanegu categori newydd" msgid "Add option" msgstr "(dewisol)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +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:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -289,23 +316,23 @@ msgstr "" msgid "Add user" msgstr "Ychwanegu defnyddiwr" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Ychwanegwyd %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -329,9 +356,10 @@ msgstr "Analluogwyd yr hysbysiad %d (créwyd %s)" msgid "Alert me to future updates" msgstr "Rhoi gwybod am ddiweddariadau i ddod" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: templates/web/base/dashboard/index.html:30 +#: templates/web/base/dashboard/index.html:40 +#: templates/web/base/dashboard/index.html:51 +#: templates/web/base/dashboard/index.html:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -340,12 +368,13 @@ msgstr "" msgid "All Reports" msgstr "Pob adroddiad" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -361,17 +390,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Pob adroddiad" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Pob adroddiad rhwng %s a %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -409,7 +438,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -420,7 +450,7 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -434,7 +464,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "" @@ -446,7 +476,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -462,12 +492,17 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Ymateb cyhoeddus:" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -475,18 +510,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -500,20 +527,21 @@ msgstr "" msgid "Back" msgstr "Yn ôl" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "" +#, fuzzy +msgid "Ban user" +msgstr "Ychwanegu defnyddiwr" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Cyrff" @@ -524,14 +552,10 @@ msgstr "Cyrff" msgid "Body" msgstr "Corff" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Corff:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Yn ôl dyddiad" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (<code>meta.datatype_description</code>), you must add it in <code>category_extras_fields.html</code>" msgstr "" @@ -544,8 +568,9 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -556,30 +581,36 @@ msgstr "" #: templates/web/base/admin/body.html:72 #: templates/web/base/admin/contact-form.html:19 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/base/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Categori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Categori" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -587,17 +618,17 @@ msgstr "" msgid "Category:" msgstr "Categori:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Categori: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -605,10 +636,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Newid cyfrinair" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "Eich rhif ffôn" + #: templates/web/base/admin/contact-form.html:80 msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent." msgstr "" @@ -630,19 +667,14 @@ msgid "" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Cliciwch yma neu rhowch fel dd/mm/bbbb" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Cliciwch ar y map i adrodd problem" @@ -670,18 +702,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 #: templates/web/base/admin/states/index.html:33 +#: templates/web/base/dashboard/index.html:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Ar gau" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Caewyd gan y cyngor" @@ -696,16 +729,17 @@ msgid "Cobrand" msgstr "" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -713,7 +747,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -722,7 +756,7 @@ msgstr "" msgid "Confirm" msgstr "Cadarnhau" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "" @@ -741,14 +775,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Cadarnhawyd" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Adroddiadau a gadarnhawyd rhwng %s a %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -775,8 +805,8 @@ msgstr "Cysylltu â'r tîm" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Methu dod o hyd i'r defnyddiwr" @@ -794,43 +824,16 @@ msgstr "Cyngor" msgid "Council contacts for %s" msgstr "" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Cyngor:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "" @@ -852,39 +855,44 @@ msgstr "Creu categori" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Crëwyd" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Crëwyd:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Cyflwr presennol" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -895,14 +903,14 @@ msgstr "Ar hyn o bryd does dim cyrff." msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "" @@ -914,12 +922,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -930,8 +938,8 @@ msgstr "" msgid "Deleted" msgstr "Dilëwyd" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -947,6 +955,10 @@ msgstr "Disgrifiad" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -959,6 +971,10 @@ msgstr "Manylion" msgid "Details:" msgstr "Manylion:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "" @@ -972,8 +988,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -982,7 +998,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:60 +#: 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:30 @@ -990,7 +1006,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1010,11 +1026,11 @@ msgstr "" msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1034,9 +1050,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Golygu" @@ -1046,33 +1063,33 @@ msgstr "Golygu" msgid "Edit body details" msgstr "Golygu manylion y corff" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Golygu'r broblem %d" @@ -1093,7 +1110,6 @@ msgstr "Golygydd" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1101,17 +1117,20 @@ msgstr "Golygydd" msgid "Email" msgstr "E-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: 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 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Cyfrinair (dewisol)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Crëwyd hysbysiad e-bost" @@ -1120,19 +1139,18 @@ msgstr "Crëwyd hysbysiad e-bost" msgid "Email alert deleted" msgstr "Dilëwyd hysbysiad e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "E-bost eisoes yn y rhestr camddefnydd" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "E-bost:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "E-bost: %s" @@ -1145,16 +1163,17 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 msgid "" "Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Dyddiad dod i ben:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1175,14 +1194,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Rhowch god post, neu enw stryd ac ardal" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Rhowch enw stryd ac ardal gerllaw" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Rhowch gyfrinair" @@ -1200,8 +1219,8 @@ msgstr "Rhowch fanylion am y broblem" msgid "Error" msgstr "Gwall" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1226,7 +1245,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1242,7 +1261,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "URL allanol" @@ -1254,7 +1273,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1266,7 +1285,7 @@ msgstr "Data ychwanegol:" msgid "Extra data:" msgstr "Data ychwanegol:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1296,21 +1315,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "" @@ -1318,7 +1338,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "" @@ -1327,7 +1347,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1335,8 +1355,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "" @@ -1356,7 +1376,7 @@ msgstr "" msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1376,8 +1396,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Cwestiynau a ofynnir yn aml" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1410,12 +1434,12 @@ msgstr "Mae'n dda gennym glywed y cafodd ei drwsio!" #: templates/web/base/admin/index.html:28 #: templates/web/base/admin/index.html:34 #: templates/web/base/admin/index.html:49 -#: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "" @@ -1423,7 +1447,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1431,6 +1455,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "gan %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Gafodd y broblem ei thrwsio?" @@ -1451,21 +1484,26 @@ msgstr "Cymorth" msgid "Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Lluniau o adroddiadau diweddar gerllaw" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Helo %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Cudd" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1486,21 +1524,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Cuddio'r hen rai" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Cuddio'r piniau" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1512,7 +1547,7 @@ msgstr "" msgid "History" msgstr "Hanes" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Hafan" @@ -1569,12 +1604,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +msgid "If ticked, this template will be used for Open311 updates that put problems in this state." +msgstr "" + #: templates/web/base/admin/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" +#: templates/web/base/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Os cewch chi ragor o wybodaeth am statws eich problem, dychwelwch i'r wefan i adael diweddariad." @@ -1583,7 +1626,7 @@ msgstr "Os cewch chi ragor o wybodaeth am statws eich problem, dychwelwch i'r we msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1592,7 +1635,7 @@ msgstr "" msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1664,11 +1707,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1680,7 +1719,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1692,26 +1731,18 @@ msgstr "Nodiadau mewnol" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Dyddiad dod i ben annilys" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Dyddiad cychwyn annilys" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1730,7 +1761,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1755,12 +1786,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1786,18 +1812,14 @@ msgstr "Diweddariad diwethaf:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1806,13 +1828,13 @@ msgstr "" msgid "List all reported problems" msgstr "Rhestru'r holl broblemau a adroddwyd" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Wrthi'n llwytho..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1844,12 +1866,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1857,11 +1882,11 @@ msgstr "" msgid "MAP" msgstr "MAP" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1873,11 +1898,11 @@ msgstr "Map" msgid "Mark as sent" msgstr "Nodi ei fod wedi'i anfon" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1897,45 +1922,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "jurisdiction_id coll" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Mis" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1953,9 +1978,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1966,19 +1991,23 @@ msgstr "Enw" #: templates/web/base/admin/report_edit.html:127 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 -#: templates/web/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Enw:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Enw: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1988,12 +2017,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2007,19 +2036,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Ychwanegwyd corff newydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2040,6 +2073,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "Eich rhif ffôn" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2069,18 +2107,19 @@ msgstr "Problemau newydd o fewn ffiniau {{NAME}} ar FixMyStreet" msgid "New reports" msgstr "Adroddiadau newydd" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2088,7 +2127,7 @@ msgstr "" msgid "Next" msgstr "Nesaf" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2100,22 +2139,18 @@ msgstr "Nesaf" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Dim corff" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Dim cyngor" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "" @@ -2145,6 +2180,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Dim canlyniadau" @@ -2167,15 +2206,15 @@ msgstr "Dim cefnogwyr" msgid "None" msgstr "Dim" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-form.html:77 msgid "" "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n" " Authorised staff users can be associated with the body they represent.<br>\n" @@ -2194,7 +2233,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "" @@ -2208,10 +2247,6 @@ msgstr "" msgid "Note" msgstr "Nodyn" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2239,37 +2274,46 @@ msgstr "Nawr i gyflwyno eich adroddiad…" msgid "Now to submit your update…" msgstr "Nawr i gyflwyno eich diweddariad…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "Iawn" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Hen gyflwr" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 #: templates/web/base/admin/states/index.html:32 #: templates/web/base/admin/update_edit.html:30 +#: templates/web/base/dashboard/index.html:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2308,23 +2352,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "ardaloedd eraill:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2342,19 +2393,19 @@ msgstr "Ni chanfuwyd y dudalen" msgid "Parent" msgstr "Rhiant" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Rhannol" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Cyfrinair (dewisol)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Cyfrinair:" @@ -2362,7 +2413,7 @@ msgstr "Cyfrinair:" msgid "Permalink" msgstr "Dolen barhaol" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2370,19 +2421,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: 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:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Rhif ffôn (dewisol)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Ffôn:" @@ -2398,7 +2454,7 @@ msgstr "Ffôn:" #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 -#: templates/web/zurich/admin/stats.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:36 #: templates/web/zurich/report/new/fill_in_details_form.html:38 @@ -2424,12 +2480,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Lluniau o adroddiadau diweddar gerllaw" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "" @@ -2451,25 +2512,34 @@ msgstr "Byddwch yn gwrtais, yn gryno ac yn berthnasol." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Rhowch eich rhif ffôn" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2484,39 +2554,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Peidiwch â bod yn sarhaus — byddai sarhau eich cyngor yn dibrisio'r gwasanaeth i bawb." -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Rhowch neges" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Rhowch eich rhif ffôn" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Rhowch gyfrinair" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Rhowch bwnc" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Rhowch e-bost dilys" @@ -2525,55 +2603,62 @@ msgstr "Rhowch e-bost dilys" msgid "Please enter a valid email address" msgstr "Rhowch gyfeiriad e-bost dilys" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, 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:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Rhowch fanylion" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: templates/web/base/auth/_username_error.html:1 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Rhowch eich e-bost" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Rhowch eich cyfeiriad e-bost" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Rhowch eich enw cyntaf" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Rhowch eich enw" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Rhowch eich rhif ffôn" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Rhowch eich cyfenw" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Rhowch eich teitl" @@ -2622,7 +2707,11 @@ msgstr "" msgid "Please note:" msgstr "Noder:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +msgid "Please provide a duplicate ID or public update for this report." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2662,6 +2751,11 @@ msgstr "Dywedwch a gafodd y broblem ei thrwsio" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Ysgrifennwch neges" @@ -2671,7 +2765,7 @@ msgid "Please write your update here" msgstr "Ysgrifennwch eich diweddariad yma" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -2680,15 +2774,15 @@ msgstr "" msgid "Posted anonymously at %s" msgstr "Postiwyd yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Postiwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by <strong>%s</strong> (%s) at %s" msgstr "Postiwyd gan <strong>%s</strong> (%s) am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by <strong>%s</strong> at %s" msgstr "Postiwyd gan <strong>%s</strong> am %s" @@ -2700,11 +2794,11 @@ msgstr "" msgid "Previous" msgstr "Blaenorol" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2721,7 +2815,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Preifat" @@ -2745,21 +2839,21 @@ msgstr "Cadarnhawyd y broblem %s" msgid "Problem %s sent to council %s" msgstr "Anfonwyd y broblem %s at y cyngor" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "" -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemau" @@ -2786,7 +2880,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "Problemau yn %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2812,7 +2906,8 @@ msgstr "" msgid "Property address:" msgstr "Cyfeiriad yr eiddo:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Darparu diweddariad" @@ -2821,12 +2916,12 @@ msgstr "Darparu diweddariad" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 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/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 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." @@ -2839,12 +2934,12 @@ msgstr "" msgid "Public response:" msgstr "Ymateb cyhoeddus:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Cyhoeddi llun" @@ -2899,7 +2994,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:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2924,7 +3019,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:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2938,7 +3033,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Problemau a adroddwyd yn ddiweddar" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2960,9 +3055,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2970,12 +3065,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3004,11 +3103,11 @@ msgstr "Adrodd camddefnydd" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Adroddwyd ar %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3023,17 +3122,17 @@ msgstr "Adrodd eich problem" msgid "Report, view, or discuss local problems" msgstr "Adrodd, gweld, neu drafod problemau lleol" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddienw am %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Adroddwyd eisoes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" @@ -3047,27 +3146,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 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:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Adroddwyd drwy %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Adroddwyd drwy %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 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:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Adroddwyd drwy %s yn y categori %s am %s" @@ -3076,8 +3175,8 @@ msgstr "Adroddwyd drwy %s yn y categori %s am %s" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3085,10 +3184,9 @@ msgstr "" msgid "Reporting a problem" msgstr "Adrodd problem" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Adroddiadau" @@ -3105,7 +3203,7 @@ msgstr "" msgid "Reports by destination" msgstr "Adroddwyd gan %s am %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3117,7 +3215,7 @@ msgstr "" msgid "Reports published" msgstr "Adroddiadau a gyhoeddwyd" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3172,21 +3270,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3205,17 +3304,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Cylchdroi i'r chwith" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Cylchdroi i'r dde" @@ -3225,21 +3324,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3250,12 +3349,12 @@ msgstr "Cadw'r newidiadau" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3273,7 +3372,7 @@ msgstr "Chwilio am adroddiadau" msgid "Search Users" msgstr "Chwilio am ddefnyddwyr" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Chwilio am adroddiadau" @@ -3284,6 +3383,7 @@ msgid "Search:" msgstr "Chwilio:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -3296,7 +3396,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3305,8 +3405,8 @@ msgstr "" msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "" @@ -3326,11 +3426,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "" @@ -3339,11 +3444,11 @@ msgid "Sent:" msgstr "Anfonwyd:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Gwasanaeth:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3352,9 +3457,9 @@ msgid "Share" msgstr "Rhannu" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3362,19 +3467,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3382,40 +3487,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Dangos fy enw yn gyhoeddus" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Dangos yr hen rai" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Dangos piniau" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3426,12 +3528,16 @@ msgstr "Mewngofnodi" 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:96 +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 "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Mewngofnodi neu greu cyfrif" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Allgofnodi" @@ -3447,7 +3553,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Lluniau o adroddiadau diweddar" @@ -3460,15 +3566,19 @@ msgstr "Testun i'w leoleiddio" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3501,20 +3611,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Dyddiad cychwyn:" #: templates/web/base/admin/body.html:73 @@ -3524,15 +3635,18 @@ msgstr "Dyddiad cychwyn:" #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 -#: templates/web/base/admin/template_edit.html:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Cyflwr" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Cadw'r newidiadau" @@ -3546,17 +3660,19 @@ msgstr "Cadw'r newidiadau" msgid "State:" msgstr "Cyflwr:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Cyflwr" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: templates/web/base/admin/index.html:71 +#: templates/web/base/admin/stats/index.html:1 +#: templates/web/base/admin/stats/state.html:1 +#: templates/web/zurich/admin/stats/index.html:1 +#: templates/web/zurich/header.html:59 msgid "Stats" msgstr "Ystadegau" @@ -3566,7 +3682,7 @@ msgstr "Ystadegau" msgid "Status" msgstr "Statws" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Ar agor o hyd, drwy holiadur, %s" @@ -3579,7 +3695,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Is-gategori: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Is-gategori: %s" @@ -3596,18 +3717,19 @@ msgstr "Pwnc" msgid "Subject:" msgstr "Pwnc:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Cyflwyno" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3649,7 +3771,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3657,25 +3779,31 @@ msgstr "" #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 -#: templates/web/zurich/header.html:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Crynodeb" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Adroddiadau" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Adroddiadau" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Canlyniadau arolwg" @@ -3683,14 +3811,14 @@ msgstr "Canlyniadau arolwg" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Testun" @@ -3698,7 +3826,7 @@ msgstr "Testun" msgid "Text only version" msgstr "Fersiwn testun yn unig" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3725,7 +3853,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "Diolch am eich adborth" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Diolch am uwchlwytho eich llun. Nawr mae'n rhaid i ni leoli eich problem, felly rhowch enw stryd cyfagos neu god post yn y blwch uchod :" @@ -3741,7 +3869,7 @@ msgstr "Ni uwchlwythwyd y llun yn gywir (%s), ceisiwch eto." msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arni." @@ -3751,11 +3879,11 @@ msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arn msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Ailanfonir y broblem nawr." @@ -3787,8 +3915,8 @@ msgid "" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" +#: templates/web/base/admin/body-form.html:101 #: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3821,8 +3949,8 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Y gwall oedd: %s" @@ -3864,7 +3992,7 @@ msgstr "" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3889,7 +4017,7 @@ msgstr "Ni chanfuwyd yr URL '%s' ar y gweinydd hwn" msgid "The type of input field to show to the user. <strong>Text</strong> is a simple text field, <strong>List</strong> is a drop-down selection." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3900,33 +4028,38 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Nid oes unrhyw adroddiadau i'w dangos." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Bu problem gyda'r e-bost neu gyfrinair. Os na allwch gofio eich cyfrinair, neu os nad oes un gennych, llenwch ddarn ‘mewngofnodi drwy e-bost’ y ffurflen." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 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/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, 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:338 msgid "There was a problem with your update. Please try again." msgstr "Bu gwall gyda'r diweddariad. Rhowch gynnig arall arni." @@ -3934,7 +4067,7 @@ 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:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Bu gwallau gyda'r diweddariad. Gwelwch isod." @@ -3989,26 +4122,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Mae'r wybodaeth hon yn ofynnol" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a <strong>private</strong> name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the <strong>public</strong> text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4025,7 +4166,7 @@ msgstr "Ni thrwsiwyd y broblem hon" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4035,23 +4176,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Mae'r adroddiad hwn wedi'i nodi ar gau." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Cyflwynwyd yr adroddiad yn ddienw" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Mae'r dudalen we hon yn cynnwys llun o'r broblem, a ddarparwyd gan y defnyddiwr." @@ -4062,7 +4203,7 @@ msgstr "Mae'r dudalen we hon yn cynnwys llun o'r broblem, a ddarparwyd gan y def msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Llinell amser" @@ -4074,20 +4215,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Teitl" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" @@ -4099,44 +4241,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Cyfanswm" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Cyfanswm" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4149,18 +4283,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Ceisio eto" @@ -4175,7 +4310,11 @@ msgstr "Ceisiwch anfon e-bost atom yn uniongyrchol:" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +msgid "Unban" +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 #: templates/web/base/admin/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 @@ -4184,15 +4323,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Heb ei gadarnhau" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Anhysbys" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "" @@ -4202,13 +4337,14 @@ msgstr "" msgid "Unknown error" msgstr "Gwall anhysbys" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4233,12 +4369,12 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -4246,16 +4382,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "" @@ -4269,20 +4405,20 @@ msgstr "" msgid "Updated" msgstr "Diweddarwyd" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, 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:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by <strong>%s</strong> at %s" msgstr "Postiwyd gan <strong>%s</strong> am %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4290,7 +4426,7 @@ msgid "Updated!" msgstr "Diweddarwyd!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Diweddariadau" @@ -4337,40 +4473,80 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "E-bost eisoes yn y rhestr camddefnydd" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +msgid "User in abuse table" msgstr "" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Defnyddwyr" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Defnyddwyr" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Eich cyfeiriad e-bost" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Eich rhif ffôn" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4392,12 +4568,7 @@ msgstr "" msgid "Viewing a problem" msgstr "" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4407,20 +4578,25 @@ msgstr "Wardiau'r cyngor hwn" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "" +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Mae'n ddrwg gennym, ni allwn ddod o hyd i'r lleoliad hwnnw." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +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/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4428,6 +4604,11 @@ msgstr "" msgid "We send it to the council on your behalf" msgstr "" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "" + #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" @@ -4437,8 +4618,8 @@ msgstr "Rydym ond yn defnyddio eich gwybodaeth bersonol yn unol â'n <a href=\" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4466,7 +4647,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4489,6 +4670,10 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -4505,16 +4690,7 @@ msgstr "Mae ysgrifennu eich holl neges mewn priflythrennau yn ei gwneud hi'n ano msgid "Wrong location? Just click again on the map." msgstr "Lleoliad anghywir? Cliciwch ar y map eto." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Blwyddyn" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4529,7 +4705,7 @@ msgstr "Blwyddyn" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "" @@ -4542,7 +4718,7 @@ msgstr "Oes, mae gen i gyfrinair" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4559,7 +4735,7 @@ msgstr "" msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "Gallwch <a href=\"%s%s\">weld y broblem ar y wefan hon</a>." -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4585,7 +4761,7 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: templates/web/base/admin/body-form.html:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4593,7 +4769,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "Gwrthodoch chi; llenwch y blwch uchod" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>." msgstr "" @@ -4620,18 +4796,38 @@ msgstr "" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "" -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Rhowch eich rhif ffôn" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "" +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Rhowch eich rhif ffôn" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Rhowch eich rhif ffôn" + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Mewngofnodwyd yn llwyddiannus; gwiriwch a chadarnhewch fod eich manylion yn gywir:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Rhowch eich rhif ffôn" + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. <a href=\"%s\">Report a problem now.</a>" msgstr "" @@ -4655,36 +4851,43 @@ msgid "Your Reports" msgstr "Eich adroddiadau" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Eich e-bost" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 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 +#, fuzzy +msgid "Your email or mobile" +msgstr "Eich cyfeiriad e-bost" + #: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4695,19 +4898,19 @@ msgstr "Eich enw" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4718,8 +4921,8 @@ msgstr "Eich cyfrinair" msgid "Your password has been changed" msgstr "Newidiwyd eich cyfrinair" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Eich rhif ffôn" @@ -4728,7 +4931,7 @@ msgstr "Eich rhif ffôn" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Eich adroddiadau" @@ -4737,25 +4940,40 @@ msgstr "Eich adroddiadau" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Newidiwyd eich cyfrinair" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Eich diweddariadau" +#: perllib/FixMyStreet/SMS.pm:46 +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 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4772,8 +4990,8 @@ msgstr "cyngor" msgid "didn't use map" msgstr "" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "e.e. '%s' neu '%s'" @@ -4796,22 +5014,23 @@ msgstr "diweddarwyd ddiwethaf %s" msgid "less than a minute" msgstr "llai na munud" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "ddim yn berthnasol" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "neu dewch o hyd i fi'n awtomatig" @@ -4852,7 +5071,7 @@ msgstr "" msgid "this location" msgstr "y cyngor lleol" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "" @@ -4860,11 +5079,11 @@ msgstr "" msgid "today" msgstr "heddiw" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4872,14 +5091,24 @@ msgstr "" msgid "used map" msgstr "" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "E-bost eisoes yn y rhestr camddefnydd" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4957,7 +5186,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -4966,7 +5195,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" @@ -4975,7 +5204,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" @@ -4984,7 +5213,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -4993,7 +5222,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5083,6 +5312,33 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#~ msgid "By Date" +#~ msgstr "Yn ôl dyddiad" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Cliciwch yma neu rhowch fel dd/mm/bbbb" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Adroddiadau a gadarnhawyd rhwng %s a %s" + +#~ msgid "Hide old" +#~ msgstr "Cuddio'r hen rai" + +#~ msgid "Invalid end date" +#~ msgstr "Dyddiad dod i ben annilys" + +#~ msgid "Invalid start date" +#~ msgstr "Dyddiad cychwyn annilys" + +#~ msgid "No council" +#~ msgstr "Dim cyngor" + +#~ msgid "Show old" +#~ msgstr "Dangos yr hen rai" + +#~ msgid "Year" +#~ msgstr "Blwyddyn" + #~ msgid "%s ward, %s" #~ msgstr "ward %s, %s" |