Update settings section titles

8 files changed, 144 insertions, 31 deletions

diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml
index 3f440c76ee0..3ac1721f7cd 100644
--- a/app/views/admin/application_settings/show.html.haml
+++ b/app/views/admin/application_settings/show.html.haml
@@ -17,7 +17,7 @@
 %section.settings.as-account-limit.no-animate#js-account-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h4
-      = _('Account and limit settings')
+      = _('Account and limit')
     %button.btn.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
@@ -317,7 +317,7 @@
 %section.settings.as-mirror.no-animate#js-mirror-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h4
-      = _('Repository mirror settings')
+      = _('Repository mirror')
     %button.btn.js-settings-toggle{ type: 'button' }
       = expanded ? 'Collapse' : 'Expand'
     %p
diff --git a/app/views/groups/settings/ci_cd/show.html.haml b/app/views/groups/settings/ci_cd/show.html.haml
index ff2b418e479..647948c7dff 100644
--- a/app/views/groups/settings/ci_cd/show.html.haml
+++ b/app/views/groups/settings/ci_cd/show.html.haml
@@ -18,7 +18,7 @@
 %section.settings#runners-settings.no-animate{ class: ('expanded' if expanded) }
   .settings-header
     %h4
-      = _('Runners settings')
+      = _('Runners')
     %button.btn.btn-default.js-settings-toggle{ type: "button" }
       = expanded ? _('Collapse') : _('Expand')
     %p
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 77ba422e87e..77665a2ac23 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -7,7 +7,7 @@
   %section.settings.general-settings.no-animate{ class: ('expanded' if expanded) }
     .settings-header
       %h4
-        General project settings
+        General project
       %button.btn.js-settings-toggle{ type: 'button' }
         = expanded ? 'Collapse' : 'Expand'
       %p
@@ -85,7 +85,7 @@
   %section.settings.merge-requests-feature.no-animate{ class: [('expanded' if expanded), ('hidden' if @project.project_feature.send(:merge_requests_access_level) == 0)] }
     .settings-header
       %h4
-        Merge request settings
+        Merge request
       %button.btn.js-settings-toggle{ type: 'button' }
         = expanded ? 'Collapse' : 'Expand'
       %p
@@ -104,7 +104,7 @@
   %section.settings.advanced-settings.no-animate{ class: ('expanded' if expanded) }
     .settings-header
       %h4
-        Advanced settings
+        Advanced
       %button.btn.js-settings-toggle{ type: 'button' }
         = expanded ? 'Collapse' : 'Expand'
       %p
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml
index ed118d1bcef..3047207bca7 100644
--- a/app/views/projects/settings/ci_cd/show.html.haml
+++ b/app/views/projects/settings/ci_cd/show.html.haml
@@ -8,7 +8,7 @@
 %section.settings#js-general-pipeline-settings.no-animate{ class: ('expanded' if general_expanded) }
   .settings-header
     %h4
-      General pipelines settings
+      General pipelines
     %button.btn.js-settings-toggle{ type: 'button' }
       = expanded ? 'Collapse' : 'Expand'
     %p
@@ -31,7 +31,7 @@
 %section.settings.no-animate{ class: ('expanded' if expanded) }
   .settings-header
     %h4
-      Runners settings
+      Runners
     %button.btn.js-settings-toggle{ type: 'button' }
       = expanded ? 'Collapse' : 'Expand'
     %p
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 43afb140051..fec990a6df6 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-29 09:43-0500\n"
-"PO-Revision-Date: 2018-05-29 09:43-0500\n"
+"POT-Creation-Date: 2018-06-07 19:35+0200\n"
+"PO-Revision-Date: 2018-06-07 19:35+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -370,7 +370,7 @@ msgstr ""
 msgid "An error occurred while getting projects"
 msgstr ""
 
-msgid "An error occurred while importing project"
+msgid "An error occurred while importing project: ${details}"
 msgstr ""
 
 msgid "An error occurred while loading commits"
@@ -463,6 +463,9 @@ msgstr ""
 msgid "Assigned to :name"
 msgstr ""
 
+msgid "Assigned to me"
+msgstr ""
+
 msgid "Assignee"
 msgstr ""
 
@@ -616,9 +619,6 @@ msgstr ""
 msgid "Begin with the selected commit"
 msgstr ""
 
-msgid "Blame"
-msgstr ""
-
 msgid "Branch (%{branch_count})"
 msgid_plural "Branches (%{branch_count})"
 msgstr[0] ""
@@ -1041,6 +1041,9 @@ msgstr ""
 msgid "ClusterIntegration|Copy Ingress IP Address to clipboard"
 msgstr ""
 
+msgid "ClusterIntegration|Copy Jupyter Hostname to clipboard"
+msgstr ""
+
 msgid "ClusterIntegration|Copy Kubernetes cluster name"
 msgstr ""
 
@@ -1119,6 +1122,12 @@ msgstr ""
 msgid "ClusterIntegration|Integration status"
 msgstr ""
 
+msgid "ClusterIntegration|Jupyter Hostname"
+msgstr ""
+
+msgid "ClusterIntegration|JupyterHub"
+msgstr ""
+
 msgid "ClusterIntegration|Kubernetes cluster"
 msgstr ""
 
@@ -1519,6 +1528,9 @@ msgstr ""
 msgid "ContainerRegistry|You can also use a %{deploy_token} for read-only access to the registry images."
 msgstr ""
 
+msgid "Continue"
+msgstr ""
+
 msgid "Continuous Integration and Deployment"
 msgstr ""
 
@@ -1558,6 +1570,9 @@ msgstr ""
 msgid "Copy reference to clipboard"
 msgstr ""
 
+msgid "Copy to clipboard"
+msgstr ""
+
 msgid "Create"
 msgstr ""
 
@@ -1627,6 +1642,9 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
+msgid "Created by me"
+msgstr ""
+
 msgid "Cron Timezone"
 msgstr ""
 
@@ -1818,6 +1836,9 @@ msgstr ""
 msgid "DeployTokens|Your new project deploy token has been created."
 msgstr ""
 
+msgid "Deprioritize label"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
@@ -2010,6 +2031,9 @@ msgstr ""
 msgid "Error fetching contributors data."
 msgstr ""
 
+msgid "Error fetching job trace"
+msgstr ""
+
 msgid "Error fetching labels."
 msgstr ""
 
@@ -2028,6 +2052,9 @@ msgstr ""
 msgid "Error loading last commit."
 msgstr ""
 
+msgid "Error loading merge requests."
+msgstr ""
+
 msgid "Error loading project data. Please try again."
 msgstr ""
 
@@ -2156,6 +2183,9 @@ msgstr ""
 msgid "Format"
 msgstr ""
 
+msgid "Found errors in your .gitlab-ci.yml:"
+msgstr ""
+
 msgid "From %{provider_title}"
 msgstr ""
 
@@ -2350,6 +2380,9 @@ msgstr ""
 msgid "IDE|Go back"
 msgstr ""
 
+msgid "IDE|Open in file view"
+msgstr ""
+
 msgid "IDE|Review"
 msgstr ""
 
@@ -2476,6 +2509,9 @@ msgstr ""
 msgid "Label"
 msgstr ""
 
+msgid "Label actions dropdown"
+msgstr ""
+
 msgid "LabelSelect|%{firstLabelName} +%{remainingLabelCount} more"
 msgstr ""
 
@@ -2491,6 +2527,9 @@ msgstr ""
 msgid "Labels can be applied to issues and merge requests to categorize them."
 msgstr ""
 
+msgid "Labels can be applied to issues and merge requests."
+msgstr ""
+
 msgid "Labels|<span>Promote label</span> %{labelTitle} <span>to Group Label?</span>"
 msgstr ""
 
@@ -2801,7 +2840,10 @@ msgstr ""
 msgid "No files found."
 msgstr ""
 
-msgid "No labels created yet."
+msgid "No merge requests found"
+msgstr ""
+
+msgid "No messages were logged"
 msgstr ""
 
 msgid "No repository"
@@ -2927,6 +2969,9 @@ msgstr ""
 msgid "Only project members can comment."
 msgstr ""
 
+msgid "Open in Xcode"
+msgstr ""
+
 msgid "OpenedNDaysAgo|Opened"
 msgstr ""
 
@@ -2939,6 +2984,9 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
+msgid "Other Labels"
+msgstr ""
+
 msgid "Otherwise it is recommended you start with one of the options below."
 msgstr ""
 
@@ -2984,9 +3032,6 @@ msgstr ""
 msgid "Performance optimization"
 msgstr ""
 
-msgid "Permalink"
-msgstr ""
-
 msgid "Permissions"
 msgstr ""
 
@@ -3164,6 +3209,21 @@ msgstr ""
 msgid "Preferences"
 msgstr ""
 
+msgid "Preferences|Navigation theme"
+msgstr ""
+
+msgid "Prioritize"
+msgstr ""
+
+msgid "Prioritize label"
+msgstr ""
+
+msgid "Prioritized Labels"
+msgstr ""
+
+msgid "Prioritized label"
+msgstr ""
+
 msgid "Private - Project access must be granted explicitly to each user."
 msgstr ""
 
@@ -3389,10 +3449,10 @@ msgstr ""
 msgid "Promote these project milestones into a group milestone."
 msgstr ""
 
-msgid "Promote to Group Label"
+msgid "Promote to Group Milestone"
 msgstr ""
 
-msgid "Promote to Group Milestone"
+msgid "Promote to group label"
 msgstr ""
 
 msgid "Protip:"
@@ -3416,9 +3476,6 @@ msgstr ""
 msgid "Quick actions can be used in the issues description and comment boxes."
 msgstr ""
 
-msgid "Raw"
-msgstr ""
-
 msgid "Read more"
 msgstr ""
 
@@ -3479,6 +3536,9 @@ msgstr ""
 msgid "Remove avatar"
 msgstr ""
 
+msgid "Remove priority"
+msgstr ""
+
 msgid "Remove project"
 msgstr ""
 
@@ -3586,6 +3646,12 @@ msgstr ""
 msgid "Scheduling Pipelines"
 msgstr ""
 
+msgid "Scroll to bottom"
+msgstr ""
+
+msgid "Scroll to top"
+msgstr ""
+
 msgid "Search"
 msgstr ""
 
@@ -3601,6 +3667,9 @@ msgstr ""
 msgid "Search for projects, issues, etc."
 msgstr ""
 
+msgid "Search merge requests"
+msgstr ""
+
 msgid "Search milestones"
 msgstr ""
 
@@ -3709,6 +3778,9 @@ msgstr ""
 msgid "Show command"
 msgstr ""
 
+msgid "Show complete raw log"
+msgstr ""
+
 msgid "Show parent pages"
 msgstr ""
 
@@ -3744,9 +3816,6 @@ msgstr ""
 msgid "Something went wrong when toggling the button"
 msgstr ""
 
-msgid "Something went wrong while fetching the latest pipeline status."
-msgstr ""
-
 msgid "Something went wrong while fetching the projects."
 msgstr ""
 
@@ -3870,6 +3939,9 @@ msgstr ""
 msgid "Specify the following URL during the Runner setup:"
 msgstr ""
 
+msgid "Squash commits"
+msgstr ""
+
 msgid "Stage all"
 msgstr ""
 
@@ -3882,6 +3954,9 @@ msgstr ""
 msgid "Staged %{type}"
 msgstr ""
 
+msgid "Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging."
+msgstr ""
+
 msgid "StarProject|Star"
 msgstr ""
 
@@ -3921,6 +3996,15 @@ msgstr ""
 msgid "Subgroups"
 msgstr ""
 
+msgid "Subscribe"
+msgstr ""
+
+msgid "Subscribe at group level"
+msgstr ""
+
+msgid "Subscribe at project level"
+msgstr ""
+
 msgid "Switch branch/tag"
 msgstr ""
 
@@ -4464,6 +4548,15 @@ msgstr ""
 msgid "Unstar"
 msgstr ""
 
+msgid "Unsubscribe"
+msgstr ""
+
+msgid "Unsubscribe at group level"
+msgstr ""
+
+msgid "Unsubscribe at project level"
+msgstr ""
+
 msgid "Unverified"
 msgstr ""
 
@@ -4527,9 +4620,15 @@ msgstr ""
 msgid "View group labels"
 msgstr ""
 
+msgid "View jobs"
+msgstr ""
+
 msgid "View labels"
 msgstr ""
 
+msgid "View log"
+msgstr ""
+
 msgid "View open merge request"
 msgstr ""
 
@@ -4740,6 +4839,9 @@ msgstr ""
 msgid "You can also star a label to make it a priority label."
 msgstr ""
 
+msgid "You can also test your .gitlab-ci.yml in the %{linkStart}Lint%{linkEnd}"
+msgstr ""
+
 msgid "You can easily install a Runner on a Kubernetes cluster. %{link_to_help_page}"
 msgstr ""
 
@@ -4758,9 +4860,15 @@ msgstr ""
 msgid "You cannot write to this read-only GitLab instance."
 msgstr ""
 
+msgid "You do not have any assigned merge requests"
+msgstr ""
+
 msgid "You have no permissions"
 msgstr ""
 
+msgid "You have not created any merge requests"
+msgstr ""
+
 msgid "You have reached your project limit"
 msgstr ""
 
@@ -5093,3 +5201,8 @@ msgstr ""
 
 msgid "with %{additions} additions, %{deletions} deletions."
 msgstr ""
+
+msgid "within %d minute "
+msgid_plural "within %d minutes "
+msgstr[0] ""
+msgstr[1] ""
diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb
index dfb71e0a9f0..d5da9ea0099 100644
--- a/qa/qa/page/project/settings/ci_cd.rb
+++ b/qa/qa/page/project/settings/ci_cd.rb
@@ -6,7 +6,7 @@ module QA # rubocop:disable Naming/FileName
           include Common
 
           view 'app/views/projects/settings/ci_cd/show.html.haml' do
-            element :runners_settings, 'Runners settings'
+            element :runners_settings, 'Runners'
             element :secret_variables, 'Variables'
             element :auto_devops_section, 'Auto DevOps'
           end
@@ -18,7 +18,7 @@ module QA # rubocop:disable Naming/FileName
           end
 
           def expand_runners_settings(&block)
-            expand_section('Runners settings') do
+            expand_section('Runners') do
               Settings::Runners.perform(&block)
             end
           end
diff --git a/qa/qa/page/project/settings/main.rb b/qa/qa/page/project/settings/main.rb
index 5d743f4c9c8..e3faa76b966 100644
--- a/qa/qa/page/project/settings/main.rb
+++ b/qa/qa/page/project/settings/main.rb
@@ -6,7 +6,7 @@ module QA
           include Common
 
           view 'app/views/projects/edit.html.haml' do
-            element :advanced_settings_section, 'Advanced settings'
+            element :advanced_settings_section, 'Advanced'
           end
 
           def expand_advanced_settings(&block)
diff --git a/qa/qa/page/project/settings/merge_request.rb b/qa/qa/page/project/settings/merge_request.rb
index a88cd661016..06d4937a4c8 100644
--- a/qa/qa/page/project/settings/merge_request.rb
+++ b/qa/qa/page/project/settings/merge_request.rb
@@ -10,12 +10,12 @@ module QA
           end
 
           view 'app/views/projects/edit.html.haml' do
-            element :merge_request_settings, 'Merge request settings'
+            element :merge_request_settings, 'Merge request'
             element :save_merge_request_changes
           end
 
           def enable_ff_only
-            expand_section('Merge request settings') do
+            expand_section('Merge request') do
               click_element :radio_button_merge_ff
               click_element :save_merge_request_changes
             end