aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-03-05 12:12:36 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-03-05 12:12:36 +0100
commite5344ae135d2e90aad51319ce17210d5551c1634 (patch)
treeb9d02ed5802aaddedaab8d2e276ba8fc1b18cffe /phpBB/language
parent0e6bcd166cd4540b56d57b88b6412309c57b7fbc (diff)
parentf53a27e891ce38c2728b3c31fd70b9f9896f69bd (diff)
downloadforums-e5344ae135d2e90aad51319ce17210d5551c1634.tar
forums-e5344ae135d2e90aad51319ce17210d5551c1634.tar.gz
forums-e5344ae135d2e90aad51319ce17210d5551c1634.tar.bz2
forums-e5344ae135d2e90aad51319ce17210d5551c1634.tar.xz
forums-e5344ae135d2e90aad51319ce17210d5551c1634.zip
Merge branch '3.2.x'
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/ucp.php2
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.',