Merge branch 'issue_215364_fe-translations' into 'master'

Add missing translations to service desk

See merge request gitlab-org/gitlab!37705

app/views/notify/service_desk_new_note_email.html.haml

 - if Gitlab::CurrentSettings.email_author_in_body
   %div
-    #{link_to @note.author_name, user_url(@note.author)} wrote:
+    = _("%{author_link} wrote:").html_safe % { author_link: link_to(@note.author_name, user_url(@note.author)) }
 %div
   = markdown(@note.note, pipeline: :email, author: @note.author)

app/views/notify/service_desk_new_note_email.text.erb

-New response for issue #<%= @issue.iid %>:
+<%= _("New response for issue #%{issue_iid}:") % { issue_iid: @issue.iid } %>
 
-Author: <%= sanitize_name(@note.author_name) %>
+<%= _("Author: %{author_name}") % { author_name: sanitize_name(@note.author_name) } %>
 
 <%= @note.note %>
 <%# EE-specific start %><%= render_if_exists 'layouts/mailer/additional_text'%><%# EE-specific end %>

app/views/notify/service_desk_thank_you_email.html.haml

 %p
-  Thank you for your support request! We are tracking your request as ticket ##{@issue.iid}, and will respond as soon as we can.
+  = _("Thank you for your support request! We are tracking your request as ticket #%{issue_iid}, and will respond as soon as we can.") % { issue_iid: @issue.iid }

app/views/notify/service_desk_thank_you_email.text.erb

-Thank you for your support request! We are tracking your request as ticket #<%= @issue.iid %>, and will respond as soon as we can.
+<%= _("Thank you for your support request! We are tracking your request as ticket #%{issue_iid}, and will respond as soon as we can.") % { issue_iid: @issue.iid } %>
 
-To unsubscribe from this issue, please paste the following link into your browser:
+<%= _("To unsubscribe from this issue, please paste the following link into your browser:") %>
 
 <%= @unsubscribe_url %>
 <%# EE-specific start %><%= render_if_exists 'layouts/mailer/additional_text' %><%# EE-specific end %>

app/views/shared/promotions/_promote_servicedesk.html.haml

@@ -5,9 +5,9 @@
     .svg-container
       = custom_icon('icon_service_desk')
     .user-callout-copy
-      -# haml-lint:disable NoPlainNodes
       %h4
-        Improve customer support with GitLab Service Desk.
+        = _("Improve customer support with GitLab Service Desk.")
       %p
-        GitLab Service Desk is a simple way to allow people to create issues in your GitLab instance without needing their own user account. It provides a unique email address for end users to create issues in a project, and replies can be sent either through the GitLab interface or by email. End users will only see the thread through email.
-        = link_to 'Read more', help_page_path('user/project/service_desk.md'), target: '_blank'
+        = _("GitLab Service Desk is a simple way to allow people to create issues in your GitLab instance without needing their own user account. It provides a unique email address for end users to create issues in a project, and replies can be sent either through the GitLab interface or by email. End users will only see the thread through email.")
+        = link_to _('Read more'), help_page_path('user/project/service_desk.md'), target: '_blank'
+

locale/gitlab.pot

@@ -292,6 +292,9 @@ msgstr[1] ""
 msgid "%{actionText} & %{openOrClose} %{noteable}"
 msgstr ""
 
+msgid "%{author_link} wrote:"
+msgstr ""
+
 msgid "%{authorsName}'s thread"
 msgstr ""
 
@@ -3432,6 +3435,9 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
+msgid "Author: %{author_name}"
+msgstr ""
+
 msgid "Authored %{timeago} by %{author}"
 msgstr ""
 
@@ -11203,6 +11209,9 @@ msgstr ""
 msgid "GitLab Issue"
 msgstr ""
 
+msgid "GitLab Service Desk is a simple way to allow people to create issues in your GitLab instance without needing their own user account. It provides a unique email address for end users to create issues in a project, and replies can be sent either through the GitLab interface or by email. End users will only see the thread through email."
+msgstr ""
+
 msgid "GitLab Shared Runners execute code of different projects on the same Runner unless you configure GitLab Runner Autoscale with MaxBuilds 1 (which it is on GitLab.com)."
 msgstr ""
 
@@ -12650,6 +12659,9 @@ msgstr ""
 msgid "Improve Merge Requests and customer support with GitLab Enterprise Edition."
 msgstr ""
 
+msgid "Improve customer support with GitLab Service Desk."
+msgstr ""
+
 msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition."
 msgstr ""
 
@@ -15773,6 +15785,9 @@ msgstr ""
 msgid "New requirement"
 msgstr ""
 
+msgid "New response for issue #%{issue_iid}:"
+msgstr ""
+
 msgid "New runners registration token has been generated!"
 msgstr ""
 
@@ -23464,6 +23479,9 @@ msgstr ""
 msgid "Thank you for your report. A GitLab administrator will look into it shortly."
 msgstr ""
 
+msgid "Thank you for your support request! We are tracking your request as ticket #%{issue_iid}, and will respond as soon as we can."
+msgstr ""
+
 msgid "Thanks for your purchase!"
 msgstr ""
 
@@ -25011,6 +25029,9 @@ msgstr ""
 msgid "To start serving your jobs you can either add specific Runners to your project or use shared Runners"
 msgstr ""
 
+msgid "To unsubscribe from this issue, please paste the following link into your browser:"
+msgstr ""
+
 msgid "To view all %{scannedResourcesCount} scanned URLs, please download the CSV file"
 msgstr ""