diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-07 08:32:13 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-07 08:32:13 -0500 |
| commit | b0948fb3470056b14a743dcfeb59aea0f35d0029 (patch) | |
| tree | 27623997067385f23c35220c9a664557fb568fe5 /phpBB/language/en | |
| parent | 2364d4b2172c9f54520f04001b29c517d7138b69 (diff) | |
| parent | c23d2457e9be616bfa83aebc5e743130b6c69624 (diff) | |
| download | forums-b0948fb3470056b14a743dcfeb59aea0f35d0029.tar forums-b0948fb3470056b14a743dcfeb59aea0f35d0029.tar.gz forums-b0948fb3470056b14a743dcfeb59aea0f35d0029.tar.bz2 forums-b0948fb3470056b14a743dcfeb59aea0f35d0029.tar.xz forums-b0948fb3470056b14a743dcfeb59aea0f35d0029.zip | |
Merge PR #607 branch 'nickvergessen/ticket/10679' into develop
* nickvergessen/ticket/10679:
[ticket/10679] Update module basename, we added the xcp_ prefix in 3.1
[ticket/10679] Use module_auth to limit access to the module
[ticket/10679] Add new permission for changing profile field information
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index b142cfd9aa..27ef714f8b 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -102,6 +102,7 @@ $lang = array_merge($lang, array( 'acl_u_chgemail' => array('lang' => 'Can change email address', 'cat' => 'profile'), 'acl_u_chgavatar' => array('lang' => 'Can change avatar', 'cat' => 'profile'), 'acl_u_chggrp' => array('lang' => 'Can change default usergroup', 'cat' => 'profile'), + 'acl_u_chgprofileinfo' => array('lang' => 'Can change profile field information', 'cat' => 'profile'), 'acl_u_attach' => array('lang' => 'Can attach files', 'cat' => 'post'), 'acl_u_download' => array('lang' => 'Can download files', 'cat' => 'post'), diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index b919699ea0..267ae00710 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -318,6 +318,7 @@ $lang = array_merge($lang, array( 'NO_AUTH_FORWARD_MESSAGE' => 'You are not authorised to forward private messages.', 'NO_AUTH_GROUP_MESSAGE' => 'You are not authorised to send private messages to groups.', 'NO_AUTH_PASSWORD_REMINDER' => 'You are not authorised to request a new password.', + 'NO_AUTH_PROFILEINFO' => 'You are not authorised to change your profile information.', 'NO_AUTH_READ_HOLD_MESSAGE' => 'You are not authorised to read private messages that are on hold.', 'NO_AUTH_READ_MESSAGE' => 'You are not authorised to read private messages.', 'NO_AUTH_READ_REMOVED_MESSAGE' => 'You are not able to read this message because it was removed by the author.', |