diff options
Diffstat (limited to 'app/views/admin/application_settings/preferences.html.haml')
| -rw-r--r-- | app/views/admin/application_settings/preferences.html.haml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/app/views/admin/application_settings/preferences.html.haml b/app/views/admin/application_settings/preferences.html.haml index 17bf9ba84a2..0dfc3d7a60d 100644 --- a/app/views/admin/application_settings/preferences.html.haml +++ b/app/views/admin/application_settings/preferences.html.haml @@ -20,18 +20,19 @@ %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _("Configure What's new drawer and content.") + = _("Configure %{italic_start}What's new%{italic_end} drawer and content.").html_safe % { italic_start: '<i>'.html_safe, italic_end: '</i>'.html_safe } .settings-content = render 'whats_new' %section.settings.as-help-page.no-animate#js-help-settings{ class: ('expanded' if expanded_by_default?) } .settings-header %h4 - = _('Help page') + = _('Sign-in and Help page') %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _('Help page text and support page url.') + = _('Additional text for the sign-in and Help page.') + = link_to s_('Learn more.'), help_page_path('user/admin_area/settings/help_page.md'), target: '_blank', rel: 'noopener noreferrer' .settings-content = render 'help_page' @@ -60,11 +61,13 @@ %section.settings.as-gitaly.no-animate#js-gitaly-settings{ class: ('expanded' if expanded_by_default?) } .settings-header %h4 - = _('Gitaly') + = _('Gitaly timeouts') %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p = _('Configure Gitaly timeouts.') + %span + = link_to _('Learn more.'), help_page_path('user/admin_area/settings/gitaly_timeouts.md'), target: '_blank', rel: 'noopener noreferrer' .settings-content = render 'gitaly' @@ -75,6 +78,6 @@ %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _('Various localization settings.') + = _('Configure the default first day of the week and time tracking units.') .settings-content = render 'localization' |