Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-08-30 00:34:07 +0300
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-08-30 00:34:07 +0300
commit4ed9802a40a992bfd5c8bf2c41499d54e44aff5a (patch)
treebc0b536a246b253e63097771d6717e35a69610b4 /locale
parent7d6edff6f3c7483ac588160bdf4e43ec8d0ad5d9 (diff)
parent20e8c92410d93c39f4a800941d0c633f949e7790 (diff)
Merge branch 'security-katex-dos-master' into 'master'
Enforce max chars and max render time in markdown math See merge request gitlab/gitlabhq!3277
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot9
1 files changed, 6 insertions, 3 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 61642fbbd59..840c27d1699 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1101,9 +1101,6 @@ msgstr ""
msgid "An error occurred while parsing recent searches"
msgstr ""
-msgid "An error occurred while rendering KaTeX"
-msgstr ""
-
msgid "An error occurred while rendering preview broadcast message"
msgstr ""
@@ -13676,6 +13673,12 @@ msgstr ""
msgid "manual"
msgstr ""
+msgid "math|The math in this entry is taking too long to render and may not be displayed as expected. For performance reasons, math blocks are also limited to %{maxChars} characters. Consider splitting up large formulae, splitting math blocks among multiple entries, or using an image instead."
+msgstr ""
+
+msgid "math|There was an error rendering this math block"
+msgstr ""
+
msgid "merge request"
msgid_plural "merge requests"
msgstr[0] ""