diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-12-08 22:22:06 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-12-08 22:22:06 +0100 |
| commit | a8ee32a66b495ef21d75073c9da0900db3395a9c (patch) | |
| tree | 9ee66eaa56f009b3a5a1d2d5810f79b836284423 /phpBB/language/en/acp/permissions.php | |
| parent | b05c658722f132e7f8202d5dfd8254d83b3331b6 (diff) | |
| parent | 48d767a36e607743beff1d07edc170247c3bd192 (diff) | |
| download | forums-a8ee32a66b495ef21d75073c9da0900db3395a9c.tar forums-a8ee32a66b495ef21d75073c9da0900db3395a9c.tar.gz forums-a8ee32a66b495ef21d75073c9da0900db3395a9c.tar.bz2 forums-a8ee32a66b495ef21d75073c9da0900db3395a9c.tar.xz forums-a8ee32a66b495ef21d75073c9da0900db3395a9c.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9876] Distinctly name user and forum roles for newly registered users.
Diffstat (limited to 'phpBB/language/en/acp/permissions.php')
| -rw-r--r-- | phpBB/language/en/acp/permissions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php index 806350e3c8..23c7407802 100644 --- a/phpBB/language/en/acp/permissions.php +++ b/phpBB/language/en/acp/permissions.php @@ -171,7 +171,7 @@ $lang = array_merge($lang, array( 'ROLE_FORUM_POLLS' => 'Standard Access + Polls', 'ROLE_FORUM_READONLY' => 'Read Only Access', 'ROLE_FORUM_STANDARD' => 'Standard Access', - 'ROLE_FORUM_NEW_MEMBER' => 'Newly registered User', + 'ROLE_FORUM_NEW_MEMBER' => 'Newly Registered User Access', 'ROLE_MOD_FULL' => 'Full Moderator', 'ROLE_MOD_QUEUE' => 'Queue Moderator', 'ROLE_MOD_SIMPLE' => 'Simple Moderator', @@ -181,7 +181,7 @@ $lang = array_merge($lang, array( 'ROLE_USER_NOAVATAR' => 'No Avatar', 'ROLE_USER_NOPM' => 'No Private Messages', 'ROLE_USER_STANDARD' => 'Standard Features', - 'ROLE_USER_NEW_MEMBER' => 'Newly registered User', + 'ROLE_USER_NEW_MEMBER' => 'Newly Registered User Features', 'ROLE_DESCRIPTION_ADMIN_FORUM' => 'Can access the forum management and forum permission settings.', |