aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-03-09 23:41:43 +0100
committerAndreas Fischer <bantu@phpbb.com>2012-03-09 23:41:43 +0100
commitaee79c6cdb75407ad36be03ac2fb0cc99e78c185 (patch)
tree8dd0ab48f0f002587bc626c0a76bed32494a15a6 /phpBB
parentbd1fb91dd2245c0b84d5857b3633ea4ad65545db (diff)
parent89a0cbc57e98d182f2696c49e182c57fb63b88c7 (diff)
downloadforums-aee79c6cdb75407ad36be03ac2fb0cc99e78c185.tar
forums-aee79c6cdb75407ad36be03ac2fb0cc99e78c185.tar.gz
forums-aee79c6cdb75407ad36be03ac2fb0cc99e78c185.tar.bz2
forums-aee79c6cdb75407ad36be03ac2fb0cc99e78c185.tar.xz
forums-aee79c6cdb75407ad36be03ac2fb0cc99e78c185.zip
Merge remote-tracking branch 'p/ticket/7432' into develop-olympus
* p/ticket/7432: [ticket/7432] Delete redundant reference to "appropriate menu item". [ticket/7432] Explain what users are inactive in more detail.
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/acp/common.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index ef8d6f1cb3..958b9c7598 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -405,7 +405,7 @@ $lang = array_merge($lang, array(
'INACTIVE_REASON_UNKNOWN' => 'Unknown',
'INACTIVE_USERS' => 'Inactive users',
'INACTIVE_USERS_EXPLAIN' => 'This is a list of users who have registered but whose accounts are inactive. You can activate, delete or remind (by sending an e-mail) these users if you wish.',
- 'INACTIVE_USERS_EXPLAIN_INDEX' => 'This is a list of the last 10 registered users who have inactive accounts. A full list is available from the appropriate menu item or by following the link below from where you can activate, delete or remind (by sending an e-mail) these users if you wish.',
+ 'INACTIVE_USERS_EXPLAIN_INDEX' => 'This is a list of the last 10 registered users who have inactive accounts. Accounts are inactive either because account activation was enabled in user registration settings and these users’ accounts have not yet been activated, or because these accounts have been deactivated. A full list is available by following the link below from where you can activate, delete or remind (by sending an e-mail) these users if you wish.',
'NO_INACTIVE_USERS' => 'No inactive users',