diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-05 12:12:27 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-05 12:12:27 +0100 |
| commit | f53a27e891ce38c2728b3c31fd70b9f9896f69bd (patch) | |
| tree | e5846d543a2672c76a98cfa29b9b3f288a9fba42 /phpBB/language | |
| parent | 942383d74320612ca8d4eb413c1d23459942028a (diff) | |
| parent | ad23b2330c765ebbafe96ba3f68543284fbed456 (diff) | |
| download | forums-f53a27e891ce38c2728b3c31fd70b9f9896f69bd.tar forums-f53a27e891ce38c2728b3c31fd70b9f9896f69bd.tar.gz forums-f53a27e891ce38c2728b3c31fd70b9f9896f69bd.tar.bz2 forums-f53a27e891ce38c2728b3c31fd70b9f9896f69bd.tar.xz forums-f53a27e891ce38c2728b3c31fd70b9f9896f69bd.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/ucp.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 6063f71d98..ec7f3fe714 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -66,7 +66,7 @@ $lang = array_merge($lang, array( 'ACCOUNT_COPPA' => 'Your account has been created but has to be approved, please check your email for details.', 'ACCOUNT_EMAIL_CHANGED' => 'Your account has been updated. However, this board requires account reactivation on email changes. An activation key has been sent to the new email address you provided. Please check your email for further information.', 'ACCOUNT_EMAIL_CHANGED_ADMIN' => 'Your account has been updated. However, this board requires account reactivation by the administrators on email changes. An email has been sent to them and you will be informed when your account has been reactivated.', - 'ACCOUNT_INACTIVE' => 'Your account has been created. However, this board requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information.', + 'ACCOUNT_INACTIVE' => 'Your account has been created. However, this board requires account activation. An activation key has been sent to the email address you provided. Please check your email for further information and also be sure to check your junk mail box. It may take a while to get the email depending on your email provider.', 'ACCOUNT_INACTIVE_ADMIN' => 'Your account has been created. However, this board requires account activation by the administrator group. An email has been sent to them and you will be informed when your account has been activated.', 'ACTIVATION_EMAIL_SENT' => 'The activation email has been sent to your email address.', 'ACTIVATION_EMAIL_SENT_ADMIN' => 'The activation email has been sent to the administrators email addresses.', |