diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 46384bc28ef..4ebfaff0860 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -5,7 +5,8 @@ .col-lg-4.application-theme %h4.prepend-top-0 = s_('Preferences|Navigation theme') - %p= _('Customize the appearance of the application header and navigation sidebar.') + %p + = s_('Preferences|Customize the appearance of the application header and navigation sidebar.') .col-lg-8.application-theme - Gitlab::Themes.each do |theme| = label_tag do @@ -18,9 +19,9 @@ .col-lg-4.profile-settings-sidebar %h4.prepend-top-0 - = _('Syntax highlighting theme') + = s_('Preferences|Syntax highlighting theme') %p - = _('This setting allows you to customize the appearance of the syntax.') + = s_('Preferences|This setting allows you to customize the appearance of the syntax.') = succeed '.' do = link_to _('Learn more'), help_page_path('user/profile/preferences', anchor: 'syntax-highlighting-theme'), target: '_blank' .col-lg-8.syntax-theme @@ -35,31 +36,31 @@ .col-lg-4.profile-settings-sidebar %h4.prepend-top-0 - = _('Behavior') + = s_('Preferences|Behavior') %p - = _('This setting allows you to customize the behavior of the system layout and default views.') + = s_('Preferences|This setting allows you to customize the behavior of the system layout and default views.') = succeed '.' do = link_to _('Learn more'), help_page_path('user/profile/preferences', anchor: 'behavior'), target: '_blank' .col-lg-8 .form-group = f.label :layout, class: 'label-bold' do - = _('Layout width') + = s_('Preferences|Layout width') = f.select :layout, layout_choices, {}, class: 'form-control' .form-text.text-muted - = _('Choose between fixed (max. 1280px) and fluid (100%%) application layout.') + = s_('Preferences|Choose between fixed (max. 1280px) and fluid (100%%) application layout.') .form-group = f.label :dashboard, class: 'label-bold' do - = _('Default dashboard') + = s_('Preferences|Default dashboard') = f.select :dashboard, dashboard_choices, {}, class: 'form-control' = render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific .form-group = f.label :project_view, class: 'label-bold' do - = _('Project overview content') + = s_('Preferences|Project overview content') = f.select :project_view, project_view_choices, {}, class: 'form-control' .form-text.text-muted - = _('Choose what content you want to see on a project’s overview page.') + = s_('Preferences|Choose what content you want to see on a project’s overview page.') .col-sm-12 %hr diff --git a/changelogs/unreleased/gt-externalize-profiles-preferences.yml b/changelogs/unreleased/gt-externalize-profiles-preferences.yml new file mode 100644 index 00000000000..1a72e92a241 --- /dev/null +++ b/changelogs/unreleased/gt-externalize-profiles-preferences.yml @@ -0,0 +1,5 @@ +--- +title: Externalize profiles preferences +merge_request: 28470 +author: George Tsiolis +type: other diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 9f3b3213a3e..5d9b49d959e 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1485,9 +1485,6 @@ msgstr "" msgid "Begin with the selected commit" msgstr "" -msgid "Behavior" -msgstr "" - msgid "Below are examples of regex for existing tools:" msgstr "" @@ -1911,9 +1908,6 @@ msgstr "" msgid "Choose between clone or fetch to get the recent application code" msgstr "" -msgid "Choose between fixed (max. 1280px) and fluid (100%%) application layout." -msgstr "" - msgid "Choose file…" msgstr "" @@ -1923,9 +1917,6 @@ msgstr "" msgid "Choose visibility level, enable/disable project features (issues, repository, wiki, snippets) and set permissions." msgstr "" -msgid "Choose what content you want to see on a project’s overview page." -msgstr "" - msgid "Choose your merge method, options, checks, and set up a default merge request description template." msgstr "" @@ -3167,9 +3158,6 @@ msgstr "" msgid "Customize language and region related settings." msgstr "" -msgid "Customize the appearance of the application header and navigation sidebar." -msgstr "" - msgid "Customize your pipeline configuration, view your pipeline status and coverage report." msgstr "" @@ -3257,9 +3245,6 @@ msgstr "" msgid "Default classification label" msgstr "" -msgid "Default dashboard" -msgstr "" - msgid "Default first day of the week" msgstr "" @@ -5773,9 +5758,6 @@ msgstr "" msgid "Latest pipeline for this branch" msgstr "" -msgid "Layout width" -msgstr "" - msgid "Lead" msgstr "" @@ -7318,21 +7300,51 @@ msgstr "" msgid "Preferences saved." msgstr "" +msgid "Preferences|Behavior" +msgstr "" + +msgid "Preferences|Choose between fixed (max. 1280px) and fluid (100%%) application layout." +msgstr "" + +msgid "Preferences|Choose what content you want to see on a project’s overview page." +msgstr "" + +msgid "Preferences|Customize the appearance of the application header and navigation sidebar." +msgstr "" + +msgid "Preferences|Default dashboard" +msgstr "" + msgid "Preferences|Display time in 24-hour format" msgstr "" msgid "Preferences|For example: 30 mins ago." msgstr "" +msgid "Preferences|Layout width" +msgstr "" + msgid "Preferences|Navigation theme" msgstr "" +msgid "Preferences|Project overview content" +msgstr "" + +msgid "Preferences|Syntax highlighting theme" +msgstr "" + msgid "Preferences|These settings will update how dates and times are displayed for you." msgstr "" msgid "Preferences|This feature is experimental and translations are not complete yet" msgstr "" +msgid "Preferences|This setting allows you to customize the appearance of the syntax." +msgstr "" + +msgid "Preferences|This setting allows you to customize the behavior of the system layout and default views." +msgstr "" + msgid "Preferences|Time display" msgstr "" @@ -7768,9 +7780,6 @@ msgstr "" msgid "Project name" msgstr "" -msgid "Project overview content" -msgstr "" - msgid "Project slug" msgstr "" @@ -9676,9 +9685,6 @@ msgstr "" msgid "Switch to the source to copy it to the clipboard" msgstr "" -msgid "Syntax highlighting theme" -msgstr "" - msgid "System Hooks" msgstr "" @@ -10389,12 +10395,6 @@ msgstr "" msgid "This runner will only run on pipelines triggered on protected branches" msgstr "" -msgid "This setting allows you to customize the appearance of the syntax." -msgstr "" - -msgid "This setting allows you to customize the behavior of the system layout and default views." -msgstr "" - msgid "This setting can be overridden in each project." msgstr ""