diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index 2cdbfc8c58..50b2bd4cf8 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -318,7 +318,7 @@ $lang['No_folder'] = "No folder specified"; $lang['Viewing_profile_of'] = "Viewing profile of"; // followed by username $lang['Preferences'] = "Preferences"; $lang['Items_required'] = "Items marked with a * are required unless stated otherwise"; -$lang['Registration_info'] = "Registraction Information"; +$lang['Registration_info'] = "Registration Information"; $lang['Profile_info'] = "Profile Information"; $lang['Profile_info_warn'] = "This information will be publicly viewable"; $lang['Avatar_panel'] = "Avatar control panel"; @@ -329,7 +329,7 @@ $lang['Contact'] = "Contact"; $lang['Email_address'] = "Email address"; $lang['Email'] = "Email"; $lang['Private_message'] = "Send Private Message"; -$lang['Hidden'] = "[ Hidden email address ]"; +$lang['Hidden_email'] = "[ Hidden email address ]"; $lang['Search_user_posts'] = "Search for posts by this user"; $lang['Interests'] = "Interests"; $lang['Occupation'] = "Occupation"; diff --git a/phpBB/profile.php b/phpBB/profile.php index 763c27a938..93066c62f5 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -253,8 +253,8 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) } else { - $email = $lang['Hidden']; - $email_img = $lang['Hidden']; + $email = $lang['Hidden_email']; + $email_img = $lang['Hidden_email']; } if($members[$i]['user_icq']) diff --git a/phpBB/templates/Default/profile_add_body.tpl b/phpBB/templates/Default/profile_add_body.tpl index 1712c023c1..0a59baa7f9 100755 --- a/phpBB/templates/Default/profile_add_body.tpl +++ b/phpBB/templates/Default/profile_add_body.tpl @@ -58,18 +58,6 @@ {L_INTERESTS}: - - {L_AVATAR}:
{L_AVATAR_EXPLAIN} - - - - - - - - -
{L_CURRENT_IMAGE}     {L_UPLOAD_IMAGE}:
     
     {L_DELETE_IMAGE}:
 {AVATAR} 
- {L_SIGNATURE}:
{L_SIGNATURE_EXPLAIN} @@ -125,6 +113,41 @@ {L_DATE_FORMAT}:
{L_DATE_FORMAT_EXPLANATION} + + {L_AVATAR_PANEL} + + + + + + + + +
{L_AVATAR_EXPLAIN}{L_CURRENT_IMAGE}
{AVATAR}
 {L_DELETE_AVATAR}
+ + + + + {L_UPLOAD_AVATAR_FILE}: + + + + {L_UPLOAD_AVATAR_URL}:
{L_UPLOAD_AVATAR_URL_EXPLAIN} + + + + + + {L_LINK_REMOTE_AVATAR}:
{L_LINK_REMOTE_AVATAR_EXPLAIN} + + + + + + {L_AVATAR_GALLERY}: + + + {S_HIDDEN_FIELDS}  diff --git a/phpBB/templates/PSO/profile_add_body.tpl b/phpBB/templates/PSO/profile_add_body.tpl index e74ef63cb2..9b3a088409 100644 --- a/phpBB/templates/PSO/profile_add_body.tpl +++ b/phpBB/templates/PSO/profile_add_body.tpl @@ -113,7 +113,7 @@ {TIMEZONE_SELECT} - {L_DATE_FORMAT}:
{L_DATE_FORMAT_EXPLANATION} + {L_DATE_FORMAT}:
{L_DATE_FORMAT_EXPLAIN}