aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/permissions_phpbb.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-09-23 13:11:34 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-09-23 13:11:34 +0000
commitce6b87ccec8a92c5455871446f88b122019672e9 (patch)
tree2e8acf0fe3e28ac79c7d8f54b2bceda2eaf05ec1 /phpBB/language/en/acp/permissions_phpbb.php
parentb486710ea127ca055ac1cb117f056e837a32370f (diff)
downloadforums-ce6b87ccec8a92c5455871446f88b122019672e9.tar
forums-ce6b87ccec8a92c5455871446f88b122019672e9.tar.gz
forums-ce6b87ccec8a92c5455871446f88b122019672e9.tar.bz2
forums-ce6b87ccec8a92c5455871446f88b122019672e9.tar.xz
forums-ce6b87ccec8a92c5455871446f88b122019672e9.zip
- Automatically add users/groups to the PM recipient list, if entered or selected.
- Reply to PM now includes all previous recipients and not only the original sender. - Added 'max_recipients' setting for private messages. This setting allows admins to define the maximum number of recipients per private message with a board-wide setting and a group-specific setting. - Added new permission setting for sending private messages to groups. Now there are two permissions to define sending private messages to multiple recipients and private messages to groups. git-svn-id: file:///svn/phpbb/trunk@8914 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/permissions_phpbb.php')
-rw-r--r--phpBB/language/en/acp/permissions_phpbb.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 8f090667b4..c8ccc0e56a 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -111,7 +111,8 @@ $lang = array_merge($lang, array(
'acl_u_sig' => array('lang' => 'Can use signature', 'cat' => 'post'),
'acl_u_sendpm' => array('lang' => 'Can send private messages', 'cat' => 'pm'),
- 'acl_u_masspm' => array('lang' => 'Can send pm to multiple users and groups', 'cat' => 'pm'),
+ 'acl_u_masspm' => array('lang' => 'Can send messages to multiple users', 'cat' => 'pm'),
+ 'acl_u_masspm_group'=> array('lang' => 'Can send messages to groups', 'cat' => 'pm'),
'acl_u_readpm' => array('lang' => 'Can read private messages', 'cat' => 'pm'),
'acl_u_pm_edit' => array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
'acl_u_pm_delete' => array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),