? files
? sites/localhost.c-drupal
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.618
diff -u -F^f -r1.618 user.module
--- modules/user.module	7 May 2006 00:08:36 -0000	1.618
+++ modules/user.module	7 May 2006 02:35:19 -0000
@@ -903,7 +903,7 @@ function user_login_validate($form_id, $
   if ($form_values['name']) {
     if (user_is_blocked($form_values['name'])) {
       // blocked in user administration
-      form_set_error('login', t('The username %name has been blocked.', array('%name' => theme('placeholder', $form_values['name']))));
+      form_set_error('login', t('The username %name has not been activated or is blocked.', array('%name' => theme('placeholder', $form_values['name']))));
     }
     else if (drupal_is_denied('user', $form_values['name'])) {
       // denied by access controls