Commit 3cb560f8 authored by Clement Ho's avatar Clement Ho

Merge branch 'remove-settings-title-suffix' into 'master'

Update settings section titles

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