diff options
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/common.php | 3 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 2 | 
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 79d504a67d..47e04d9360 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -329,6 +329,7 @@ $lang = array_merge($lang, array(  	'IMAGE_FILETYPE_INVALID'	=> 'Image file type %d for mimetype %s not supported.',  	'IMAGE_FILETYPE_MISMATCH'	=> 'Image file type mismatch: expected extension %1$s but extension %2$s given.',  	'IN'						=> 'in', +	'INACTIVE'					=> 'Inactive',  	'INDEX'						=> 'Index page',  	'INFORMATION'				=> 'Information',  	'INSECURE_REDIRECT'			=> 'Tried to redirect to potentially insecure url.', @@ -467,7 +468,7 @@ $lang = array_merge($lang, array(  	'NOTIFICATION_TOPIC_DISAPPROVED'	=> '<strong>Topic disapproved</strong>:',  	'NOTIFICATION_TOPIC_IN_QUEUE'		=> '<strong>Topic approval</strong> request by %1$s:',  	'NOTIFICATION_TYPE_NOT_EXIST'		=> 'The notification type "%s" is missing from the file system.', -	'NOTIFICATION_ADMIN_ACTIVATE_USER'	=> '<strong>Activation required</strong> for newly registered user: ā%1$sā', +	'NOTIFICATION_ADMIN_ACTIVATE_USER'	=> '<strong>Activation required</strong> for deactivated or newly registered user: ā%1$sā',  	// Used in conjuction with NOTIFICATION_BOOKMARK and NOTIFICATION_POST.  	'NOTIFICATION_MANY_OTHERS'			=> 'others',  	'NOTIFICATION_X_OTHERS'				=> array( diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 07751d1f7f..1faa623b44 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -339,7 +339,7 @@ $lang = array_merge($lang, array(  	'NOTIFICATION_TYPE_QUOTE'							=> 'Someone quotes you in a post',  	'NOTIFICATION_TYPE_REPORT'							=> 'Someone reports a post',  	'NOTIFICATION_TYPE_TOPIC'							=> 'Someone creates a topic in a forum to which you are subscribed', -	'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER'				=> 'Newly registered user requiring activation', +	'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER'				=> 'User requiring activation',  	'NOTIFY_METHOD'					=> 'Notification method',  	'NOTIFY_METHOD_BOTH'			=> 'Both',  | 
