MDL-55661 lang: Merge English strings from the en_fix language pack

This commit is contained in:
Helen Foster 2016-08-25 14:38:07 +02:00 committed by David Mudrák
parent 3ca3cc77a2
commit b61b927356
12 changed files with 25 additions and 25 deletions

View file

@ -1667,7 +1667,7 @@ $string['servererror'] = 'An error occurred whilst communicating with the server
$string['serverlocaltime'] = 'Server\'s local time';
$string['setcategorytheme'] = 'Set category theme';
$string['setpassword'] = 'Set password';
$string['setpasswordinstructions'] = 'Please enter and repeat your new password below, then click "Set password". <br />Your new password will be saved, and you will be logged in.';
$string['setpasswordinstructions'] = 'Please enter your new password below, then save changes.';
$string['settings'] = 'Settings';
$string['shortname'] = 'Short name'; /* @deprecated MDL-34652 - Use shortnamecourse or shortnameuser or some own context specific string. */
$string['shortnamecollisionwarning'] = '[*] = This shortname is already in use by a course and will need to be changed upon approval';