summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-18 12:09:25 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-18 12:09:25 +0000
commit8eef083ccd59505b606e9733d38589cbd3d01fdf (patch)
tree72cc132b2bb3a60a8802d6af80c49953d7084afd /locale
parente1d53af7ad463decf1df2944343c66b27512d4e1 (diff)
downloadgitlab-ce-8eef083ccd59505b606e9733d38589cbd3d01fdf.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot23
1 files changed, 13 insertions, 10 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 595dd6d043b..3f329917e75 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -9257,6 +9257,9 @@ msgstr ""
msgid "Expiration date"
msgstr ""
+msgid "Expiration not enforced"
+msgstr ""
+
msgid "Expiration policy for the Container Registry is a perfect solution for keeping the Registry space down while still enjoying the full power of GitLab CI/CD."
msgstr ""
@@ -22834,6 +22837,12 @@ msgstr ""
msgid "This %{issuable} is locked. Only <strong>project members</strong> can comment."
msgstr ""
+msgid "This %{noteableTypeText} is %{confidentialLinkStart}confidential%{linkEnd} and %{lockedLinkStart}locked%{linkEnd}."
+msgstr ""
+
+msgid "This %{noteableTypeText} is locked."
+msgstr ""
+
msgid "This %{viewer} could not be displayed because %{reason}. You can %{options} instead."
msgstr ""
@@ -22981,10 +22990,7 @@ msgstr ""
msgid "This is a Work in Progress"
msgstr ""
-msgid "This is a confidential epic."
-msgstr ""
-
-msgid "This is a confidential issue."
+msgid "This is a confidential %{noteableTypeText}."
msgstr ""
msgid "This is a delayed job to run in %{remainingTime}"
@@ -23011,9 +23017,6 @@ msgstr ""
msgid "This is your current session"
msgstr ""
-msgid "This issue is %{confidentialLinkStart}confidential%{linkEnd} and %{lockedLinkStart}locked%{linkEnd}."
-msgstr ""
-
msgid "This issue is confidential"
msgstr ""
@@ -23023,9 +23026,6 @@ msgstr ""
msgid "This issue is in a child epic of the filtered epic"
msgstr ""
-msgid "This issue is locked."
-msgstr ""
-
msgid "This job depends on other jobs with expired/erased artifacts: %{invalid_dependencies}"
msgstr ""
@@ -26849,6 +26849,9 @@ msgstr ""
msgid "entries cannot contain HTML tags"
msgstr ""
+msgid "epic"
+msgstr ""
+
msgid "error"
msgstr ""