diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index aff5922b0e3a630e0c14c9fcf4db5d6044d6e64a..56189f61e0c6d46a71a9e0a43f051c09398e36e6 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -28,7 +28,7 @@ = markdown_field(Gitlab::CurrentSettings.current_application_settings, :sign_in_text) - if Gitlab::CurrentSettings.help_text.present? - %h3 Need help? + %h3= _("Need help?") %hr %p.slead = markdown(Gitlab::CurrentSettings.help_text) diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index 16f102eba08a6a099590fef02ef725538198b874..44861ad4ae1d90405a02bec45529c8fc6d2c3e20 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -138,12 +138,12 @@ .nav-icon-container = sprite_icon('license') %span.nav-item-name - License + = _('License') %ul.sidebar-sub-level-items.is-fly-out-only = nav_link(controller: :licenses, html_options: { class: "fly-out-top-item" } ) do = link_to admin_license_path do %strong.fly-out-top-item-name - #{ _('License') } + = _('License') - if akismet_enabled? = nav_link(controller: :spam_logs) do @@ -163,34 +163,34 @@ .nav-icon-container = sprite_icon('push-rules') %span.nav-item-name - Push Rules + = _('Push Rules') %ul.sidebar-sub-level-items.is-fly-out-only = nav_link(controller: :push_rules, html_options: { class: "fly-out-top-item" } ) do = link_to admin_push_rule_path do %strong.fly-out-top-item-name - #{ _('Push Rules') } + = _('Push Rules') = nav_link(controller: [:geo_nodes, :geo_projects]) do = link_to admin_geo_nodes_path do .nav-icon-container = sprite_icon('location-dot') %span.nav-item-name - #{ _('Geo Nodes') } + = _('Geo Nodes') - if Gitlab::Geo.secondary? %ul.sidebar-sub-level-items = nav_link(controller: :geo_nodes, html_options: { class: "fly-out-top-item" } ) do = link_to admin_geo_nodes_path do %strong.fly-out-top-item-name - #{ _('Geo Nodes') } + = _('Geo Nodes') %li.divider.fly-out-top-item = nav_link(path: 'geo_nodes#index') do - = link_to admin_geo_nodes_path, title: 'Nodes' do + = link_to admin_geo_nodes_path, title: _('Nodes') do %span - #{ _('Nodes') } + = _('Nodes') = nav_link(path: 'geo_projects#index') do - = link_to admin_geo_projects_path, title: 'Projects' do + = link_to admin_geo_projects_path, title: _('Projects') do %span - #{ _('Projects') } + = _('Projects') = nav_link(controller: :deploy_keys) do = link_to admin_deploy_keys_path do diff --git a/app/views/layouts/nav/sidebar/_profile.html.haml b/app/views/layouts/nav/sidebar/_profile.html.haml index 8d18944937fb9767300cbcdc4ac96350adad5cf9..337a6cd2402221b8398440c62d067670a2a08f8c 100644 --- a/app/views/layouts/nav/sidebar/_profile.html.haml +++ b/app/views/layouts/nav/sidebar/_profile.html.haml @@ -34,12 +34,12 @@ .nav-icon-container = custom_icon('credit_card') %span.nav-item-name - Billing + = _("Billing") %ul.sidebar-sub-level-items.is-fly-out-only = nav_link(controller: :billings, html_options: { class: "fly-out-top-item" } ) do = link_to profile_billings_path do %strong.fly-out-top-item-name - #{ _('Billing') } + = _('Billing') - if Gitlab::CurrentSettings.user_oauth_applications? = nav_link(controller: 'oauth/applications') do = link_to applications_profile_path do @@ -168,11 +168,11 @@ .nav-icon-container = custom_icon('pipeline') %span.nav-item-name - Pipeline quota + = _('Pipeline quota') %ul.sidebar-sub-level-items.is-fly-out-only = nav_link(path: 'profiles#pipeline_quota', html_options: { class: "fly-out-top-item" } ) do = link_to profile_pipeline_quota_path do %strong.fly-out-top-item-name - #{ _('Pipeline quota') } + = _('Pipeline quota') = render 'shared/sidebar_toggle_button' diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 0ea8789d6cbfc5b9435051434d264fa0aa5b3903..09eee8bfd08ce19dabfa6c19a3b7b38921a0fcc8 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -4650,6 +4650,9 @@ msgstr "" msgid "Nav|Sign out and sign in with a different account" msgstr "" +msgid "Need help?" +msgstr "" + msgid "Network" msgstr ""