--- drupal-4.7.0-rc2/modules/user.module	Wed Apr  5 19:41:48 2006
+++ drupal-new/modules/user.module	Sun Apr  9 13:23:02 2006
@@ -903,7 +903,7 @@
   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 account for %name is currently not activated.', array('%name' => theme('placeholder', $form_values['name']))));
     }
     else if (drupal_is_denied('user', $form_values['name'])) {
       // denied by access controls
@@ -1293,7 +1293,7 @@
     '#description' => t('To change the current user password, enter the new password in both fields.'),
   );
   if (user_access('administer users')) {
-    $form['account']['status'] = array('#type' => 'radios', '#title' => t('Status'), '#default_value' => $edit['status'], '#options' => array(t('Blocked'), t('Active')));
+    $form['account']['status'] = array('#type' => 'radios', '#title' => t('Status'), '#default_value' => $edit['status'], '#options' => array(t('Inactive'), t('Active')));
   }
   if (user_access('administer access control')) {
     $roles = user_roles(1);
@@ -1897,7 +1897,7 @@
   $sql .= tablesort_sql($header);
   $result = pager_query($sql, 50);
 
-  $status = array(t('blocked'), t('active'));
+  $status = array(t('inactive'), t('active'));
   while ($account = db_fetch_object($result)) {
     $rows[] = array(theme('username', $account),
                     $status[$account->status],