Commit e0807693 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'sselhorn-sentence-case-ui' into 'master'

Edited strings to be sentence case

See merge request gitlab-org/gitlab!53323
parents 5127f962 bb2baed0
- breadcrumb_title _('Repository Settings') - breadcrumb_title _('Repository Settings')
- page_title _('Repository') - page_title _('Repository')
- deploy_token_description = s_('DeployTokens|Group Deploy Tokens allow access to the packages, repositories, and registry images within the group.') - deploy_token_description = s_('DeployTokens|Group deploy tokens allow access to the packages, repositories, and registry images within the group.')
= render "shared/deploy_tokens/index", group_or_project: @group, description: deploy_token_description = render "shared/deploy_tokens/index", group_or_project: @group, description: deploy_token_description
= render "initial_branch_name", group: @group = render "initial_branch_name", group: @group
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
%section.settings.no-animate#default-branch-settings{ class: ('expanded' if expanded) } %section.settings.no-animate#default-branch-settings{ class: ('expanded' if expanded) }
.settings-header .settings-header
%h4= _('Default Branch') %h4= _('Default branch')
%button.btn.js-settings-toggle %button.btn.js-settings-toggle
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')
%p %p
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
= _('A default branch cannot be chosen for an empty project.') = _('A default branch cannot be chosen for an empty project.')
- else - else
.form-group .form-group
= f.label :default_branch, "Default Branch", class: 'label-bold' = f.label :default_branch, "Default branch", class: 'label-bold'
= f.select(:default_branch, @project.repository.branch_names, {}, {class: 'select2 select-wide'}) = f.select(:default_branch, @project.repository.branch_names, {}, {class: 'select2 select-wide'})
.form-group .form-group
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%section.settings.no-animate#js-protected-branches-settings{ class: ('expanded' if expanded), data: { qa_selector: 'protected_branches_settings_content' } } %section.settings.no-animate#js-protected-branches-settings{ class: ('expanded' if expanded), data: { qa_selector: 'protected_branches_settings_content' } }
.settings-header .settings-header
%h4 %h4
Protected Branches Protected branches
%button.btn.js-settings-toggle.qa-expand-protected-branches{ type: 'button' } %button.btn.js-settings-toggle.qa-expand-protected-branches{ type: 'button' }
= expanded ? 'Collapse' : 'Expand' = expanded ? 'Collapse' : 'Expand'
%p %p
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%section.settings.no-animate#js-protected-tags-settings{ class: ('expanded' if expanded), data: { qa_selector: 'protected_tag_settings_content' } } %section.settings.no-animate#js-protected-tags-settings{ class: ('expanded' if expanded), data: { qa_selector: 'protected_tag_settings_content' } }
.settings-header .settings-header
%h4 %h4
Protected Tags Protected tags
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.js-settings-toggle{ type: 'button' }
= expanded ? 'Collapse' : 'Expand' = expanded ? 'Collapse' : 'Expand'
%p %p
......
- breadcrumb_title _("Repository Settings") - breadcrumb_title _("Repository Settings")
- page_title _("Repository") - page_title _("Repository")
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
- deploy_token_description = s_('DeployTokens|Deploy Tokens allow access to packages, your repository, and registry images.') - deploy_token_description = s_('DeployTokens|Deploy tokens allow access to packages, your repository, and registry images.')
= render "projects/default_branch/show" = render "projects/default_branch/show"
= render_if_exists "projects/push_rules/index" = render_if_exists "projects/push_rules/index"
......
- expanded = expanded_by_default? - expanded = expanded_by_default?
%section.qa-deploy-keys-settings.settings.no-animate#js-deploy-keys-settings{ class: ('expanded' if expanded), data: { qa_selector: 'deploy_keys_settings_content' } } %section.qa-deploy-keys-settings.settings.no-animate#js-deploy-keys-settings{ class: ('expanded' if expanded), data: { qa_selector: 'deploy_keys_settings_content' } }
.settings-header .settings-header
%h4= _('Deploy Keys') %h4= _('Deploy keys')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.js-settings-toggle{ type: 'button' }
= expanded ? 'Collapse' : 'Expand' = expanded ? 'Collapse' : 'Expand'
%p %p
- link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/project/deploy_keys/index') } - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/project/deploy_keys/index') }
= _("Add deploy keys to grant read/write access to this repository. %{link_start}What are Deploy Keys?%{link_end}").html_safe % { link_start: link_start, link_end: '</a>'.html_safe } = _("Add deploy keys to grant read/write access to this repository. %{link_start}What are deploy keys?%{link_end}").html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
.settings-content .settings-content
%h5.gl-mt-0 %h5.gl-mt-0
= render @deploy_keys.form_partial_path = render @deploy_keys.form_partial_path
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
%section.qa-deploy-tokens-settings.settings.no-animate#js-deploy-tokens{ class: ('expanded' if expanded), data: { qa_selector: 'deploy_tokens_settings_content' } } %section.qa-deploy-tokens-settings.settings.no-animate#js-deploy-tokens{ class: ('expanded' if expanded), data: { qa_selector: 'deploy_tokens_settings_content' } }
.settings-header .settings-header
%h4= s_('DeployTokens|Deploy Tokens') %h4= s_('DeployTokens|Deploy tokens')
%button.gl-button.btn.js-settings-toggle.qa-expand-deploy-keys{ type: 'button' } %button.gl-button.btn.js-settings-toggle.qa-expand-deploy-keys{ type: 'button' }
= expanded ? 'Collapse' : 'Expand' = expanded ? 'Collapse' : 'Expand'
%p %p
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
- if @new_deploy_token.persisted? - if @new_deploy_token.persisted?
= render 'shared/deploy_tokens/new_deploy_token', deploy_token: @new_deploy_token = render 'shared/deploy_tokens/new_deploy_token', deploy_token: @new_deploy_token
%h5.gl-mt-0 %h5.gl-mt-0
= s_('DeployTokens|Add a Deploy Token') = s_('DeployTokens|Add a deploy token')
= render 'shared/deploy_tokens/form', group_or_project: group_or_project, token: @new_deploy_token, presenter: @deploy_tokens = render 'shared/deploy_tokens/form', group_or_project: group_or_project, token: @new_deploy_token, presenter: @deploy_tokens
%hr %hr
= render 'shared/deploy_tokens/table', group_or_project: group_or_project, active_tokens: @deploy_tokens = render 'shared/deploy_tokens/table', group_or_project: group_or_project, active_tokens: @deploy_tokens
......
---
title: Updated UI text to be sentence case
merge_request: 53323
author:
type: other
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%section.settings.no-animate#js-push-rules{ class: ('expanded' if expanded), data: { qa_selector: 'push_rules_content' } } %section.settings.no-animate#js-push-rules{ class: ('expanded' if expanded), data: { qa_selector: 'push_rules_content' } }
.settings-header .settings-header
%h4 %h4
= s_('PushRule|Push Rules') = s_('PushRule|Push rules')
%button.gl-button.btn.btn-default.js-settings-toggle %button.gl-button.btn.btn-default.js-settings-toggle
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')
%p %p
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
%section.protected-environments-settings.settings.no-animate#js-protected-environments-settings{ class: ('expanded' if expanded) } %section.protected-environments-settings.settings.no-animate#js-protected-environments-settings{ class: ('expanded' if expanded) }
.settings-header .settings-header
%h4 %h4
= _('Protected Environments') = _('Protected environments')
%button.btn.gl-button.js-settings-toggle{ type: 'button' } %button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')
%p %p
......
...@@ -1713,7 +1713,7 @@ msgstr "" ...@@ -1713,7 +1713,7 @@ msgstr ""
msgid "Add deploy freeze" msgid "Add deploy freeze"
msgstr "" msgstr ""
msgid "Add deploy keys to grant read/write access to this repository. %{link_start}What are Deploy Keys?%{link_end}" msgid "Add deploy keys to grant read/write access to this repository. %{link_start}What are deploy keys?%{link_end}"
msgstr "" msgstr ""
msgid "Add domain" msgid "Add domain"
...@@ -9279,9 +9279,6 @@ msgstr "" ...@@ -9279,9 +9279,6 @@ msgstr ""
msgid "Decompressed archive size validation failed." msgid "Decompressed archive size validation failed."
msgstr "" msgstr ""
msgid "Default Branch"
msgstr ""
msgid "Default CI configuration path" msgid "Default CI configuration path"
msgstr "" msgstr ""
...@@ -9624,6 +9621,9 @@ msgstr "" ...@@ -9624,6 +9621,9 @@ msgstr ""
msgid "Deploy key was successfully updated." msgid "Deploy key was successfully updated."
msgstr "" msgstr ""
msgid "Deploy keys"
msgstr ""
msgid "Deploy keys grant read/write access to all repositories in your instance" msgid "Deploy keys grant read/write access to all repositories in your instance"
msgstr "" msgstr ""
...@@ -9702,7 +9702,7 @@ msgstr "" ...@@ -9702,7 +9702,7 @@ msgstr ""
msgid "DeployTokens|Active Deploy Tokens (%{active_tokens})" msgid "DeployTokens|Active Deploy Tokens (%{active_tokens})"
msgstr "" msgstr ""
msgid "DeployTokens|Add a Deploy Token" msgid "DeployTokens|Add a deploy token"
msgstr "" msgstr ""
msgid "DeployTokens|Allows read access to the package registry." msgid "DeployTokens|Allows read access to the package registry."
...@@ -9732,16 +9732,16 @@ msgstr "" ...@@ -9732,16 +9732,16 @@ msgstr ""
msgid "DeployTokens|Created" msgid "DeployTokens|Created"
msgstr "" msgstr ""
msgid "DeployTokens|Deploy Tokens" msgid "DeployTokens|Deploy tokens"
msgstr "" msgstr ""
msgid "DeployTokens|Deploy Tokens allow access to packages, your repository, and registry images." msgid "DeployTokens|Deploy tokens allow access to packages, your repository, and registry images."
msgstr "" msgstr ""
msgid "DeployTokens|Expires" msgid "DeployTokens|Expires"
msgstr "" msgstr ""
msgid "DeployTokens|Group Deploy Tokens allow access to the packages, repositories, and registry images within the group." msgid "DeployTokens|Group deploy tokens allow access to the packages, repositories, and registry images within the group."
msgstr "" msgstr ""
msgid "DeployTokens|Name" msgid "DeployTokens|Name"
...@@ -23612,9 +23612,6 @@ msgstr "" ...@@ -23612,9 +23612,6 @@ msgstr ""
msgid "Protected Environment" msgid "Protected Environment"
msgstr "" msgstr ""
msgid "Protected Environments"
msgstr ""
msgid "Protected Paths" msgid "Protected Paths"
msgstr "" msgstr ""
...@@ -23627,6 +23624,9 @@ msgstr "" ...@@ -23627,6 +23624,9 @@ msgstr ""
msgid "Protected branches" msgid "Protected branches"
msgstr "" msgstr ""
msgid "Protected environments"
msgstr ""
msgid "ProtectedBranch|%{wildcards_link_start}Wildcards%{wildcards_link_end} such as %{code_tag_start}*-stable%{code_tag_end} or %{code_tag_start}production/*%{code_tag_end} are supported." msgid "ProtectedBranch|%{wildcards_link_start}Wildcards%{wildcards_link_end} such as %{code_tag_start}*-stable%{code_tag_end} or %{code_tag_start}production/*%{code_tag_end} are supported."
msgstr "" msgstr ""
...@@ -23855,7 +23855,7 @@ msgstr "" ...@@ -23855,7 +23855,7 @@ msgstr ""
msgid "PushRules|Users can still delete tags through the GitLab UI." msgid "PushRules|Users can still delete tags through the GitLab UI."
msgstr "" msgstr ""
msgid "PushRule|Push Rules" msgid "PushRule|Push rules"
msgstr "" msgstr ""
msgid "PushRule|Reject unverified users" msgid "PushRule|Reject unverified users"
......
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