diff options
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 15 | 
2 files changed, 16 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 1b99c87938..ff686f2360 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -99,6 +99,7 @@ $lang = array_merge($lang, array(  	'ALLOW_AVATARS'					=> 'Enable avatars',  	'ALLOW_AVATARS_EXPLAIN'			=> 'Allow general usage of avatars;<br />If you disable avatars in general or avatars of a certain mode, the disabled avatars will no longer be shown on the board, but users will still be able to download their own avatars in the User Control Panel.', +	'ALLOW_GRAVATAR'				=> 'Enable gravatar avatars',  	'ALLOW_LOCAL'					=> 'Enable gallery avatars',  	'ALLOW_REMOTE'					=> 'Enable remote avatars',  	'ALLOW_REMOTE_EXPLAIN'			=> 'Avatars linked to from another website.', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 267ae00710..eb08296895 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -89,12 +89,22 @@ $lang = array_merge($lang, array(  	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',  	'AUTOLOGIN_SESSION_KEYS_DELETED'=> 'The selected "Remember Me" login keys were successfully deleted.',  	'AVATAR_CATEGORY'				=> 'Category', +	'AVATAR_DRIVER_GRAVATAR_TITLE'	=> 'Gravatar', +	'AVATAR_DRIVER_GRAVATAR_EXPLAIN'=> 'Gravatar is a service that allows you to maintain the same avatar across multiple websites. Visit <a href="http://www.gravatar.com/">Gravatar</a> for more information.', +	'AVATAR_DRIVER_LOCAL_TITLE'		=> 'Gallery avatar', +	'AVATAR_DRIVER_LOCAL_EXPLAIN'	=> 'You can choose your avatar from a locally available set of avatars.', +	'AVATAR_DRIVER_REMOTE_TITLE'	=> 'Remote avatar', +	'AVATAR_DRIVER_REMOTE_EXPLAIN'	=> 'Link to avatar images from another website.', +	'AVATAR_DRIVER_UPLOAD_TITLE'	=> 'Upload avatar', +	'AVATAR_DRIVER_UPLOAD_EXPLAIN'	=> 'Upload your own custom avatar.',  	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$s, height: %2$s, file size: %3$.2f KiB.',  	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',  	'AVATAR_GALLERY'				=> 'Local gallery',  	'AVATAR_GENERAL_UPLOAD_ERROR'	=> 'Could not upload avatar to %s.',  	'AVATAR_NOT_ALLOWED'			=> 'Your avatar cannot be displayed because avatars have been disallowed.',  	'AVATAR_PAGE'					=> 'Page', +	'AVATAR_SELECT'					=> 'Select your avatar', +	'AVATAR_TYPE'					=> 'Avatar type',  	'AVATAR_TYPE_NOT_ALLOWED'		=> 'Your current avatar cannot be displayed because its type has been disallowed.',  	'BACK_TO_DRAFTS'			=> 'Back to saved drafts', @@ -236,6 +246,11 @@ $lang = array_merge($lang, array(  	'GLOBAL_ANNOUNCEMENT'		=> 'Global announcement', +	'GRAVATAR_AVATAR_EMAIL'			=> 'Gravatar email', +	'GRAVATAR_AVATAR_EMAIL_EXPLAIN'	=> 'Enter the email address you used for registering your account on <a href="http://www.gravatar.com/">Gravatar</a>.', +	'GRAVATAR_AVATAR_SIZE'			=> 'Avatar dimensions', +	'GRAVATAR_AVATAR_SIZE_EXPLAIN'	=> 'Specify the width and height of the avatar, leave blank to attempt automatic verification.', +  	'HIDE_ONLINE'				=> 'Hide my online status',  	'HIDE_ONLINE_EXPLAIN'		=> 'Changing this setting won’t become effective until your next visit to the board.',  	'HOLD_NEW_MESSAGES'			=> 'Do not accept new messages (New messages will be held back until enough space is available)',  | 
