aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-02-22 21:42:26 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-02-22 21:42:26 +0000
commit6b13f94be9fdd4054e08d593f5c871a11853344e (patch)
treea9394609b17fc472f2b9748d6e16130d18df22aa /phpBB/language
parent19d5dddaebecd2ef85eee40690a69f272fafdb2d (diff)
downloadforums-6b13f94be9fdd4054e08d593f5c871a11853344e.tar
forums-6b13f94be9fdd4054e08d593f5c871a11853344e.tar.gz
forums-6b13f94be9fdd4054e08d593f5c871a11853344e.tar.bz2
forums-6b13f94be9fdd4054e08d593f5c871a11853344e.tar.xz
forums-6b13f94be9fdd4054e08d593f5c871a11853344e.zip
implementing permission roles
- copy permissions (adding groups) - copy permissions (adding forums) - checking proper groupadd/del settings - added intro page to permissions (to give an overview and quick links) - able to select forums + subforums, single forum, all groups, all users (permission screens) - able to reset permissions (only reset input field) - fix forum deletion bug git-svn-id: file:///svn/phpbb/trunk@5574 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/common.php35
-rw-r--r--phpBB/language/en/acp/forums.php5
-rw-r--r--phpBB/language/en/acp/groups.php5
-rw-r--r--phpBB/language/en/acp/permissions.php74
-rw-r--r--phpBB/language/en/acp/permissions_phpbb.php37
-rw-r--r--phpBB/language/en/common.php1
6 files changed, 108 insertions, 49 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index d796137bf3..93f42b58ec 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -32,6 +32,7 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'ACP_ADMINISTRATORS' => 'Administrators',
'ACP_ADMIN_LOGS' => 'Admin Log',
+ 'ACP_ADMIN_ROLES' => 'Admin Roles',
'ACP_ATTACHMENTS' => 'Attachments',
'ACP_ATTACHMENT_SETTINGS' => 'Attachment Settings',
'ACP_AUTH_SETTINGS' => 'Authentication',
@@ -42,6 +43,7 @@ $lang = array_merge($lang, array(
'ACP_BAN_EMAILS' => 'Ban Emails',
'ACP_BAN_IPS' => 'Ban IPs',
'ACP_BAN_USERNAMES' => 'Ban Usernames',
+ 'ACP_BASIC_PERMISSIONS' => 'Basic Permissions',
'ACP_BBCODES' => 'BBCodes',
'ACP_BOARD_DEFAULTS' => 'Board Defaults',
'ACP_BOARD_MANAGEMENT' => 'Board Management',
@@ -70,10 +72,12 @@ $lang = array_merge($lang, array(
'ACP_EMAIL_SETTINGS' => 'Email Settings',
'ACP_EXTENSION_GROUPS' => 'Manage Extension Groups',
- 'ACP_FORUM_LOGS' => 'Forum Logs',
- 'ACP_FORUM_MANAGEMENT' => 'Forum Management',
- 'ACP_FORUM_MODERATORS' => 'Forum Moderators',
- 'ACP_FORUM_PERMISSIONS' => 'Forum Permissions',
+ 'ACP_FORUM_BASED_PERMISSIONS' => 'Forum Based Permissions',
+ 'ACP_FORUM_LOGS' => 'Forum Logs',
+ 'ACP_FORUM_MANAGEMENT' => 'Forum Management',
+ 'ACP_FORUM_MODERATORS' => 'Forum Moderators',
+ 'ACP_FORUM_PERMISSIONS' => 'Forum Permissions',
+ 'ACP_FORUM_ROLES' => 'Forum Roles',
'ACP_GENERAL_CONFIGURATION' => 'General Configuration',
'ACP_GENERAL_TASKS' => 'General Tasks',
@@ -106,16 +110,15 @@ $lang = array_merge($lang, array(
'ACP_MESSAGE_SETTINGS' => 'Message Settings',
'ACP_MODULE_MANAGEMENT' => 'Module Management',
'ACP_MOD_LOGS' => 'Moderator Log',
+ 'ACP_MOD_ROLES' => 'Mod Roles',
'ACP_ORPHAN_ATTACHMENTS' => 'Orphan Attachments',
+ 'ACP_PERMISSIONS' => 'Permissions',
'ACP_PERMISSION_MASKS' => 'Permission Masks',
+ 'ACP_PERMISSION_ROLES' => 'Permission Roles',
'ACP_PERMISSION_SETTINGS' => 'Permission Settings',
'ACP_PHP_INFO' => 'PHP Information',
- 'ACP_PRESET_ADMIN' => 'Admin Permission Presets',
- 'ACP_PRESET_FORUM' => 'Forum Permission Presets',
- 'ACP_PRESET_MOD' => 'Mod Permission Presets',
- 'ACP_PRESET_USER' => 'User Permission Presets',
'ACP_PRUNE_FORUMS' => 'Prune Forums',
'ACP_PRUNE_USERS' => 'Prune Users',
'ACP_PRUNING' => 'Pruning',
@@ -125,6 +128,7 @@ $lang = array_merge($lang, array(
'ACP_SERVER_CONFIGURATION' => 'Server Configuration',
'ACP_SERVER_SETTINGS' => 'Server Settings',
'ACP_SMILIES' => 'Smilies',
+ 'ACP_SPECIAL_PERMISSIONS' => 'Special Permissions',
'ACP_STYLE_COMPONENTS' => 'Style Components',
'ACP_STYLE_MANAGEMENT' => 'Style Management',
'ACP_STYLES' => 'Styles',
@@ -145,6 +149,7 @@ $lang = array_merge($lang, array(
'ACP_USER_PREFS' => 'Preferences',
'ACP_USER_PROFILE' => 'Profile',
'ACP_USER_RANK' => 'Rank',
+ 'ACP_USER_ROLES' => 'User Roles',
'ACP_USER_SECURITY' => 'User Security',
'ACP_USER_SIG' => 'Signature',
@@ -427,8 +432,18 @@ $lang = array_merge($lang, array(
'LOG_MODULE_ADD' => '<b>Module added</b><br />&#187; %s',
'LOG_MODULE_EDIT' => '<b>Module edited</b><br />&#187; %s',
- 'LOG_PRESET_ADD' => '<b>Preset added</b><br />&#187; %s',
- 'LOG_PRESET_EDIT' => '<b>Preset edited</b><br />&#187; %s',
+ 'LOG_A_ROLE_ADD' => '<b>Admin Role added</b><br />&#187; %s',
+ 'LOG_A_ROLE_EDIT' => '<b>Admin Role edited</b><br />&#187; %s',
+ 'LOG_A_ROLE_REMOVED' => '<b>Admin Role removed</b><br />&#187; %s',
+ 'LOG_F_ROLE_ADD' => '<b>Forum Role added</b><br />&#187; %s',
+ 'LOG_F_ROLE_EDIT' => '<b>Forum Role edited</b><br />&#187; %s',
+ 'LOG_F_ROLE_REMOVED' => '<b>Forum Role removed</b><br />&#187; %s',
+ 'LOG_M_ROLE_ADD' => '<b>Mod Role added</b><br />&#187; %s',
+ 'LOG_M_ROLE_EDIT' => '<b>Mod Role edited</b><br />&#187; %s',
+ 'LOG_M_ROLE_REMOVED' => '<b>Mod Role removed</b><br />&#187; %s',
+ 'LOG_U_ROLE_ADD' => '<b>User Role added</b><br />&#187; %s',
+ 'LOG_U_ROLE_EDIT' => '<b>User Role edited</b><br />&#187; %s',
+ 'LOG_U_ROLE_REMOVED' => '<b>User Role removed</b><br />&#187; %s',
'LOG_PROFILE_FIELD_ACTIVATE' => '<b>Profile field activated</b><br />&#187; %s',
'LOG_PROFILE_FIELD_CREATE' => '<b>Profile field added</b><br />&#187; %s',
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index c9b619ebce..4e32b313ee 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -37,7 +37,9 @@ $lang = array_merge($lang, array(
'AUTO_PRUNE_VIEWED' => 'Auto-prune Post Viewed Age',
'AUTO_PRUNE_VIEWED_EXPLAIN' => 'Number of days since topic was viewed after which topic is removed.',
- 'CREATE_FORUM' => 'Create new forum',
+ 'COPY_PERMISSIONS' => 'Copy permissions from',
+ 'COPY_PERMISSIONS_EXPLAIN' => 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.',
+ 'CREATE_FORUM' => 'Create new forum',
'DECIDE_MOVE_DELETE_CONTENT' => 'Delete content or move to forum',
'DEFAULT_STYLE' => 'Default Style',
@@ -107,6 +109,7 @@ $lang = array_merge($lang, array(
'NO_DESTINATION_FORUM' => 'You have not specified a forum to move content to',
'NO_FORUM_ACTION' => 'No action defined for what happens with the forum content',
'NO_PARENT' => 'No Parent',
+ 'NO_PERMISSIONS' => 'Do not copy permissions',
'NO_PERMISSION_FORUM_ADD' => 'You do not have the neccessary permissions to delete forums',
'NO_PERMISSION_FORUM_DELETE' => 'You do not have the neccessary permissions to add forums',
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 7035466cb8..574dfbafd2 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -33,7 +33,9 @@ $lang = array_merge($lang, array(
'ADD_USERS' => 'Add Users',
'ADD_USERS_EXPLAIN' => 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a seperate line.',
- 'CREATE_GROUP' => 'Create new group',
+ 'COPY_PERMISSIONS' => 'Copy permissions from',
+ 'COPY_PERMISSIONS_EXPLAIN' => 'Once created, the group will have the same permissions as the one you select here.',
+ 'CREATE_GROUP' => 'Create new group',
'GROUPS_NO_MEMBERS' => 'This group has no members',
'GROUPS_NO_MODS' => 'No group leaders defined',
@@ -90,6 +92,7 @@ $lang = array_merge($lang, array(
'GROUP_USERS_REMOVE' => 'Users removed from group and new defaults set successfully',
'NO_GROUP' => 'No group specified',
+ 'NO_PERMISSIONS' => 'Do not copy permissions',
'NO_USERS' => 'The requested users do not exist',
'SPECIAL_GROUPS' => 'Predefined groups',
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 9e1cbed806..def1fa7c7e 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -56,10 +56,10 @@ $lang = array_merge($lang, array(
'ACP_GLOBAL_MODERATORS_EXPLAIN' => 'Here you can assign global moderator rights to users or groups. These moderators are like ordinary moderators except they have access to every forum on your board.',
'ACP_GROUPS_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can assign forum permissions to groups.',
'ACP_GROUPS_PERMISSIONS_EXPLAIN' => 'Here you can assign global permissions to groups - user permissions, global moderator permissions and admin permissions. User permissions include capabilities such as the use of avatars, sending private messages, etc. Global moderator permissions are blabla, administrative permissions blabla. Individual users permissions should only be changed in rare occassions, the preferred method is putting users in groups and assigning the groups permissions.',
- 'ACP_PRESET_ADMIN_EXPLAIN' => 'Here you are able to manage the presets for administrative permissions. Presets are effective permissions, if you change a preset the items having this preset assigned will change it\'s permissions too.',
- 'ACP_PRESET_FORUM_EXPLAIN' => 'Here you are able to manage the presets for forum permissions. Presets are effective permissions, if you change a preset the items having this preset assigned will change it\'s permissions too.',
- 'ACP_PRESET_MOD_EXPLAIN' => 'Here you are able to manage the presets for moderative permissions. Presets are effective permissions, if you change a preset the items having this preset assigned will change it\'s permissions too.',
- 'ACP_PRESET_USER_EXPLAIN' => 'Here you are able to manage the presets for user permissions. Presets are effective permissions, if you change a preset the items having this preset assigned will change it\'s permissions too.',
+ 'ACP_ADMIN_ROLES_EXPLAIN' => 'Here you are able to manage the roles for administrative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it\'s permissions too.',
+ 'ACP_FORUM_ROLES_EXPLAIN' => 'Here you are able to manage the roles for forum permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it\'s permissions too.',
+ 'ACP_MOD_ROLES_EXPLAIN' => 'Here you are able to manage the roles for moderative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it\'s permissions too.',
+ 'ACP_USER_ROLES_EXPLAIN' => 'Here you are able to manage the roles for user permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it\'s permissions too.',
'ACP_USERS_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can assign forum permissions to users.',
'ACP_USERS_PERMISSIONS_EXPLAIN' => 'Here you can assign global permissions to users - user permissions, global moderator permissions and admin permissions. User permissions include capabilities such as the use of avatars, sending private messages, etc. Global moderator permissions are blabla, administrative permissions blabla. To alter these settings for large numbers of users the Group permissions system is the prefered method. Users permissions should only be changed in rare occassions, the preferred method is putting users in groups and assigning the groups permissions.',
'ACP_VIEW_ADMIN_PERMISSIONS_EXPLAIN' => 'Here you can view the effective administrative permissions assigned to the selected users/groups',
@@ -70,22 +70,30 @@ $lang = array_merge($lang, array(
'ADD_GROUPS' => 'Add Groups',
'ADD_USERS' => 'Add Users',
+ 'ALL_GROUPS' => 'Select all groups',
'ALL_NO' => 'All No',
'ALL_UNSET' => 'All Unset',
+ 'ALL_USERS' => 'Select all users',
'ALL_YES' => 'All Yes',
'APPLY_ALL_PERMISSIONS' => 'Apply all Permissions',
'APPLY_PERMISSIONS' => 'Apply Permissions',
- 'APPLY_PERMISSIONS_EXPLAIN' => 'The Permissions and Preset defined for this item will only be applied to this item and all checked items.',
+ 'APPLY_PERMISSIONS_EXPLAIN' => 'The Permissions and Role defined for this item will only be applied to this item and all checked items.',
'AUTH_UPDATED' => 'Permissions have been updated',
- 'CREATE_PRESET' => 'Create Preset',
- 'CREATE_PRESET_FROM' => 'Use settings from...',
-
- 'EDIT_PRESET' => 'Edit Preset',
+ 'CREATE_ROLE' => 'Create Role',
+ 'CREATE_ROLE_FROM' => 'Use settings from...',
+ 'CUSTOM' => 'Custom...',
+
+ 'DELETE_ROLE' => 'Delete role',
+ 'DELETE_ROLE_CONFIRM' => 'Are you sure you want to remove this role? Items having this role assigned will <strong>not</strong> loosing their permission settings.',
+ 'DISPLAY_FOR_GROUP' => 'Display for group',
+ 'DISPLAY_FOR_GROUP_EXPLAIN' => 'The role only shows up for the selected group(s). This is helpful if you set options only meant for some groups for example.',
+ 'DISPLAY_ROLE_ITEMS' => 'View Items using this role',
+
+ 'EDIT_ROLE' => 'Edit Role',
'EVERY_USER_GROUP' => 'Every user/group',
- 'GROUP_BINDING' => 'Group Binding',
- 'GROUP_BINDING_EXPLAIN' => 'If a group is selected here the preset only shows up for the selected group. This is helpful if you set options only meant for administrators for example.',
+ 'GROUPS_NOT_ASSIGNED' => 'No group assigned to this role',
'LOOK_UP_FORUMS_EXPLAIN' => 'You are able to select more than one forum',
'LOOK_UP_GROUP' => 'Look up Usergroup',
@@ -95,30 +103,56 @@ $lang = array_merge($lang, array(
'MANAGE_USERS' => 'Manage Users',
'NO_AUTH_SETTING_FOUND' => 'Permission settings not defined.',
- 'NO_PRESET_NAME_SPECIFIED' => 'Please give the preset a name.',
- 'NO_PRESET_SELECTED' => 'Preset could not be found.',
+ 'NO_ROLE_AVAILABLE' => 'No role available',
+ 'NO_ROLE_NAME_SPECIFIED' => 'Please give the role a name.',
+ 'NO_ROLE_SELECTED' => 'Role could not be found.',
'ONLY_FORUM_DEFINED' => 'You only defined forums in your selection. Please also select at least one user or one group.',
- 'PERM_PRESET_APPLIED_TO_ALL' => 'Permissions and Preset will also be applied to all checked objects',
- 'PRESET' => 'Preset',
- 'PRESET_ADD_SUCCESS' => 'Preset successfully added.',
- 'PRESET_DETAILS' => 'Preset Details',
- 'PRESET_EDIT_SUCCESS' => 'Preset successfully edited.',
- 'PRESET_NAME' => 'Preset Name',
- 'PRESET_NAME_ALREADY_EXIST' => 'A preset named <strong>%s</strong> already exist for the specified settings.',
+ 'PERMISSION_APPLIED_TO_ALL' => 'Permissions and Role will also be applied to all checked objects',
+ 'PLUS_SUBFORUMS' => '+Subforums',
+ 'PRE_ALL_CLOSED' => 'All closed groups',
+ 'PRE_ALL_FREE' => 'All freely open groups',
+ 'PRE_ALL_HIDDEN' => 'All hidden groups',
+ 'PRE_ALL_OPEN' => 'All open groups',
+ 'PRE_ALL_SPECIAL' => 'All special groups',
+ 'PRE_NOT_CLOSED' => 'All groups excluding closed groups',
+ 'PRE_NOT_FREE' => 'All groups excluding freely open groups',
+ 'PRE_NOT_HIDDEN' => 'All groups excluding hidden groups',
+ 'PRE_NOT_OPEN' => 'All groups excluding open groups',
+ 'PRE_NOT_SPECIAL' => 'All groups excluding special groups',
+ 'PRE_NOT_SPECIAL_GUEST' => 'All groups excluding special guest groups',
+ 'PRE_NOT_SPECIAL_REGISTERED' => 'All groups excluding special registered groups',
+ 'PRE_ONLY_SPECIAL_GUEST' => 'Only special guest groups',
+ 'PRE_ONLY_SPECIAL_REGISTERED' => 'Only special registered groups',
+
+ 'REMOVE_ROLE' => 'Remove Role',
+ 'ROLE' => 'Role',
+ 'ROLE_ADD_SUCCESS' => 'Role successfully added.',
+ 'ROLE_ASSIGNED_TO' => 'Role assigned to',
+ 'ROLE_DELETED' => 'Role successfully removed.',
+ 'ROLE_DETAILS' => 'Role Details',
+ 'ROLE_EDIT_SUCCESS' => 'Role successfully edited.',
+ 'ROLE_NAME' => 'Role Name',
+ 'ROLE_NAME_ALREADY_EXIST' => 'A role named <strong>%s</strong> already exist for the specified permission type.',
+ 'ROLE_NOT_ASSIGNED' => 'Role has not been assigned yet.',
'SELECTED_FORUM_NOT_EXIST' => 'The selected forum(s) do not exist',
'SELECTED_GROUP_NOT_EXIST' => 'The selected group(s) do not exist',
'SELECTED_USER_NOT_EXIST' => 'The selected user(s) do not exist',
+ 'SELECT_FORUM_SUBFORUM_EXPLAIN' => 'The forum you select here will include all subforums into the selection',
+ 'SELECT_ROLE' => 'Select role...',
'SELECT_TYPE' => 'Select type',
'SET_PERMISSIONS' => 'Set permissions',
+ 'SET_ROLE_PERMISSIONS' => 'Set role permissions',
'SET_USERS_PERMISSIONS' => 'Set users permissions',
'SET_USERS_FORUM_PERMISSIONS' => 'Set users forum permissions',
+ 'USERS_NOT_ASSIGNED' => 'No user assigned to this role',
'USER_IS_MEMBER_OF_DEFAULT' => 'is a member of the following default groups',
'USER_IS_MEMBER_OF_CUSTOM' => 'is a member of the following custom groups',
+ 'VIEW_ASSIGNED_ITEMS' => 'View assigned items',
'VIEW_PERMISSIONS' => 'View permissions',
'WRONG_PERMISSION_TYPE' => 'Wrong permission type selected',
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 1083dfe71f..20f1cebe84 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -54,16 +54,18 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'permission_cat' => array(
'actions' => 'Actions',
+ 'content' => 'Content',
'forums' => 'Forums',
+ 'misc' => 'Misc',
+ 'permissions' => 'Permissions',
+ 'pm' => 'Private Messages',
+ 'polls' => 'Polls',
'post' => 'Post',
+ 'post_actions' => 'Post Actions',
'posting' => 'Posting',
- 'polls' => 'Polls',
- 'content' => 'Content',
- 'pm' => 'Private Messages',
- 'misc' => 'Misc',
'profile' => 'Profile',
- 'permissions' => 'Permissions',
'settings' => 'Settings',
+ 'topic_actions' => 'Topic Actions',
'user_group' => 'Users &amp; Groups',
),
@@ -156,18 +158,18 @@ $lang = array_merge($lang, array(
// Moderator Permissions
$lang = array_merge($lang, array(
- 'acl_m_edit' => array('lang' => 'Can edit posts', 'cat' => 'actions'),
- 'acl_m_delete' => array('lang' => 'Can delete posts', 'cat' => 'actions'),
- 'acl_m_move' => array('lang' => 'Can move topics', 'cat' => 'actions'),
- 'acl_m_lock' => array('lang' => 'Can lock topics', 'cat' => 'actions'),
- 'acl_m_split' => array('lang' => 'Can split topics', 'cat' => 'actions'),
- 'acl_m_merge' => array('lang' => 'Can merge topics', 'cat' => 'actions'),
- 'acl_m_approve' => array('lang' => 'Can approve posts', 'cat' => 'actions'),
- 'acl_m_unrate' => array('lang' => 'Can un-rate posts', 'cat' => 'actions'),
-
- 'acl_m_auth' => array('lang' => 'Can set permissions', 'cat' => 'misc'),
- 'acl_m_ip' => array('lang' => 'Can view IP\'s', 'cat' => 'misc'),
- 'acl_m_info' => array('lang' => 'Can alter forum info', 'cat' => 'misc'),
+ 'acl_m_edit' => array('lang' => 'Can edit posts', 'cat' => 'post_actions'),
+ 'acl_m_delete' => array('lang' => 'Can delete posts', 'cat' => 'post_actions'),
+ 'acl_m_approve' => array('lang' => 'Can approve posts', 'cat' => 'post_actions'),
+ 'acl_m_chgposter' => array('lang' => 'Can change post author', 'cat' => 'post_actions'),
+
+ 'acl_m_move' => array('lang' => 'Can move topics', 'cat' => 'topic_actions'),
+ 'acl_m_lock' => array('lang' => 'Can lock topics', 'cat' => 'topic_actions'),
+ 'acl_m_split' => array('lang' => 'Can split topics', 'cat' => 'topic_actions'),
+ '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'),
));
// Admin Permissions
@@ -206,6 +208,7 @@ $lang = array_merge($lang, array(
'acl_a_uauth' => array('lang' => 'Can alter user permissions', 'cat' => 'permissions'),
'acl_a_authgroups' => array('lang' => 'Can alter permissions for groups', 'cat' => 'permissions'),
'acl_a_authusers' => array('lang' => 'Can alter permissions for users', 'cat' => 'permissions'),
+ 'acl_a_roles' => array('lang' => 'Can manage roles', 'cat' => 'permissions'),
'acl_a_styles' => array('lang' => 'Can manage styles', 'cat' => 'misc'),
'acl_a_viewlogs' => array('lang' => 'Can view logs', 'cat' => 'misc'),
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 05684243a0..ac6c36d08c 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -271,6 +271,7 @@ $lang = array_merge($lang, array(
'NONE' => 'None',
'NOT_WATCHING_FORUM'=> 'You no subscribe to updates on this forum',
'NOT_WATCHING_TOPIC'=> 'You are no longer subscribed to this topic.',
+ 'NO_AUTH_OPERATION' => 'You do not have the neccessary permissions to complete this operation.',
'NO_BIRTHDAYS' => 'No birthdays today',
'NO_FORUM' => 'The forum you selected does not exist',
'NO_FORUMS' => 'This board has no forums',