diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
| commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
| tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /config/locales | |
| parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/devise.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/en.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index bd4c3ebc69e..ee75ffbb8e9 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -15,7 +15,7 @@ en: not_found_in_database: "Invalid %{authentication_keys} or password." 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." + 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'." mailer: confirmation_instructions: subject: "Confirmation instructions" diff --git a/config/locales/en.yml b/config/locales/en.yml index ed0552ab452..7ff4e3bf7da 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -22,6 +22,8 @@ en: grafana_enabled: "Grafana integration enabled" user/user_detail: job_title: 'Job title' + user/user_detail: + bio: 'Bio' views: pagination: previous: "Prev" |