Merge branch 'djadmin-remove-blacklist' into 'master'

Remove blacklist terminology from License Compliance

See merge request gitlab-org/gitlab!39071

ee/app/assets/javascripts/vue_shared/license_compliance/license_management.vue

@@ -69,11 +69,9 @@ export default {
       this.formIsOpen = false;
     },
   },
-  emptyMessage: s__(
-    'LicenseCompliance|There are currently no approved or blacklisted licenses in this project.',
-  ),
+  emptyMessage: s__('LicenseCompliance|There are currently no policies in this project.'),
   emptySearchMessage: s__(
-    'LicenseCompliance|There are currently no approved or blacklisted licenses that match in this project.',
+    'LicenseCompliance|There are currently no policies that match in this project.',
   ),
 };
 </script>

ee/changelogs/unreleased/djadmin-remove-blacklist.yml

+---
+title: Remove blacklist terminology from License Compliance
+merge_request: 39071
+author:
+type: other

locale/gitlab.pot

@@ -14214,10 +14214,10 @@ msgstr ""
 msgid "LicenseCompliance|Remove license?"
 msgstr ""
 
-msgid "LicenseCompliance|There are currently no approved or blacklisted licenses in this project."
+msgid "LicenseCompliance|There are currently no policies in this project."
 msgstr ""
 
-msgid "LicenseCompliance|There are currently no approved or blacklisted licenses that match in this project."
+msgid "LicenseCompliance|There are currently no policies that match in this project."
 msgstr ""
 
 msgid "LicenseCompliance|This license already exists in this project."