diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 11:41:01 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-29 11:41:01 +0200 |
| commit | 7c100587872227ce427a43dfa8b51d789e0535fa (patch) | |
| tree | be592f6d3f7ae73d75c3937afe472d95416dbc9a | |
| parent | 83d71ecb885ec2f594d3863cfa42111b8f06260b (diff) | |
| parent | 983b3d7f646804ae8dfbb4f42f3fd444346499ee (diff) | |
| download | forums-7c100587872227ce427a43dfa8b51d789e0535fa.tar forums-7c100587872227ce427a43dfa8b51d789e0535fa.tar.gz forums-7c100587872227ce427a43dfa8b51d789e0535fa.tar.bz2 forums-7c100587872227ce427a43dfa8b51d789e0535fa.tar.xz forums-7c100587872227ce427a43dfa8b51d789e0535fa.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
| -rw-r--r-- | phpBB/language/en/email/admin_welcome_activated.txt | 2 |
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. |