From b8f2bd7587f656a04f8489e235bae7c6bd93d11c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sat, 10 Sep 2022 15:10:14 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 app/views/notify/push_to_merge_request_email.html.haml | 2 +-
 locale/gitlab.pot                                      | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

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 fc32ceab765..16612cd43c5 100644
--- a/app/views/notify/push_to_merge_request_email.html.haml
+++ b/app/views/notify/push_to_merge_request_email.html.haml
@@ -13,7 +13,7 @@
         = 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 = n_("#%d commit", "#%d commits", @total_existing_commits_count) % @total_existing_commits_count
+        - 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
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 47a4ebf70ce..07eb2451694 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -72,11 +72,6 @@ msgstr ""
 msgid "\"%{repository_name}\" size (%{repository_size}) is larger than the limit of %{limit}."
 msgstr ""
 
-msgid "#%d commit"
-msgid_plural "#%d commits"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "#%{issueIid} (closed)"
 msgstr ""