Commit 1a20f683 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'sh-fix-locale-pot' into 'master'

Resolve conflicts in locale/gitlab.pot

See merge request gitlab-org/gitlab-ee!9104
parents 2c3ec87c 7f30ee4d
...@@ -9372,7 +9372,7 @@ msgstr "" ...@@ -9372,7 +9372,7 @@ msgstr ""
msgid "To open Jaeger and easily view tracing from GitLab, link the %{link} page to your server" msgid "To open Jaeger and easily view tracing from GitLab, link the %{link} page to your server"
msgstr "" msgstr ""
msgid "To preserve performance only <strong>%{display_size} of ${real_size}</strong> files are displayed." msgid "To preserve performance only <strong>%{display_size} of %{real_size}</strong> files are displayed."
msgstr "" msgstr ""
msgid "To set up SAML authentication for your group through an identity provider like Azure, Okta, Onelogin, Ping Identity, or your custom SAML 2.0 provider:" msgid "To set up SAML authentication for your group through an identity provider like Azure, Okta, Onelogin, Ping Identity, or your custom SAML 2.0 provider:"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment