aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-02-02 15:24:55 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-02-02 15:24:55 +0000
commite9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a (patch)
tree8d2fe110a9af4b52f5766c0a64d77e35bb8b1ec9 /phpBB/language/en
parent2e5e0a7868b246427943feb096a383ccc355a344 (diff)
downloadforums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.tar
forums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.tar.gz
forums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.tar.bz2
forums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.tar.xz
forums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.zip
merge revisions: #r8359, #r8360, #r8368
git-svn-id: file:///svn/phpbb/trunk@8369 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/groups.php6
1 files changed, 4 insertions, 2 deletions
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',