diff options
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 18 | ||||
| -rw-r--r-- | phpBB/language/en/acp/users.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
3 files changed, 12 insertions, 8 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 0847ff44c9..9ffba39d6a 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -241,14 +241,16 @@ $lang = array_merge($lang, array( 'OFF' => 'OFF', 'ON' => 'ON', - 'PARSE_BBCODE' => 'Parse BBCode', - 'PARSE_SMILIES' => 'Parse Smilies', - 'PARSE_URLS' => 'Parse Links', - 'PROCEED_TO_ACP' => '%sProceed to the ACP%s', - 'REMIND' => 'Remind', - 'REORDER' => 'Reorder', - 'RESYNC' => 'Sync', - 'RETURN_TO' => 'Return to ...', + 'PARSE_BBCODE' => 'Parse BBCode', + 'PARSE_SMILIES' => 'Parse Smilies', + 'PARSE_URLS' => 'Parse Links', + 'PERMISSIONS_TRANSFERED' => 'Permissions transfered', + 'PERMISSIONS_TRANSFERED_EXPLAIN' => 'You are currently having the permissions from %1$s. You are able to browse the forum with the users permissions but not access the administration control panel since admin permissions were not transfered. You are able to <a href="%2$s"><strong>revert to your permission set</strong></a> at any time.', + 'PROCEED_TO_ACP' => '%sProceed to the ACP%s', + 'REMIND' => 'Remind', + 'REORDER' => 'Reorder', + 'RESYNC' => 'Sync', + 'RETURN_TO' => 'Return to ...', 'SELECT_ANONYMOUS' => 'Select Anonymous User', 'SELECT_OPTION' => 'Select option', diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index 6398ff8f70..3f36325ab5 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -100,6 +100,7 @@ $lang = array_merge($lang, array( 'USER_GROUP_NORMAL' => 'Normal groups user is a member of', 'USER_GROUP_PENDING' => 'Groups user is in pending mode', 'USER_GROUP_SPECIAL' => 'Special groups user is a member of', + 'USER_IS_INACTIVE' => 'User is inactive', 'USER_OVERVIEW_UPDATED' => 'User details updated', 'USER_POSTS_DELETED' => 'Successfully removed all posts made by this user', 'USER_POSTS_MOVED' => 'Successfully moved users posts to target forum', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index c9c22c6221..579642e08a 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -323,6 +323,7 @@ $lang = array_merge($lang, array( 'PERMISSIONS_TRANSFERED' => 'Successfully transfered permissions from <strong>%s</strong>, you are now able to browse the forum with the users permissions.<br />Please note that admin permissions were not transfered. You are able to revert to your permission set at any time.', 'PM_DISABLED' => 'Private messaging has been disabled on this board', 'PM_FROM' => 'From', + 'PM_FROM_REMOVED_AUTHOR' => 'This message was sent by a user no longer registered.', 'PM_ICON' => 'PM icon', 'PM_INBOX' => 'Inbox', 'PM_OUTBOX' => 'Outbox', |