Add latest changes from gitlab-org/gitlab@master

1 files changed, 44 insertions, 32 deletions

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 13dc05c0d16..fa551259516 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -751,9 +751,6 @@ msgstr ""
 msgid "%{integrations_link_start}Integrations%{link_end} enable you to make third-party applications part of your GitLab workflow. If the available integrations don't meet your needs, consider using a %{webhooks_link_start}webhook%{link_end}."
 msgstr ""
 
-msgid "%{issuableDisplayName} %{lockStatus}."
-msgstr ""
-
 msgid "%{issuableType} will be removed! Are you sure?"
 msgstr ""
 
@@ -11777,9 +11774,6 @@ msgstr ""
 msgid "Copy %{http_label} clone URL"
 msgstr ""
 
-msgid "Copy %{issueType} email address"
-msgstr ""
-
 msgid "Copy %{name}"
 msgstr ""
 
@@ -15859,9 +15853,6 @@ msgstr ""
 msgid "Email a new %{name} to this project"
 msgstr ""
 
-msgid "Email address copied"
-msgstr ""
-
 msgid "Email address suffix"
 msgstr ""
 
@@ -21277,12 +21268,6 @@ msgstr ""
 msgid "Header message"
 msgstr ""
 
-msgid "HeaderAction|Notifications and other %{issueType} actions have moved to this menu."
-msgstr ""
-
-msgid "HeaderAction|Okay!"
-msgstr ""
-
 msgid "HeaderAction|incident"
 msgstr ""
 
@@ -26229,9 +26214,6 @@ msgstr ""
 msgid "Lock %{issuableDisplayName}"
 msgstr ""
 
-msgid "Lock %{issuableType}"
-msgstr ""
-
 msgid "Lock File?"
 msgstr ""
 
@@ -26241,6 +26223,9 @@ msgstr ""
 msgid "Lock memberships to SAML Group Links synchronization"
 msgstr ""
 
+msgid "Lock merge request"
+msgstr ""
+
 msgid "Lock not found"
 msgstr ""
 
@@ -27220,12 +27205,18 @@ msgstr ""
 msgid "Merge request events"
 msgstr ""
 
+msgid "Merge request locked."
+msgstr ""
+
 msgid "Merge request not merged"
 msgstr ""
 
 msgid "Merge request reports"
 msgstr ""
 
+msgid "Merge request unlocked."
+msgstr ""
+
 msgid "Merge request was scheduled to merge after pipeline succeeds"
 msgstr ""
 
@@ -36236,9 +36227,6 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-msgid "Reference copied"
-msgstr ""
-
 msgid "References"
 msgstr ""
 
@@ -38725,12 +38713,42 @@ msgstr ""
 msgid "ScanResultPolicy|%{thenLabelStart}Then%{thenLabelEnd} Require approval from %{approvalsRequired} of the following approvers:"
 msgstr ""
 
+msgid "ScanResultPolicy|Add new criteria"
+msgstr ""
+
+msgid "ScanResultPolicy|Choose an option"
+msgstr ""
+
+msgid "ScanResultPolicy|Choose criteria type"
+msgstr ""
+
+msgid "ScanResultPolicy|Maximum number of severity-criteria is one"
+msgstr ""
+
+msgid "ScanResultPolicy|Maximum number of status-criteria is one"
+msgstr ""
+
+msgid "ScanResultPolicy|New severity"
+msgstr ""
+
+msgid "ScanResultPolicy|New status"
+msgstr ""
+
 msgid "ScanResultPolicy|Newly Detected"
 msgstr ""
 
 msgid "ScanResultPolicy|Pre-existing"
 msgstr ""
 
+msgid "ScanResultPolicy|Severity is:"
+msgstr ""
+
+msgid "ScanResultPolicy|Status is:"
+msgstr ""
+
+msgid "ScanResultPolicy|When %{scanners} runs against the %{branches} and find(s) more than %{vulnerabilitiesAllowed} %{boldDescription} of the following criteria:"
+msgstr ""
+
 msgid "ScanResultPolicy|add an approver"
 msgstr ""
 
@@ -38740,9 +38758,6 @@ msgstr ""
 msgid "ScanResultPolicy|finds any license %{matchType} %{licenseType} and is %{licenseStates} in an open merge request targeting %{branches}"
 msgstr ""
 
-msgid "ScanResultPolicy|from %{scanners} find(s) more than %{vulnerabilitiesAllowed} %{severities} %{vulnerabilityStates} vulnerabilities in an open merge request targeting %{branches}"
-msgstr ""
-
 msgid "ScanResultPolicy|license states"
 msgstr ""
 
@@ -38764,6 +38779,9 @@ msgstr ""
 msgid "ScanResultPolicy|vulnerabilities allowed"
 msgstr ""
 
+msgid "ScanResultPolicy|vulnerabilities that match all"
+msgstr ""
+
 msgid "ScanResultPolicy|vulnerability states"
 msgstr ""
 
@@ -46847,10 +46865,10 @@ msgstr ""
 msgid "Unlock"
 msgstr ""
 
-msgid "Unlock %{issuableType}"
+msgid "Unlock account"
 msgstr ""
 
-msgid "Unlock account"
+msgid "Unlock merge request"
 msgstr ""
 
 msgid "Unlock more features with GitLab Ultimate"
@@ -52389,9 +52407,6 @@ msgstr ""
 msgid "loading"
 msgstr ""
 
-msgid "locked"
-msgstr ""
-
 msgid "locked by %{path_lock_user_name} %{created_at}"
 msgstr ""
 
@@ -53290,9 +53305,6 @@ msgstr ""
 msgid "unicode domains should use IDNA encoding"
 msgstr ""
 
-msgid "unlocked"
-msgstr ""
-
 msgid "updated"
 msgstr ""