summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-03 12:09:52 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-03 12:09:52 +0000
commit546ddc3f6ac96fdf09934390a938bb391d07dc94 (patch)
treed0c92fca27ee76b5a20b7bfb56bda6f057424127 /locale
parent04baa85554ff13bdd4d6f4e6bb24119d17608fee (diff)
downloadgitlab-ce-546ddc3f6ac96fdf09934390a938bb391d07dc94.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot27
1 files changed, 21 insertions, 6 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 3de227fba99..278aca1bf86 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3353,6 +3353,12 @@ msgstr ""
msgid "Cannot create the abuse report. This user has been blocked."
msgstr ""
+msgid "Cannot make epic confidential if it contains not-confidential issues"
+msgstr ""
+
+msgid "Cannot make epic confidential if it contains not-confidential sub-epics"
+msgstr ""
+
msgid "Cannot merge"
msgstr ""
@@ -3371,6 +3377,9 @@ msgstr ""
msgid "Cannot refer to a group milestone by an internal id!"
msgstr ""
+msgid "Cannot set confidential epic for not-confidential issue"
+msgstr ""
+
msgid "Cannot show preview. For previews on sketch files, they must have the file format introduced by Sketch version 43 and above."
msgstr ""
@@ -5760,6 +5769,9 @@ msgstr ""
msgid "Could not save prometheus manual configuration"
msgstr ""
+msgid "Could not update the LDAP settings"
+msgstr ""
+
msgid "Could not upload your designs as one or more files uploaded are not supported."
msgstr ""
@@ -11585,6 +11597,9 @@ msgstr ""
msgid "LDAP settings"
msgstr ""
+msgid "LDAP settings updated"
+msgstr ""
+
msgid "LDAP sync in progress. This could take a few minutes. Refresh the page to see the changes."
msgstr ""
@@ -13598,6 +13613,9 @@ msgstr ""
msgid "Not started"
msgstr ""
+msgid "Not-confidential epic cannot be assigned to a confidential parent epic"
+msgstr ""
+
msgid "Note"
msgstr ""
@@ -17646,9 +17664,6 @@ msgstr ""
msgid "Security Dashboard"
msgstr ""
-msgid "Security Dashboard|Error fetching the dashboard data. Please check your network connection and try again."
-msgstr ""
-
msgid "Security Dashboard|Error fetching the vulnerability counts. Please check your network connection and try again."
msgstr ""
@@ -17940,7 +17955,7 @@ msgstr ""
msgid "Select the branch you want to set as the default for this project. All merge requests and commits will automatically be made against this branch unless you specify a different one."
msgstr ""
-msgid "Select the configured storaged available for new projects to be placed on."
+msgid "Select the configured storage available for new repositories to be placed on."
msgstr ""
msgid "Select the custom project template source group."
@@ -19226,7 +19241,7 @@ msgstr ""
msgid "Storage"
msgstr ""
-msgid "Storage nodes for new projects"
+msgid "Storage nodes for new repositories"
msgstr ""
msgid "Storage:"
@@ -21969,7 +21984,7 @@ msgstr ""
msgid "Use hashed storage"
msgstr ""
-msgid "Use hashed storage paths for newly created and renamed projects. Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance."
+msgid "Use hashed storage paths for newly created and renamed repositories. Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents repositories from having to be moved or renamed when the Repository URL changes and may improve disk I/O performance."
msgstr ""
msgid "Use one line per URI"