Add latest changes from gitlab-org/gitlab@master

1 files changed, 25 insertions, 31 deletions

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index f86eaaa88a5..e7954873267 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1659,9 +1659,6 @@ msgstr ""
 msgid "A %{incident_docs_start}modified issue%{incident_docs_end} to guide the resolution of incidents."
 msgstr ""
 
-msgid "A %{linkStart}merge train%{linkEnd} is a queued list of merge requests, each waiting to be merged into the target branch."
-msgstr ""
-
 msgid "A .NET Core console application template, customizable for any .NET Core project"
 msgstr ""
 
@@ -1830,9 +1827,6 @@ msgstr ""
 msgid "API Fuzzing"
 msgstr ""
 
-msgid "API Fuzzing Configuration"
-msgstr ""
-
 msgid "API Help"
 msgstr ""
 
@@ -10639,9 +10633,6 @@ msgstr ""
 msgid "Confidentiality"
 msgstr ""
 
-msgid "Configuration"
-msgstr ""
-
 msgid "Configuration help"
 msgstr ""
 
@@ -12642,9 +12633,6 @@ msgstr ""
 msgid "DAG visualization requires at least 3 dependent jobs."
 msgstr ""
 
-msgid "DAST Configuration"
-msgstr ""
-
 msgid "DAST configuration not found"
 msgstr ""
 
@@ -14918,9 +14906,6 @@ msgstr ""
 msgid "DiscordService|Send notifications about project events to a Discord channel."
 msgstr ""
 
-msgid "Discover"
-msgstr ""
-
 msgid "Discover GitLab Geo"
 msgstr ""
 
@@ -26762,9 +26747,6 @@ msgstr ""
 msgid "Merge requests can't be merged if the status checks did not succeed or are still running."
 msgstr ""
 
-msgid "Merge trains"
-msgstr ""
-
 msgid "Merge unverified changes"
 msgstr ""
 
@@ -37807,9 +37789,6 @@ msgstr ""
 msgid "SAML|Your organization's SSO has been connected to your GitLab account"
 msgstr ""
 
-msgid "SAST Configuration"
-msgstr ""
-
 msgid "SCIM|SCIM Token"
 msgstr ""
 
@@ -38444,9 +38423,6 @@ msgstr ""
 msgid "Security"
 msgstr ""
 
-msgid "Security Configuration"
-msgstr ""
-
 msgid "Security Dashboard"
 msgstr ""
 
@@ -38456,6 +38432,12 @@ msgstr ""
 msgid "Security and Compliance"
 msgstr ""
 
+msgid "Security capabilities"
+msgstr ""
+
+msgid "Security configuration"
+msgstr ""
+
 msgid "Security dashboard"
 msgstr ""
 
@@ -38588,7 +38570,7 @@ msgstr ""
 msgid "SecurityConfiguration|SAST Analyzers"
 msgstr ""
 
-msgid "SecurityConfiguration|SAST Configuration"
+msgid "SecurityConfiguration|SAST configuration"
 msgstr ""
 
 msgid "SecurityConfiguration|Secure your project"
@@ -39860,9 +39842,6 @@ msgstr ""
 msgid "Set any rate limit to %{code_open}0%{code_close} to disable the limit."
 msgstr ""
 
-msgid "Set auto-merge"
-msgstr ""
-
 msgid "Set due date"
 msgstr ""
 
@@ -41406,6 +41385,12 @@ msgstr ""
 msgid "Start merge train"
 msgstr ""
 
+msgid "Start merge train when pipeline succeeds"
+msgstr ""
+
+msgid "Start merge train..."
+msgstr ""
+
 msgid "Start remote connection"
 msgstr ""
 
@@ -48553,9 +48538,6 @@ msgstr ""
 msgid "When merge requests and commits in the default branch close, any issues they reference also close."
 msgstr ""
 
-msgid "When the pipeline for this merge request succeeds, it will %{linkStart}automatically merge%{linkEnd}."
-msgstr ""
-
 msgid "When this merge request is accepted"
 msgid_plural "When these merge requests are accepted"
 msgstr[0] ""
@@ -51602,6 +51584,9 @@ msgstr ""
 msgid "mrWidget|%{metricsLinkStart} Memory %{metricsLinkEnd} usage is %{emphasisStart} unchanged %{emphasisEnd} at %{memoryFrom}MB"
 msgstr ""
 
+msgid "mrWidget|A merge train is a queued list of merge requests waiting to be merged into the target branch. The changes in each merge request are combined with the changes in earlier merge requests and tested before merge."
+msgstr ""
+
 msgid "mrWidget|A new merge train has started and this merge request is the first of the queue."
 msgstr ""
 
@@ -51712,6 +51697,9 @@ msgstr ""
 msgid "mrWidget|Jump to first unresolved thread"
 msgstr ""
 
+msgid "mrWidget|Learn more"
+msgstr ""
+
 msgid "mrWidget|Loading deployment statistics"
 msgstr ""
 
@@ -51735,6 +51723,9 @@ msgstr ""
 msgid "mrWidget|Merged by"
 msgstr ""
 
+msgid "mrWidget|More information"
+msgstr ""
+
 msgid "mrWidget|No users match the rule's criteria."
 msgstr ""
 
@@ -51810,6 +51801,9 @@ msgstr ""
 msgid "mrWidget|To change this default message, edit the template for squash commit messages. %{linkStart}Learn more.%{linkEnd}"
 msgstr ""
 
+msgid "mrWidget|What is a merge train?"
+msgstr ""
+
 msgid "mrWidget|Your password"
 msgstr ""