diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-19 20:38:38 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-19 20:38:38 +0000 |
| commit | 75a51629454e971fd85118647d05a2a7f39931ad (patch) | |
| tree | 2a22645ce7b2ccfdbe62b85515f252af3cd9e131 /phpBB/language/en/acp/permissions_phpbb.php | |
| parent | 870991c0608caf7467018245a0a4e1f1d55efd12 (diff) | |
| download | forums-75a51629454e971fd85118647d05a2a7f39931ad.tar forums-75a51629454e971fd85118647d05a2a7f39931ad.tar.gz forums-75a51629454e971fd85118647d05a2a7f39931ad.tar.bz2 forums-75a51629454e971fd85118647d05a2a7f39931ad.tar.xz forums-75a51629454e971fd85118647d05a2a7f39931ad.zip | |
again, a lot of bug fixes
git-svn-id: file:///svn/phpbb/trunk@7909 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/permissions_phpbb.php')
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 7db7426672..6579f23018 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -78,11 +78,15 @@ $lang = array_merge($lang, array( 'user_group' => 'Users & Groups', ), + // With defining 'global' here we are able to specify what is printed out if the permission is within the global scope. 'permission_type' => array( 'u_' => 'User permissions', 'a_' => 'Admin permissions', 'm_' => 'Moderator permissions', 'f_' => 'Forum permissions', + 'global' => array( + 'm_' => 'Global moderator permissions', + ), ), )); @@ -175,8 +179,8 @@ $lang = array_merge($lang, array( 'acl_m_merge' => array('lang' => 'Can merge topics', 'cat' => 'topic_actions'), 'acl_m_info' => array('lang' => 'Can view post details', 'cat' => 'misc'), - 'acl_m_warn' => array('lang' => 'Can issue warnings', 'cat' => 'misc'), // This moderator setting is only global (and not local) - 'acl_m_ban' => array('lang' => 'Can manage bans', 'cat' => 'misc'), // This moderator setting is only global (and not local) + 'acl_m_warn' => array('lang' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local) + 'acl_m_ban' => array('lang' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local) )); // Admin Permissions |