summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-16 12:09:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-16 12:09:12 +0000
commitcbfe03ae04a52d9825ff7cbeccdfe5d313adf6a2 (patch)
treee4879b35d019d3bbba1689f3ac4c48b81bf7b451 /locale
parent3fd97b4bba24ca412112aad025a38a32c7a6cf8c (diff)
downloadgitlab-ce-cbfe03ae04a52d9825ff7cbeccdfe5d313adf6a2.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot20
1 files changed, 13 insertions, 7 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 1c39a581b2f..20d9990ddcf 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3256,6 +3256,9 @@ msgstr ""
msgid "Can't find variable: ZiteReader"
msgstr ""
+msgid "Can't load mermaid module: %{err}"
+msgstr ""
+
msgid "Can't remove group members without group managed account"
msgstr ""
@@ -3304,9 +3307,6 @@ msgstr ""
msgid "Cannot refer to a group milestone by an internal id!"
msgstr ""
-msgid "Cannot render the image. Maximum character count (%{charLimit}) has been exceeded."
-msgstr ""
-
msgid "Cannot show preview. For previews on sketch files, they must have the file format introduced by Sketch version 43 and above."
msgstr ""
@@ -7492,6 +7492,9 @@ 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 ""
+
msgid "End date"
msgstr ""
@@ -8380,7 +8383,7 @@ msgstr ""
msgid "Failed to create a branch for this issue. Please try again."
msgstr ""
-msgid "Failed to create repository via gitlab-shell"
+msgid "Failed to create repository"
msgstr ""
msgid "Failed to create resources"
@@ -15148,6 +15151,9 @@ msgstr ""
msgid "Profiles|your account"
msgstr ""
+msgid "Profile|%{job_title} at %{organization}"
+msgstr ""
+
msgid "Profiling - Performance bar"
msgstr ""
@@ -17679,9 +17685,6 @@ msgstr ""
msgid "Select user"
msgstr ""
-msgid "Select your role"
-msgstr ""
-
msgid "Selected levels cannot be used by non-admin users for groups, projects or snippets. If the public level is restricted, user profiles are only visible to logged in users."
msgstr ""
@@ -22362,6 +22365,9 @@ msgstr ""
msgid "Warning:"
msgstr ""
+msgid "Warning: Displaying this diagram might cause performance issues on this page."
+msgstr ""
+
msgid "We could not determine the path to remove the epic"
msgstr ""