[Phpbb-checkins] CVS: phpBB2/language/en admin.php,1.30,1.31 groups.php,1.4,1.5

[Meik S. <acy...@us...>]

Update of /cvsroot/phpbb/phpBB2/language/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25700/language/en

Modified Files:
	admin.php groups.php 
Log Message:
ucp -> groups -> memberships

Index: admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/en/admin.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** admin.php	17 Aug 2005 15:57:50 -0000	1.30
--- admin.php	19 Aug 2005 10:56:44 -0000	1.31
***************
*** 143,146 ****
--- 143,147 ----
  	'LOG_USER_INACTIVE'		=> '<b>User deactivated</b><br />&#187; %s',
  	'LOG_USER_ACTIVE'		=> '<b>User activated</b><br />&#187; %s',
+ 	'LOG_USER_GROUP_CHANGE'	=> '<b>User changed default group</b><br />&#187; %s',
  
  	'LOG_MASS_EMAIL'		=> '<b>Sent mass email</b><br />&#187; %s',

Index: groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/en/groups.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** groups.php	17 Aug 2005 15:57:50 -0000	1.4
--- groups.php	19 Aug 2005 10:56:45 -0000	1.5
***************
*** 35,59 ****
  	'CHANGED_DEFAULT_GROUP'	=> 'Successfully changed default group',
  	
! 	'GROUP_AVATAR'		=> 'Group avatar', 
  	'GROUP_CHANGE_DEFAULT'	=> 'Are you sure you want to change your default membership to the group "%s"?',
! 	'GROUP_CLOSED'		=> 'Closed',
! 	'GROUP_DESC'		=> 'Group description',
! 	'GROUP_HIDDEN'		=> 'Hidden',
! 	'GROUP_INFORMATION'	=> 'Usergroup Information', 
! 	'GROUP_MEMBERS'		=> 'Group members',
! 	'GROUP_NAME'		=> 'Group name',
! 	'GROUP_OPEN'		=> 'Open',
! 	'GROUP_RANK'		=> 'Group rank', 
! 	'GROUP_TYPE'		=> 'Group type',
! 	'GROUP_IS_CLOSED'	=> 'This is a closed group, new members cannot automatically join.',
! 	'GROUP_IS_OPEN'		=> 'This is an open group, members can apply to join.',
! 	'GROUP_IS_HIDDEN'	=> 'This is a hidden group, only members of this group can view its membership.',
! 	'GROUP_IS_FREE'		=> 'This is a freely open group, all new members are welcome.', 
! 	'GROUP_IS_SPECIAL'	=> 'This is a special group, special groups are managed by the board administrators.', 
  
- 	'LOG_USER_GROUP_CHANGE'	=> '<b>User changed default group</b><br />&#187; %s',
  	'LOGIN_EXPLAIN_GROUP'	=> 'You need to login to view group details',
  	
! 	'NOT_MEMBER_OF_GROUP'	=> 'The requested operation cannot be taken because you are not a member of the selected group',
  
  	'PRIMARY_GROUP'		=> 'Primary group',
--- 35,71 ----
  	'CHANGED_DEFAULT_GROUP'	=> 'Successfully changed default group',
  	
! 	'GROUP_AVATAR'			=> 'Group avatar', 
  	'GROUP_CHANGE_DEFAULT'	=> 'Are you sure you want to change your default membership to the group "%s"?',
! 	'GROUP_CLOSED'			=> 'Closed',
! 	'GROUP_DESC'			=> 'Group description',
! 	'GROUP_HIDDEN'			=> 'Hidden',
! 	'GROUP_INFORMATION'		=> 'Usergroup Information', 
! 	'GROUP_JOIN'			=> 'Join Group',
! 	'GROUP_JOIN_CONFIRM'	=> 'Are you sure you want to join the selected group?',
! 	'GROUP_JOIN_PENDING'	=> 'Request to join group',
! 	'GROUP_JOIN_PENDING_CONFIRM'	=> 'Are you sure you want to request joining the selected group?',
! 	'GROUP_JOINED'			=> 'Successfully joined selected group',
! 	'GROUP_JOINED_PENDING'	=> 'Successfully requested group membership. Please wait for a group leader to approve your membership.',
! 	'GROUP_MEMBERS'			=> 'Group members',
! 	'GROUP_NAME'			=> 'Group name',
! 	'GROUP_OPEN'			=> 'Open',
! 	'GROUP_RANK'			=> 'Group rank', 
! 	'GROUP_RESIGN_MEMBERSHIP'		=> 'Resign group membership',
! 	'GROUP_RESIGN_MEMBERSHIP_CONFIRM'	=> 'Are you sure you want to resign your membership from the selected group?',
! 	'GROUP_RESIGN_PENDING'			=> 'Resign pending group membership',
! 	'GROUP_RESIGN_PENDING_CONFIRM'	=> 'Are you sure you want to resign your pending membership from the selected group?',
! 	'GROUP_RESIGNED_MEMBERSHIP'		=> 'You were successfully removed from the selected group',
! 	'GROUP_RESIGNED_PENDING'		=> 'Your pending membership was successfully removed from the selected group',
! 	'GROUP_TYPE'			=> 'Group type',
! 	'GROUP_IS_CLOSED'		=> 'This is a closed group, new members cannot automatically join.',
! 	'GROUP_IS_OPEN'			=> 'This is an open group, members can apply to join.',
! 	'GROUP_IS_HIDDEN'		=> 'This is a hidden group, only members of this group can view its membership.',
! 	'GROUP_IS_FREE'			=> 'This is a freely open group, all new members are welcome.', 
! 	'GROUP_IS_SPECIAL'		=> 'This is a special group, special groups are managed by the board administrators.', 
  
  	'LOGIN_EXPLAIN_GROUP'	=> 'You need to login to view group details',
  	
! 	'NOT_LEADER_OF_GROUP'	=> 'The requested operation cannot be taken because you are not a leader of the selected group.',
! 	'NOT_MEMBER_OF_GROUP'	=> 'The requested operation cannot be taken because you are not a member of the selected group.',
  
  	'PRIMARY_GROUP'		=> 'Primary group',
***************
*** 61,65 ****
  	'REMOVE_SELECTED'		=> 'Remove selected',
  
! 	'USER_GROUP_CHANGE'		=> 'From "%1$s" group to "%2$s"',
  );
  
--- 73,80 ----
  	'REMOVE_SELECTED'		=> 'Remove selected',
  
! 	'USER_GROUP_CHANGE'			=> 'From "%1$s" group to "%2$s"',
! 	'USER_GROUP_DEMOTE'			=> 'Demote leadership',
! 	'USER_GROUP_DEMOTE_CONFIRM'	=> 'Are you sure you want to demote as group leader from the selected group?',
! 	'USER_GROUP_DEMOTED'		=> 'Successfully demoted your leadership.',
  );