DEFRA · jason-ee · Apr 1, 2026 · Apr 1, 2026 · Apr 10, 2026 · Apr 10, 2026
@@ -113,17 +113,10 @@ protect_breaking_commits = false
 commit_parsers = [
     { message = "^feat", group = "<!-- 0 -->🚀 Features" },
     { message = "^fix", group = "<!-- 1 -->🐛 Bug Fixes" },
-    { message = "^doc", group = "<!-- 3 -->📚 Documentation" },
+    { message = "^content", group = "<!-- 2 -->📝 Content" },
     { message = "^perf", group = "<!-- 4 -->⚡ Performance" },
-    { message = "^refactor", group = "<!-- 2 -->🚜 Refactor" },
     { message = "^style", group = "<!-- 5 -->🎨 Styling" },
-    { message = "^test", group = "<!-- 6 -->🧪 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 = "<!-- 7 -->⚙️ Miscellaneous Tasks" },
-    { body = ".*security", group = "<!-- 8 -->🛡️ Security" },
+    { body = "^security", group = "<!-- 8 -->🛡️ Security" },
     { message = "^revert", group = "<!-- 9 -->◀️ Revert" },
     # Include non-conventional commits only if they have a JIRA ticket
     { message = "eaflood\\.atlassian\\.net/browse/[A-Z]+-[0-9]+", group = "<!-- 99 -->📋 Additional changes" },

@@ -131,7 +131,7 @@
     <value>Rydych chi wedi trosglwyddo {0} i {1}</value>
   </data>
   <data name="RejectedApprovedPerson" xml:space="preserve">
-    <value>WYou rejected {0} as an approved person. The organisation cannot submit data.</value>
+    <value>Fe wnaethoch chi wrthod {0} fel person cymeradwy. Ni all y sefydliad gyflwyno data.</value>
   </data>
   <data name="Applications.Title" xml:space="preserve">
     <value>Asiantaeth yr Amgylchedd</value>

@@ -28,7 +28,7 @@
     <value>Rydyn ni’n defnyddio’r wybodaeth yma mewn neges ebost at {0} {1}</value>
   </data>
   <data name="Reject.CommentsRequiredError" xml:space="preserve">
-    <value>WEnter your reason for rejecting {0}</value>
+    <value>Rhowch eich rheswm dros wrthod {0}</value>
   </data>
   <data name="Reject.CommentsMaxLengthError" xml:space="preserve">
     <value>Rhaid i’ch crynodeb fod yn 200 neu lai o gymeriadau</value>

@@ -34,7 +34,7 @@
     <value>i</value>
   </data>
   <data name="Page.OrganisationType" xml:space="preserve">
-      <value>WOrganisation type</value>
+      <value>Math o sefydliad</value>
   </data>
   <data name="Subheading.OrganisationType" xml:space="preserve">
     <value>Math o sefydliad</value>

@@ -19,21 +19,21 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Page.Panel" xml:space="preserve">
-    <value>WAccount permissions have changed</value>
+    <value>Mae caniatadau'r cyfrif wedi newid</value>
   </data>
   <data name="Page.Title" xml:space="preserve">
-    <value>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.</value>
+    <value>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.</value>
   </data>
   <data name="Page.Heading" xml:space="preserve">
-    <value>WWhat you need to do next</value>
+    <value>Beth mae angen ichi ei wneud nesaf</value>
   </data>
   <data name="Confirmation.AfterAccountCreated.AcceptOrRejectAccount" xml:space="preserve">
-    <value>WOnce {0} has created an account, you need to accept or reject it.</value>
+    <value>Ar ôl i {0} greu cyfrif, mae angen ichi ei dderbyn neu ei wrthod.</value>
   </data>
   <data name="Confirmation.DoesNotApplyToBeApprovedUser.ContactThem" xml:space="preserve">
-    <value>WIf {0} does not apply to be an approved user, you will need to contact them.</value>
+    <value>Os na fydd {0} yn gwneud cais am fod yn ddefnyddiwr a gymeradwywyd, bydd angen ichi gysylltu â nhw.</value>
   </data>
   <data name="Custom.GoToHome" xml:space="preserve">
-    <value>WGo to home</value>
+    <value>Ewch i'r cartref</value>
   </data>
 </root>
@@ -19,18 +19,18 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Page.Panel" xml:space="preserve">
-    <value>WEmail sent to nominated approved person</value>
+    <value>Neges ebost wedi'i hanfon at y person a gymeradwywyd a enwebwyd</value>
   </data>
   <data name="Page.Heading" xml:space="preserve">
-    <value>WWe've sent an email to {0} asking them to apply to be an approved user by creating an account.</value>
+    <value>Rydym wedi anfon e-bost at {0} yn gofyn iddynt wneud cais i fod yn ddefnyddiwr cymeradwy drwy greu cyfrif.</value>
   </data>
   <data name="Page.Title" xml:space="preserve">
-    <value>WWhat you need to do next</value>
+    <value>Beth sydd angen i chi ei wneud nesaf</value>
   </data>
   <data name="Confirmation.AfterAccountCreated.AcceptOrRejectAccount" xml:space="preserve">
-    <value>WOnce {0} has created an account, you need to accept or reject it.</value>
+    <value>Ar ôl i {0} greu cyfrif, mae angen ichi ei dderbyn neu ei wrthod.</value>
   </data>
   <data name="Confirmation.DoesNotApplyToBeApprovedUser.ContactThem" xml:space="preserve">
-    <value>WIf {0} does not apply to be an approved user, you will need to contact them.</value>
+    <value>Os na fydd {0} yn gwneud cais am fod yn ddefnyddiwr a gymeradwywyd, bydd angen ichi gysylltu â nhw.</value>
   </data>
 </root>
@@ -31,21 +31,21 @@
     <value>Rhowch eu cyfeiriad ebost</value>
   </data>
   <data name="ErrorTitle.InvalidEmail" xml:space="preserve">
-    <value>WEnter an email in the correct format, like name example.com 111</value>
+    <value>Rhowch gyfeiriad ebost yn y fformat cywir, fel enw@enghraifft.com</value>
   </data>
   <data name="ErrorTitle.InvalidEmailLength" xml:space="preserve">
-    <value>WEmail address must be 254 characters or less</value>
+    <value>Rhaid i gyfeiriad ebost fod yn 254 neu lai o gymeriadau</value>
   </data>
   <data name="Email.Label" xml:space="preserve">
-    <value>WEmail</value>
+    <value>Ebost</value>
   </data>
   <data name="PersonEmail.MissingError" xml:space="preserve">
     <value>Rhowch eu cyfeiriad ebost</value>
   </data>
   <data name="PersonEmail.TooLongError" xml:space="preserve">
-    <value>WEmail address must be 254 characters or less</value>
+    <value>Rhaid i gyfeiriad ebost fod yn 254 neu lai o gymeriadau</value>
   </data>
   <data name="PersonEmail.InvalidFormat" xml:space="preserve">
-    <value>WEnter an email in the correct format, like name@example.com 222</value>
+    <value>Rhowch gyfeiriad ebost yn y fformat cywir, fel enw@enghraifft.com</value>
   </data>
 </root>
@@ -34,18 +34,18 @@
     <value>Rhowch eu henw cyntaf</value>
   </data>
   <data name="ErrorTitle.FirstNameDigits" xml:space="preserve">
-    <value>WFirst name must not include numbers</value>
+    <value>Chaiff yr enw cyntaf ddim cynnwys rhifaus</value>
   </data>
   <data name="ErrorTitle.FirstNameLength" xml:space="preserve">
-    <value>WFirst name must be 35 characters or less</value>
+    <value>Rhaid i'r enw cyntaf fod yn 35 neu lai o gymeriadau</value>
   </data>
   <data name="ErrorTitle.LastNameNull" xml:space="preserve">
     <value>Rhowch eu henw olaf</value>
   </data>
   <data name="ErrorTitle.LastNameDigits" xml:space="preserve">
-    <value>WLast name must not include numbers</value>
+    <value>Chaiff yr enw olaf ddim cynnwys rhifau</value>
   </data>
   <data name="ErrorTitle.LastNameLength" xml:space="preserve">
-    <value>WLast name must be 35 characters or less</value>
+    <value>Rhaid i'r enw olaf fod yn 35 neu lai o gymeriadau</value>
   </data>
 </root>
@@ -29,7 +29,7 @@
   </data>
 
   <data name="Content.WhenAccountIsCreated" xml:space="preserve">
-      <value>WOnce {0} has made an application to change their account permissions to submit data, you will need to accept or reject the request.</value>
+      <value>Ar ôl i {0} wneud cais am newid caniatâd eu cyfrif er mwyn cyflwyno data, bydd angen ichi dderbyn neu wrthod y cais.</value>
   </data>
   <data name="Content.DoesNotApply" xml:space="preserve">
       <value>Os na fydd {0} yn gwneud cais am fod yn ddefnyddiwr a gymeradwywyd, bydd angen ichi gysylltu â nhw.</value>

@@ -27,6 +27,6 @@
     <value>Rhywun newydd</value>
   </data>
   <data name="SelectNominatedApprovedPerson" xml:space="preserve">
-    <value>WSelect who has been nominated to be an approved person</value>
+    <value>Dewiswch pwy sydd wedi'i enwebu i fod yn berson cymeradwy</value>
   </data>
 </root>
@@ -17,18 +17,18 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Page.Panel" xml:space="preserve">
-    <value>WEmail sent to nominated approved person</value>
+    <value>Neges ebost wedi'i hanfon at y person a gymeradwywyd a enwebwyd</value>
   </data>
   <data name="Page.CreateAccount" xml:space="preserve">
-    <value>WWe've sent an email to {0} asking them to apply to be an approved person for {1}.</value>
+    <value>Rydym wedi anfon e-bost at {0} yn gofyn iddynt wneud cais i fod yn berson cymeradwy ar gyfer {1}.</value>
   </data>
   <data name="Page.Heading" xml:space="preserve">
-    <value>WWhat you need to do next</value>
+    <value>Beth sydd angen i chi ei wneud nesaf</value>
   </data>
   <data name="Content.WhenAccountIsCreated" xml:space="preserve">
-    <value>WOnce {0} has made the application to change their account permissions to submit data, you will need to accept or reject the request.</value>
+    <value>Ar ôl i {0} wneud cais am newid caniatâd eu cyfrif er mwyn cyflwyno data, bydd angen ichi dderbyn neu wrthod y cais.</value>
   </data>
   <data name="Content.DoesNotApply" xml:space="preserve">
-    <value>WIf {0} does not apply to be an approved user, you will need to contact them.</value>
+    <value>Os na fydd {0} yn gwneud cais am fod yn ddefnyddiwr a gymeradwywyd, bydd angen ichi gysylltu â nhw.</value>
   </data>
 </root>
@@ -28,6 +28,6 @@
       <value>Nac ydy</value>
   </data>
   <data name="NominateApproved.Decision.Error" xml:space="preserve">
-    <value>WSelect whether a new approved person has been nominated or not</value>
+    <value>Dewiswch a yw person cymeradwy newydd wedi'i enwebu ai peidio</value>
   </data>
 </root>
@@ -19,18 +19,18 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Page.Panel" xml:space="preserve">
-      <value>WApproved person removed</value>
+      <value>Person a gymeradwywyd wedi'i dynnu</value>
   </data>
   <data name="Page.Heading" xml:space="preserve">
-      <value>WWhat happens next</value>
+      <value>Beth sy'n digwydd nesaf</value>
   </data>
   <data name="Page.Title" xml:space="preserve">
-      <value>WYou have selected {0} to be removed from {1} account</value>
+      <value>Rydych chi wedi dewis tynnu {0} o gyfrif {1}</value>
   </data>
   <data name="Confirmation.CannotSubmit.PackagingData" xml:space="preserve">
-      <value>WThe organisation has not nominated a new approved person. They cannot submit packaging data.</value>
+      <value>Nid yw'r sefydliad wedi enwebu person cymeradwy newydd. Ni allant gyflwyno data pecynnu.</value>
   </data>
   <data name="Confirmation.Nominate.ApprovedUser" xml:space="preserve">
-      <value>WYou need to ask the organisation to contact the service desk to nominate a new approved person.</value>
+      <value>Mae angen i chi ofyn i'r sefydliad gysylltu â'r ddesg wasanaeth i enwebu person cymeradwy newydd.</value>
   </data>
 </root>
@@ -59,16 +59,16 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="SearchTerm.OrganisationName.TooLongError" xml:space="preserve">
-    <value>WOrganisation name must be 254 characters or less</value>
+    <value>Rhaid i enw'r sefydliad fod yn 254 nod neu lai</value>
   </data>
   <data name="SearchTerm.OrganisationId.TooLongError" xml:space="preserve">
-    <value>WOrganisation ID must be 6 digits</value>
+    <value>Rhaid i ID y sefydliad fod yn 6 digid</value>
   </data>
   <data name="SearchTerm.OrganisationName.TooShortError" xml:space="preserve">
-    <value>WOrganisation name must be 3 characters or more</value>
+    <value>Rhaid i enw'r sefydliad fod yn 3 nod neu fwy</value>
   </data>
   <data name="SearchTerm.OrganisationId.TooShortError" xml:space="preserve">
-    <value>WOrganisation ID must be 3 digits or more</value>
+    <value>Rhaid i ID y sefydliad fod yn 3 digid neu fwy</value>
   </data>
   <data name="SearchTerm.MissingError" xml:space="preserve">
     <value>Rhowch enw neu ID y sefydliad</value>

@@ -21,6 +21,6 @@
     <value>Canlyniadau</value>
   </data>
   <data name="Page.No.Results.Title" xml:space="preserve">
-    <value>WNo results found</value>
+    <value>Dim cofnodion wedi'u canfod</value>
   </data>
 </root>
@@ -127,7 +127,7 @@
     <value>Statws yr ailgyflwyniad</value>
   </data>
   <data name="Table.Header.CompanyId" xml:space="preserve">
-    <value>[Welsh]Organisation ID and reference number</value>
+    <value>ID y sefydliad a rhif cyfeirnod</value>
   </data>
   <data name="Table.Header.Company" xml:space="preserve">
     <value>Sefydliad a math cofrestru</value>

@@ -136,6 +136,6 @@
     <value>Cyfnod y cyflwyniad</value>
   </data>
   <data name="Body.NoResultsFound" xml:space="preserve">
-    <value>WNo results found</value>
+    <value>Dim cofnodion wedi'u canfod</value>
   </data>
-</root>
+</root>
@@ -21,6 +21,6 @@
         <value>Cais yn yr arfaeth</value>
    </data>
     <data name="Enrolment.Status.Awaiting" xml:space="preserve">
-        <value>WAPPLICATION AWAITING APPROVAL</value>
+        <value>Mae'r cais yn aros i gael ei gymeradwyo</value>
    </data>
 </root>
@@ -121,6 +121,6 @@
     <value>Cais yn yr arfaeth</value>
   </data>
   <data name="Enrolment.Status.Awaiting" xml:space="preserve">
-    <value>WAPPLICATION AWAITING APPROVAL</value>
+    <value>Mae'r cais yn aros i gael ei gymeradwyo</value>
   </data>
 </root>
@@ -139,6 +139,6 @@
     <value>Cynhyrchydd anuniongyrchol</value>
   </data>
   <data name="OrgType.MemberOfScheme" xml:space="preserve">
-    <value>WMember of {0} compliance scheme</value>
+    <value>Aelod o gynllun cydymffurfio {0}</value>
   </data>
-</root>
+</root>
@@ -99,6 +99,6 @@
 		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 	</resheader>
   <data name="PackagingDataFileDownload.Title" xml:space="preserve">
-    <value>W Packaging data file download</value>
+    <value>Lawrlwytho ffeil data pecynnu</value>
   </data>
 </root>