diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-15 13:47:01 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-15 13:47:01 +0000 |
| commit | f27fa04b8c7f6d668e9cc651afaa10334f5d7067 (patch) | |
| tree | 84a5422ac89d24673c073d736560ff4ff7d0fc0c /phpBB/language/en/acp | |
| parent | 86de92d8f0c858895adef258c6cdc64f4cf43deb (diff) | |
| download | forums-f27fa04b8c7f6d668e9cc651afaa10334f5d7067.tar forums-f27fa04b8c7f6d668e9cc651afaa10334f5d7067.tar.gz forums-f27fa04b8c7f6d668e9cc651afaa10334f5d7067.tar.bz2 forums-f27fa04b8c7f6d668e9cc651afaa10334f5d7067.tar.xz forums-f27fa04b8c7f6d668e9cc651afaa10334f5d7067.zip | |
even more fixes. :o
git-svn-id: file:///svn/phpbb/trunk@7889 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp')
| -rw-r--r-- | phpBB/language/en/acp/forums.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 5281651bad..2235772bf4 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -62,7 +62,7 @@ $lang = array_merge($lang, array( 'ENABLE_TOPIC_ICONS' => 'Enable topic icons', 'FORUM_ADMIN' => 'Forum administration', - 'FORUM_ADMIN_EXPLAIN' => 'In phpBB3 there are no categories, everything is forum based. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum.', + 'FORUM_ADMIN_EXPLAIN' => 'In phpBB3 there are no categories, everything is forum based. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum. <strong>You need to copy or set appropriate permissions for newly created forums to have them displayed.</strong>', 'FORUM_AUTO_PRUNE' => 'Enable auto-pruning', 'FORUM_AUTO_PRUNE_EXPLAIN' => 'Prunes the forum of topics, set the frequency/age parameters below.', 'FORUM_CREATED' => 'Forum created successfully.', diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 00c53257ad..7db7426672 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -88,7 +88,7 @@ $lang = array_merge($lang, array( // User Permissions $lang = array_merge($lang, array( - 'acl_u_viewprofile' => array('lang' => 'Can view profiles', 'cat' => 'profile'), + 'acl_u_viewprofile' => array('lang' => 'Can view profiles, memberlist and online list', 'cat' => 'profile'), 'acl_u_chgname' => array('lang' => 'Can change username', 'cat' => 'profile'), 'acl_u_chgpasswd' => array('lang' => 'Can change password', 'cat' => 'profile'), 'acl_u_chgemail' => array('lang' => 'Can change e-mail address', 'cat' => 'profile'), @@ -196,7 +196,7 @@ $lang = array_merge($lang, array( 'acl_a_bbcode' => array('lang' => 'Can define BBCode tags', 'cat' => 'posting'), 'acl_a_attach' => array('lang' => 'Can alter attachment related settings', 'cat' => 'posting'), - 'acl_a_user' => array('lang' => 'Can manage users', 'cat' => 'user_group'), + 'acl_a_user' => array('lang' => 'Can manage users<br /><em>This also includes seeing the users browser agent within the viewonline list.</em>', 'cat' => 'user_group'), 'acl_a_userdel' => array('lang' => 'Can delete/prune users', 'cat' => 'user_group'), 'acl_a_group' => array('lang' => 'Can manage groups', 'cat' => 'user_group'), 'acl_a_groupadd' => array('lang' => 'Can add new groups', 'cat' => 'user_group'), |