diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-11-26 14:45:36 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-11-26 14:45:36 +0100 |
| commit | 1316fe208482d0a56ce6e54b79a1a00ae05d32ce (patch) | |
| tree | 3ec85e2149f39a33e0345e1794687cbe85db4cc0 /phpBB/language | |
| parent | 9d4f52a5ebf72ec08374e16f56e79437814a72d6 (diff) | |
| parent | 8899829752538946d844e34e10d9feacb72c66a8 (diff) | |
| download | forums-1316fe208482d0a56ce6e54b79a1a00ae05d32ce.tar forums-1316fe208482d0a56ce6e54b79a1a00ae05d32ce.tar.gz forums-1316fe208482d0a56ce6e54b79a1a00ae05d32ce.tar.bz2 forums-1316fe208482d0a56ce6e54b79a1a00ae05d32ce.tar.xz forums-1316fe208482d0a56ce6e54b79a1a00ae05d32ce.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/memberlist_group.html
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/memberlist.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 5605f8f4b5..c7b2bf55d1 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -101,6 +101,7 @@ $lang = array_merge($lang, array( 'LOGIN_EXPLAIN_SEARCHUSER' => 'The board requires you to be registered and logged in to search users.', 'LOGIN_EXPLAIN_VIEWPROFILE' => 'The board requires you to be registered and logged in to view profiles.', + 'MANAGE_GROUP' => 'Manage Group', 'MORE_THAN' => 'More than', 'NO_CONTACT_FORM' => 'The board administrator contact form has been disabled.', |