Index: user_status.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/user_status/user_status.module,v
retrieving revision 1.15
diff -u -r1.15 user_status.module
--- user_status.module	10 Jul 2007 05:58:34 -0000	1.15
+++ user_status.module	24 Oct 2007 16:28:09 -0000
@@ -60,7 +60,7 @@
  * @return string
  */
 function user_status_activated_subject() {
-  return t('%username account approved');
+  return t('Account details for %username at %site (approved)');
 }
 
 /**
@@ -69,7 +69,7 @@
  * @return string
  */
 function user_status_activated_body() {
-  return t("Hello %username,\n\nYour account at %site has been activated.\n\nYou may now log in by clicking on this link or copying and pasting it in your browser:\n\n%login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to %edit_uri so you can change your password.\n\nOnce you have set your own password, you will be able to log in to %login_uri in the future using the following username:\n\nusername: %username\n");
+  return t("%username,\n\nYour account at %site has been activated.\n\nYou may now log in by clicking on this link or copying and pasting it in your browser:\n\n%login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to %edit_uri so you can change your password.\n\nOnce you have set your own password, you will be able to log in to %login_uri in the future using the following username:\n\nusername: %username\n\n\n--  %site team");
 }
 
 /**
@@ -78,7 +78,7 @@
  * @return string
  */
 function user_status_blocked_subject() {
-  return t('%username account blocked');
+  return t('Account %username blocked on %site');
 }
 
 /**
@@ -87,7 +87,7 @@
  * @return string
  */
 function user_status_blocked_body() {
-  return t("Hello %username,\n\nYour account on %site has been blocked.");
+  return t("%username,\n\nYour account on %site has been blocked.\n\n\n--  %site team");
 }
 
 /**
@@ -96,7 +96,7 @@
  * @return string
  */
 function user_status_deleted_subject() {
-  return t('%username account deleted');
+  return t('Account %username deleted on %site');
 }
 
 /**
@@ -105,7 +105,7 @@
  * @return string
  */
 function user_status_deleted_body() {
-  return t("Hello %username,\n\nYour account on %site has been deleted.");
+  return t("%username,\n\nYour account on %site has been deleted.\n\n\n--  %site team");
 }
 
 /**
@@ -118,17 +118,18 @@
     '#type' => 'fieldset',
     '#title' => t('Activated'),
     '#collapsible' => true,
-    '#collapsed' => true
-  );
-  $form['activate_status']['user_status_reset_password'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Reset password when accounts are activated. If enabled, this will provide access to a %password placeholder in the notification message.', array('%password' => '%password')),
-    '#default_value' => variable_get('user_status_reset_password', FALSE)
+    '#collapsed' => true,
   );
   $form['activate_status']['user_status_activated_enable'] = array(
     '#type' => 'checkbox',
     '#title' => t('Notify user when account is activated.'),
-    '#default_value' => variable_get('user_status_activated_enable', FALSE)
+    '#default_value' => variable_get('user_status_activated_enable', FALSE),
+  );
+  $form['activate_status']['user_status_reset_password'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Reset password when accounts are activated.'),
+    '#default_value' => variable_get('user_status_reset_password', FALSE),
+    '#description' => t('Create new random generated password.'),
   );
   $form['activate_status']['user_status_activated_subject'] = array(
     '#type' => 'textfield',
@@ -141,21 +142,21 @@
     '#type' => 'textarea',
     '#title' => t('Body'),
     '#default_value' => variable_get('user_status_activated_body', user_status_activated_body()),
-    '#description' => t('In addition to the variables described above, the password will be reset when users are activated, so you can also use %password (the new temporary password) and %login_url (a one-time login URL)'),
     '#cols' => 72,
     '#rows' => 10,
+    '#description' => t('In addition to the variables described above, %login_url (a one-time login URL) is available in the notification message. If "reset password when accounts are activated" is checked, you may also use %password.'),
   );
 
   $form['block_status'] = array(
     '#type' => 'fieldset',
     '#title' => t('Blocked'),
     '#collapsible' => true,
-    '#collapsed' => true
+    '#collapsed' => true,
   );
   $form['block_status']['user_status_blocked_enable'] = array(
     '#type' => 'checkbox',
     '#title' => t('Notify user when account is blocked.'),
-    '#default_value' => variable_get('user_status_blocked_enable', FALSE)
+    '#default_value' => variable_get('user_status_blocked_enable', FALSE),
   );
   $form['block_status']['user_status_blocked_subject'] = array(
     '#type' => 'textfield',
@@ -176,12 +177,12 @@
     '#type' => 'fieldset',
     '#title' => t('Deleted'),
     '#collapsible' => true,
-    '#collapsed' => true
+    '#collapsed' => true,
   );
   $form['delete_status']['user_status_deleted_enable'] = array(
     '#type' => 'checkbox',
     '#title' => t('Notify user when account is deleted.'),
-    '#default_value' => variable_get('user_status_deleted_enable', FALSE)
+    '#default_value' => variable_get('user_status_deleted_enable', FALSE),
   );
   $form['delete_status']['user_status_deleted_subject'] = array(
     '#type' => 'textfield',