aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/ucp.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-03-30 10:49:06 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-03-30 10:49:06 +0000
commit9f82dec04b18813c060e5a090a149c1a2c140689 (patch)
treeefab7d5e9ce8166ff4bff69d180c82230c3df481 /phpBB/language/en/ucp.php
parent331a549c42a74472d27dadbe213618a7b914a737 (diff)
downloadforums-9f82dec04b18813c060e5a090a149c1a2c140689.tar
forums-9f82dec04b18813c060e5a090a149c1a2c140689.tar.gz
forums-9f82dec04b18813c060e5a090a149c1a2c140689.tar.bz2
forums-9f82dec04b18813c060e5a090a149c1a2c140689.tar.xz
forums-9f82dec04b18813c060e5a090a149c1a2c140689.zip
some changes/bugfixes
git-svn-id: file:///svn/phpbb/trunk@7241 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/ucp.php')
-rw-r--r--phpBB/language/en/ucp.php15
1 files changed, 9 insertions, 6 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 0ed68da8fe..d099152954 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -53,13 +53,16 @@ $lang = array_merge($lang, array(
// Common language entries
$lang = array_merge($lang, array(
- 'ACCOUNT_ACTIVE' => 'Your account has now been activated. Thank you for registering',
- 'ACCOUNT_ACTIVE_ADMIN' => 'The account has now been activated',
- 'ACCOUNT_ADDED' => 'Thank you for registering, your account has been created. You may now login with your username and password',
+ 'ACCOUNT_ACTIVE' => 'Your account has now been activated. Thank you for registering.',
+ 'ACCOUNT_ACTIVE_ADMIN' => 'The account has now been activated.',
+ 'ACCOUNT_ACTIVE_PROFILE' => 'Your account has now been successfully reactivated.',
+ 'ACCOUNT_ADDED' => 'Thank you for registering, your account has been created. You may now login with your username and password.',
'ACCOUNT_COPPA' => 'Your account has been created but has to be approved, please check your email for details.',
- 'ACCOUNT_INACTIVE' => 'Your account has been created. However, this forum requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information',
- 'ACCOUNT_INACTIVE_ADMIN' => 'Your account has been created. However, this forum requires account activation by the administrator. 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',
+ 'ACCOUNT_EMAIL_CHANGED' => 'Your account has been updated. However, this forum 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 forum 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 forum requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information.',
+ 'ACCOUNT_INACTIVE_ADMIN' => 'Your account has been created. However, this forum requires account activation by the administrator. 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.',
'ADD' => 'Add',
'ADD_BCC' => 'Add [BCC]',
'ADD_FOES' => 'Add new foes',