diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 20:46:19 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 20:46:19 +0100 |
| commit | 72e2af08e14abd32aec0187fb644bfadd158fc79 (patch) | |
| tree | 7e41d9ed8e984a332cd0e4d2386c75f06f8e3326 /phpBB | |
| parent | 24fda6671d597bf8d890c095fb9883d3fd1657be (diff) | |
| parent | 2f6c8a0164e08a66505bf322781b4ebce488e3bc (diff) | |
| download | forums-72e2af08e14abd32aec0187fb644bfadd158fc79.tar forums-72e2af08e14abd32aec0187fb644bfadd158fc79.tar.gz forums-72e2af08e14abd32aec0187fb644bfadd158fc79.tar.bz2 forums-72e2af08e14abd32aec0187fb644bfadd158fc79.tar.xz forums-72e2af08e14abd32aec0187fb644bfadd158fc79.zip | |
Merge remote branch 'github-cs278/bug/54855' into bug/cs278/54855
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/language/en/email/admin_welcome_inactive.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 4e9adaa1f9..53863da302 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -97,6 +97,7 @@ <li>[Fix] No longer return the character O in generated random strings and passwords. (Bug #57345)</li> <li>[Fix] Allow redirect() function to redirect across directories. (Bug #56965)</li> <li>[Fix] Add terminating semicolons to JavaScript code. (Bug #58085 - Patch by nn-)</li> + <li>[Fix] Minor language fixes. (Bug #54855)</li> <li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li> </ul> diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt index e0970d3ff3..30b3aae852 100644 --- a/phpBB/language/en/email/admin_welcome_inactive.txt +++ b/phpBB/language/en/email/admin_welcome_inactive.txt @@ -10,7 +10,7 @@ Username: {USERNAME} Board URL: {U_BOARD} ---------------------------- -Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this has occured. +Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this has occurred. 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. |