diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-21 16:15:42 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-21 16:15:42 +0200 |
| commit | f7f78adeb910c84e86414dd6f6470631f5a47d8f (patch) | |
| tree | 02851242b3758f6ba6f156e180a3cbe53e4a0810 /phpBB/language/en/acp | |
| parent | 3bc15e8683ccee90224330ca7e7480eb31bba2e1 (diff) | |
| parent | 29bee5b01a7dfa613b1583b1b2c178c641786f4b (diff) | |
| download | forums-f7f78adeb910c84e86414dd6f6470631f5a47d8f.tar forums-f7f78adeb910c84e86414dd6f6470631f5a47d8f.tar.gz forums-f7f78adeb910c84e86414dd6f6470631f5a47d8f.tar.bz2 forums-f7f78adeb910c84e86414dd6f6470631f5a47d8f.tar.xz forums-f7f78adeb910c84e86414dd6f6470631f5a47d8f.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10950] Fix grammar in comments
[ticket/10950] Delete PMs for users that have not yet read the pm
[ticket/10950] Fix unit tests to fit the new pm deleting behaviour
[ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
[ticket/10950] Remove deleted entries in tests instead of commenting them out
[ticket/10950] Use database count() and group by instead of doing that in php
[ticket/10950] Check $delete_ids to be not empty
[ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
[ticket/10950] Fix unit tests to reflect desired behaviour
[ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
[ticket/10950] Correct comment for the second query.
[ticket/10950] Add empty line to make unset() call more visible.
[ticket/10950] Select the correct columns in SQL queries.
[ticket/10950] Use a variable for the private message id.
[ticket/10950] Move array initialisation to the front.
[ticket/10950] Remove redundant if statement.
[ticket/10950] Fix SQL coding style (indentation) in second SQL query.
[ticket/10950] Use proper ' in order to fix comment.
Diffstat (limited to 'phpBB/language/en/acp')
| -rw-r--r-- | phpBB/language/en/acp/users.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index 45cf36469b..865a2a0371 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -58,7 +58,7 @@ $lang = array_merge($lang, array( 'DELETE_POSTS' => 'Delete posts', 'DELETE_USER' => 'Delete user', - 'DELETE_USER_EXPLAIN' => 'Please note that deleting a user is final, they cannot be recovered.', + 'DELETE_USER_EXPLAIN' => 'Please note that deleting a user is final, they cannot be recovered. Unread private messages sent by this user will be deleted and will not be available to their recipients.', 'FORCE_REACTIVATION_SUCCESS' => 'Successfully forced reactivation.', 'FOUNDER' => 'Founder', |