Resolve conflicts in locale/gitlab.pot

7f30ee4d · Stan Hu · 2c3ec87c · 7f30ee4d
Commit 7f30ee4d authored Jan 09, 2019 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

locale/gitlab.pot locale/gitlab.pot +1 -1

No files found.
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -9372,7 +9372,7 @@ msgstr ""
 msgid "To open Jaeger and easily view tracing from GitLab, link the %{link} page to your server"
 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 ""

 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:"