Add latest changes from gitlab-org/gitlab@master

1 files changed, 24 insertions, 18 deletions

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 730326e8be1..4ff561ad1f0 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1213,9 +1213,6 @@ msgstr ""
 msgid "0 bytes"
 msgstr ""
 
-msgid "0 for unlimited, only effective with remote storage enabled."
-msgstr ""
-
 msgid "0t1DgySidms"
 msgstr ""
 
@@ -3416,6 +3413,9 @@ msgstr ""
 msgid "Allow this secondary node to replicate content on Object Storage"
 msgstr ""
 
+msgid "Allow use of licensed EE features"
+msgstr ""
+
 msgid "Allow users to dismiss the broadcast message"
 msgstr ""
 
@@ -10782,7 +10782,7 @@ msgstr ""
 msgid "Days to merge"
 msgstr ""
 
-msgid "Deactivate dormant users after 90 days of inactivity. Users can return to active status by signing in to their account. While inactive, a user is not counted as an active user in the instance."
+msgid "Deactivate dormant users after 90 days of inactivity"
 msgstr ""
 
 msgid "Dear Administrator,"
@@ -12757,9 +12757,6 @@ msgstr ""
 msgid "Enabled sources for code import during project creation. OmniAuth must be configured for GitHub"
 msgstr ""
 
-msgid "Enabling this will only make licensed EE features available to projects if the project namespace's plan includes the feature or if the project is public."
-msgstr ""
-
 msgid "Encountered an error while rendering: %{err}"
 msgstr ""
 
@@ -15544,9 +15541,6 @@ msgstr ""
 msgid "GitLab project export"
 msgstr ""
 
-msgid "GitLab restart is required to apply changes."
-msgstr ""
-
 msgid "GitLab single sign-on URL"
 msgstr ""
 
@@ -20184,9 +20178,6 @@ msgstr ""
 msgid "Leave Admin Mode"
 msgstr ""
 
-msgid "Leave blank for no limit. Once set, existing personal access tokens may be revoked."
-msgstr ""
-
 msgid "Leave edit mode? All unsaved changes will be lost."
 msgstr ""
 
@@ -20325,6 +20316,9 @@ msgstr ""
 msgid "LicenseManagement|Uncategorized"
 msgstr ""
 
+msgid "Licensed Enterprise Edition features can be used if the project namespace's plan includes the feature, or if the project is public."
+msgstr ""
+
 msgid "Licensed Features"
 msgstr ""
 
@@ -20891,9 +20885,6 @@ msgstr ""
 msgid "Max 100,000 events"
 msgstr ""
 
-msgid "Max 20 characters"
-msgstr ""
-
 msgid "Max authenticated Git LFS requests per period per user"
 msgstr ""
 
@@ -20909,6 +20900,9 @@ msgstr ""
 msgid "MaxBuilds"
 msgstr ""
 
+msgid "Maximum 20 characters"
+msgstr ""
+
 msgid "Maximum Conan package file size in bytes"
 msgstr ""
 
@@ -22825,7 +22819,7 @@ msgstr ""
 msgid "Newest first"
 msgstr ""
 
-msgid "Newly registered users will by default be external"
+msgid "Newly-registered users are external by default"
 msgstr ""
 
 msgid "Next"
@@ -23803,6 +23797,9 @@ msgstr ""
 msgid "Only admins can delete project"
 msgstr ""
 
+msgid "Only effective when remote storage is enabled. Set to 0 for no size limit."
+msgstr ""
+
 msgid "Only include features new to your current subscription tier."
 msgstr ""
 
@@ -28976,6 +28973,9 @@ msgstr ""
 msgid "Response text"
 msgstr ""
 
+msgid "Restart GitLab to apply changes."
+msgstr ""
+
 msgid "Restart Terminal"
 msgstr ""
 
@@ -32102,7 +32102,7 @@ msgstr ""
 msgid "Specified URL cannot be used: \"%{reason}\""
 msgstr ""
 
-msgid "Specify an e-mail address regex pattern to identify default internal users."
+msgid "Specify an email address regex pattern to identify default internal users."
 msgstr ""
 
 msgid "Speed up your pipelines with Needs relationships"
@@ -37226,6 +37226,9 @@ msgstr ""
 msgid "Users can launch a development environment from a GitLab browser tab when the %{linkStart}Gitpod%{linkEnd} integration is enabled."
 msgstr ""
 
+msgid "Users can reactivate their account by signing in."
+msgstr ""
+
 msgid "Users can render diagrams in AsciiDoc, Markdown, reStructuredText, and Textile documents using Kroki."
 msgstr ""
 
@@ -38201,6 +38204,9 @@ msgstr ""
 msgid "When an event in GitLab triggers a webhook, you can use the request details to figure out if something went wrong."
 msgstr ""
 
+msgid "When enabled, existing personal access tokens may be revoked. Leave blank for no limit."
+msgstr ""
+
 msgid "When inactive, an external authentication provider must be used."
 msgstr ""