Merge branch 'russell/project-settings-ui-text3' into 'master'

Improve UI text of projects settings for merge request approvals

See merge request gitlab-org/gitlab!78853

ee/app/assets/javascripts/approvals/components/security_configuration/unconfigured_security_rules.vue

@@ -47,7 +47,7 @@ export default {
         {
           name: LICENSE_CHECK_NAME,
           description: s__(
-            'SecurityApprovals|Requires approval for Denied licenses. %{linkStart}More information%{linkEnd}',
+            'SecurityApprovals|Requires approval for Denied licenses. %{linkStart}Learn more.%{linkEnd}',
           ),
           docsPath: this.licenseCheckHelpPagePath,
         },

ee/app/assets/javascripts/approvals/constants.js

@@ -75,16 +75,16 @@ export const APPROVAL_SETTINGS_I18N = {
 };
 
 export const PROJECT_APPROVAL_SETTINGS_LABELS_I18N = {
-  authorApprovalLabel: s__('ApprovalSettings|Prevent approval by author.'),
+  authorApprovalLabel: s__('ApprovalSettings|Prevent approval by author'),
   preventMrApprovalRuleEditLabel: s__(
-    'ApprovalSettings|Prevent editing approval rules in merge requests.',
+    'ApprovalSettings|Prevent editing approval rules in merge requests',
   ),
   preventCommittersApprovalLabel: s__(
-    'ApprovalSettings|Prevent approvals by users who add commits.',
+    'ApprovalSettings|Prevent approvals by users who add commits',
   ),
-  requireUserPasswordLabel: s__('ApprovalSettings|Require user password to approve.'),
+  requireUserPasswordLabel: s__('ApprovalSettings|Require user password to approve'),
   removeApprovalsOnPushLabel: s__(
-    'ApprovalSettings|Remove all approvals when commits are added to the source branch.',
+    'ApprovalSettings|Remove all approvals when commits are added to the source branch',
   ),
 };
 

locale/gitlab.pot

@@ -4494,22 +4494,28 @@ msgstr ""
 msgid "ApprovalSettings|Merge request approval settings have been updated."
 msgstr ""
 
+msgid "ApprovalSettings|Prevent approval by author"
+msgstr ""
+
 msgid "ApprovalSettings|Prevent approval by author."
 msgstr ""
 
+msgid "ApprovalSettings|Prevent approvals by users who add commits"
+msgstr ""
+
 msgid "ApprovalSettings|Prevent approvals by users who add commits."
 msgstr ""
 
-msgid "ApprovalSettings|Prevent editing approval rules in merge requests."
+msgid "ApprovalSettings|Prevent editing approval rules in merge requests"
 msgstr ""
 
 msgid "ApprovalSettings|Prevent editing approval rules in projects and merge requests."
 msgstr ""
 
-msgid "ApprovalSettings|Remove all approvals when commits are added to the source branch."
+msgid "ApprovalSettings|Remove all approvals when commits are added to the source branch"
 msgstr ""
 
-msgid "ApprovalSettings|Require user password to approve."
+msgid "ApprovalSettings|Require user password to approve"
 msgstr ""
 
 msgid "ApprovalSettings|There was an error loading merge request approval settings."
@@ -31543,7 +31549,7 @@ msgstr ""
 msgid "SecurityApprovals|License-Check"
 msgstr ""
 
-msgid "SecurityApprovals|Requires approval for Denied licenses. %{linkStart}More information%{linkEnd}"
+msgid "SecurityApprovals|Requires approval for Denied licenses. %{linkStart}Learn more.%{linkEnd}"
 msgstr ""
 
 msgid "SecurityApprovals|Requires approval for decreases in test coverage. %{linkStart}Learn more.%{linkEnd}"