diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 13:48:29 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 13:48:29 -0600 |
| commit | c1840c78c5ea2967dfc1912665ec19ebc25c22c6 (patch) | |
| tree | cd609ca105e042f3f1a91ece20acb293b30d2eef /phpBB/language/en/acp/groups.php | |
| parent | 071defded6f0e4d2a805b336f56f0a2524d5b1b6 (diff) | |
| parent | eb5075c80f9ddbec220e613a92ba37aa03a8a4f9 (diff) | |
| download | forums-c1840c78c5ea2967dfc1912665ec19ebc25c22c6.tar forums-c1840c78c5ea2967dfc1912665ec19ebc25c22c6.tar.gz forums-c1840c78c5ea2967dfc1912665ec19ebc25c22c6.tar.bz2 forums-c1840c78c5ea2967dfc1912665ec19ebc25c22c6.tar.xz forums-c1840c78c5ea2967dfc1912665ec19ebc25c22c6.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3
Conflicts:
phpBB/includes/db/migrator.php
Diffstat (limited to 'phpBB/language/en/acp/groups.php')
| -rw-r--r-- | phpBB/language/en/acp/groups.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php index a5c0af933c..58101e5f60 100644 --- a/phpBB/language/en/acp/groups.php +++ b/phpBB/language/en/acp/groups.php @@ -36,6 +36,7 @@ if (empty($lang) || !is_array($lang)) $lang = array_merge($lang, array( 'ACP_GROUPS_MANAGE_EXPLAIN' => 'From this panel you can administer all your usergroups. You can delete, create and edit existing groups. Furthermore, you may choose group leaders, toggle open/hidden/closed group status and set the group name and description.', + 'ADD_GROUP_CATEGORY' => 'Add category', 'ADD_USERS' => 'Add users', 'ADD_USERS_EXPLAIN' => 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a separate line.', @@ -50,6 +51,7 @@ $lang = array_merge($lang, array( 'GROUP_APPROVED' => 'Approved members', 'GROUP_AVATAR' => 'Group avatar', 'GROUP_AVATAR_EXPLAIN' => 'This image will be displayed in the Group Control Panel.', + 'GROUP_CATEGORY_NAME' => 'Category name', 'GROUP_CLOSED' => 'Closed', 'GROUP_COLOR' => 'Group colour', 'GROUP_COLOR_EXPLAIN' => 'Defines the colour members’ usernames will appear in, leave blank for user default.', @@ -130,6 +132,7 @@ $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' => 'Teampage', 'TEAMPAGE_DISP_ALL' => 'All memberships', 'TEAMPAGE_DISP_DEFAULT' => 'User’s default group only', 'TEAMPAGE_DISP_FIRST' => 'First membership only', |