From 37f60222f2e0eb95cb1e0d5a11067e8b6f48db2c Mon Sep 17 00:00:00 2001 From: Nick Gaskill <ngaskill@gitlab.com> Date: Mon, 25 Jan 2021 21:21:52 +0000 Subject: [PATCH] Edit UI text for repository cleanup --- app/views/projects/cleanup/_show.html.haml | 4 ++-- locale/gitlab.pot | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/projects/cleanup/_show.html.haml b/app/views/projects/cleanup/_show.html.haml index 37ec63cc871d2..be873f5f0ba5d 100644 --- a/app/views/projects/cleanup/_show.html.haml +++ b/app/views/projects/cleanup/_show.html.haml @@ -6,7 +6,7 @@ %button.btn.js-settings-toggle = expanded ? _('Collapse') : _('Expand') %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'), help_page_path('user/project/repository/reducing_the_repo_size_using_git.md'), target: '_blank', rel: 'noopener noreferrer' @@ -24,6 +24,6 @@ = _("No file selected") = f.file_field :bfg_object_map, class: "hidden js-object-map-input", required: true .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' diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 9bc44487d76b0..287ac10d08acc 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -28304,6 +28304,9 @@ msgstr "" msgid "The maximum file size allowed is %{size}." 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." msgstr "" -- GitLab