Merge "Allow login with passwords not meeting complexity requirements"

diff --combined languages/messages/MessagesEn.php
index 113bb24,d37d7b0..f772c27
--- 1/languages/messages/MessagesEn.php
--- 2/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@@ -460,7 -460,6 +460,7 @@@ $specialPageAliases = array
        'Redirect'                  => array( 'Redirect' ),
        'ResetTokens'               => array( 'ResetTokens' ),
        'Revisiondelete'            => array( 'RevisionDelete' ),
 +      'RunJobs'                   => array( 'RunJobs' ),
        'Search'                    => array( 'Search' ),
        'Shortpages'                => array( 'ShortPages' ),
        'Specialpages'              => array( 'SpecialPages' ),
@@@ -1290,6 -1289,9 +1290,9 @@@ To finish logging in, you must set a ne
  'resetpass-abort-generic'   => 'Password change has been aborted by an extension.',
  'resetpass-expired'         => 'Your password has expired. Please set a new password to log in.',
  'resetpass-expired-soft'    => 'Your password has expired and needs to be reset. Please choose a new password now, or click "{{int:resetpass-submit-cancel}}" to reset it later.',
+ 'resetpass-validity-soft'     => 'Your password is not valid: $1
+ 
+ Please choose a new password now, or click "{{int:resetpass-submit-cancel}}" to reset it later.',
  
  # Special:PasswordReset
  'passwordreset'                    => 'Reset password',