Merge branch 'master' into 33361-make-scroll-faster33361-make-scroll-faster

* master: (92 commits)
  Responsive table fixes
  remove the rouge copypasta and add notes to refactor
  nil-check Repository::is_ancestor?
  update rouge to 2.1.0
  Added more negative checks for public project
  Fix End Syntax Error
  Enhancing Spec's with negative cases
  Improve form spec
  Update CHANGELOG.md for 9.0.10
  Update CHANGELOG.md for 9.2.5
  Fixed spec test syntax errors
  Update CHANGELOG.md for 9.1.7
  Translate project & repository pages
  Converting Tests to Spec Tests
  Added more actions and report as abuse to all notes
  Add sticky confidential issue bar
  Fix for Login Test Problem
  Document not using STI
  Added Cop to blacklist polymorphic associations
  Document not using polymorphic associations
  ...

1 files changed, 6 insertions, 9 deletions

diff --git a/app/views/projects/_head.html.haml b/app/views/projects/_head.html.haml
index db08b77c8e0..dba84838a52 100644
--- a/app/views/projects/_head.html.haml
+++ b/app/views/projects/_head.html.haml
@@ -4,17 +4,14 @@
     .nav-links.sub-nav.scrolling-tabs
       %ul{ class: container_class }
         = nav_link(path: 'projects#show') do
-          = link_to project_path(@project), title: 'Project home', class: 'shortcuts-project' do
-            %span
-              Home
+          = link_to project_path(@project), title: _('Project home'), class: 'shortcuts-project' do
+            %span= _('Home')
 
         = nav_link(path: 'projects#activity') do
-          = link_to activity_project_path(@project), title: 'Activity', class: 'shortcuts-project-activity' do
-            %span
-              Activity
+          = link_to activity_project_path(@project), title: _('Activity'), class: 'shortcuts-project-activity' do
+            %span= _('Activity')
 
         - if can?(current_user, :read_cycle_analytics, @project)
           = nav_link(path: 'cycle_analytics#show') do
-            = link_to project_cycle_analytics_path(@project), title: 'Cycle Analytics', class: 'shortcuts-project-cycle-analytics' do
-              %span
-                Cycle Analytics
+            = link_to project_cycle_analytics_path(@project), title: _('Cycle Analytics'), class: 'shortcuts-project-cycle-analytics' do
+              %span= _('Cycle Analytics')