aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/common.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language/en/acp/common.php')
-rw-r--r--phpBB/language/en/acp/common.php35
1 files changed, 25 insertions, 10 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',