Merge branch 'MDL-60854-master' of git://github.com/aanabit/moodle

lang/en/antivirus.php

@@ -30,6 +30,3 @@ $string['datastream'] = 'Data';
 $string['emailsubject'] = '{$a} :: Antivirus notification';
 $string['privacy:metadata'] = 'The Antivirus system does not store any personal data.';
 $string['virusfound'] = '{$a->item} has been scanned by a virus checker and found to be infected!';
-
-// Deprecated since Moodle 3.5.
-$string['virusfounduser'] = 'The file you have uploaded, {$a->filename}, has been scanned by a virus checker and found to be infected! Your file upload was NOT successful.';

lang/en/deprecated.txt

@@ -5,7 +5,6 @@ myfilesmanage,core
 mypreferences,core_grades
 myprofile,core
 viewallmyentries,core_blog
-virusfounduser,core_antivirus
 formattexttype,core
 currentlyselectedusers,core
 emailuserhasnone,core