Merge branch 'localization-ui-text' into 'master'

Update admin settings text for localization preferences

See merge request gitlab-org/gitlab!65407

app/views/admin/application_settings/_localization.html.haml

@@ -7,6 +7,7 @@
       = f.select :first_day_of_week, first_day_of_week_choices, {}, class: 'form-control'
       .form-text.text-muted
         = _('Default first day of the week in calendars and date pickers.')
+        = link_to _('Learn more.'), help_page_path('user/admin_area/settings/index.md', anchor: 'default-first-day-of-the-week'), target: '_blank'
 
     .form-group
       = f.label :time_tracking, _('Time tracking'), class: 'label-bold'
@@ -14,5 +15,9 @@
         = f.check_box :time_tracking_limit_to_hours, class: 'form-check-input'
         = f.label :time_tracking_limit_to_hours, class: 'form-check-label' do
           = _('Limit display of time tracking units to hours.')
+        .form-text.text-muted
+          = _('Display time tracking in issues in total hours only.')
+          = link_to _('What is time tracking?'), help_page_path('user/project/time_tracking.md'), target: '_blank'
 
   = f.submit _('Save changes'), class: "gl-button btn btn-confirm"
+

app/views/admin/application_settings/preferences.html.haml

@@ -77,6 +77,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'

doc/user/profile/preferences.md

@@ -163,7 +163,7 @@ You can choose one of the following options as the first day of the week:
 - Sunday
 - Monday
 
-If you select **System Default**, the system-wide default setting is used.
+If you select **System Default**, the [instance default](../admin_area/settings/index.md#default-first-day-of-the-week) setting is used.
 
 ## Integrations
 

locale/gitlab.pot

@@ -8277,6 +8277,9 @@ msgstr ""
 msgid "Configure the %{link} integration."
 msgstr ""
 
+msgid "Configure the default first day of the week and time tracking units."
+msgstr ""
+
 msgid "Configure the way a user creates a new account."
 msgstr ""
 
@@ -11524,6 +11527,9 @@ msgstr ""
 msgid "Display source"
 msgstr ""
 
+msgid "Display time tracking in issues in total hours only."
+msgstr ""
+
 msgid "Do not display offers from third parties"
 msgstr ""
 
@@ -35901,9 +35907,6 @@ msgstr ""
 msgid "Various email settings."
 msgstr ""
 
-msgid "Various localization settings."
-msgstr ""
-
 msgid "Various settings that affect GitLab performance."
 msgstr ""
 
@@ -36727,6 +36730,9 @@ msgstr ""
 msgid "What is squashing?"
 msgstr ""
 
+msgid "What is time tracking?"
+msgstr ""
+
 msgid "What is your job title? (optional)"
 msgstr ""