Invalid password on CSV Upload gives a rubbish error message

[Andrew Nicols]

This error is a bit rubbish:
$string['uploadcsverrorinvalidpassword'] = 'Error on line %s of your file: The password for this user is not in correct form';

The error when trying to choose a password with the non-csv user creation is much clearer:
$string['yournewpassword'] = 'Your new password. Passwords must be at least six characters long and contain at least one digit and two letters';

Perhaps a combination would be best:
Error on line %s of your file: Passwords must be at least six characters long and contain at least one digit and two letters.

[Andrew Nicols (dobedobedoh)]

I went for the combination approach