diff --git a/phpBB/admin/admin_groups.php b/phpBB/admin/admin_groups.php index 7c124920f4..b75a799b1e 100644 --- a/phpBB/admin/admin_groups.php +++ b/phpBB/admin/admin_groups.php @@ -60,7 +60,7 @@ switch ($action) { $group_name = $_POST['group_name']; $group_description = $_POST['group_description']; - + $group_type = $_POST['group_type']; } if ($action == 'edit' && empty($_POST['submit'])) @@ -114,7 +114,19 @@ switch ($action) ?> -
"> + + +">
@@ -160,10 +172,7 @@ switch ($action) - - - - + @@ -175,10 +184,30 @@ switch ($action) - + + - + + +
lang['GROUP_DETAILS']; ?>
lang['GROUP_SETTINGS_SAVE']; ?>
lang['GROUP_SETTINGS_SAVE_EXPLAIN']; ?>
lang['GROUP_COLOR']; ?>:
lang['GROUP_COLOR_EXPLAIN']; ?>		lang['GROUP_COLOR']; ?>:
lang['GROUP_COLOR_EXPLAIN'], '', ''); ?>
 
lang['GROUP_SETTINGS']; ?>lang['GROUP_FORCE_SET']; ?>:
lang['GROUP_FORCE_SET_EXPLAIN']; ?>		 lang['YES']; ?>   lang['NO']; ?>
lang['GROUP_SETTINGS_EXPLAIN']; ?>  
+ +

lang['GROUP_SETTINGS']; ?>

+ +

lang['GROUP_SETTINGS_EXPLAIN']; ?>

+ +
"> + + @@ -190,14 +219,19 @@ switch ($action) - + - - - - - +
lang['GROUP_SETTINGS']; ?>
lang['GROUP_LANG']; ?>:
lang['GROUP_DST']; ?>: lang['DISABLED']; ?>   lang['ENABLED']; ?>   lang['USER_DEFAULT']; ?> lang['DISABLED']; ?>   lang['ENABLED']; ?>   lang['USER_DEFAULT']; ?>
lang['GROUP_FORCE_SET']; ?>:
lang['GROUP_FORCE_SET_EXPLAIN']; ?>		 lang['YES']; ?>   lang['NO']; ?>
   
diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php index 45ed37e5af..bc20bc86c0 100644 --- a/phpBB/language/en/lang_admin.php +++ b/phpBB/language/en/lang_admin.php @@ -607,22 +607,21 @@ $lang = array_merge($lang, array( 'GROUP_MEMBERS_EXPLAIN' => 'This is a complete listing of all the members of this usergroup. You can delete, approve or disprove of existing and new members.', 'GROUP_EDIT_EXPLAIN' => 'Here you can edit an existing group. You can change its name, description and type (open, closed, etc.). You can also impose certain settings for all members of this group. For example, group wide avatars, ranks, colouration, etc. can all be set. Please note that certain settings are imposed just once (e.g. daylight savings, timezone, etc.) and are not stored for future use. Others, such as colouration can be changed independently by users unless appropriate user or group permissions are set.', 'ADD_NEW_GROUP' => 'Create new group', - 'GROUP_SETTINGS_SAVE' => 'Saved group settings', - 'GROUP_SETTINGS_SAVE_EXPLAIN' => 'These settings are defined and stored for this group.', - 'GROUP_SETTINGS' => 'Unsaved group settings', - 'GROUP_SETTINGS_EXPLAIN' => 'These settings are applied to each user once upon submission, they are not stored.', + 'GROUP_SETTINGS_SAVE' => 'Groupwide settings', + 'GROUP_SETTINGS' => 'Set user preferences', + 'GROUP_SETTINGS_EXPLAIN' => 'Here you can force changes in users current preferences. Please note these settings are not saved for the group itself. They are intended as a quick method of altering the preferences of all users in this group.', 'GROUP_DETAILS' => 'Group details', 'GROUP_NAME' => 'Group name', 'GROUP_DESC' => 'Group description', 'GROUP_MODERATORS' => 'Group moderators', 'GROUP_TYPE' => 'Group type', - 'GROUP_TYPE_EXPLAIN' => 'Open: any user can join,
Request: any user can request to join,
Closed: normal users can only view group,
Hidden: prevents display of users.', + 'GROUP_TYPE_EXPLAIN' => 'This determines which users can join or view this group.', 'GROUP_OPEN' => 'Open', 'GROUP_REQUEST' => 'Request', 'GROUP_CLOSED' => 'Closed', 'GROUP_HIDDEN' => 'Hidden', 'GROUP_COLOR' => 'Group colour', - 'GROUP_COLOR_EXPLAIN' => 'Defines the colour (as hex triplet) members usernames will appear in, leave blank if not needed.', + 'GROUP_COLOR_EXPLAIN' => 'Defines the colour members usernames will appear in, leave blank if not needed. Display %swebsafe colour swatch%s.', 'GROUP_RANK' => 'Group rank', 'GROUP_AVATAR' => 'Group avatar', 'GROUP_AVATAR_EXPLAIN' => 'This image will be displayed in the Group Control Panel. You can also apply this avatar to all members.',