diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-12-13 17:14:36 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-12-13 17:14:36 +0100 |
| commit | 18f74a7e10b01f4f6f916e2baa814b27b31fc8a9 (patch) | |
| tree | c7068f8e9cb82587f97adb19a390cb69631b9b9f /phpBB/language/en/acp/groups.php | |
| parent | adfa1656fb9d8b5bb601af1d7a6720884954d87a (diff) | |
| parent | 5d8ddc748000623b8e705b9434a4133cdd8fcc19 (diff) | |
| download | forums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.tar forums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.tar.gz forums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.tar.bz2 forums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.tar.xz forums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9851] "Search new posts" should require login.
[task/phpdoc] Added a phpdoc task to the build process
[task/phpdoc] Added a configuration file for phpDocumentor.
[feature/acm-wincache] Adding caching module for WinCache's User Cache.
[ticket/9939] Fix JavaScript error in admin recaptcha template
[ticket/9575] Also change 'administrate' to 'administer' in templates
[ticket/8736] guest can have 255 chars long username
[ticket/9928] Do not link "login to your board" to the "send statistics" page.
[ticket/9575] Change 'administrate' to 'administer'
[ticket/9921] Adding sample configuration file for the lighttpd webserver.
[ticket/9932] Add the Bing bot when converting
[ticket/9930] Redirect failes with open_basedir enabled.
[ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
Diffstat (limited to 'phpBB/language/en/acp/groups.php')
| -rw-r--r-- | phpBB/language/en/acp/groups.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php index 1c439cf466..3b3953ac36 100644 --- a/phpBB/language/en/acp/groups.php +++ b/phpBB/language/en/acp/groups.php @@ -36,7 +36,7 @@ if (empty($lang) || !is_array($lang)) // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine $lang = array_merge($lang, array( - 'ACP_GROUPS_MANAGE_EXPLAIN' => 'From this panel you can administrate 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.', + '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_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.', |