Commit 78695f11 authored by Nathan Friend's avatar Nathan Friend

Merge branch 'ui-text-repository-cleanup' into 'master'

Edit UI text for repository cleanup

See merge request gitlab-org/gitlab!52384
parents b6bd7bbe 37f60222
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
%button.btn.js-settings-toggle %button.btn.js-settings-toggle
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')
%p %p
= _("Clean up after running %{filter_repo} on the repository" % { filter_repo: link_to_filter_repo }).html_safe = _("Clean up after running %{filter_repo} on the repository." % { filter_repo: link_to_filter_repo }).html_safe
= link_to sprite_icon('question-o'), = link_to sprite_icon('question-o'),
help_page_path('user/project/repository/reducing_the_repo_size_using_git.md'), help_page_path('user/project/repository/reducing_the_repo_size_using_git.md'),
target: '_blank', rel: 'noopener noreferrer' target: '_blank', rel: 'noopener noreferrer'
...@@ -24,6 +24,6 @@ ...@@ -24,6 +24,6 @@
= _("No file selected") = _("No file selected")
= f.file_field :bfg_object_map, class: "hidden js-object-map-input", required: true = f.file_field :bfg_object_map, class: "hidden js-object-map-input", required: true
.form-text.text-muted .form-text.text-muted
= _("The maximum file size allowed is %{size}.") % { size: number_to_human_size(Gitlab::CurrentSettings.max_attachment_size.megabytes) } = _("The maximum file size is %{size}.") % { size: number_to_human_size(Gitlab::CurrentSettings.max_attachment_size.megabytes) }
= f.submit _('Start cleanup'), class: 'gl-button btn btn-success' = f.submit _('Start cleanup'), class: 'gl-button btn btn-success'
...@@ -28304,6 +28304,9 @@ msgstr "" ...@@ -28304,6 +28304,9 @@ msgstr ""
msgid "The maximum file size allowed is %{size}." msgid "The maximum file size allowed is %{size}."
msgstr "" msgstr ""
msgid "The maximum file size is %{size}."
msgstr ""
msgid "The merge conflicts for this merge request cannot be resolved through GitLab. Please try to resolve them locally." msgid "The merge conflicts for this merge request cannot be resolved through GitLab. Please try to resolve them locally."
msgstr "" msgstr ""
......
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