Merge branch 'MDL-66024' of https://github.com/paulholden/moodle

diff --cc admin/tool/uploadcourse/lang/en/tool_uploadcourse.php
index 7f3e9d7,2fdcc69..9a0e2c6
--- 1/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php
--- 2/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php
+++ b/admin/tool/uploadcourse/lang/en/tool_uploadcourse.php
@@@ -90,9 -90,11 +90,11 @@@ $string['invalidcsvfile'] = 'Invalid in
  $string['invalidencoding'] = 'Invalid encoding';
  $string['invalidmode'] = 'Invalid mode selected';
  $string['invalideupdatemode'] = 'Invalid update mode selected';
 -$string['invalidvisibilitymode'] = 'Invalid visibility mode given';
 +$string['invalidvisibilitymode'] = 'Invalid visible mode';
  $string['invalidroles'] = 'Invalid role names: {$a}';
  $string['invalidshortname'] = 'Invalid shortname';
+ $string['invalidfullnametoolong'] = 'The fullname field is limited to {$a} characters';
+ $string['invalidshortnametoolong'] = 'The shortname field is limited to {$a} characters';
  $string['missingmandatoryfields'] = 'Missing value for mandatory fields: {$a}';
  $string['missingshortnamenotemplate'] = 'Missing shortname and shortname template not set';
  $string['mode'] = 'Upload mode';