diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-08-19 10:56:46 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-08-19 10:56:46 +0000 |
| commit | 4b9215bd14bc72edeff20a40962d0bd89b21718e (patch) | |
| tree | 554c9a7a023392148772c75fd887d7fecf6ba2c8 /phpBB/language | |
| parent | 9d825c0e200de129c84df55fe8d77ad2964bd2c1 (diff) | |
| download | forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.tar forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.tar.gz forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.tar.bz2 forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.tar.xz forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.zip | |
ucp -> groups -> memberships
git-svn-id: file:///svn/phpbb/trunk@5202 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/admin.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/email/group_added.txt | 4 | ||||
| -rw-r--r-- | phpBB/language/en/email/group_request.txt | 6 | ||||
| -rw-r--r-- | phpBB/language/en/groups.php | 51 |
4 files changed, 39 insertions, 23 deletions
diff --git a/phpBB/language/en/admin.php b/phpBB/language/en/admin.php index c566476aa1..9cc232b612 100644 --- a/phpBB/language/en/admin.php +++ b/phpBB/language/en/admin.php @@ -142,6 +142,7 @@ $lang += array( 'LOG_USER_INACTIVE' => '<b>User deactivated</b><br />» %s', 'LOG_USER_ACTIVE' => '<b>User activated</b><br />» %s', + 'LOG_USER_GROUP_CHANGE' => '<b>User changed default group</b><br />» %s', 'LOG_MASS_EMAIL' => '<b>Sent mass email</b><br />» %s', diff --git a/phpBB/language/en/email/group_added.txt b/phpBB/language/en/email/group_added.txt index 5707da9031..4f07fdb9cd 100644 --- a/phpBB/language/en/email/group_added.txt +++ b/phpBB/language/en/email/group_added.txt @@ -4,9 +4,9 @@ Charset: iso-8859-1 Congratulations, You have been added to the "{GROUP_NAME}" group on {SITENAME}. -This action was done by the group moderator or the site administrator, contact them for more information. +This action was done by a group moderator or the site administrator, contact them for more information. You can view your groups information here: -{U_GROUPCP} +{U_GROUP} {EMAIL_SIG} diff --git a/phpBB/language/en/email/group_request.txt b/phpBB/language/en/email/group_request.txt index 8da7fa9f29..7b51823067 100644 --- a/phpBB/language/en/email/group_request.txt +++ b/phpBB/language/en/email/group_request.txt @@ -1,11 +1,11 @@ Subject: A request to join your group has been made Charset: iso-8859-1 -Dear {GROUP_MODERATOR}, +Dear {USERNAME}, -A user has requested to join a group you moderator on {SITENAME}. +A user has requested to join the group "{GROUP_NAME}" you moderate on {SITENAME}. To approve or deny this request for group membership please visit the following link: -{U_GROUPCP} +{U_PENDING} {EMAIL_SIG} diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php index 6570e4d3bb..c741d371b7 100644 --- a/phpBB/language/en/groups.php +++ b/phpBB/language/en/groups.php @@ -34,33 +34,48 @@ $lang += array( 'CHANGED_DEFAULT_GROUP' => 'Successfully changed default group', - 'GROUP_AVATAR' => 'Group avatar', + '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.', + '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.', - 'LOG_USER_GROUP_CHANGE' => '<b>User changed default group</b><br />» %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', + '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', 'REMOVE_SELECTED' => 'Remove selected', - 'USER_GROUP_CHANGE' => 'From "%1$s" group to "%2$s"', + '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.', ); ?>
\ No newline at end of file |