diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 6ff1e53027..0c01838f4e 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -76,7 +76,7 @@ class ucp_resend // Do not resend activation email if valid one still exists if (!empty($user_row['user_actkey']) && (int) $user_row['user_actkey_expiration'] >= time()) { - trigger_error('ACTIVATION_EMAIL_ALREADY_SENT'); + trigger_error('ACTIVATION_ALREADY_SENT'); } // Determine coppa status on group (REGISTERED(_COPPA)) diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 1f4fc9f6a8..5694bbd5dc 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -64,6 +64,7 @@ $lang = array_merge($lang, array( 'ACCOUNT_DEACTIVATED' => 'Your account has been manually deactivated and is only able to be reactivated by an administrator.', 'ACP' => 'Administration Control Panel', 'ACP_SHORT' => 'ACP', + 'ACTIVATION_ALREADY_SENT' => 'The activation email has already been sent to your email address. You can try again after 24 hours. If you continue to have problems activating your account, please contact a board administrator.', 'ACTIVE' => 'active', 'ACTIVE_ERROR' => 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.', 'ADMINISTRATOR' => 'Administrator',