aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2011-10-29 11:38:57 +0200
committerIgor Wiedler <igor@wiedler.ch>2011-10-29 11:38:57 +0200
commit983b3d7f646804ae8dfbb4f42f3fd444346499ee (patch)
tree796af9e4c7beac020a5d3f2e98622920dba593af
parentcfb51358058e30e4303c1fdc10920c98a568871d (diff)
parent2e9e0a7d78bf5aaaac4b36960eb45cf014a5ccc6 (diff)
downloadforums-983b3d7f646804ae8dfbb4f42f3fd444346499ee.tar
forums-983b3d7f646804ae8dfbb4f42f3fd444346499ee.tar.gz
forums-983b3d7f646804ae8dfbb4f42f3fd444346499ee.tar.bz2
forums-983b3d7f646804ae8dfbb4f42f3fd444346499ee.tar.xz
forums-983b3d7f646804ae8dfbb4f42f3fd444346499ee.zip
Merge remote-tracking branch 'bantu/ticket/10166' into develop-olympus
* bantu/ticket/10166: [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
-rw-r--r--phpBB/language/en/email/admin_welcome_activated.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/email/admin_welcome_activated.txt b/phpBB/language/en/email/admin_welcome_activated.txt
index 2397868323..cfdb69bdcb 100644
--- a/phpBB/language/en/email/admin_welcome_activated.txt
+++ b/phpBB/language/en/email/admin_welcome_activated.txt
@@ -2,7 +2,7 @@ Subject: Account activated
Hello {USERNAME},
-Your account on "{SITENAME}" has now been activated, you may login using the username you received in a previous e-mail.
+Your account on "{SITENAME}" has been activated by an administrator, you may login now.
Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.