Merge branch 'MDL-56486-master-workshopfiletypes' of git://github.com/mudrd8mz/moodle

diff --combined mod/workshop/lang/en/workshop.php
index 1a4c200,8267cf8..21df5a6
--- 1/mod/workshop/lang/en/workshop.php
--- 2/mod/workshop/lang/en/workshop.php
+++ b/mod/workshop/lang/en/workshop.php
@@@ -31,10 -31,10 +31,10 @@@ $string['allocationdone'] = 'Allocatio
  $string['allocationerror'] = 'Allocation error';
  $string['allocationconfigured'] = 'Allocation configured';
  $string['allowedfiletypesforoverallfeedback'] = 'Feedback attachment allowed file types';
- $string['allowedfiletypesforoverallfeedback_help'] = 'Feedback attachment allowed file types can be restricted by entering a comma-separated list of file extensions, for example \'mp4, mp3, png, jpg\'. If the field is left empty, then all file types are allowed.';
+ $string['allowedfiletypesforoverallfeedback_help'] = 'Feedback attachment file types can be restricted by providing a list of allowed file types. If the field is left empty, then all file types are allowed.';
  $string['allowedfiletypesforoverallfeedback_link'] = 'admin/tool/filetypes/index';
  $string['allowedfiletypesforsubmission'] = 'Submission attachment allowed file types';
- $string['allowedfiletypesforsubmission_help'] = 'Submission attachment allowed file types can be restricted by entering a comma-separated list of file extensions, for example \'mp4, mp3, png, jpg\'. If the field is left empty, then all file types are allowed.';
+ $string['allowedfiletypesforsubmission_help'] = 'Submission attachment file types can be restricted by providing a list of allowed file types. If the field is left empty, then all file types are allowed.';
  $string['allowedfiletypesforsubmission_link'] = 'admin/tool/filetypes/index';
  $string['allsubmissions'] = 'All submissions ({$a})';
  $string['alreadygraded'] = 'Already graded';
@@@ -107,7 -107,6 +107,6 @@@ $string['editingsubmission'] = 'Editin
  $string['editsubmission'] = 'Edit submission';
  $string['err_multiplesubmissions'] = 'While editing this form, another version of the submission has been saved. Multiple submissions per user are not allowed.';
  $string['err_removegrademappings'] = 'Unable to remove the unused grade mappings';
- $string['err_unknownfileextension'] = 'Unknown file extension: {$a}';
  $string['err_wrongfileextension'] = 'Some files ({$a->wrongfiles}) cannot be uploaded. Only file types {$a->whitelist} are allowed.';
  $string['evaluategradeswait'] = 'Please wait until the assessments are evaluated and the grades are calculated';
  $string['evaluation'] = 'Grading evaluation';
@@@ -282,8 -281,8 +281,8 @@@ $string['submissiongrade'] = 'Grade fo
  $string['submissiongrade_help'] = 'This setting specifies the maximum grade that may be obtained for submitted work.';
  $string['submissiongradeof'] = 'Grade for submission (of {$a})';
  $string['submissionlastmodified'] = 'Last modified';
 -$string['submissionrequiredcontent'] = 'Please enter text here or upload a file';
 -$string['submissionrequiredfile'] = 'Please upload a file or enter text in submission content box';
 +$string['submissionrequiredcontent'] = 'You need to enter some text or add a file.';
 +$string['submissionrequiredfile'] = 'You need to add a file or enter some text.';
  $string['submissionsettings'] = 'Submission settings';
  $string['submissionstart'] = 'Open for submissions from';
  $string['submissionstartevent'] = '{$a} (opens for submissions)';
@@@ -371,3 -370,6 +370,6 @@@ $string['yoursubmission'] = 'Your submi
  
  // Deprecated since Moodle 3.1.
  $string['yourassessment'] = 'Your assessment';
+ 
+ // Deprecated since Moodle 3.4.
+ $string['err_unknownfileextension'] = 'Unknown file extension: {$a}';