Commit 5974b19a authored by Nathan Friend's avatar Nathan Friend

Merge branch 'ui-text-default-branch' into 'master'

Edit UI text for Default Branch settings

See merge request gitlab-org/gitlab!51658
parents 1ef8d7bb e7961643
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
%button.btn.js-settings-toggle %button.btn.js-settings-toggle
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')
%p %p
= _('Select the branch you want to set as the default for this project. All merge requests and commits will automatically be made against this branch unless you specify a different one.') = _('Set the default branch for this project. All merge requests and commits are made against this branch unless you specify a different one.')
.settings-content .settings-content
= form_for @project, remote: true, html: { multipart: true, anchor: 'default-branch-settings' }, authenticity_token: true do |f| = form_for @project, remote: true, html: { multipart: true, anchor: 'default-branch-settings' }, authenticity_token: true do |f|
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
= f.label :autoclose_referenced_issues, class: 'form-check-label' do = f.label :autoclose_referenced_issues, class: 'form-check-label' do
%strong= _("Auto-close referenced issues on default branch") %strong= _("Auto-close referenced issues on default branch")
.form-text.text-muted .form-text.text-muted
= _("Issues referenced by merge requests and commits within the default branch will be closed automatically") = _("When merge requests and commits in the default branch close, any issues they reference also close.")
= link_to sprite_icon('question-o'), help_page_path('user/project/issues/managing_issues.md', anchor: 'disabling-automatic-issue-closing'), target: '_blank' = link_to sprite_icon('question-o'), help_page_path('user/project/issues/managing_issues.md', anchor: 'disabling-automatic-issue-closing'), target: '_blank'
= f.submit _('Save changes'), class: "gl-button btn btn-success" = f.submit _('Save changes'), class: "gl-button btn btn-success"
---
title: Updated UI text to match style guidelines
merge_request: 51658
author:
type: other
...@@ -15899,9 +15899,6 @@ msgstr "" ...@@ -15899,9 +15899,6 @@ msgstr ""
msgid "Issues closed" msgid "Issues closed"
msgstr "" msgstr ""
msgid "Issues referenced by merge requests and commits within the default branch will be closed automatically"
msgstr ""
msgid "Issues with comments, merge requests with diffs and comments, labels, milestones, snippets, and other project entities" msgid "Issues with comments, merge requests with diffs and comments, labels, milestones, snippets, and other project entities"
msgstr "" msgstr ""
...@@ -25494,9 +25491,6 @@ msgstr "" ...@@ -25494,9 +25491,6 @@ msgstr ""
msgid "Select target branch" msgid "Select target branch"
msgstr "" msgstr ""
msgid "Select the branch you want to set as the default for this project. All merge requests and commits will automatically be made against this branch unless you specify a different one."
msgstr ""
msgid "Select the custom project template source group." msgid "Select the custom project template source group."
msgstr "" msgstr ""
...@@ -25779,6 +25773,9 @@ msgstr "" ...@@ -25779,6 +25773,9 @@ msgstr ""
msgid "Set target branch to %{branch_name}." msgid "Set target branch to %{branch_name}."
msgstr "" msgstr ""
msgid "Set the default branch for this project. All merge requests and commits are made against this branch unless you specify a different one."
msgstr ""
msgid "Set the default expiration time for each job's artifacts. 0 for unlimited. The default unit is in seconds, but you can define an alternative. For example: %{code_open}4 mins 2 sec%{code_close}, %{code_open}2h42min%{code_close}." msgid "Set the default expiration time for each job's artifacts. 0 for unlimited. The default unit is in seconds, but you can define an alternative. For example: %{code_open}4 mins 2 sec%{code_close}, %{code_open}2h42min%{code_close}."
msgstr "" msgstr ""
...@@ -31911,6 +31908,9 @@ msgstr "" ...@@ -31911,6 +31908,9 @@ msgstr ""
msgid "When leaving the URL blank, classification labels can still be specified without disabling cross project features or performing external authorization checks." msgid "When leaving the URL blank, classification labels can still be specified without disabling cross project features or performing external authorization checks."
msgstr "" msgstr ""
msgid "When merge requests and commits in the default branch close, any issues they reference also close."
msgstr ""
msgid "When this merge request is accepted" msgid "When this merge request is accepted"
msgid_plural "When these merge requests are accepted" msgid_plural "When these merge requests are accepted"
msgstr[0] "" msgstr[0] ""
......
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