From e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 2 Feb 2008 15:24:55 +0000 Subject: merge revisions: #r8359, #r8360, #r8368 git-svn-id: file:///svn/phpbb/trunk@8369 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/en/groups.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'phpBB/language') diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php index 7cee799535..9f72d4070f 100644 --- a/phpBB/language/en/groups.php +++ b/phpBB/language/en/groups.php @@ -40,8 +40,10 @@ $lang = array_merge($lang, array( 'ALREADY_IN_GROUP' => 'You are already a member of the selected group.', 'ALREADY_IN_GROUP_PENDING' => 'You already requested joining the selected group.', - 'CHANGED_DEFAULT_GROUP' => 'Successfully changed default group.', - + 'CANNOT_JOIN_GROUP' => 'You are not able to join this group. You are only able to join open and freely open groups.', + 'CANNOT_RESIGN_GROUP' => 'You are not able to resign from this group. You are only able to resign from open and freely open groups.', + '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', -- cgit v1.2.1