Commit 8751945d authored by Vitaly Slobodin's avatar Vitaly Slobodin

Merge branch 'credit-card-verification-copy-for-shared-runners' into 'master'

Clarify CC validation is for shared runners

See merge request gitlab-org/gitlab!61808
parents 44712324 ee77423e
...@@ -12,7 +12,7 @@ const IFRAME_MINIMUM_HEIGHT = 350; ...@@ -12,7 +12,7 @@ const IFRAME_MINIMUM_HEIGHT = 350;
const i18n = Object.freeze({ const i18n = Object.freeze({
title: s__('Billings|Validate user account'), title: s__('Billings|Validate user account'),
description: s__(` description: s__(`
Billings|To use free pipeline minutes, you'll need to validate your account with a credit card. This is required to discourage and reduce abuse on GitLab infrastructure. Billings|To use free pipeline minutes on shared runners, you’ll need to validate your account with a credit card. This is required to discourage and reduce abuse on GitLab infrastructure.
%{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}`), %{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}`),
iframeNotSupported: __('Your browser does not support iFrames'), iframeNotSupported: __('Your browser does not support iFrames'),
actions: { actions: {
......
...@@ -12,7 +12,7 @@ const i18n = { ...@@ -12,7 +12,7 @@ const i18n = {
}, },
dangerAlert: { dangerAlert: {
title: s__('Billings|User validation required'), title: s__('Billings|User validation required'),
text: s__(`Billings|To use free pipeline minutes, you'll need to validate your account with a credit card. text: s__(`Billings|To use free pipeline minutes on shared runners, you’ll need to validate your account with a credit card. If you prefer not to provide a credit card, you can run pipelines by bringing your own runners and disabling shared runners for your project.
This is required to discourage and reduce abuse on GitLab infrastructure. This is required to discourage and reduce abuse on GitLab infrastructure.
%{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}`), %{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}`),
primaryButtonText: s__('Billings|Validate account'), primaryButtonText: s__('Billings|Validate account'),
......
...@@ -5099,7 +5099,10 @@ msgstr "" ...@@ -5099,7 +5099,10 @@ msgstr ""
msgid "BillingPlan|Upgrade for free" msgid "BillingPlan|Upgrade for free"
msgstr "" msgstr ""
msgid "Billings|To use free pipeline minutes, you'll need to validate your account with a credit card. This is required to discourage and reduce abuse on GitLab infrastructure. %{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}" msgid "Billings|To use free pipeline minutes on shared runners, you’ll need to validate your account with a credit card. If you prefer not to provide a credit card, you can run pipelines by bringing your own runners and disabling shared runners for your project. This is required to discourage and reduce abuse on GitLab infrastructure. %{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}"
msgstr ""
msgid "Billings|To use free pipeline minutes on shared runners, you’ll need to validate your account with a credit card. This is required to discourage and reduce abuse on GitLab infrastructure. %{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}"
msgstr "" msgstr ""
msgid "Billings|User successfully validated" msgid "Billings|User successfully validated"
......
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