aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-12-08 22:21:54 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-12-08 22:21:54 +0100
commit48d767a36e607743beff1d07edc170247c3bd192 (patch)
treec33aa612fc1115bd4eceeb2dc1f6048e808ff814
parent1ce0c76e14d20299f8e085f3c02cbf109f391775 (diff)
parent5b9c83512765373fec3000dd39ba1154412281e3 (diff)
downloadforums-48d767a36e607743beff1d07edc170247c3bd192.tar
forums-48d767a36e607743beff1d07edc170247c3bd192.tar.gz
forums-48d767a36e607743beff1d07edc170247c3bd192.tar.bz2
forums-48d767a36e607743beff1d07edc170247c3bd192.tar.xz
forums-48d767a36e607743beff1d07edc170247c3bd192.zip
Merge remote-tracking branch 'p/ticket/9876' into develop-olympus
* p/ticket/9876: [ticket/9876] Distinctly name user and forum roles for newly registered users.
-rw-r--r--phpBB/language/en/acp/permissions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index cf248cffdb..8ad1db5d93 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.',