summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorJohn Jarvis <jarv@gitlab.com>2019-03-05 10:28:59 +0000
committerJohn Jarvis <jarv@gitlab.com>2019-03-05 10:28:59 +0000
commit83cb7482560c04d14fda372fcb4f95d667cd1962 (patch)
treeec36cfddb359467a35276a99b5bc872b1fdfb7e2 /locale
parent960101c20bb8ec5a2d1d3f01474676c7ea95adc7 (diff)
parenta24eabb1782785ad0bcf2460c3fff67106598b83 (diff)
downloadgitlab-ce-83cb7482560c04d14fda372fcb4f95d667cd1962.tar.gz
Merge branch 'merge-dev-to-master' into 'master'
Merge dev.gitlab.org master into GitLab.com master Closes #2794, #2814, #2806, #2805, #2798, #2795, #2788, and #2787 See merge request gitlab-org/gitlab-ce!25746
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot3
1 files changed, 3 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index c4bcc1172eb..3abd570175e 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1341,6 +1341,9 @@ msgstr ""
msgid "Cannot modify managed Kubernetes cluster"
msgstr ""
+msgid "Cannot render the image. Maximum character count (%{charLimit}) has been exceeded."
+msgstr ""
+
msgid "Certificate"
msgstr ""