diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-10-11 10:48:53 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-11 10:48:53 +0200 |
| commit | 8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d (patch) | |
| tree | 509de1d16752d04171d7fe275a2788976c509c46 /phpBB/language | |
| parent | f6f796770a0964589669d97a1c4d79569b900de8 (diff) | |
| parent | f6c8338358e5216a62c37bc8ccf252d0e5c6fe0f (diff) | |
| download | forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar.gz forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar.bz2 forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar.xz forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 8d826e4cbf..f986eced38 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -156,9 +156,10 @@ $lang = array_merge($lang, array( 'ACL_M_SPLIT' => 'Can split topics', 'ACL_M_MERGE' => 'Can merge topics', - 'ACL_M_INFO' => 'Can view post details', - 'ACL_M_WARN' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local) - 'ACL_M_BAN' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local) + 'ACL_M_INFO' => 'Can view post details', + 'ACL_M_WARN' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local) + 'ACL_M_PM_REPORT' => 'Can close and delete reports of private messages<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local) + 'ACL_M_BAN' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local) )); // Admin Permissions |