Merge branch 'MDL-61046-master-enfix' of git://github.com/mudrd8mz/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2018-01-08 10:05:39 +01:00
commit 7110a3eed6
10 changed files with 30 additions and 30 deletions

View file

@ -66,7 +66,7 @@ $string['auth_user_creation'] = 'New (anonymous) users can create user accounts
$string['auth_usernameexists'] = 'Selected username already exists. Please choose a new one.';
$string['auth_usernotexist'] = 'Cannot update non-existent user: {$a}';
$string['auto_add_remote_users'] = 'Auto add remote users';
$string['cannotmapfield'] = 'Field "{$a->fieldname}" can not be mapped because its short name "{$a->shortname}" is too long. To enable mapping reduce the profile field short name down to {$a->charlimit} characters. <a href="{$a->link}">Edit user profile fields</a>';
$string['cannotmapfield'] = 'The field "{$a->fieldname}" can\'t be mapped because its short name "{$a->shortname}" is too long. To allow it to be mapped, you need to reduce the short name to {$a->charlimit} characters. <a href="{$a->link}">Edit user profile fields</a>';
$string['createpassword'] = 'Generate password and notify user';
$string['createpasswordifneeded'] = 'Create password if needed and send via email';
$string['emailchangecancel'] = 'Cancel email change';