diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
| commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
| tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /config/locales | |
| parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) | |
| download | gitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/devise.en.yml | 4 | ||||
| -rw-r--r-- | config/locales/en.yml | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index e4a46be9bf3..6c6a5f7b1a1 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -16,6 +16,9 @@ en: timeout: "Your session expired. Please sign in again to continue." unauthenticated: "You need to sign in or sign up before continuing." unconfirmed: "You have to confirm your email address before continuing. Please check your email for the link we sent you, or click 'Resend confirmation email'." + blocked: "Your account has been blocked. Please contact your GitLab administrator if you think this is an error." + forbidden: "Your account does not have the required permission to login. Please contact your GitLab administrator if you think this is an error." + blocked_pending_approval: "Your account is pending approval from your GitLab administrator and hence blocked. Please contact your GitLab administrator if you think this is an error." mailer: confirmation_instructions: subject: "Confirmation instructions" @@ -42,6 +45,7 @@ en: signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account." + signed_up_but_blocked_pending_approval: "You have signed up successfully. However, we could not sign you in because your account is awaiting approval from your GitLab administrator." update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address." updated: "Your account has been updated successfully." sessions: diff --git a/config/locales/en.yml b/config/locales/en.yml index 7ff4e3bf7da..fb024b7ba2a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -20,6 +20,8 @@ en: token: "Grafana HTTP API Token" grafana_url: "Grafana API URL" grafana_enabled: "Grafana integration enabled" + service_desk_setting: + project_key: "Project name suffix" user/user_detail: job_title: 'Job title' user/user_detail: |