diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-06-19 22:03:19 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-06-19 22:03:19 +0000 |
| commit | d85a5ad036b2088fe742de29d9464678d2e19e23 (patch) | |
| tree | 9bbd990b2baea05723f64cbcc26ecd39669bf464 /phpBB/language | |
| parent | 6e884de00060c3632e1e7fa25c84c4e602fd46e8 (diff) | |
| download | forums-d85a5ad036b2088fe742de29d9464678d2e19e23.tar forums-d85a5ad036b2088fe742de29d9464678d2e19e23.tar.gz forums-d85a5ad036b2088fe742de29d9464678d2e19e23.tar.bz2 forums-d85a5ad036b2088fe742de29d9464678d2e19e23.tar.xz forums-d85a5ad036b2088fe742de29d9464678d2e19e23.zip | |
Fix bug #46785 - Hide avatars if type disabled and give global option to turn on/off
Authorised by: acydburn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9632 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/users.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 50f7ff612e..9ad6015a1f 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -87,6 +87,8 @@ $lang = array_merge($lang, array( $lang = array_merge($lang, array( 'ACP_AVATAR_SETTINGS_EXPLAIN' => 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that file size limits are only imposed on uploaded avatars, they do not apply to remotely linked images.', + 'ALLOW_AVATARS' => 'Enable avatars', + 'ALLOW_AVATARS_EXPLAIN' => 'Allow general usage of 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/acp/users.php b/phpBB/language/en/acp/users.php index dc28032483..01cbbfd81e 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -109,7 +109,9 @@ $lang = array_merge($lang, array( 'USER_ADMIN_MOVE_POSTS' => 'Move all posts', 'USER_ADMIN_SIG_REMOVED' => 'Successfully removed signature from user account.', 'USER_ATTACHMENTS_REMOVED' => 'Successfully removed all attachments made by this user.', + 'USER_AVATAR_NOT_ALLOWED' => 'The avatar cannot be displayed because avatars have been disallowed.', 'USER_AVATAR_UPDATED' => 'Successfully updated user avatars details.', + 'USER_AVATAR_TYPE_NOT_ALLOWED' => 'The current avatar cannot be displayed because its type has been disallowed.', 'USER_CUSTOM_PROFILE_FIELDS' => 'Custom profile fields', 'USER_DELETED' => 'User deleted successfully.', 'USER_GROUP_ADD' => 'Add user to group', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index d6148a737b..a214cc163e 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -93,7 +93,9 @@ $lang = array_merge($lang, array( '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_TYPE_NOT_ALLOWED' => 'Your current avatar cannot be displayed because its type has been disallowed.', 'BACK_TO_DRAFTS' => 'Back to saved drafts', 'BACK_TO_LOGIN' => 'Back to login screen', |