diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-01 20:04:08 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-01 20:04:08 +0100 |
| commit | 589f7ac8e4739eca623f53788342f06d5f304163 (patch) | |
| tree | 0da2a425f72022a02275b402e017253eea573dfb /phpBB/language | |
| parent | 1dfb52b8052f984edd042410170a7066505e2997 (diff) | |
| parent | 65a34fd047f4ac1ff3638a568f44d3fe7d664d88 (diff) | |
| download | forums-589f7ac8e4739eca623f53788342f06d5f304163.tar forums-589f7ac8e4739eca623f53788342f06d5f304163.tar.gz forums-589f7ac8e4739eca623f53788342f06d5f304163.tar.bz2 forums-589f7ac8e4739eca623f53788342f06d5f304163.tar.xz forums-589f7ac8e4739eca623f53788342f06d5f304163.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/10410' into develop
* nickvergessen/ticket/10410:
[ticket/10410] Add option to display users in their first teampage group
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/groups.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php index 11342bf4f2..28e6fb80d9 100644 --- a/phpBB/language/en/acp/groups.php +++ b/phpBB/language/en/acp/groups.php @@ -129,11 +129,13 @@ $lang = array_merge($lang, array( 'SPECIAL_GROUPS' => 'Pre-defined groups', 'SPECIAL_GROUPS_EXPLAIN' => 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.', + 'TEAMPAGE_DISP_ALL' => 'All memberships', + 'TEAMPAGE_DISP_DEFAULT' => 'User’s default group only', + 'TEAMPAGE_DISP_FIRST' => 'First membership only', 'TEAMPAGE_EXPLAIN' => 'These are the groups which are displayed on the teampage:', 'TEAMPAGE_FORUMS' => 'Display moderated forums', 'TEAMPAGE_FORUMS_EXPLAIN' => 'If set to yes, moderators will have a list with all of the forums where they have moderator permissions displayed in their row. This can be very database intensive for big boards.', - 'TEAMPAGE_MULTIPLE' => 'Display users in all groups', - 'TEAMPAGE_MULTIPLE_EXPLAIN' => 'If set to no, the users will only be displayed in their primary group (If the primary group is not listed, the users will be displayed in their first displayed group).', + 'TEAMPAGE_MEMBERSHIPS' => 'Display user memberships', 'TEAMPAGE_SETTINGS' => 'Teampage settings', 'TOTAL_MEMBERS' => 'Members', |