diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php index 6f10c40e18..1bb118dba1 100644 --- a/phpBB/admin/admin_users.php +++ b/phpBB/admin/admin_users.php @@ -127,6 +127,9 @@ if ( isset($HTTP_GET_VARS['submit']) ) { ); $template->assign_vars(array( + "L_USER_TITLE" => $lang['User'] . " " . $lang['User_admin'], + "L_USER_EXPLAIN" => $lang['User_admin_explain'], + "USERNAME" => stripslashes($username), "EMAIL" => stripslashes($email), "YIM" => stripslashes($yim), diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index ceadee06d6..b3183053dd 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -837,13 +837,13 @@ $lang['Emotion'] = "Emotion"; // User Management $lang['User_admin'] = "Administration"; -$lang['User_admin_explain'] = "Here you can change your user's information. Do not abuse this power. Changing admin status is not provided here. Use the user permission pages for this."; +$lang['User_admin_explain'] = "Here you can change your user's information and certain specific options. To modify the users permissions please use the user and group permissions system."; $lang['User_delete'] = "Delete this user"; -$lang['User_delete_explain'] = "Click here to delete this user. This cannot be undone."; +$lang['User_delete_explain'] = "Click here to delete this user, this cannot be undone."; $lang['User_deleted'] = "User was successfully deleted."; -$lang['User_status'] = "User active"; -$lang['User_allowpm'] = "Allow PM"; -$lang['User_allowavatar'] = "Allow Avatar"; +$lang['User_status'] = "User is active"; +$lang['User_allowpm'] = "Can send Private Messages"; +$lang['User_allowavatar'] = "Can display avatar"; $lang['Admin_avatar_explain'] = "Here you can see and delete the user's current avatar."; $lang['User_special'] = "Special admin-only fields"; $lang['User_special_explain'] = "These fields are not able to be modified by the users. Here you can set their status and other options that are not given to users."; diff --git a/phpBB/templates/PSO/admin/user_edit_body.tpl b/phpBB/templates/PSO/admin/user_edit_body.tpl index 5ccbebec72..ddd3510baa 100644 --- a/phpBB/templates/PSO/admin/user_edit_body.tpl +++ b/phpBB/templates/PSO/admin/user_edit_body.tpl @@ -1,148 +1,140 @@ -
+
+ +

{L_USER_TITLE}

+ +

{L_USER_EXPLAIN}

+ +
- + -
{SITENAME} {L_INDEX}{L_REGISTRATION_INFO}
{L_ITEMS_REQUIRED}
- - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_USERNAME}: *
{L_EMAIL_ADDRESS}: *
{L_PASSWORD}: *
{L_PASSWORD_IF_CHANGED}
{L_CONFIRM} {L_PASSWORD}: *
{L_PASSWORD_CONFIRM_IF_CHANGED}
{L_PROFILE_INFO}
{L_PROFILE_INFO_NOTICE}
{L_ICQ_NUMBER}:
{L_AIM}:
{L_MESSENGER}:
{L_YAHOO}:
{L_WEBSITE}:
{L_LOCATION}:
{L_OCCUPATION}:
{L_INTERESTS}:
{L_SIGNATURE}:
{L_SIGNATURE_EXPLAIN}

{L_HTML_IS} {HTML_STATUS}
{L_BBCODE_IS} {BBCODE_STATUS}
{L_SMILIES_ARE} {SMILIES_STATUS}
{L_PREFERENCES}
{L_PUBLIC_VIEW_EMAIL}: {L_YES}   {L_NO}
{L_HIDE_USER}: {L_YES}   {L_NO}
{L_NOTIFY_ON_PRIVMSG}: {L_YES}   {L_NO}
{L_ALWAYS_ADD_SIGNATURE}: {L_YES}   {L_NO}
{L_ALWAYS_ALLOW_BBCODE}: {L_YES}   {L_NO}
{L_ALWAYS_ALLOW_HTML}: {L_YES}   {L_NO}
{L_ALWAYS_ALLOW_SMILIES}: {L_YES}   {L_NO}
{L_TIMEZONE}:{TIMEZONE_SELECT}
{L_DATE_FORMAT}:
{L_DATE_FORMAT_EXPLAIN}
{L_AVATAR_PANEL}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
{L_REGISTRATION_INFO}
{L_ITEMS_REQUIRED}
{L_USERNAME}: *
{L_EMAIL_ADDRESS}: *
{L_PASSWORD}: *
{L_PASSWORD_IF_CHANGED}
{L_CONFIRM} {L_PASSWORD}: *
{L_PASSWORD_CONFIRM_IF_CHANGED}
{L_PROFILE_INFO}
{L_PROFILE_INFO_NOTICE}
{L_ICQ_NUMBER}:
{L_AIM}:
{L_MESSENGER}:
{L_YAHOO}:
{L_WEBSITE}:
{L_LOCATION}:
{L_OCCUPATION}:
{L_INTERESTS}:
{L_SIGNATURE}:
{L_SIGNATURE_EXPLAIN}

{L_HTML_IS} {HTML_STATUS}
{L_BBCODE_IS} {BBCODE_STATUS}
{L_SMILIES_ARE} {SMILIES_STATUS}
{L_PREFERENCES}
{L_PUBLIC_VIEW_EMAIL}: {L_YES}   {L_NO}
{L_HIDE_USER}: {L_YES}   {L_NO}
{L_NOTIFY_ON_PRIVMSG}: {L_YES}   {L_NO}
{L_ALWAYS_ADD_SIGNATURE}: {L_YES}   {L_NO}
{L_ALWAYS_ALLOW_BBCODE}: {L_YES}   {L_NO}
{L_ALWAYS_ALLOW_HTML}: {L_YES}   {L_NO}
{L_ALWAYS_ALLOW_SMILIES}: {L_YES}   {L_NO}
{L_TIMEZONE}:{TIMEZONE_SELECT}
{L_DATE_FORMAT}:
{L_DATE_FORMAT_EXPLAIN}
{L_AVATAR_PANEL}
- - - - -
{L_AVATAR_EXPLAIN}{L_CURRENT_IMAGE}
{AVATAR}
 {L_DELETE_AVATAR}
{L_SPECIAL}
- {L_SPECIAL_EXPLAIN} -
{L_STATUS}: {L_YES}   {L_NO}
{L_ALLOWPM}: {L_YES}   {L_NO}
{L_ALLOWAVATAR}: {L_YES}   {L_NO}
{L_DELETE_USER}?{L_DELETE_USER_EXPLAIN}
{S_HIDDEN_FIELDS}  {L_AVATAR_EXPLAIN}{L_CURRENT_IMAGE}
{AVATAR}
 {L_DELETE_AVATAR}
{L_SPECIAL}
{L_SPECIAL_EXPLAIN}
{L_STATUS}: {L_YES}   {L_NO}
{L_ALLOWPM}: {L_YES}   {L_NO}
{L_ALLOWAVATAR}: {L_YES}   {L_NO}
{L_DELETE_USER}?{L_DELETE_USER_EXPLAIN}
{S_HIDDEN_FIELDS}  
+