diff options
Diffstat (limited to 'app/views/admin/application_settings/_email.html.haml')
| -rw-r--r-- | app/views/admin/application_settings/_email.html.haml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/admin/application_settings/_email.html.haml b/app/views/admin/application_settings/_email.html.haml index b22aaabe41a..1c35250644d 100644 --- a/app/views/admin/application_settings/_email.html.haml +++ b/app/views/admin/application_settings/_email.html.haml @@ -8,20 +8,20 @@ = f.label :email_author_in_body, class: 'form-check-label' do = _('Include author name in notification email body') .form-text.text-muted - = _('Some email servers do not support overriding the email sender name. Enable this option to include the name of the author of the issue, merge request or comment in the email body instead.') + = _("Include the name of the author of the issue, merge request or comment in the email body. By default, GitLab overrides the email sender's name. Some email servers don't support that option.") .form-group .form-check = f.check_box :html_emails_enabled, class: 'form-check-input' = f.label :html_emails_enabled, class: 'form-check-label' do - = _('Enable HTML emails') + = _('Enable multipart emails') .form-text.text-muted - = _('By default GitLab sends emails in HTML and plain text formats so mail clients can choose what format to use. Disable this option if you only want to send emails in plain text format.') + = _('Send email in multipart format (HTML and plain text). Uncheck to send email messages in plain text only.') .form-group = f.label :commit_email_hostname, _('Custom hostname (for private commit emails)'), class: 'label-bold' = f.text_field :commit_email_hostname, class: 'form-control gl-form-input' .form-text.text-muted - commit_email_hostname_docs_link = link_to _('Learn more'), help_page_path('user/admin_area/settings/email.md', anchor: 'custom-hostname-for-private-commit-emails'), target: '_blank' - = _("This setting will update the hostname that is used to generate private commit emails. %{learn_more}").html_safe % { learn_more: commit_email_hostname_docs_link } + = _("Hostname used in private commit emails. %{learn_more}").html_safe % { learn_more: commit_email_hostname_docs_link } = render_if_exists 'admin/application_settings/email_additional_text_setting', form: f @@ -31,6 +31,6 @@ = f.label :in_product_marketing_emails_enabled, class: 'form-check-label' do = _('Enable in-product marketing emails') .form-text.text-muted - = _('By default, GitLab sends emails to help guide users through the onboarding process.') + = _('Send emails to help guide new users through the onboarding process.') = f.submit _('Save changes'), class: "gl-button btn btn-confirm", data: { qa_selector: 'save_changes_button' } |