Commit 911d45b7 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'i18n-extract-app/views/layouts' into 'master'

i18n: externalize strings from 'app/views/layouts'

See merge request gitlab-org/gitlab-ce!19766
parents 40631412 dc157729
- humanized_resource_name = spammable.class.model_name.human.downcase - humanized_resource_name = spammable.class.model_name.human.downcase
%h3.page-title %h3.page-title
Anti-spam verification = _('Anti-spam verification')
%hr %hr
%p %p
#{"We detected potential spam in the #{humanized_resource_name}. Please solve the reCAPTCHA to proceed."} = _("We detected potential spam in the %{humanized_resource_name}. Please solve the reCAPTCHA to proceed.") % { humanized_resource_name: humanized_resource_name }
= render 'shared/recaptcha_form', spammable: spammable = render 'shared/recaptcha_form', spammable: spammable
- if controller.controller_path =~ /^groups/ && @group.persisted? - if controller.controller_path =~ /^groups/ && @group.persisted?
- label = 'This group' - label = _('This group')
- if controller.controller_path =~ /^projects/ && @project.persisted? - if controller.controller_path =~ /^projects/ && @project.persisted?
- label = 'This project' - label = _('This project')
- if @group && @group.persisted? && @group.path - if @group && @group.persisted? && @group.path
- group_data_attrs = { group_path: j(@group.path), name: @group.name, issues_path: issues_group_path(j(@group.path)), mr_path: merge_requests_group_path(j(@group.path)) } - group_data_attrs = { group_path: j(@group.path), name: @group.name, issues_path: issues_group_path(j(@group.path)), mr_path: merge_requests_group_path(j(@group.path)) }
- if @project && @project.persisted? - if @project && @project.persisted?
...@@ -13,21 +13,21 @@ ...@@ -13,21 +13,21 @@
.location-badge= label .location-badge= label
.search-input-wrap .search-input-wrap
.dropdown{ data: { url: search_autocomplete_path } } .dropdown{ data: { url: search_autocomplete_path } }
= search_field_tag 'search', nil, placeholder: 'Search', = search_field_tag 'search', nil, placeholder: _('Search'),
class: 'search-input dropdown-menu-toggle no-outline js-search-dashboard-options', class: 'search-input dropdown-menu-toggle no-outline js-search-dashboard-options',
spellcheck: false, spellcheck: false,
tabindex: '1', tabindex: '1',
autocomplete: 'off', autocomplete: 'off',
data: { issues_path: issues_dashboard_path, data: { issues_path: issues_dashboard_path,
mr_path: merge_requests_dashboard_path }, mr_path: merge_requests_dashboard_path },
aria: { label: 'Search' } aria: { label: _('Search') }
%button.hidden.js-dropdown-search-toggle{ type: 'button', data: { toggle: 'dropdown' } } %button.hidden.js-dropdown-search-toggle{ type: 'button', data: { toggle: 'dropdown' } }
.dropdown-menu.dropdown-select .dropdown-menu.dropdown-select
= dropdown_content do = dropdown_content do
%ul %ul
%li.dropdown-menu-empty-item %li.dropdown-menu-empty-item
%a %a
Loading... = _('Loading...')
= dropdown_loading = dropdown_loading
= sprite_icon('search', size: 16, css_class: 'search-icon') = sprite_icon('search', size: 16, css_class: 'search-icon')
= sprite_icon('close', size: 16, css_class: 'clear-icon js-clear-input') = sprite_icon('close', size: 16, css_class: 'clear-icon js-clear-input')
......
- page_title "Admin Area" - page_title _("Admin Area")
- header_title "Admin Area", admin_root_path - header_title _("Admin Area"), admin_root_path
- nav "admin" - nav "admin"
- @left_sidebar = true - @left_sidebar = true
......
- page_title "Dashboard" - page_title _("Dashboard")
- header_title "Dashboard", root_path unless header_title - header_title _("Dashboard"), root_path unless header_title
- sidebar "dashboard" - sidebar "dashboard"
= render template: "layouts/application" = render template: "layouts/application"
...@@ -17,12 +17,11 @@ ...@@ -17,12 +17,11 @@
- if current_appearance&.description? - if current_appearance&.description?
= brand_text = brand_text
- else - else
%h3 Open source software to collaborate on code %h3
= _('Open source software to collaborate on code')
%p %p
Manage Git repositories with fine-grained access controls that keep your code secure. = _('Manage Git repositories with fine-grained access controls that keep your code secure. Perform code reviews and enhance collaboration with merge requests. Each project can also have an issue tracker and a wiki.')
Perform code reviews and enhance collaboration with merge requests.
Each project can also have an issue tracker and a wiki.
- if Gitlab::CurrentSettings.sign_in_text.present? - if Gitlab::CurrentSettings.sign_in_text.present?
= markdown_field(Gitlab::CurrentSettings.current_application_settings, :sign_in_text) = markdown_field(Gitlab::CurrentSettings.current_application_settings, :sign_in_text)
...@@ -32,6 +31,6 @@ ...@@ -32,6 +31,6 @@
%hr.footer-fixed %hr.footer-fixed
.container.footer-container .container.footer-container
.footer-links .footer-links
= link_to "Explore", explore_root_path = link_to _("Explore"), explore_root_path
= link_to "Help", help_path = link_to _("Help"), help_path
= link_to "About GitLab", "https://about.gitlab.com/" = link_to _("About GitLab"), "https://about.gitlab.com/"
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
%hr %hr
.container .container
.footer-links .footer-links
= link_to "Explore", explore_root_path = link_to _("Explore"), explore_root_path
= link_to "Help", help_path = link_to _("Help"), help_path
= link_to "About GitLab", "https://about.gitlab.com/" = link_to _("About GitLab"), "https://about.gitlab.com/"
- page_title "Explore" - page_title = _("Explore")
- unless current_user - unless current_user
- header_title "Explore GitLab", explore_root_path - header_title = _("Explore GitLab"), explore_root_path
= render template: "layouts/application" = render template: "layouts/application"
- page_title "Settings" - page_title = _("Settings")
- nav "group" - nav "group"
= render template: "layouts/group" = render template: "layouts/group"
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.header-content .header-content
.title-container .title-container
%h1.title %h1.title
= link_to root_path, title: 'Dashboard', id: 'logo' do = link_to root_path, title: _('Dashboard'), id: 'logo' do
= brand_header_logo = brand_header_logo
- logo_text = brand_header_logo_type - logo_text = brand_header_logo_type
- if logo_text.present? - if logo_text.present?
...@@ -24,26 +24,26 @@ ...@@ -24,26 +24,26 @@
%li.nav-item.d-none.d-sm-none.d-md-block.m-auto %li.nav-item.d-none.d-sm-none.d-md-block.m-auto
= render 'layouts/search' unless current_controller?(:search) = render 'layouts/search' unless current_controller?(:search)
%li.nav-item.d-inline-block.d-sm-none.d-md-none %li.nav-item.d-inline-block.d-sm-none.d-md-none
= link_to search_path, title: 'Search', aria: { label: "Search" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = link_to search_path, title: _('Search'), aria: { label: _("Search") }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= sprite_icon('search', size: 16) = sprite_icon('search', size: 16)
- if header_link?(:issues) - if header_link?(:issues)
= nav_link(path: 'dashboard#issues', html_options: { class: "user-counter" }) do = nav_link(path: 'dashboard#issues', html_options: { class: "user-counter" }) do
= link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues', aria: { label: "Issues" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = link_to assigned_issues_dashboard_path, title: _('Issues'), class: 'dashboard-shortcuts-issues', aria: { label: _("Issues") }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= sprite_icon('issues', size: 16) = sprite_icon('issues', size: 16)
- issues_count = assigned_issuables_count(:issues) - issues_count = assigned_issuables_count(:issues)
%span.badge.badge-pill.issues-count{ class: ('hidden' if issues_count.zero?) } %span.badge.badge-pill.issues-count{ class: ('hidden' if issues_count.zero?) }
= number_with_delimiter(issues_count) = number_with_delimiter(issues_count)
- if header_link?(:merge_requests) - if header_link?(:merge_requests)
= nav_link(path: 'dashboard#merge_requests', html_options: { class: "user-counter" }) do = nav_link(path: 'dashboard#merge_requests', html_options: { class: "user-counter" }) do
= link_to assigned_mrs_dashboard_path, title: 'Merge requests', class: 'dashboard-shortcuts-merge_requests', aria: { label: "Merge requests" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = link_to assigned_mrs_dashboard_path, title: _('Merge requests'), class: 'dashboard-shortcuts-merge_requests', aria: { label: _("Merge requests") }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= sprite_icon('git-merge', size: 16) = sprite_icon('git-merge', size: 16)
- merge_requests_count = assigned_issuables_count(:merge_requests) - merge_requests_count = assigned_issuables_count(:merge_requests)
%span.badge.badge-pill.merge-requests-count{ class: ('hidden' if merge_requests_count.zero?) } %span.badge.badge-pill.merge-requests-count{ class: ('hidden' if merge_requests_count.zero?) }
= number_with_delimiter(merge_requests_count) = number_with_delimiter(merge_requests_count)
- if header_link?(:todos) - if header_link?(:todos)
= nav_link(controller: 'dashboard/todos', html_options: { class: "user-counter" }) do = nav_link(controller: 'dashboard/todos', html_options: { class: "user-counter" }) do
= link_to dashboard_todos_path, title: 'Todos', aria: { label: "Todos" }, class: 'shortcuts-todos', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = link_to dashboard_todos_path, title: _('Todos'), aria: { label: _("Todos") }, class: 'shortcuts-todos', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= sprite_icon('todo-done', size: 16) = sprite_icon('todo-done', size: 16)
%span.badge.badge-pill.todos-count{ class: ('hidden' if todos_pending_count.zero?) } %span.badge.badge-pill.todos-count{ class: ('hidden' if todos_pending_count.zero?) }
= todos_count_format(todos_pending_count) = todos_count_format(todos_pending_count)
...@@ -56,16 +56,16 @@ ...@@ -56,16 +56,16 @@
= render 'layouts/header/current_user_dropdown' = render 'layouts/header/current_user_dropdown'
- if header_link?(:admin_impersonation) - if header_link?(:admin_impersonation)
%li.nav-item.impersonation %li.nav-item.impersonation
= link_to admin_impersonation_path, class: 'nav-link impersonation-btn', method: :delete, title: "Stop impersonation", aria: { label: 'Stop impersonation' }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do = link_to admin_impersonation_path, class: 'nav-link impersonation-btn', method: :delete, title: _("Stop impersonation"), aria: { label: _('Stop impersonation') }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
= icon('user-secret') = icon('user-secret')
- if header_link?(:sign_in) - if header_link?(:sign_in)
%li.nav-item %li.nav-item
%div %div
- sign_in_text = allow_signup? ? 'Sign in / Register' : 'Sign in' - sign_in_text = allow_signup? ? _('Sign in / Register') : _('Sign in')
= link_to sign_in_text, new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in' = link_to sign_in_text, new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in'
%button.navbar-toggler.d-block.d-sm-none{ type: 'button' } %button.navbar-toggler.d-block.d-sm-none{ type: 'button' }
%span.sr-only Toggle navigation %span.sr-only= _("Toggle navigation")
= sprite_icon('more', size: 12, css_class: 'more-icon js-navbar-toggle-right') = sprite_icon('more', size: 12, css_class: 'more-icon js-navbar-toggle-right')
= sprite_icon('close', size: 12, css_class: 'close-icon js-navbar-toggle-left') = sprite_icon('close', size: 12, css_class: 'close-icon js-navbar-toggle-left')
%li.header-new.dropdown %li.header-new.dropdown
= link_to new_project_path, class: "header-new-dropdown-toggle has-tooltip qa-new-menu-toggle", title: "New...", ref: 'tooltip', aria: { label: "New..." }, data: { toggle: 'dropdown', placement: 'bottom', container: 'body', display: 'static' } do = link_to new_project_path, class: "header-new-dropdown-toggle has-tooltip qa-new-menu-toggle", title: _("New..."), ref: 'tooltip', aria: { label: _("New...") }, data: { toggle: 'dropdown', placement: 'bottom', container: 'body', display: 'static' } do
= sprite_icon('plus-square', size: 16) = sprite_icon('plus-square', size: 16)
= sprite_icon('angle-down', css_class: 'caret-down') = sprite_icon('angle-down', css_class: 'caret-down')
.dropdown-menu.dropdown-menu-right .dropdown-menu.dropdown-menu-right
...@@ -8,13 +8,14 @@ ...@@ -8,13 +8,14 @@
- create_group_project = can?(current_user, :create_projects, @group) - create_group_project = can?(current_user, :create_projects, @group)
- create_group_subgroup = can?(current_user, :create_subgroup, @group) - create_group_subgroup = can?(current_user, :create_subgroup, @group)
- if create_group_project || create_group_subgroup - if create_group_project || create_group_subgroup
%li.dropdown-bold-header This group %li.dropdown-bold-header
= _('This group')
- if create_group_project - if create_group_project
%li.header-new-group-project %li.header-new-group-project
= link_to 'New project', new_project_path(namespace_id: @group.id) = link_to _('New project'), new_project_path(namespace_id: @group.id)
- if create_group_subgroup - if create_group_subgroup
%li %li
= link_to 'New subgroup', new_group_path(parent_id: @group.id) = link_to _('New subgroup'), new_group_path(parent_id: @group.id)
%li.divider %li.divider
%li.dropdown-bold-header GitLab %li.dropdown-bold-header GitLab
...@@ -23,23 +24,24 @@ ...@@ -23,23 +24,24 @@
- merge_project = merge_request_source_project_for_project(@project) - merge_project = merge_request_source_project_for_project(@project)
- create_project_snippet = can?(current_user, :create_project_snippet, @project) - create_project_snippet = can?(current_user, :create_project_snippet, @project)
- if create_project_issue || merge_project || create_project_snippet - if create_project_issue || merge_project || create_project_snippet
%li.dropdown-bold-header This project %li.dropdown-bold-header
= _('This project')
- if create_project_issue - if create_project_issue
%li %li
= link_to 'New issue', new_project_issue_path(@project) = link_to _('New issue'), new_project_issue_path(@project)
- if merge_project - if merge_project
%li %li
= link_to 'New merge request', project_new_merge_request_path(merge_project) = link_to _('New merge request'), project_new_merge_request_path(merge_project)
- if create_project_snippet - if create_project_snippet
%li.header-new-project-snippet %li.header-new-project-snippet
= link_to 'New snippet', new_project_snippet_path(@project) = link_to _('New snippet'), new_project_snippet_path(@project)
%li.divider %li.divider
%li.dropdown-bold-header GitLab %li.dropdown-bold-header GitLab
- if current_user.can_create_project? - if current_user.can_create_project?
%li %li
= link_to 'New project', new_project_path, class: 'qa-global-new-project-link' = link_to _('New project'), new_project_path, class: 'qa-global-new-project-link'
- if current_user.can_create_group? - if current_user.can_create_group?
%li %li
= link_to 'New group', new_group_path = link_to _('New group'), new_group_path
%li %li
= link_to 'New snippet', new_snippet_path = link_to _('New snippet'), new_snippet_path
- @breadcrumb_title = "Help" - @breadcrumb_title = _("Help")
- page_title "Help" - page_title _("Help")
- header_title "Help", help_path - header_title _("Help"), help_path
= render template: "layouts/application" = render template: "layouts/application"
- page_title "Koding" - page_title _("Koding")
- page_description "Koding Dashboard" - page_description _("Koding Dashboard")
- header_title "Koding", koding_path - header_title _("Koding"), koding_path
= render template: "layouts/application" = render template: "layouts/application"
<%= yield -%> <%= yield -%>
-- <%# signature marker %> -- <%# signature marker %>
You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>. <%= _("You're receiving this email because of your account on %{host}.") % { host: Gitlab.config.gitlab.host } %>
...@@ -3,17 +3,17 @@ ...@@ -3,17 +3,17 @@
%tr %tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:13px;line-height:1.6;color:#5c5c5c;" } %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:13px;line-height:1.6;color:#5c5c5c;" }
%div %div
Everyone can contribute = _('Everyone can contribute')
%div %div
= link_to 'Blog', 'https://about.gitlab.com/blog/', style: "color:#3777b0;text-decoration:none;" = link_to _('Blog'), 'https://about.gitlab.com/blog/', style: "color:#3777b0;text-decoration:none;"
&middot; &middot;
= link_to 'Twitter', 'https://twitter.com/gitlab', style: "color:#3777b0;text-decoration:none;" = link_to _('Twitter'), 'https://twitter.com/gitlab', style: "color:#3777b0;text-decoration:none;"
&middot; &middot;
= link_to 'Facebook', 'https://www.facebook.com/gitlab/', style: "color:#3777b0;text-decoration:none;" = link_to _('Facebook'), 'https://www.facebook.com/gitlab/', style: "color:#3777b0;text-decoration:none;"
&middot; &middot;
= link_to 'YouTube', 'https://www.youtube.com/channel/UCnMGQ8QHMAnVIsI3xJrihhg', style: "color:#3777b0;text-decoration:none;" = link_to _('YouTube'), 'https://www.youtube.com/channel/UCnMGQ8QHMAnVIsI3xJrihhg', style: "color:#3777b0;text-decoration:none;"
&middot; &middot;
= link_to 'LinkedIn', 'https://www.linkedin.com/company/gitlab-com', style: "color:#3777b0;text-decoration:none;" = link_to _('LinkedIn'), 'https://www.linkedin.com/company/gitlab-com', style: "color:#3777b0;text-decoration:none;"
= render layout: 'layouts/mailer' do = render layout: 'layouts/mailer' do
%tr %tr
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.breadcrumbs-container .breadcrumbs-container
- if defined?(@left_sidebar) - if defined?(@left_sidebar)
= button_tag class: 'toggle-mobile-nav', type: 'button' do = button_tag class: 'toggle-mobile-nav', type: 'button' do
%span.sr-only Open sidebar %span.sr-only= _("Open sidebar")
= icon ('bars') = icon ('bars')
.breadcrumbs-links.js-title-container .breadcrumbs-links.js-title-container
%ul.list-unstyled.breadcrumbs-list.js-breadcrumbs-list %ul.list-unstyled.breadcrumbs-list.js-breadcrumbs-list
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- if dashboard_nav_link?(:projects) - if dashboard_nav_link?(:projects)
= nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: { id: 'nav-projects-dropdown', class: "home dropdown header-projects qa-projects-dropdown" }) do = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: { id: 'nav-projects-dropdown', class: "home dropdown header-projects qa-projects-dropdown" }) do
%button{ type: 'button', data: { toggle: "dropdown" } } %button{ type: 'button', data: { toggle: "dropdown" } }
Projects = _('Projects')
= sprite_icon('angle-down', css_class: 'caret-down') = sprite_icon('angle-down', css_class: 'caret-down')
.dropdown-menu.frequent-items-dropdown-menu .dropdown-menu.frequent-items-dropdown-menu
= render "layouts/nav/projects_dropdown/show" = render "layouts/nav/projects_dropdown/show"
...@@ -10,68 +10,68 @@ ...@@ -10,68 +10,68 @@
- if dashboard_nav_link?(:groups) - if dashboard_nav_link?(:groups)
= nav_link(controller: ['dashboard/groups', 'explore/groups'], html_options: { id: 'nav-groups-dropdown', class: "home dropdown header-groups qa-groups-dropdown" }) do = nav_link(controller: ['dashboard/groups', 'explore/groups'], html_options: { id: 'nav-groups-dropdown', class: "home dropdown header-groups qa-groups-dropdown" }) do
%button{ type: 'button', data: { toggle: "dropdown" } } %button{ type: 'button', data: { toggle: "dropdown" } }
Groups = _('Groups')
= sprite_icon('angle-down', css_class: 'caret-down') = sprite_icon('angle-down', css_class: 'caret-down')
.dropdown-menu.frequent-items-dropdown-menu .dropdown-menu.frequent-items-dropdown-menu
= render "layouts/nav/groups_dropdown/show" = render "layouts/nav/groups_dropdown/show"
- if dashboard_nav_link?(:activity) - if dashboard_nav_link?(:activity)
= nav_link(path: 'dashboard#activity', html_options: { class: "d-none d-lg-block d-xl-block" }) do = nav_link(path: 'dashboard#activity', html_options: { class: "d-none d-lg-block d-xl-block" }) do
= link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: _('Activity') do
Activity = _('Activity')
- if dashboard_nav_link?(:milestones) - if dashboard_nav_link?(:milestones)
= nav_link(controller: 'dashboard/milestones', html_options: { class: "d-none d-lg-block d-xl-block" }) do = nav_link(controller: 'dashboard/milestones', html_options: { class: "d-none d-lg-block d-xl-block" }) do
= link_to dashboard_milestones_path, class: 'dashboard-shortcuts-milestones', title: 'Milestones' do = link_to dashboard_milestones_path, class: 'dashboard-shortcuts-milestones', title: _('Milestones') do
Milestones = _('Milestones')
- if dashboard_nav_link?(:snippets) - if dashboard_nav_link?(:snippets)
= nav_link(controller: 'dashboard/snippets', html_options: { class: "d-none d-lg-block d-xl-block" }) do = nav_link(controller: 'dashboard/snippets', html_options: { class: "d-none d-lg-block d-xl-block" }) do
= link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: _('Snippets') do
Snippets = _('Snippets')
- if any_dashboard_nav_link?([:groups, :milestones, :activity, :snippets]) - if any_dashboard_nav_link?([:groups, :milestones, :activity, :snippets])
%li.header-more.dropdown.d-lg-none.d-xl-none %li.header-more.dropdown.d-lg-none.d-xl-none
%a{ href: "#", data: { toggle: "dropdown" } } %a{ href: "#", data: { toggle: "dropdown" } }
More = _('More')
= sprite_icon('angle-down', css_class: 'caret-down') = sprite_icon('angle-down', css_class: 'caret-down')
.dropdown-menu .dropdown-menu
%ul %ul
- if dashboard_nav_link?(:activity) - if dashboard_nav_link?(:activity)
= nav_link(path: 'dashboard#activity') do = nav_link(path: 'dashboard#activity') do
= link_to activity_dashboard_path, title: 'Activity' do = link_to activity_dashboard_path, title: _('Activity') do
Activity = _('Activity')
- if dashboard_nav_link?(:milestones) - if dashboard_nav_link?(:milestones)
= nav_link(controller: 'dashboard/milestones') do = nav_link(controller: 'dashboard/milestones') do
= link_to dashboard_milestones_path, class: 'dashboard-shortcuts-milestones', title: 'Milestones' do = link_to dashboard_milestones_path, class: 'dashboard-shortcuts-milestones', title: _('Milestones') do
Milestones = _('Milestones')
- if dashboard_nav_link?(:snippets) - if dashboard_nav_link?(:snippets)
= nav_link(controller: 'dashboard/snippets') do = nav_link(controller: 'dashboard/snippets') do
= link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: _('Snippets') do
Snippets = _('Snippets')
-# Shortcut to Dashboard > Projects -# Shortcut to Dashboard > Projects
- if dashboard_nav_link?(:projects) - if dashboard_nav_link?(:projects)
%li.hidden %li.hidden
= link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do = link_to dashboard_projects_path, title: _('Projects'), class: 'dashboard-shortcuts-projects' do
Projects = _('Projects')
- if current_controller?('ide') - if current_controller?('ide')
%li.line-separator.d-none.d-sm-block %li.line-separator.d-none.d-sm-block
= nav_link(controller: 'ide') do = nav_link(controller: 'ide') do
= link_to '#', class: 'dashboard-shortcuts-web-ide', title: 'Web IDE' do = link_to '#', class: 'dashboard-shortcuts-web-ide', title: _('Web IDE') do
Web IDE = _('Web IDE')
- if current_user.admin? || Gitlab::Sherlock.enabled? - if current_user.admin? || Gitlab::Sherlock.enabled?
%li.line-separator.d-none.d-sm-block %li.line-separator.d-none.d-sm-block
- if current_user.admin? - if current_user.admin?
= nav_link(controller: 'admin/dashboard') do = nav_link(controller: 'admin/dashboard') do
= link_to admin_root_path, class: 'admin-icon qa-admin-area-link', title: 'Admin area', aria: { label: "Admin area" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = link_to admin_root_path, class: 'admin-icon qa-admin-area-link', title: _('Admin area'), aria: { label: _("Admin area") }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= sprite_icon('admin', size: 18) = sprite_icon('admin', size: 18)
- if Gitlab::Sherlock.enabled? - if Gitlab::Sherlock.enabled?
%li %li
= link_to sherlock_transactions_path, class: 'admin-icon', title: 'Sherlock Transactions', = link_to sherlock_transactions_path, class: 'admin-icon', title: _('Sherlock Transactions'),
data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= icon('tachometer fw') = icon('tachometer fw')
%ul.list-unstyled.navbar-sub-nav %ul.list-unstyled.navbar-sub-nav
- if explore_nav_link?(:projects) - if explore_nav_link?(:projects)
= nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do = nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do
= link_to explore_root_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do = link_to explore_root_path, title: _('Projects'), class: 'dashboard-shortcuts-projects' do
Projects = _('Projects')
- if explore_nav_link?(:groups) - if explore_nav_link?(:groups)
= nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
= link_to explore_groups_path, title: 'Groups', class: 'dashboard-shortcuts-groups' do = link_to explore_groups_path, title: _('Groups'), class: 'dashboard-shortcuts-groups' do
Groups = _('Groups')
- if explore_nav_link?(:snippets) - if explore_nav_link?(:snippets)
= nav_link(controller: :snippets) do = nav_link(controller: :snippets) do
= link_to explore_snippets_path, title: 'Snippets', class: 'dashboard-shortcuts-snippets' do = link_to explore_snippets_path, title: _('Snippets'), class: 'dashboard-shortcuts-snippets' do
Snippets = _('Snippets')
%li %li
= link_to "Help", help_path, title: 'About GitLab CE' = link_to _("Help"), help_path, title: _('About GitLab CE')
...@@ -17,24 +17,24 @@ ...@@ -17,24 +17,24 @@
.nav-icon-container .nav-icon-container
= sprite_icon('project') = sprite_icon('project')
%span.nav-item-name %span.nav-item-name
Overview = _('Overview')
%ul.sidebar-sub-level-items %ul.sidebar-sub-level-items
= nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups'], html_options: { class: "fly-out-top-item" } ) do = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups'], html_options: { class: "fly-out-top-item" } ) do
= link_to group_path(@group) do = link_to group_path(@group) do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Overview') } = _('Overview')
%li.divider.fly-out-top-item %li.divider.fly-out-top-item
= nav_link(path: ['groups#show', 'groups#subgroups'], html_options: { class: 'home' }) do = nav_link(path: ['groups#show', 'groups#subgroups'], html_options: { class: 'home' }) do
= link_to group_path(@group), title: 'Group details' do = link_to group_path(@group), title: _('Group details') do
%span %span
Details = _('Details')
- if group_sidebar_link?(:activity) - if group_sidebar_link?(:activity)
= nav_link(path: 'groups#activity') do = nav_link(path: 'groups#activity') do
= link_to activity_group_path(@group), title: 'Activity' do = link_to activity_group_path(@group), title: _('Activity') do
%span %span
Activity = _('Activity')
- if group_sidebar_link?(:issues) - if group_sidebar_link?(:issues)
= nav_link(path: issues_sub_menu_items) do = nav_link(path: issues_sub_menu_items) do
...@@ -42,21 +42,21 @@ ...@@ -42,21 +42,21 @@
.nav-icon-container .nav-icon-container
= sprite_icon('issues') = sprite_icon('issues')
%span.nav-item-name %span.nav-item-name
Issues = _('Issues')
%span.badge.badge-pill.count= number_with_delimiter(issues_count) %span.badge.badge-pill.count= number_with_delimiter(issues_count)
%ul.sidebar-sub-level-items %ul.sidebar-sub-level-items
= nav_link(path: ['groups#issues', 'labels#index', 'milestones#index'], html_options: { class: "fly-out-top-item" } ) do = nav_link(path: ['groups#issues', 'labels#index', 'milestones#index'], html_options: { class: "fly-out-top-item" } ) do
= link_to issues_group_path(@group) do = link_to issues_group_path(@group) do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Issues') } = _('Issues')
%span.badge.badge-pill.count.issue_counter.fly-out-badge= number_with_delimiter(issues_count) %span.badge.badge-pill.count.issue_counter.fly-out-badge= number_with_delimiter(issues_count)
%li.divider.fly-out-top-item %li.divider.fly-out-top-item
= nav_link(path: 'groups#issues', html_options: { class: 'home' }) do = nav_link(path: 'groups#issues', html_options: { class: 'home' }) do
= link_to issues_group_path(@group), title: 'List' do = link_to issues_group_path(@group), title: _('List') do
%span %span
List = _('List')
- if group_sidebar_link?(:boards) - if group_sidebar_link?(:boards)
= nav_link(path: ['boards#index', 'boards#show']) do = nav_link(path: ['boards#index', 'boards#show']) do
...@@ -66,15 +66,15 @@ ...@@ -66,15 +66,15 @@
- if group_sidebar_link?(:labels) - if group_sidebar_link?(:labels)
= nav_link(path: 'labels#index') do = nav_link(path: 'labels#index') do
= link_to group_labels_path(@group), title: 'Labels' do = link_to group_labels_path(@group), title: _('Labels') do
%span %span
Labels = _('Labels')
- if group_sidebar_link?(:milestones) - if group_sidebar_link?(:milestones)
= nav_link(path: 'milestones#index') do = nav_link(path: 'milestones#index') do
= link_to group_milestones_path(@group), title: 'Milestones' do = link_to group_milestones_path(@group), title: _('Milestones') do
%span %span
Milestones = _('Milestones')
- if group_sidebar_link?(:merge_requests) - if group_sidebar_link?(:merge_requests)
= nav_link(path: 'groups#merge_requests') do = nav_link(path: 'groups#merge_requests') do
...@@ -82,13 +82,13 @@ ...@@ -82,13 +82,13 @@
.nav-icon-container .nav-icon-container
= sprite_icon('git-merge') = sprite_icon('git-merge')
%span.nav-item-name %span.nav-item-name
Merge Requests = _('Merge Requests')
%span.badge.badge-pill.count= number_with_delimiter(merge_requests_count) %span.badge.badge-pill.count= number_with_delimiter(merge_requests_count)
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(path: 'groups#merge_requests', html_options: { class: "fly-out-top-item" } ) do = nav_link(path: 'groups#merge_requests', html_options: { class: "fly-out-top-item" } ) do
= link_to merge_requests_group_path(@group) do = link_to merge_requests_group_path(@group) do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Merge Requests') } = _('Merge Requests')
%span.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge= number_with_delimiter(merge_requests_count) %span.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge= number_with_delimiter(merge_requests_count)
- if group_sidebar_link?(:group_members) - if group_sidebar_link?(:group_members)
...@@ -97,12 +97,12 @@ ...@@ -97,12 +97,12 @@
.nav-icon-container .nav-icon-container
= sprite_icon('users') = sprite_icon('users')
%span.nav-item-name %span.nav-item-name
Members = _('Members')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(path: 'group_members#index', html_options: { class: "fly-out-top-item" } ) do = nav_link(path: 'group_members#index', html_options: { class: "fly-out-top-item" } ) do
= link_to group_group_members_path(@group) do = link_to group_group_members_path(@group) do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Members') } = _('Members')
- if group_sidebar_link?(:settings) - if group_sidebar_link?(:settings)
= nav_link(path: group_nav_link_paths) do = nav_link(path: group_nav_link_paths) do
...@@ -110,17 +110,17 @@ ...@@ -110,17 +110,17 @@
.nav-icon-container .nav-icon-container
= sprite_icon('settings') = sprite_icon('settings')
%span.nav-item-name %span.nav-item-name
Settings = _('Settings')
%ul.sidebar-sub-level-items %ul.sidebar-sub-level-items
= nav_link(path: %w[groups#projects groups#edit badges#index ci_cd#show], html_options: { class: "fly-out-top-item" } ) do = nav_link(path: %w[groups#projects groups#edit badges#index ci_cd#show], html_options: { class: "fly-out-top-item" } ) do
= link_to edit_group_path(@group) do = link_to edit_group_path(@group) do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Settings') } = _('Settings')
%li.divider.fly-out-top-item %li.divider.fly-out-top-item
= nav_link(path: 'groups#edit') do = nav_link(path: 'groups#edit') do
= link_to edit_group_path(@group), title: 'General' do = link_to edit_group_path(@group), title: _('General') do
%span %span
General = _('General')
= nav_link(controller: :badges) do = nav_link(controller: :badges) do
= link_to group_settings_badges_path(@group), title: _('Project Badges') do = link_to group_settings_badges_path(@group), title: _('Project Badges') do
...@@ -129,13 +129,13 @@ ...@@ -129,13 +129,13 @@
= nav_link(path: 'groups#projects') do = nav_link(path: 'groups#projects') do
= link_to projects_group_path(@group), title: 'Projects' do = link_to projects_group_path(@group), title: _('Projects') do
%span %span
Projects = _('Projects')
= nav_link(controller: :ci_cd) do = nav_link(controller: :ci_cd) do
= link_to group_settings_ci_cd_path(@group), title: 'CI / CD' do = link_to group_settings_ci_cd_path(@group), title: _('CI / CD') do
%span %span
CI / CD = _('CI / CD')
= render 'shared/sidebar_toggle_button' = render 'shared/sidebar_toggle_button'
.nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?) } .nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?) }
.nav-sidebar-inner-scroll .nav-sidebar-inner-scroll
.context-header .context-header
= link_to profile_path, title: 'Profile Settings' do = link_to profile_path, title: _('Profile Settings') do
.avatar-container.s40.settings-avatar .avatar-container.s40.settings-avatar
= sprite_icon('user', size: 24) = sprite_icon('user', size: 24)
.sidebar-context-title User Settings .sidebar-context-title User Settings
...@@ -11,145 +11,145 @@ ...@@ -11,145 +11,145 @@
.nav-icon-container .nav-icon-container
= sprite_icon('profile') = sprite_icon('profile')
%span.nav-item-name %span.nav-item-name
Profile = _('Profile')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(path: 'profiles#show', html_options: { class: "fly-out-top-item" } ) do = nav_link(path: 'profiles#show', html_options: { class: "fly-out-top-item" } ) do
= link_to profile_path do = link_to profile_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Profile') } = _('Profile')
= nav_link(controller: [:accounts, :two_factor_auths]) do = nav_link(controller: [:accounts, :two_factor_auths]) do
= link_to profile_account_path do = link_to profile_account_path do
.nav-icon-container .nav-icon-container
= sprite_icon('account') = sprite_icon('account')
%span.nav-item-name %span.nav-item-name
Account = _('Account')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(controller: [:accounts, :two_factor_auths], html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: [:accounts, :two_factor_auths], html_options: { class: "fly-out-top-item" } ) do
= link_to profile_account_path do = link_to profile_account_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Account') } = _('Account')
- if Gitlab::CurrentSettings.user_oauth_applications? - if Gitlab::CurrentSettings.user_oauth_applications?
= nav_link(controller: 'oauth/applications') do = nav_link(controller: 'oauth/applications') do
= link_to applications_profile_path do = link_to applications_profile_path do
.nav-icon-container .nav-icon-container
= sprite_icon('applications') = sprite_icon('applications')
%span.nav-item-name %span.nav-item-name
Applications = _('Applications')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(controller: 'oauth/applications', html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: 'oauth/applications', html_options: { class: "fly-out-top-item" } ) do
= link_to applications_profile_path do = link_to applications_profile_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Applications') } = _('Applications')
= nav_link(controller: :chat_names) do = nav_link(controller: :chat_names) do
= link_to profile_chat_names_path do = link_to profile_chat_names_path do
.nav-icon-container .nav-icon-container
= sprite_icon('comment') = sprite_icon('comment')
%span.nav-item-name %span.nav-item-name
Chat = _('Chat')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(controller: :chat_names, html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: :chat_names, html_options: { class: "fly-out-top-item" } ) do
= link_to profile_chat_names_path do = link_to profile_chat_names_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Chat') } = _('Chat')
= nav_link(controller: :personal_access_tokens) do = nav_link(controller: :personal_access_tokens) do
= link_to profile_personal_access_tokens_path do = link_to profile_personal_access_tokens_path do
.nav-icon-container .nav-icon-container
= sprite_icon('token') = sprite_icon('token')
%span.nav-item-name %span.nav-item-name
Access Tokens = _('Access Tokens')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(controller: :personal_access_tokens, html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: :personal_access_tokens, html_options: { class: "fly-out-top-item" } ) do
= link_to profile_personal_access_tokens_path do = link_to profile_personal_access_tokens_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Access Tokens') } = _('Access Tokens')
= nav_link(controller: :emails) do = nav_link(controller: :emails) do
= link_to profile_emails_path do = link_to profile_emails_path do
.nav-icon-container .nav-icon-container
= sprite_icon('mail') = sprite_icon('mail')
%span.nav-item-name %span.nav-item-name
Emails = _('Emails')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(controller: :emails, html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: :emails, html_options: { class: "fly-out-top-item" } ) do
= link_to profile_emails_path do = link_to profile_emails_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Emails') } = _('Emails')
- if current_user.allow_password_authentication? - if current_user.allow_password_authentication?
= nav_link(controller: :passwords) do = nav_link(controller: :passwords) do
= link_to edit_profile_password_path do = link_to edit_profile_password_path do
.nav-icon-container .nav-icon-container
= sprite_icon('lock') = sprite_icon('lock')
%span.nav-item-name %span.nav-item-name
Password = _('Password')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(controller: :passwords, html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: :passwords, html_options: { class: "fly-out-top-item" } ) do
= link_to edit_profile_password_path do = link_to edit_profile_password_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Password') } = _('Password')
= nav_link(controller: :notifications) do = nav_link(controller: :notifications) do
= link_to profile_notifications_path do = link_to profile_notifications_path do
.nav-icon-container .nav-icon-container
= sprite_icon('notifications') = sprite_icon('notifications')
%span.nav-item-name %span.nav-item-name
Notifications = _('Notifications')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(controller: :notifications, html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: :notifications, html_options: { class: "fly-out-top-item" } ) do
= link_to profile_notifications_path do = link_to profile_notifications_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Notifications') } = _('Notifications')
= nav_link(controller: :keys) do = nav_link(controller: :keys) do
= link_to profile_keys_path do = link_to profile_keys_path do
.nav-icon-container .nav-icon-container
= sprite_icon('key') = sprite_icon('key')
%span.nav-item-name %span.nav-item-name
SSH Keys = _('SSH Keys')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(controller: :keys, html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: :keys, html_options: { class: "fly-out-top-item" } ) do
= link_to profile_keys_path do = link_to profile_keys_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('SSH Keys') } = _('SSH Keys')
= nav_link(controller: :gpg_keys) do = nav_link(controller: :gpg_keys) do
= link_to profile_gpg_keys_path do = link_to profile_gpg_keys_path do
.nav-icon-container .nav-icon-container
= sprite_icon('key-2') = sprite_icon('key-2')
%span.nav-item-name %span.nav-item-name
GPG Keys = _('GPG Keys')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(controller: :gpg_keys, html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: :gpg_keys, html_options: { class: "fly-out-top-item" } ) do
= link_to profile_gpg_keys_path do = link_to profile_gpg_keys_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('GPG Keys') } = _('GPG Keys')
= nav_link(controller: :preferences) do = nav_link(controller: :preferences) do
= link_to profile_preferences_path do = link_to profile_preferences_path do
.nav-icon-container .nav-icon-container
= sprite_icon('preferences') = sprite_icon('preferences')
%span.nav-item-name %span.nav-item-name
Preferences = _('Preferences')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(controller: :preferences, html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: :preferences, html_options: { class: "fly-out-top-item" } ) do
= link_to profile_preferences_path do = link_to profile_preferences_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Preferences') } = _('Preferences')
= nav_link(controller: :active_sessions) do = nav_link(controller: :active_sessions) do
= link_to profile_active_sessions_path do = link_to profile_active_sessions_path do
.nav-icon-container .nav-icon-container
= sprite_icon('monitor-lines') = sprite_icon('monitor-lines')
%span.nav-item-name %span.nav-item-name
Active Sessions = _('Active Sessions')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(controller: :active_sessions, html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: :active_sessions, html_options: { class: "fly-out-top-item" } ) do
= link_to profile_active_sessions_path do = link_to profile_active_sessions_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Active Sessions') } = _('Active Sessions')
= nav_link(path: 'profiles#audit_log') do = nav_link(path: 'profiles#audit_log') do
= link_to audit_log_profile_path do = link_to audit_log_profile_path do
.nav-icon-container .nav-icon-container
= sprite_icon('log') = sprite_icon('log')
%span.nav-item-name %span.nav-item-name
Authentication log = _('Authentication log')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(path: 'profiles#audit_log', html_options: { class: "fly-out-top-item" } ) do = nav_link(path: 'profiles#audit_log', html_options: { class: "fly-out-top-item" } ) do
= link_to audit_log_profile_path do = link_to audit_log_profile_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
#{ _('Authentication Log') } = _('Authentication Log')
= render 'shared/sidebar_toggle_button' = render 'shared/sidebar_toggle_button'
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
= number_with_delimiter(@project.open_issues_count(current_user)) = number_with_delimiter(@project.open_issues_count(current_user))
%li.divider.fly-out-top-item %li.divider.fly-out-top-item
= nav_link(controller: :issues, action: :index) do = nav_link(controller: :issues, action: :index) do
= link_to project_issues_path(@project), title: 'Issues' do = link_to project_issues_path(@project), title: _('Issues') do
%span %span
= _('List') = _('List')
...@@ -115,14 +115,14 @@ ...@@ -115,14 +115,14 @@
= boards_link_text = boards_link_text
= nav_link(controller: :labels) do = nav_link(controller: :labels) do
= link_to project_labels_path(@project), title: 'Labels' do = link_to project_labels_path(@project), title: _('Labels') do
%span %span
= _('Labels') = _('Labels')
= render_if_exists 'projects/sidebar/issues_service_desk' = render_if_exists 'projects/sidebar/issues_service_desk'
= nav_link(controller: :milestones) do = nav_link(controller: :milestones) do
= link_to project_milestones_path(@project), title: 'Milestones', class: 'qa-milestones-link' do = link_to project_milestones_path(@project), title: _('Milestones'), class: 'qa-milestones-link' do
%span %span
= _('Milestones') = _('Milestones')
- if project_nav_tab? :external_issue_tracker - if project_nav_tab? :external_issue_tracker
...@@ -172,25 +172,25 @@ ...@@ -172,25 +172,25 @@
%li.divider.fly-out-top-item %li.divider.fly-out-top-item
- if project_nav_tab? :pipelines - if project_nav_tab? :pipelines
= nav_link(path: ['pipelines#index', 'pipelines#show']) do = nav_link(path: ['pipelines#index', 'pipelines#show']) do
= link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do = link_to project_pipelines_path(@project), title: _('Pipelines'), class: 'shortcuts-pipelines' do
%span %span
= _('Pipelines') = _('Pipelines')
- if project_nav_tab? :builds - if project_nav_tab? :builds
= nav_link(controller: [:jobs, :artifacts]) do = nav_link(controller: [:jobs, :artifacts]) do
= link_to project_jobs_path(@project), title: 'Jobs', class: 'shortcuts-builds' do = link_to project_jobs_path(@project), title: _('Jobs'), class: 'shortcuts-builds' do
%span %span
= _('Jobs') = _('Jobs')
- if project_nav_tab? :pipelines - if project_nav_tab? :pipelines
= nav_link(controller: :pipeline_schedules) do = nav_link(controller: :pipeline_schedules) do
= link_to pipeline_schedules_path(@project), title: 'Schedules', class: 'shortcuts-builds' do = link_to pipeline_schedules_path(@project), title: _('Schedules'), class: 'shortcuts-builds' do
%span %span
= _('Schedules') = _('Schedules')
- if @project.feature_available?(:builds, current_user) && !@project.empty_repo? - if @project.feature_available?(:builds, current_user) && !@project.empty_repo?
= nav_link(path: 'pipelines#charts') do = nav_link(path: 'pipelines#charts') do
= link_to charts_project_pipelines_path(@project), title: 'Charts', class: 'shortcuts-pipelines-charts' do = link_to charts_project_pipelines_path(@project), title: _('Charts'), class: 'shortcuts-pipelines-charts' do
%span %span
= _('Charts') = _('Charts')
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
%p= _('Allows you to add and manage Kubernetes clusters.') %p= _('Allows you to add and manage Kubernetes clusters.')
%p %p
= _('Protip:') = _('Protip:')
= link_to 'Auto DevOps', help_page_path('topics/autodevops/index.md') = link_to _('Auto DevOps'), help_page_path('topics/autodevops/index.md')
%span= _('uses Kubernetes clusters to deploy your code!') %span= _('uses Kubernetes clusters to deploy your code!')
%hr %hr
%button.btn.btn-create.btn-sm.dismiss-feature-highlight{ type: 'button' } %button.btn.btn-create.btn-sm.dismiss-feature-highlight{ type: 'button' }
...@@ -305,11 +305,11 @@ ...@@ -305,11 +305,11 @@
= _('Settings') = _('Settings')
%li.divider.fly-out-top-item %li.divider.fly-out-top-item
= nav_link(path: %w[projects#edit]) do = nav_link(path: %w[projects#edit]) do
= link_to edit_project_path(@project), title: 'General' do = link_to edit_project_path(@project), title: _('General') do
%span %span
= _('General') = _('General')
= nav_link(controller: :project_members) do = nav_link(controller: :project_members) do
= link_to project_project_members_path(@project), title: 'Members' do = link_to project_project_members_path(@project), title: _('Members') do
%span %span
= _('Members') = _('Members')
- if can_edit - if can_edit
...@@ -319,21 +319,21 @@ ...@@ -319,21 +319,21 @@
= _('Badges') = _('Badges')
- if can_edit - if can_edit
= nav_link(controller: [:integrations, :services, :hooks, :hook_logs]) do = nav_link(controller: [:integrations, :services, :hooks, :hook_logs]) do
= link_to project_settings_integrations_path(@project), title: 'Integrations' do = link_to project_settings_integrations_path(@project), title: _('Integrations') do
%span %span
= _('Integrations') = _('Integrations')
= nav_link(controller: :repository) do = nav_link(controller: :repository) do
= link_to project_settings_repository_path(@project), title: 'Repository' do = link_to project_settings_repository_path(@project), title: _('Repository') do
%span %span
= _('Repository') = _('Repository')
- if @project.feature_available?(:builds, current_user) - if @project.feature_available?(:builds, current_user)
= nav_link(controller: :ci_cd) do = nav_link(controller: :ci_cd) do
= link_to project_settings_ci_cd_path(@project), title: 'CI / CD' do = link_to project_settings_ci_cd_path(@project), title: _('CI / CD') do
%span %span
= _('CI / CD') = _('CI / CD')
- if @project.pages_available? - if @project.pages_available?
= nav_link(controller: :pages) do = nav_link(controller: :pages) do
= link_to project_pages_path(@project), title: 'Pages' do = link_to project_pages_path(@project), title: _('Pages') do
%span %span
= _('Pages') = _('Pages')
...@@ -341,7 +341,7 @@ ...@@ -341,7 +341,7 @@
- else - else
= nav_link(controller: :project_members) do = nav_link(controller: :project_members) do
= link_to project_settings_members_path(@project), title: 'Members', class: 'shortcuts-tree' do = link_to project_settings_members_path(@project), title: _('Members'), class: 'shortcuts-tree' do
.nav-icon-container .nav-icon-container
= sprite_icon('users') = sprite_icon('users')
%span.nav-item-name %span.nav-item-name
...@@ -356,41 +356,41 @@ ...@@ -356,41 +356,41 @@
-# Shortcut to Project > Activity -# Shortcut to Project > Activity
%li.hidden %li.hidden
= link_to activity_project_path(@project), title: 'Activity', class: 'shortcuts-project-activity' do = link_to activity_project_path(@project), title: _('Activity'), class: 'shortcuts-project-activity' do
%span %span
Activity = _('Activity')
-# Shortcut to Repository > Graph (formerly, Network) -# Shortcut to Repository > Graph (formerly, Network)
- if project_nav_tab? :network - if project_nav_tab? :network
%li.hidden %li.hidden
= link_to project_network_path(@project, current_ref), title: 'Network', class: 'shortcuts-network' do = link_to project_network_path(@project, current_ref), title: _('Network'), class: 'shortcuts-network' do
Graph = _('Graph')
-# Shortcut to Repository > Charts (formerly, top-nav item "Graphs") -# Shortcut to Repository > Charts (formerly, top-nav item "Graphs")
- unless @project.empty_repo? - unless @project.empty_repo?
%li.hidden %li.hidden
= link_to charts_project_graph_path(@project, current_ref), title: 'Charts', class: 'shortcuts-repository-charts' do = link_to charts_project_graph_path(@project, current_ref), title: _('Charts'), class: 'shortcuts-repository-charts' do
Charts = _('Charts')
-# Shortcut to Issues > New Issue -# Shortcut to Issues > New Issue
- if project_nav_tab?(:issues) - if project_nav_tab?(:issues)
%li.hidden %li.hidden
= link_to new_project_issue_path(@project), class: 'shortcuts-new-issue' do = link_to new_project_issue_path(@project), class: 'shortcuts-new-issue' do
Create a new issue = _('Create a new issue')
-# Shortcut to Pipelines > Jobs -# Shortcut to Pipelines > Jobs
- if project_nav_tab? :builds - if project_nav_tab? :builds
%li.hidden %li.hidden
= link_to project_jobs_path(@project), title: 'Jobs', class: 'shortcuts-builds' do = link_to project_jobs_path(@project), title: _('Jobs'), class: 'shortcuts-builds' do
Jobs = _('Jobs')
-# Shortcut to commits page -# Shortcut to commits page
- if project_nav_tab? :commits - if project_nav_tab? :commits
%li.hidden %li.hidden
= link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits' do = link_to project_commits_path(@project), title: _('Commits'), class: 'shortcuts-commits' do
Commits = _('Commits')
-# Shortcut to issue boards -# Shortcut to issue boards
- if project_nav_tab?(:issues) - if project_nav_tab?(:issues)
%li.hidden %li.hidden
= link_to 'Issue Boards', project_boards_path(@project), title: 'Issue Boards', class: 'shortcuts-issue-boards' = link_to _('Issue Boards'), project_boards_path(@project), title: _('Issue Boards'), class: 'shortcuts-issue-boards'
...@@ -14,13 +14,12 @@ ...@@ -14,13 +14,12 @@
%br %br
- if @target_url - if @target_url
- if @reply_by_email - if @reply_by_email
Reply to this email directly or = _('Reply to this email directly or %{view_it_on_gitlab}.') % { view_it_on_gitlab: link_to(_("view it on GitLab"), @target_url) }
#{link_to "view it on GitLab", @target_url}.
- else - else
#{link_to "View it on GitLab", @target_url}. #{link_to _("View it on GitLab"), @target_url}.
%br %br
-# Don't link the host in the line below, one link in the email is easier to quickly click than two. -# Don't link the host in the line below, one link in the email is easier to quickly click than two.
You're receiving this email because #{notification_reason_text(@reason)}. = _("You're receiving this email because %{reason}.") % { reason: notification_reason_text(@reason) }
If you'd like to receive fewer emails, you can If you'd like to receive fewer emails, you can
- if @labels_url - if @labels_url
adjust your #{link_to 'label subscriptions', @labels_url}. adjust your #{link_to 'label subscriptions', @labels_url}.
......
- page_title "User Settings" - page_title _("User Settings")
- header_title "User Settings", profile_path unless header_title - header_title _("User Settings"), profile_path unless header_title
- sidebar "dashboard" - sidebar "dashboard"
- nav "profile" - nav "profile"
- @left_sidebar = true - @left_sidebar = true
......
- page_title "Settings" - page_title _("Settings")
- nav "project" - nav "project"
= render template: "layouts/project" = render template: "layouts/project"
- page_title "Search" - page_title _("Search")
- header_title "Search", search_path - header_title _("Search"), search_path
= render template: "layouts/application" = render template: "layouts/application"
- header_title "Snippets", snippets_path - header_title _("Snippets"), snippets_path
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
- if @snippet && current_user - if @snippet && current_user
......
...@@ -240,6 +240,12 @@ msgstr "" ...@@ -240,6 +240,12 @@ msgstr ""
msgid "A user with write access to the source branch selected this option" msgid "A user with write access to the source branch selected this option"
msgstr "" msgstr ""
msgid "About GitLab"
msgstr ""
msgid "About GitLab CE"
msgstr ""
msgid "About auto deploy" msgid "About auto deploy"
msgstr "" msgstr ""
...@@ -312,6 +318,15 @@ msgstr "" ...@@ -312,6 +318,15 @@ msgstr ""
msgid "Add users to group" msgid "Add users to group"
msgstr "" msgstr ""
msgid "Admin Area"
msgstr ""
msgid "Admin Overview"
msgstr ""
msgid "Admin area"
msgstr ""
msgid "AdminArea|Stop all jobs" msgid "AdminArea|Stop all jobs"
msgstr "" msgstr ""
...@@ -504,6 +519,9 @@ msgstr "" ...@@ -504,6 +519,9 @@ msgstr ""
msgid "Anonymous" msgid "Anonymous"
msgstr "" msgstr ""
msgid "Anti-spam verification"
msgstr ""
msgid "Any" msgid "Any"
msgstr "" msgstr ""
...@@ -597,6 +615,9 @@ msgstr "" ...@@ -597,6 +615,9 @@ msgstr ""
msgid "Authentication Log" msgid "Authentication Log"
msgstr "" msgstr ""
msgid "Authentication log"
msgstr ""
msgid "Author" msgid "Author"
msgstr "" msgstr ""
...@@ -621,6 +642,9 @@ msgstr "" ...@@ -621,6 +642,9 @@ msgstr ""
msgid "Authors: %{authors}" msgid "Authors: %{authors}"
msgstr "" msgstr ""
msgid "Auto DevOps"
msgstr ""
msgid "Auto DevOps enabled" msgid "Auto DevOps enabled"
msgstr "" msgstr ""
...@@ -678,6 +702,9 @@ msgstr "" ...@@ -678,6 +702,9 @@ msgstr ""
msgid "Average per day: %{average}" msgid "Average per day: %{average}"
msgstr "" msgstr ""
msgid "Background Jobs"
msgstr ""
msgid "Background color" msgid "Background color"
msgstr "" msgstr ""
...@@ -765,6 +792,9 @@ msgstr "" ...@@ -765,6 +792,9 @@ msgstr ""
msgid "Bitbucket import" msgid "Bitbucket import"
msgstr "" msgstr ""
msgid "Blog"
msgstr ""
msgid "Boards" msgid "Boards"
msgstr "" msgstr ""
...@@ -1529,6 +1559,9 @@ msgstr "" ...@@ -1529,6 +1559,9 @@ msgstr ""
msgid "ClusterIntegration|sign up" msgid "ClusterIntegration|sign up"
msgstr "" msgstr ""
msgid "Cohorts"
msgstr ""
msgid "Collapse" msgid "Collapse"
msgstr "" msgstr ""
...@@ -1755,6 +1788,9 @@ msgstr "" ...@@ -1755,6 +1788,9 @@ msgstr ""
msgid "Control the display of third party offers." msgid "Control the display of third party offers."
msgstr "" msgstr ""
msgid "ConvDev Index"
msgstr ""
msgid "Copy URL to clipboard" msgid "Copy URL to clipboard"
msgstr "" msgstr ""
...@@ -1791,6 +1827,9 @@ msgstr "" ...@@ -1791,6 +1827,9 @@ msgstr ""
msgid "Create a new branch and merge request" msgid "Create a new branch and merge request"
msgstr "" msgstr ""
msgid "Create a new issue"
msgstr ""
msgid "Create a personal access token on your account to pull or push via %{protocol}." msgid "Create a personal access token on your account to pull or push via %{protocol}."
msgstr "" msgstr ""
...@@ -1917,6 +1956,9 @@ msgstr "" ...@@ -1917,6 +1956,9 @@ msgstr ""
msgid "CycleAnalyticsStage|Test" msgid "CycleAnalyticsStage|Test"
msgstr "" msgstr ""
msgid "Dashboard"
msgstr ""
msgid "DashboardProjects|All" msgid "DashboardProjects|All"
msgstr "" msgstr ""
...@@ -2396,6 +2438,9 @@ msgstr "" ...@@ -2396,6 +2438,9 @@ msgstr ""
msgid "Every week (Sundays at 4:00am)" msgid "Every week (Sundays at 4:00am)"
msgstr "" msgstr ""
msgid "Everyone can contribute"
msgstr ""
msgid "Expand" msgid "Expand"
msgstr "" msgstr ""
...@@ -2405,6 +2450,9 @@ msgstr "" ...@@ -2405,6 +2450,9 @@ msgstr ""
msgid "Expand sidebar" msgid "Expand sidebar"
msgstr "" msgstr ""
msgid "Explore"
msgstr ""
msgid "Explore GitLab" msgid "Explore GitLab"
msgstr "" msgstr ""
...@@ -2420,6 +2468,9 @@ msgstr "" ...@@ -2420,6 +2468,9 @@ msgstr ""
msgid "Explore public groups" msgid "Explore public groups"
msgstr "" msgstr ""
msgid "Facebook"
msgstr ""
msgid "Failed" msgid "Failed"
msgstr "" msgstr ""
...@@ -2671,6 +2722,9 @@ msgstr "" ...@@ -2671,6 +2722,9 @@ msgstr ""
msgid "Group avatar" msgid "Group avatar"
msgstr "" msgstr ""
msgid "Group details"
msgstr ""
msgid "Group info:" msgid "Group info:"
msgstr "" msgstr ""
...@@ -2994,6 +3048,9 @@ msgstr "" ...@@ -2994,6 +3048,9 @@ msgstr ""
msgid "Koding" msgid "Koding"
msgstr "" msgstr ""
msgid "Koding Dashboard"
msgstr ""
msgid "Kubernetes" msgid "Kubernetes"
msgstr "" msgstr ""
...@@ -3116,6 +3173,9 @@ msgstr "" ...@@ -3116,6 +3173,9 @@ msgstr ""
msgid "Leave the \"File type\" and \"Delivery method\" options on their default values." msgid "Leave the \"File type\" and \"Delivery method\" options on their default values."
msgstr "" msgstr ""
msgid "LinkedIn"
msgstr ""
msgid "List" msgid "List"
msgstr "" msgstr ""
...@@ -3152,9 +3212,15 @@ msgstr "" ...@@ -3152,9 +3212,15 @@ msgstr ""
msgid "Locked to current projects" msgid "Locked to current projects"
msgstr "" msgstr ""
msgid "Logs"
msgstr ""
msgid "Make sure you're logged into the account that owns the projects you'd like to import." msgid "Make sure you're logged into the account that owns the projects you'd like to import."
msgstr "" msgstr ""
msgid "Manage Git repositories with fine-grained access controls that keep your code secure. Perform code reviews and enhance collaboration with merge requests. Each project can also have an issue tracker and a wiki."
msgstr ""
msgid "Manage access" msgid "Manage access"
msgstr "" msgstr ""
...@@ -3335,6 +3401,9 @@ msgstr "" ...@@ -3335,6 +3401,9 @@ msgstr ""
msgid "Monitoring" msgid "Monitoring"
msgstr "" msgstr ""
msgid "More"
msgstr ""
msgid "More actions" msgid "More actions"
msgstr "" msgstr ""
...@@ -3377,6 +3446,9 @@ msgstr "" ...@@ -3377,6 +3446,9 @@ msgstr ""
msgid "Nav|Sign out and sign in with a different account" msgid "Nav|Sign out and sign in with a different account"
msgstr "" msgstr ""
msgid "Network"
msgstr ""
msgid "New" msgid "New"
msgstr "" msgstr ""
...@@ -3451,6 +3523,9 @@ msgstr "" ...@@ -3451,6 +3523,9 @@ msgstr ""
msgid "New tag" msgid "New tag"
msgstr "" msgstr ""
msgid "New..."
msgstr ""
msgid "No" msgid "No"
msgstr "" msgstr ""
...@@ -3631,6 +3706,12 @@ msgstr "" ...@@ -3631,6 +3706,12 @@ msgstr ""
msgid "Open in Xcode" msgid "Open in Xcode"
msgstr "" msgstr ""
msgid "Open sidebar"
msgstr ""
msgid "Open source software to collaborate on code"
msgstr ""
msgid "OpenedNDaysAgo|Opened" msgid "OpenedNDaysAgo|Opened"
msgstr "" msgstr ""
...@@ -3931,6 +4012,9 @@ msgstr "" ...@@ -3931,6 +4012,9 @@ msgstr ""
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
msgid "Profile Settings"
msgstr ""
msgid "Profiles|Account scheduled for removal." msgid "Profiles|Account scheduled for removal."
msgstr "" msgstr ""
...@@ -4261,6 +4345,9 @@ msgstr "" ...@@ -4261,6 +4345,9 @@ msgstr ""
msgid "Remove project" msgid "Remove project"
msgstr "" msgstr ""
msgid "Reply to this email directly or %{view_it_on_gitlab}."
msgstr ""
msgid "Repository" msgid "Repository"
msgstr "" msgstr ""
...@@ -4282,6 +4369,9 @@ msgstr "" ...@@ -4282,6 +4369,9 @@ msgstr ""
msgid "Request Access" msgid "Request Access"
msgstr "" msgstr ""
msgid "Requests Profiles"
msgstr ""
msgid "Require all users to accept Terms of Service and Privacy Policy when they access GitLab." msgid "Require all users to accept Terms of Service and Privacy Policy when they access GitLab."
msgstr "" msgstr ""
...@@ -4530,6 +4620,9 @@ msgstr "" ...@@ -4530,6 +4620,9 @@ msgstr ""
msgid "Shared Runners" msgid "Shared Runners"
msgstr "" msgstr ""
msgid "Sherlock Transactions"
msgstr ""
msgid "Show command" msgid "Show command"
msgstr "" msgstr ""
...@@ -4559,6 +4652,12 @@ msgstr[1] "" ...@@ -4559,6 +4652,12 @@ msgstr[1] ""
msgid "Side-by-side" msgid "Side-by-side"
msgstr "" msgstr ""
msgid "Sign in"
msgstr ""
msgid "Sign in / Register"
msgstr ""
msgid "Sign out" msgid "Sign out"
msgstr "" msgstr ""
...@@ -4772,6 +4871,9 @@ msgstr "" ...@@ -4772,6 +4871,9 @@ msgstr ""
msgid "Status" msgid "Status"
msgstr "" msgstr ""
msgid "Stop impersonation"
msgstr ""
msgid "Stop this environment" msgid "Stop this environment"
msgstr "" msgstr ""
...@@ -4805,6 +4907,9 @@ msgstr "" ...@@ -4805,6 +4907,9 @@ msgstr ""
msgid "System Hooks" msgid "System Hooks"
msgstr "" msgstr ""
msgid "System Info"
msgstr ""
msgid "Tag (%{tag_count})" msgid "Tag (%{tag_count})"
msgid_plural "Tags (%{tag_count})" msgid_plural "Tags (%{tag_count})"
msgstr[0] "" msgstr[0] ""
...@@ -5044,6 +5149,9 @@ msgstr "" ...@@ -5044,6 +5149,9 @@ msgstr ""
msgid "This directory" msgid "This directory"
msgstr "" msgstr ""
msgid "This group"
msgstr ""
msgid "This group does not provide any group Runners yet." msgid "This group does not provide any group Runners yet."
msgstr "" msgstr ""
...@@ -5333,12 +5441,18 @@ msgstr "" ...@@ -5333,12 +5441,18 @@ msgstr ""
msgid "Todo" msgid "Todo"
msgstr "" msgstr ""
msgid "Todos"
msgstr ""
msgid "Toggle Sidebar" msgid "Toggle Sidebar"
msgstr "" msgstr ""
msgid "Toggle discussion" msgid "Toggle discussion"
msgstr "" msgstr ""
msgid "Toggle navigation"
msgstr ""
msgid "Toggle sidebar" msgid "Toggle sidebar"
msgstr "" msgstr ""
...@@ -5375,6 +5489,9 @@ msgstr "" ...@@ -5375,6 +5489,9 @@ msgstr ""
msgid "Try again" msgid "Try again"
msgstr "" msgstr ""
msgid "Twitter"
msgstr ""
msgid "Unable to load the diff. %{button_try_again}" msgid "Unable to load the diff. %{button_try_again}"
msgstr "" msgstr ""
...@@ -5464,6 +5581,9 @@ msgstr "" ...@@ -5464,6 +5581,9 @@ msgstr ""
msgid "Use your global notification setting" msgid "Use your global notification setting"
msgstr "" msgstr ""
msgid "User Settings"
msgstr ""
msgid "User and IP Rate Limits" msgid "User and IP Rate Limits"
msgstr "" msgstr ""
...@@ -5497,6 +5617,9 @@ msgstr "" ...@@ -5497,6 +5617,9 @@ msgstr ""
msgid "View group labels" msgid "View group labels"
msgstr "" msgstr ""
msgid "View it on GitLab"
msgstr ""
msgid "View jobs" msgid "View jobs"
msgstr "" msgstr ""
...@@ -5539,6 +5662,9 @@ msgstr "" ...@@ -5539,6 +5662,9 @@ msgstr ""
msgid "Want to see the data? Please ask an administrator for access." msgid "Want to see the data? Please ask an administrator for access."
msgstr "" msgstr ""
msgid "We detected potential spam in the %{humanized_resource_name}. Please solve the reCAPTCHA to proceed."
msgstr ""
msgid "We don't have enough data to show this stage." msgid "We don't have enough data to show this stage."
msgstr "" msgstr ""
...@@ -5812,9 +5938,18 @@ msgstr "" ...@@ -5812,9 +5938,18 @@ msgstr ""
msgid "You'll need to use different branch names to get a valid comparison." msgid "You'll need to use different branch names to get a valid comparison."
msgstr "" msgstr ""
msgid "You're receiving this email because %{reason}."
msgstr ""
msgid "You're receiving this email because of your account on %{host}."
msgstr ""
msgid "You're receiving this email because of your account on %{host}. %{manage_notifications_link} &middot; %{help_link}" msgid "You're receiving this email because of your account on %{host}. %{manage_notifications_link} &middot; %{help_link}"
msgstr "" msgstr ""
msgid "YouTube"
msgstr ""
msgid "Your Groups" msgid "Your Groups"
msgstr "" msgstr ""
...@@ -6130,6 +6265,9 @@ msgstr "" ...@@ -6130,6 +6265,9 @@ msgstr ""
msgid "uses Kubernetes clusters to deploy your code!" msgid "uses Kubernetes clusters to deploy your code!"
msgstr "" msgstr ""
msgid "view it on GitLab"
msgstr ""
msgid "with %{additions} additions, %{deletions} deletions." msgid "with %{additions} additions, %{deletions} deletions."
msgstr "" msgstr ""
......
...@@ -5,8 +5,8 @@ module QA ...@@ -5,8 +5,8 @@ module QA
view 'app/views/layouts/nav/sidebar/_project.html.haml' do view 'app/views/layouts/nav/sidebar/_project.html.haml' do
element :settings_item element :settings_item
element :settings_link, 'link_to edit_project_path' element :settings_link, 'link_to edit_project_path'
element :repository_link, "title: 'Repository'" element :repository_link, "title: _('Repository')"
element :pipelines_settings_link, "title: 'CI / CD'" element :pipelines_settings_link, "title: _('CI / CD')"
element :operations_kubernetes_link, "title: _('Kubernetes')" element :operations_kubernetes_link, "title: _('Kubernetes')"
element :issues_link, /link_to.*shortcuts-issues/ element :issues_link, /link_to.*shortcuts-issues/
element :issues_link_text, "Issues" element :issues_link_text, "Issues"
...@@ -14,7 +14,7 @@ module QA ...@@ -14,7 +14,7 @@ module QA
element :merge_requests_link_text, "Merge Requests" element :merge_requests_link_text, "Merge Requests"
element :top_level_items, '.sidebar-top-level-items' element :top_level_items, '.sidebar-top-level-items'
element :operations_section, "class: 'shortcuts-operations'" element :operations_section, "class: 'shortcuts-operations'"
element :activity_link, "title: 'Activity'" element :activity_link, "title: _('Activity')"
element :wiki_link_text, "Wiki" element :wiki_link_text, "Wiki"
element :milestones_link element :milestones_link
end end
......
...@@ -14,7 +14,7 @@ module QA ...@@ -14,7 +14,7 @@ module QA
view 'app/views/layouts/header/_new_dropdown.haml' do view 'app/views/layouts/header/_new_dropdown.haml' do
element :new_menu_toggle element :new_menu_toggle
element :new_issue_link, "link_to 'New issue', new_project_issue_path(@project)" element :new_issue_link, "link_to _('New issue'), new_project_issue_path(@project)"
end end
view 'app/views/shared/_ref_switcher.html.haml' do view 'app/views/shared/_ref_switcher.html.haml' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment