Add latest changes from gitlab-org/gitlab@master

4 files changed, 14 insertions, 12 deletions

diff --git a/app/views/admin/application_settings/_floc.html.haml b/app/views/admin/application_settings/_floc.html.haml
index 9bd2fd0a895..e56ba635890 100644
--- a/app/views/admin/application_settings/_floc.html.haml
+++ b/app/views/admin/application_settings/_floc.html.haml
@@ -3,12 +3,13 @@
 %section.settings.no-animate#js-floc-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
-      = s_('FloC|Federated Learning of Cohorts')
+      = s_('FloC|Federated Learning of Cohorts (FLoC)')
     = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = s_('FloC|Configure whether you want to participate in FloC.').html_safe
-      = link_to sprite_icon('question-o'), 'https://github.com/WICG/floc', target: '_blank', rel: 'noopener noreferrer', class: 'has-tooltip', title: _('More information')
+      - floc_link_url = help_page_path('user/admin_area/settings/floc.md')
+      - floc_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: floc_link_url }
+      = html_escape(s_('FloC|Configure whether you want to participate in FLoC. %{floc_link_start}What is FLoC?%{floc_link_end}')) % { floc_link_start: floc_link_start, floc_link_end: '</a>'.html_safe }
 
   .settings-content
     = gitlab_ui_form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-floc-settings'), html: { class: 'fieldset-form', id: 'floc-settings' } do |f|
@@ -17,5 +18,5 @@
       %fieldset
         .form-group
           = f.gitlab_ui_checkbox_component :floc_enabled,
-          s_('FloC|Enable FloC (Federated Learning of Cohorts)')
+          s_('FloC|Participate in FLoC')
       = f.submit _('Save changes'), class: 'gl-button btn btn-confirm'
diff --git a/app/views/notify/push_to_merge_request_email.html.haml b/app/views/notify/push_to_merge_request_email.html.haml
index 5197a1bdd08..fc32ceab765 100644
--- a/app/views/notify/push_to_merge_request_email.html.haml
+++ b/app/views/notify/push_to_merge_request_email.html.haml
@@ -1,7 +1,7 @@
 %h3
-  = sanitize_name(@updated_by_user.name)
-  pushed new commits to merge request
-  = merge_request_reference_link(@merge_request)
+  - updated_by_user_name = sanitize_name(@updated_by_user.name)
+  - mr_link = sanitize(merge_request_reference_link(@merge_request))
+  = s_('Notify|%{updated_by_user_name} pushed new commits to merge request %{mr_link}').html_safe % {updated_by_user_name: updated_by_user_name, mr_link: mr_link}
 
 - if @total_existing_commits_count > 0
   %ul
@@ -13,8 +13,8 @@
         = link_to(project_compare_url(@merge_request.target_project, from: @existing_commits.first[:short_id], to: @existing_commits.last[:short_id])) do
           #{@existing_commits.first[:short_id]}...#{@existing_commits.last[:short_id]}
       = precede '&nbsp;- ' do
-        - commits_text = "#{@total_existing_commits_count} commit".pluralize(@total_existing_commits_count)
-        #{commits_text} from branch `#{@merge_request.target_branch}`
+        - commits_text = n_("#%d commit", "#%d commits", @total_existing_commits_count) % @total_existing_commits_count
+        = s_('Notify|%{commits_text} from branch `%{target_branch}`') % {commits_text: commits_text, target_branch: @merge_request.target_branch}
 
 - if @total_new_commits_count > 0
   %ul
@@ -24,4 +24,5 @@
         = precede ' - ' do
           #{commit[:title]}
     - if @total_stripped_new_commits_count > 0
-      %li And #{@total_stripped_new_commits_count} more
+      %li
+        = s_('Notify|And %{total_stripped_new_commits_count} more') % {total_stripped_new_commits_count: @total_stripped_new_commits_count}
diff --git a/app/views/shared/issuable/_sidebar_reviewers.html.haml b/app/views/shared/issuable/_sidebar_reviewers.html.haml
index cd976b88304..3f78f29ea24 100644
--- a/app/views/shared/issuable/_sidebar_reviewers.html.haml
+++ b/app/views/shared/issuable/_sidebar_reviewers.html.haml
@@ -2,7 +2,7 @@
 
 #js-vue-sidebar-reviewers{ data: { field: issuable_type, signed_in: signed_in } }
   .title.hide-collapsed
-    = _('Reviewer')
+    = _('Reviewers')
     = gl_loading_icon(inline: true)
 
 .selectbox.hide-collapsed
diff --git a/app/views/shared/projects/_search_form.html.haml b/app/views/shared/projects/_search_form.html.haml
index 51a5c9dd38f..a5170b199e8 100644
--- a/app/views/shared/projects/_search_form.html.haml
+++ b/app/views/shared/projects/_search_form.html.haml
@@ -1,5 +1,5 @@
 - form_field_classes = local_assigns[:admin_view] || !Feature.enabled?(:project_list_filter_bar) ? 'input-short js-projects-list-filter' : ''
-- placeholder = local_assigns[:search_form_placeholder] ? search_form_placeholder : 'Filter by name...'
+- placeholder = local_assigns[:search_form_placeholder] ? search_form_placeholder : _('Filter by name')
 
 = form_tag filter_projects_path, method: :get, class: 'project-filter-form', data: { qa_selector: 'project_filter_form_container' }, id: 'project-filter-form' do |f|
   = search_field_tag :name, params[:name],