Commit afc6cf79 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'fix62' into 'master'

Add "will" to "ServiceDesk" string

See merge request gitlab-org/gitlab!72439
parents 24c4cd1c 119f7a5f
...@@ -20,7 +20,7 @@ export function generateMessages(emptyStateMeta) { ...@@ -20,7 +20,7 @@ export function generateMessages(emptyStateMeta) {
); );
const serviceDeskSupportedMessage = s__( const serviceDeskSupportedMessage = s__(
'ServiceDesk|Issues created from Service Desk emails appear here. Each comment becomes part of the email conversation.', 'ServiceDesk|Issues created from Service Desk emails will appear here. Each comment becomes part of the email conversation.',
); );
const commonDescription = ` const commonDescription = `
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
= s_("ServiceDesk|Your users can send emails to this address:") = s_("ServiceDesk|Your users can send emails to this address:")
%code= @project.service_desk_address %code= @project.service_desk_address
%span= s_("ServiceDesk|Issues created from Service Desk emails appear here. Each comment becomes part of the email conversation.") %span= s_("ServiceDesk|Issues created from Service Desk emails will appear here. Each comment becomes part of the email conversation.")
= link_to _('Learn more.'), help_page_path('user/project/service_desk') = link_to _('Learn more.'), help_page_path('user/project/service_desk')
- if can_edit_project_settings && !service_desk_enabled - if can_edit_project_settings && !service_desk_enabled
......
...@@ -31088,9 +31088,6 @@ msgstr "" ...@@ -31088,9 +31088,6 @@ msgstr ""
msgid "ServiceDesk|For help setting up the Service Desk for your instance, please contact an administrator." msgid "ServiceDesk|For help setting up the Service Desk for your instance, please contact an administrator."
msgstr "" msgstr ""
msgid "ServiceDesk|Issues created from Service Desk emails appear here. Each comment becomes part of the email conversation."
msgstr ""
msgid "ServiceDesk|Issues created from Service Desk emails will appear here. Each comment becomes part of the email conversation." msgid "ServiceDesk|Issues created from Service Desk emails will appear here. Each comment becomes part of the email conversation."
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