diff options
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 10 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 2 | 
2 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 5eb10d50b3..427e4f4d98 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -59,6 +59,7 @@ $lang = array_merge($lang, array(  	'ACP_CAPTCHA'				=> 'CAPTCHA', +	'ACP_CAT_CUSTOMISE'			=> 'Customise',  	'ACP_CAT_DATABASE'			=> 'Database',  	'ACP_CAT_DOT_MODS'			=> '.MODs',  	'ACP_CAT_FORUMS'			=> 'Forums', @@ -80,8 +81,10 @@ $lang = array_merge($lang, array(  	'ACP_DISALLOW_USERNAMES'	=> 'Disallow usernames',  	'ACP_EMAIL_SETTINGS'		=> 'Email settings', -	'ACP_EXTENSION_GROUPS'		=> 'Manage extension groups', -	'ACP_EXTENSIONS'			=> 'Manage board extensions', +	'ACP_EXTENSION_GROUPS'		=> 'Manage attachment extension groups', +	'ACP_EXTENSION_MANAGEMENT'	=> 'Extension management', +	'ACP_EXTENSIONS'			=> 'Extensions', +  	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',  	'ACP_FORUM_LOGS'				=> 'Forum logs', @@ -119,7 +122,7 @@ $lang = array_merge($lang, array(  	'ACP_MANAGE_ATTACHMENTS'			=> 'Manage attachments',  	'ACP_MANAGE_ATTACHMENTS_EXPLAIN'	=> 'Here you can list and delete files attached to posts and private messages.', -	'ACP_MANAGE_EXTENSIONS'		=> 'Manage extensions', +	'ACP_MANAGE_EXTENSIONS'		=> 'Manage attachment extensions',  	'ACP_MANAGE_FORUMS'			=> 'Manage forums',  	'ACP_MANAGE_RANKS'			=> 'Manage ranks',  	'ACP_MANAGE_REASONS'		=> 'Manage report/denial reasons', @@ -166,7 +169,6 @@ $lang = array_merge($lang, array(  	'ACP_SERVER_SETTINGS'		=> 'Server settings',  	'ACP_SIGNATURE_SETTINGS'	=> 'Signature settings',  	'ACP_SMILIES'				=> 'Smilies', -	'ACP_STYLE_COMPONENTS'		=> 'Style components',  	'ACP_STYLE_MANAGEMENT'		=> 'Style management',  	'ACP_STYLES'				=> 'Styles',  	'ACP_STYLES_CACHE'			=> 'Purge Cache', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index fbb7b40d41..6277457af7 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -186,6 +186,8 @@ $lang = array_merge($lang, array(  	'ERR_CONNECTING_SERVER'				=> 'Error connecting to the server.',  	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',  	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.', +	'ERR_TEMPLATE_EVENT_LOCATION'		=> 'The specified template event location <em>[%s]</em> is improperly formatted.', +	'ERR_TEMPLATE_COMPILATION'		=> 'The file could not be compiled: %s',  	'ERR_UNABLE_TO_LOGIN'				=> 'The specified username or password is incorrect.',  	'ERR_UNWATCHING'					=> 'An error occured while trying to unsubscribe.',  	'ERR_WATCHING'						=> 'An error occured while trying to subscribe.',  | 
