Ticket #30227: 30227.diff

src/wp-includes/ms-functions.php

@@ -531 +531 @@
                 if ( $diff > 2 * DAY_IN_SECONDS )
                         $wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
                 else
-                        $errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
+                        $errors->add('user_email', __('That email address is currently pending activation and is not available for new registration. If you have made a previous attempt with this email address, please check your inbox for an activation email. If left unconfirmed, it will become available in a couple of days.'));
         }
 
         $result = array('user_name' => $user_name, 'orig_username' => $orig_username, 'user_email' => $user_email, 'errors' => $errors);