Skip to content

G
gitlab-ce
Commit c5e8ce8a authored by scootergrisen's avatar scootergrisen Committed by Olena Horal-Koretska
Browse files
Options

Add/remove space and tab

parent 57ef1c2c
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
app/assets/javascripts/create_cluster/eks_cluster/components/service_credentials_form.vue
View file @ c5e8ce8a
......@@ -78,7 +78,7 @@ export default {
return sprintf(
s__(
'ClusterIntegration|The Amazon Resource Name (ARN) associated with your role. If you do not have a provision role, first create one on %{startAwsLink}Amazon Web Services %{externalLinkIcon}%{endLink} using the above account and external IDs. %{startMoreInfoLink}More information%{endLink}',
'ClusterIntegration|The Amazon Resource Name (ARN) associated with your role. If you do not have a provisioned role, first create one on %{startAwsLink}Amazon Web Services %{externalLinkIcon}%{endLink} using the above account and external IDs. %{startMoreInfoLink}More information%{endLink}',
),
{
startAwsLink:
......
app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue
View file @ c5e8ce8a
......@@ -18,7 +18,7 @@ export default {
computed: {
text() {
return s__(
'AdminArea|You’re about to stop all jobs.This will halt all current jobs that are running.',
'AdminArea|You’re about to stop all jobs. This will halt all current jobs that are running.',
);
},
},
......
app/assets/javascripts/terraform/components/states_table_actions.vue
View file @ c5e8ce8a
......@@ -43,7 +43,7 @@ export default {
errorUpdate: s__('Terraform|An error occurred while changing the state file'),
lock: s__('Terraform|Lock'),
modalBody: s__(
'Terraform|You are about to remove the State file %{name}. This will permanently delete all the State versions and history. The infrastructure provisioned previously will remain intact, only the state file with all its versions are to be removed. This action is non-revertible.',
'Terraform|You are about to remove the state file %{name}. This will permanently delete all the State versions and history. The infrastructure provisioned previously will remain intact, and only the state file with all its versions will be removed. This action cannot be undone.',
),
modalCancel: s__('Terraform|Cancel'),
modalHeader: s__('Terraform|Are you sure you want to remove the Terraform State %{name}?'),
......
app/views/admin/application_settings/appearances/_form.html.haml
View file @ c5e8ce8a
......@@ -40,7 +40,7 @@
= f.hidden_field :favicon_cache
= f.file_field :favicon, class: '', accept: 'image/*'
.hint
= _("Maximum file size is 1MB. Image size must be 32x32px. Allowed image formats are %{favicon_extension_whitelist}.") % { favicon_extension_whitelist: favicon_extension_whitelist }
= _("Maximum file size is 1 MB. Image size must be 32 x 32 pixels. Allowed image formats are %{favicon_extension_whitelist}.") % { favicon_extension_whitelist: favicon_extension_whitelist }
%br
= _("Images with incorrect dimensions are not resized automatically, and may result in unexpected behavior.")
......
ee/app/assets/javascripts/clusters_list/constants.js
View file @ c5e8ce8a
......@@ -30,7 +30,7 @@ export const I18N_INSTALL_AGENT_MODAL = {
basicInstallTitle: s__('ClusterAgents|Recommended installation method'),
basicInstallBody: s__(
`Open a CLI and connect to the cluster you want to install the Agent in. Use this installation method to minimise any manual steps.The token is already included in the command.`,
`Open a CLI and connect to the cluster you want to install the Agent in. Use this installation method to minimize any manual steps. The token is already included in the command.`,
),
advancedInstallTitle: s__('ClusterAgents|Alternative installation methods'),
......
ee/app/assets/javascripts/oncall_schedules/components/oncall_schedules_wrapper.vue
View file @ c5e8ce8a
......@@ -24,7 +24,7 @@ export const i18n = {
tooltip: s__('OnCallSchedules|Add an additional schedule to your project'),
},
emptyState: {
title: s__('OnCallSchedules|Create on-call schedules in GitLab'),
title: s__('OnCallSchedules|Create on-call schedules in GitLab'),
description: s__('OnCallSchedules|Route alerts directly to specific members of your team'),
},
successNotification: {
......
ee/app/assets/javascripts/requirements/components/import_requirements_modal.vue
View file @ c5e8ce8a
......@@ -62,7 +62,7 @@ export default {
<p>
{{
__(
"Your requirements will be imported in the background. Once it's finished, you'll get a confirmation email. ",
"Your requirements will be imported in the background. After it's finished, you'll get a confirmation email.",
)
}}
</p>
......
locale/gitlab.pot
View file @ c5e8ce8a
......@@ -2343,7 +2343,7 @@ msgstr ""
msgid "AdminArea|View latest users"
msgstr ""
msgid "AdminArea|You’re about to stop all jobs.This will halt all current jobs that are running."
msgid "AdminArea|You’re about to stop all jobs. This will halt all current jobs that are running."
msgstr ""
msgid "AdminDashboard|Error loading the statistics. Please try again"
......@@ -7840,7 +7840,7 @@ msgstr ""
msgid "ClusterIntegration|Subnets"
msgstr ""
msgid "ClusterIntegration|The Amazon Resource Name (ARN) associated with your role. If you do not have a provision role, first create one on %{startAwsLink}Amazon Web Services %{externalLinkIcon}%{endLink} using the above account and external IDs. %{startMoreInfoLink}More information%{endLink}"
msgid "ClusterIntegration|The Amazon Resource Name (ARN) associated with your role. If you do not have a provisioned role, first create one on %{startAwsLink}Amazon Web Services %{externalLinkIcon}%{endLink} using the above account and external IDs. %{startMoreInfoLink}More information%{endLink}"
msgstr ""
msgid "ClusterIntegration|The Kubernetes certificate used to authenticate to the cluster."
......@@ -20552,7 +20552,7 @@ msgstr ""
msgid "Maximum file size indexed (KiB)"
msgstr ""
msgid "Maximum file size is 1MB. Image size must be 32x32px. Allowed image formats are %{favicon_extension_whitelist}."
msgid "Maximum file size is 1 MB. Image size must be 32 x 32 pixels. Allowed image formats are %{favicon_extension_whitelist}."
msgstr ""
msgid "Maximum file size is 1MB. Pages are optimized for a 28px tall header logo"
......@@ -23097,7 +23097,7 @@ msgstr ""
msgid "OnCallSchedules|Collapse schedule"
msgstr ""
msgid "OnCallSchedules|Create on-call schedules in GitLab"
msgid "OnCallSchedules|Create on-call schedules in GitLab"
msgstr ""
msgid "OnCallSchedules|Currently no rotation."
......@@ -23393,7 +23393,7 @@ msgstr ""
msgid "Open Selection"
msgstr ""
msgid "Open a CLI and connect to the cluster you want to install the Agent in. Use this installation method to minimise any manual steps.The token is already included in the command."
msgid "Open a CLI and connect to the cluster you want to install the Agent in. Use this installation method to minimize any manual steps. The token is already included in the command."
msgstr ""
msgid "Open comment type dropdown"
......@@ -32698,7 +32698,7 @@ msgstr ""
msgid "Terraform|Unlocking state"
msgstr ""
msgid "Terraform|You are about to remove the State file %{name}. This will permanently delete all the State versions and history. The infrastructure provisioned previously\twill remain intact, only the state file with all its versions are to be removed. This action is non-revertible."
msgid "Terraform|You are about to remove the state file %{name}. This will permanently delete all the State versions and history. The infrastructure provisioned previously will remain intact, and only the state file with all its versions will be removed. This action cannot be undone."
msgstr ""
msgid "Terraform|You cannot remove the State file because it's locked. Unlock the State file first before removing it."
......@@ -38574,7 +38574,7 @@ msgstr ""
msgid "Your requirements are being imported. Once finished, you'll receive a confirmation email."
msgstr ""
msgid "Your requirements will be imported in the background. Once it's finished, you'll get a confirmation email. "
msgid "Your requirements will be imported in the background. After it's finished, you'll get a confirmation email."
msgstr ""
msgid "Your response has been recorded."
......
spec/frontend/terraform/components/states_table_actions_spec.js
View file @ c5e8ce8a
......@@ -253,7 +253,7 @@ describe('StatesTableActions', () => {
it('displays a remove modal', () => {
expect(findRemoveModal().text()).toContain(
`You are about to remove the State file ${defaultProps.state.name}`,
`You are about to remove the state file ${defaultProps.state.name}`,
);
});
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7