diff --git a/pipelines/release-notes/cliff.toml b/pipelines/release-notes/cliff.toml
index 8c041cf32..a111eb1e4 100644
--- a/pipelines/release-notes/cliff.toml
+++ b/pipelines/release-notes/cliff.toml
@@ -113,17 +113,10 @@ protect_breaking_commits = false
commit_parsers = [
{ message = "^feat", group = "🚀 Features" },
{ message = "^fix", group = "🐛 Bug Fixes" },
- { message = "^doc", group = "📚 Documentation" },
+ { message = "^content", group = "📝 Content" },
{ message = "^perf", group = "⚡ Performance" },
- { message = "^refactor", group = "🚜 Refactor" },
{ message = "^style", group = "🎨 Styling" },
- { message = "^test", group = "🧪 Testing" },
- { message = "^chore\\(release\\): prepare for", skip = true },
- { message = "^chore\\(deps.*\\)", skip = true },
- { message = "^chore\\(pr\\)", skip = true },
- { message = "^chore\\(pull\\)", skip = true },
- { message = "^chore|^ci", group = "⚙️ Miscellaneous Tasks" },
- { body = ".*security", group = "🛡️ Security" },
+ { body = "^security", group = "🛡️ Security" },
{ message = "^revert", group = "◀️ Revert" },
# Include non-conventional commits only if they have a JIRA ticket
{ message = "eaflood\\.atlassian\\.net/browse/[A-Z]+-[0-9]+", group = "📋 Additional changes" },
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Applications/Applications.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Applications/Applications.cy.resx
index 01cde3b81..9abbd2f84 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Applications/Applications.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Applications/Applications.cy.resx
@@ -131,7 +131,7 @@
Rydych chi wedi trosglwyddo {0} i {1}
- WYou rejected {0} as an approved person. The organisation cannot submit data.
+ Fe wnaethoch chi wrthod {0} fel person cymeradwy. Ni all y sefydliad gyflwyno data.
Asiantaeth yr Amgylchedd
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Applications/EnrolmentDecision.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Applications/EnrolmentDecision.cy.resx
index 9d0a4a8da..ada12e4ed 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Applications/EnrolmentDecision.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Applications/EnrolmentDecision.cy.resx
@@ -28,7 +28,7 @@
Rydyn ni’n defnyddio’r wybodaeth yma mewn neges ebost at {0} {1}
- WEnter your reason for rejecting {0}
+ Rhowch eich rheswm dros wrthod {0}
Rhaid i’ch crynodeb fod yn 200 neu lai o gymeriadau
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Applications/EnrolmentRequests.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Applications/EnrolmentRequests.cy.resx
index c12024aa2..717694170 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Applications/EnrolmentRequests.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Applications/EnrolmentRequests.cy.resx
@@ -34,7 +34,7 @@
i
- WOrganisation type
+ Math o sefydliad
Math o sefydliad
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/AccountPermissionHaveChanged.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/AccountPermissionHaveChanged.cy.resx
index 0a89257cc..1ecd46a2a 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/AccountPermissionHaveChanged.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/AccountPermissionHaveChanged.cy.resx
@@ -19,21 +19,21 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- WAccount permissions have changed
+ Mae caniatadau'r cyfrif wedi newid
- WYou have removed {0} from {1}. We've sent and email to {2} asking them to apply to be an approved person by creating an account.
+ Rydych chi wedi tynnu {0} o {1}. Rydym wedi anfon e-bost at {2} yn gofyn iddynt wneud cais i fod yn berson cymeradwy drwy greu cyfrif.
- WWhat you need to do next
+ Beth mae angen ichi ei wneud nesaf
- WOnce {0} has created an account, you need to accept or reject it.
+ Ar ôl i {0} greu cyfrif, mae angen ichi ei dderbyn neu ei wrthod.
- WIf {0} does not apply to be an approved user, you will need to contact them.
+ Os na fydd {0} yn gwneud cais am fod yn ddefnyddiwr a gymeradwywyd, bydd angen ichi gysylltu â nhw.
- WGo to home
+ Ewch i'r cartref
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/EmailSentToNominatedApprovedPerson.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/EmailSentToNominatedApprovedPerson.cy.resx
index f21155054..04fcaa4b0 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/EmailSentToNominatedApprovedPerson.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/EmailSentToNominatedApprovedPerson.cy.resx
@@ -19,18 +19,18 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- WEmail sent to nominated approved person
+ Neges ebost wedi'i hanfon at y person a gymeradwywyd a enwebwyd
- WWe've sent an email to {0} asking them to apply to be an approved user by creating an account.
+ Rydym wedi anfon e-bost at {0} yn gofyn iddynt wneud cais i fod yn ddefnyddiwr cymeradwy drwy greu cyfrif.
- WWhat you need to do next
+ Beth sydd angen i chi ei wneud nesaf
- WOnce {0} has created an account, you need to accept or reject it.
+ Ar ôl i {0} greu cyfrif, mae angen ichi ei dderbyn neu ei wrthod.
- WIf {0} does not apply to be an approved user, you will need to contact them.
+ Os na fydd {0} yn gwneud cais am fod yn ddefnyddiwr a gymeradwywyd, bydd angen ichi gysylltu â nhw.
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/EnterPersonEmail.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/EnterPersonEmail.cy.resx
index 59fba181c..afcaba253 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/EnterPersonEmail.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/EnterPersonEmail.cy.resx
@@ -31,21 +31,21 @@
Rhowch eu cyfeiriad ebost
- WEnter an email in the correct format, like name example.com 111
+ Rhowch gyfeiriad ebost yn y fformat cywir, fel enw@enghraifft.com
- WEmail address must be 254 characters or less
+ Rhaid i gyfeiriad ebost fod yn 254 neu lai o gymeriadau
- WEmail
+ Ebost
Rhowch eu cyfeiriad ebost
- WEmail address must be 254 characters or less
+ Rhaid i gyfeiriad ebost fod yn 254 neu lai o gymeriadau
- WEnter an email in the correct format, like name@example.com 222
+ Rhowch gyfeiriad ebost yn y fformat cywir, fel enw@enghraifft.com
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/EnterPersonName.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/EnterPersonName.cy.resx
index 8122eed15..28fc6d730 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/EnterPersonName.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/InviteNewApprovedPerson/EnterPersonName.cy.resx
@@ -34,18 +34,18 @@
Rhowch eu henw cyntaf
- WFirst name must not include numbers
+ Chaiff yr enw cyntaf ddim cynnwys rhifaus
- WFirst name must be 35 characters or less
+ Rhaid i'r enw cyntaf fod yn 35 neu lai o gymeriadau
Rhowch eu henw olaf
- WLast name must not include numbers
+ Chaiff yr enw olaf ddim cynnwys rhifau
- WLast name must be 35 characters or less
+ Rhaid i'r enw olaf fod yn 35 neu lai o gymeriadau
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/AccountPermissionsHaveChanged.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/AccountPermissionsHaveChanged.cy.resx
index bbac7ee49..76e52162d 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/AccountPermissionsHaveChanged.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/AccountPermissionsHaveChanged.cy.resx
@@ -29,7 +29,7 @@
- WOnce {0} has made an application to change their account permissions to submit data, you will need to accept or reject the request.
+ Ar ôl i {0} wneud cais am newid caniatâd eu cyfrif er mwyn cyflwyno data, bydd angen ichi dderbyn neu wrthod y cais.
Os na fydd {0} yn gwneud cais am fod yn ddefnyddiwr a gymeradwywyd, bydd angen ichi gysylltu â nhw.
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/ApprovedPersonListPage.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/ApprovedPersonListPage.cy.resx
index a1644103e..971edd347 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/ApprovedPersonListPage.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/ApprovedPersonListPage.cy.resx
@@ -27,6 +27,6 @@
Rhywun newydd
- WSelect who has been nominated to be an approved person
+ Dewiswch pwy sydd wedi'i enwebu i fod yn berson cymeradwy
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/EmailSentToNominatedApprovedPerson.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/EmailSentToNominatedApprovedPerson.cy.resx
index d32f55c45..40a2cef9e 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/EmailSentToNominatedApprovedPerson.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/EmailSentToNominatedApprovedPerson.cy.resx
@@ -17,18 +17,18 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- WEmail sent to nominated approved person
+ Neges ebost wedi'i hanfon at y person a gymeradwywyd a enwebwyd
- WWe've sent an email to {0} asking them to apply to be an approved person for {1}.
+ Rydym wedi anfon e-bost at {0} yn gofyn iddynt wneud cais i fod yn berson cymeradwy ar gyfer {1}.
- WWhat you need to do next
+ Beth sydd angen i chi ei wneud nesaf
- WOnce {0} has made the application to change their account permissions to submit data, you will need to accept or reject the request.
+ Ar ôl i {0} wneud cais am newid caniatâd eu cyfrif er mwyn cyflwyno data, bydd angen ichi dderbyn neu wrthod y cais.
- WIf {0} does not apply to be an approved user, you will need to contact them.
+ Os na fydd {0} yn gwneud cais am fod yn ddefnyddiwr a gymeradwywyd, bydd angen ichi gysylltu â nhw.
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/NominationDecision.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/NominationDecision.cy.resx
index 9b00eb619..d38ebca6f 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/NominationDecision.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/NominationDecision.cy.resx
@@ -28,6 +28,6 @@
Nac ydy
- WSelect whether a new approved person has been nominated or not
+ Dewiswch a yw person cymeradwy newydd wedi'i enwebu ai peidio
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/RemovedConfirmation.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/RemovedConfirmation.cy.resx
index 65f2413fb..b01f88204 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/RemovedConfirmation.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/RemoveApprovedUser/RemovedConfirmation.cy.resx
@@ -19,18 +19,18 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- WApproved person removed
+ Person a gymeradwywyd wedi'i dynnu
- WWhat happens next
+ Beth sy'n digwydd nesaf
- WYou have selected {0} to be removed from {1} account
+ Rydych chi wedi dewis tynnu {0} o gyfrif {1}
- WThe organisation has not nominated a new approved person. They cannot submit packaging data.
+ Nid yw'r sefydliad wedi enwebu person cymeradwy newydd. Ni allant gyflwyno data pecynnu.
- WYou need to ask the organisation to contact the service desk to nominate a new approved person.
+ Mae angen i chi ofyn i'r sefydliad gysylltu â'r ddesg wasanaeth i enwebu person cymeradwy newydd.
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/SearchManageApprovers/RegulatorSearchPage.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/SearchManageApprovers/RegulatorSearchPage.cy.resx
index 8a4fcbefc..c9d0388ba 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/SearchManageApprovers/RegulatorSearchPage.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/SearchManageApprovers/RegulatorSearchPage.cy.resx
@@ -59,16 +59,16 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- WOrganisation name must be 254 characters or less
+ Rhaid i enw'r sefydliad fod yn 254 nod neu lai
- WOrganisation ID must be 6 digits
+ Rhaid i ID y sefydliad fod yn 6 digid
- WOrganisation name must be 3 characters or more
+ Rhaid i enw'r sefydliad fod yn 3 nod neu fwy
- WOrganisation ID must be 3 digits or more
+ Rhaid i ID y sefydliad fod yn 3 digid neu fwy
Rhowch enw neu ID y sefydliad
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/SearchManageApprovers/RegulatorSearchResult.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/SearchManageApprovers/RegulatorSearchResult.cy.resx
index 90b4878ec..4ae83a1eb 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/SearchManageApprovers/RegulatorSearchResult.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/SearchManageApprovers/RegulatorSearchResult.cy.resx
@@ -21,6 +21,6 @@
Canlyniadau
- WNo results found
+ Dim cofnodion wedi'u canfod
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Components/RegistrationSubmissionList/Default.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Components/RegistrationSubmissionList/Default.cy.resx
index 2a6ece278..e6bf95ae1 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Components/RegistrationSubmissionList/Default.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Components/RegistrationSubmissionList/Default.cy.resx
@@ -127,7 +127,7 @@
Statws yr ailgyflwyniad
- [Welsh]Organisation ID and reference number
+ ID y sefydliad a rhif cyfeirnod
Sefydliad a math cofrestru
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Components/RegistrationsList/Default.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Components/RegistrationsList/Default.cy.resx
index f9a325e8a..6bf3eecf9 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Components/RegistrationsList/Default.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Components/RegistrationsList/Default.cy.resx
@@ -136,6 +136,6 @@
Cyfnod y cyflwyniad
- WNo results found
+ Dim cofnodion wedi'u canfod
-
+
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_ApprovedPerson.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_ApprovedPerson.cy.resx
index 807150023..93b86c721 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_ApprovedPerson.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_ApprovedPerson.cy.resx
@@ -21,6 +21,6 @@
Cais yn yr arfaeth
- WAPPLICATION AWAITING APPROVAL
+ Mae'r cais yn aros i gael ei gymeradwyo
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cy.resx
index 16dc1f5ee..29e906211 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/ManageApprovedUser/_DelegatedPersons.cy.resx
@@ -121,6 +121,6 @@
Cais yn yr arfaeth
- WAPPLICATION AWAITING APPROVAL
+ Mae'r cais yn aros i gael ei gymeradwyo
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/_OrganisationSearchResultList.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/_OrganisationSearchResultList.cy.resx
index f817dba26..e44d0f082 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/_OrganisationSearchResultList.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/_OrganisationSearchResultList.cy.resx
@@ -139,6 +139,6 @@
Cynhyrchydd anuniongyrchol
- WMember of {0} compliance scheme
+ Aelod o gynllun cydymffurfio {0}
-
\ No newline at end of file
+
diff --git a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Submissions/PackagingDataFileDownload.cy.resx b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Submissions/PackagingDataFileDownload.cy.resx
index 09556a544..35db75008 100644
--- a/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Submissions/PackagingDataFileDownload.cy.resx
+++ b/src/EPR.RegulatorService.Frontend.Web/Resources/Views/Submissions/PackagingDataFileDownload.cy.resx
@@ -99,6 +99,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- W Packaging data file download
+ Lawrlwytho ffeil data pecynnu