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

admin/tool/usertours/lang/en/deprecated.txt

@@ -1 +0,0 @@
-previousstep,tool_usertours

admin/tool/usertours/lang/en/tool_usertours.php

@@ -303,6 +303,3 @@ $string['tour_gradebook_tour_description'] = 'Search and navigation features in
 $string['tour_gradebook_tour_name'] = 'Gradebook Grader Report';
 $string['tour_final_step_title'] = 'End of tour';
 $string['tour_final_step_content'] = 'This is the end of your user tour. It won\'t show again unless you reset it using the link in the footer.';
-
-// Deprecated since Moodle 4.0.
-$string['previousstep'] = 'Previous';

auth/lti/lang/en/auth_lti.php

@@ -52,8 +52,5 @@ $string['provisioningmodeexistingonly'] = 'Existing accounts only (prompt)';
 $string['useexistingaccount'] = 'Use existing account';
 $string['welcome'] = 'Welcome!';
 
-// Deprecated since Moodle 4.0.
-$string['privacy:metadata'] = 'The LTI authentication plugin does not store any personal data.';
-
 // Deprecated since Moodle 4.4.
 $string['firstlaunchnoauthnotice'] = 'To link your existing account you must be logged in to the site. Please log in to the site in a new tab/window and then relaunch the tool here. For further information, see the documentation <a href="{$a}" target="_blank">Publish as LTI tool</a>.';

auth/lti/lang/en/deprecated.txt

@@ -1,2 +1 @@
-privacy:metadata,auth_lti
 firstlaunchnoauthnotice,auth_lti

blocks/myoverview/lang/en/block_myoverview.php

@@ -94,9 +94,3 @@ $string['zero_request_title'] = 'Request your first course';
 $string['zero_request_intro'] = 'Need help getting started? Check out the <a href="{$a->dochref}" title="{$a->doctitle}" target="{$a->doctarget}">Moodle documentation</a> or take your first steps with our <a href="{$a->quickhref}" title="{$a->quicktitle}" target="{$a->quicktarget}">Quickstart guide</a>.';
 $string['zero_nocourses_title'] = 'Create your first course';
 $string['zero_nocourses_intro'] = 'Need help getting started? Check out the <a href="{$a->dochref}" title="{$a->doctitle}" target="{$a->doctarget}">Moodle documentation</a> or take your first steps with our Quickstart guide.';
-
-// Deprecated since Moodle 4.0.
-$string['clearsearch'] = "Clear search";
-$string['aria:lastaccessed'] = 'Sort courses by last accessed date';
-$string['aria:shortname'] = 'Sort courses by course short name';
-$string['aria:title'] = 'Sort courses by course name';

blocks/myoverview/lang/en/deprecated.txt

@@ -1,4 +0,0 @@
-clearsearch,block_myoverview
-aria:shortname,block_myoverview
-aria:lastaccessed,block_myoverview
-aria:title,block_myoverview

blocks/timeline/lang/en/block_timeline.php

@@ -48,8 +48,3 @@ $string['viewcourse'] = 'View course';
 $string['privacy:metadata:timelinesortpreference'] = 'The user sort preference for the timeline block.';
 $string['privacy:metadata:timelinefilterpreference'] = 'The user day filter preference for the timeline block.';
 $string['privacy:metadata:timelinelimitpreference'] = 'The user page limit preference for the timeline block.';
-
-// Deprecated since Moodle 4.0.
-$string['ariaeventlistpagelimit'] = 'Show {$a} activities per page';
-$string['ariaeventlistpaginationnavdates'] = 'Timeline activities pagination';
-$string['ariaeventlistpaginationnavcourses'] = 'Timeline activities for course {$a} pagination';

blocks/timeline/lang/en/deprecated.txt

@@ -1,3 +0,0 @@
-ariaeventlistpagelimit,block_timeline
-ariaeventlistpaginationnavdates,block_timeline
-ariaeventlistpaginationnavcourses,block_timeline

lang/en/admin.php

@@ -1622,11 +1622,6 @@ $string['cachesessionhelp'] = 'User specific cache that expires when the user\'s
 $string['cacheapplication'] = 'Application cache';
 $string['cacheapplicationhelp'] = 'Cached items are shared among all users and expire by a determined time to live (ttl).';
 
-// Deprecated since Moodle 4.0.
-$string['coursepage'] = 'Course page';
-$string['mediapluginswf'] = 'Enable .swf filter';
-$string['mediapluginswfnote'] = 'As a default security measure, normal users should not be allowed to embed swf flash files.';
-
 // Deprecated since Moodle 4.1.
 $string['multilangforceold'] = 'Force old multilang syntax: <span> without the class="multilang" and <lang>';
 

lang/en/badges.php

@@ -592,11 +592,6 @@ $string['warnexpired'] = ' (This badge has expired!)';
 $string['year'] = 'Year(s)';
 $string['includeauthdetails'] = "Include authentication details with the backpack";
 
-// Deprecated since Moodle 4.0.
-$string['evidence'] = 'Evidence';
-$string['recipientdetails'] = 'Recipient details';
-$string['recipientidentificationproblem'] = 'Cannot find a recipient of this badge among the existing users.';
-
 // Deprecated since Moodle 4.3.
 $string['backpackemail'] = 'Email address';
 $string['backpackemail_help'] = 'The email address associated with your backpack. While you are connected, any badges earned on this site will be associated with this email address.';

lang/en/calendar.php

@@ -284,8 +284,3 @@ $string['whendate'] = 'When: {$a}';
 $string['yesterday'] = 'Yesterday';
 $string['youcandeleteallrepeats'] = 'This event is part of a repeating event series. You can delete this event only, or all {$a} events in the series at once.';
 $string['yoursubscriptions'] = 'Imported calendars';
-
-// Deprecated since Moodle 4.0.
-$string['calendarurl'] = 'Calendar URL: {$a}';
-$string['importfrominstructions'] = 'Please provide either a URL to a remote calendar, or upload a file.';
-$string['monthlyview'] = 'Monthly view';

lang/en/competency.php

@@ -201,5 +201,3 @@ $string['usercompetencystatus_inreview'] = 'In review';
 $string['usercompetencystatus_waitingforreview'] = 'Waiting for review';
 $string['userplans'] = 'Learning plans';
 
-// Deprecated since Moodle 4.0.
-$string['invalidpersistenterror'] = 'Error: {$a}';

lang/en/completion.php

@@ -255,9 +255,6 @@ $string['writingcompletiondata'] = 'Writing completion data';
 $string['xdays'] = '{$a} days';
 $string['youmust'] = 'You must';
 
-// Deprecated since Moodle 4.0.
-$string['yourprogress'] = 'Your progress';
-
 // Deprecated since Moodle 4.3.
 $string['editcoursecompletionsettings'] = 'Edit course completion settings';
 $string['completiondefault'] = 'Default completion tracking';

lang/en/contentbank.php

@@ -98,6 +98,3 @@ $string['visibilitypref_help'] = 'Content you create in the content bank will us
 $string['visibilitysetpublic'] = 'Make public';
 $string['visibilitysetunlisted'] = 'Make unlisted';
 $string['visibilitytitleunlisted'] = '{$a} (Unlisted)';
-
-// Deprecated since 4.0.
-$string['close'] = 'Close';

lang/en/deprecated.txt

@@ -7,33 +7,6 @@ myprofile,core
 viewallmyentries,core_blog
 searchallavailablecourses_desc,core_admin
 search:mycourse,core_search
-calendarurl,core_calendar
-yourprogress,core_completion
-importfrominstructions,core_calendar
-proceedtocourse,core_enrol
-coursepage,core_admin
-invalidpersistenterror,core_competency
-mediapluginswf,core_admin
-mediapluginswfnote,core_admin
-createuserandpass,core
-supplyinfo,core
-monthlyview,core_calendar
-evidence,core_badges
-recipientdetails,core_badges
-recipientidentificationproblem,core_badges
-navmethod,core_grades
-dropdown,core_grades
-tabs,core_grades
-combo,core_grades
-defaults,core_message
-loggedin_help,core_message
-loggedindescription,core_message
-loggedoff_help,core_message
-loggedoffdescription,core_message
-sendingvia,core_message
-sendingviawhen,core_message
-close,core_contentbank
-notflagged,core_question
 cannotswitcheditmodeon,core_error
 multilangforceold,core_admin
 nopermissionmove,core_question

lang/en/enrol.php

@@ -171,6 +171,3 @@ $string['privacy:metadata:user_enrolments:timemodified'] = 'The time when the us
 $string['privacy:metadata:user_enrolments:userid'] = 'The ID of the user';
 $string['youenrolledincourse'] = 'You are enrolled in the course.';
 $string['youunenrolledfromcourse'] = 'You are unenrolled from the course "{$a}".';
-
-// Deprecated since Moodle 4.0.
-$string['proceedtocourse'] = 'Proceed to course content';

lang/en/grades.php

@@ -892,12 +892,6 @@ $string['yourgrade'] = 'Your grade';
 $string['aria-toggledropdown'] = 'Toggle the following dropdown';
 $string['aria:dropdowngrades'] = 'Grade items found';
 
-// Deprecated since Moodle 4.0.
-$string['navmethod'] = 'Navigation method';
-$string['dropdown'] = 'Drop-down menu';
-$string['tabs'] = 'Tabs';
-$string['combo'] = 'Tabs and drop-down menu';
-
 // Deprecated since Moodle 4.2.
 $string['showanalysisicon'] = 'Show grade analysis icon';
 $string['showanalysisicon_desc'] = 'Whether to show grade analysis icon by default. If the activity module supports it, the grade analysis icon links to a page with more detailed explanation of the grade and how it was obtained.';

lang/en/message.php

@@ -274,12 +274,3 @@ $string['wouldliketocontactyou'] = 'Would like to contact you';
 $string['you'] = 'You:';
 $string['youhaveblockeduser'] = 'You have blocked this user.';
 $string['yourcontactrequestpending'] = 'Your contact request is pending with {$a}';
-
-// Deprecated since Moodle 4.0.
-$string['defaults'] = 'Defaults';
-$string['loggedin_help'] = 'Configure how you would like to receive notifications when you are logged into Moodle';
-$string['loggedindescription'] = 'When you are logged into Moodle';
-$string['loggedoff_help'] = 'Configure how you would like to receive notifications when you are not logged into Moodle';
-$string['loggedoffdescription'] = 'When you are not logged into Moodle';
-$string['sendingvia'] = 'Sending "{$a->provider}" via "{$a->processor}"';
-$string['sendingviawhen'] = 'Sending "{$a->provider}" via "{$a->processor}" when {$a->state}';

lang/en/moodle.php

@@ -2460,11 +2460,6 @@ $string['yourwordforx'] = 'Your word for \'{$a}\'';
 $string['zippingbackup'] = 'Zipping backup';
 $string['deprecatedeventname'] = '{$a} (no longer in use)';
 
-// Deprecated since Moodle 4.0.
-$string['createuserandpass'] = 'Choose your username and password';
-$string['descriptiona'] = 'Description: {$a}';
-$string['supplyinfo'] = 'More details';
-
 // Deprecated since Moodle 4.3.
 $string['clicktochangeinbrackets'] = '{$a} (Click to change)';
 $string['modshowcmtitle'] = 'Show activity';

lang/en/question.php

@@ -520,8 +520,5 @@ $string['versioninfo'] = 'Version {$a->version} (of {$a->latestversion})';
 $string['versioninfolatest'] = 'Version {$a->version} (latest)';
 $string['question_version'] = 'Question version';
 
-// Deprecated since Moodle 4.0.
-$string['notflagged'] = 'Not flagged';
-
 // Deprecated since Moodle 4.1.
 $string['nopermissionmove'] = 'You don\'t have permission to move questions from here. You must save the question in this category or save it as a new question.';

lib/editor/atto/plugins/recordrtc/lang/en/atto_recordrtc.php

@@ -78,7 +78,3 @@ $string['uploadprogress'] = 'completed';
 $string['videobitrate'] = 'Video bitrate';
 $string['videobitrate_desc'] = 'Quality of video recording (larger number means higher quality)';
 $string['videortc'] = 'Record video';
-
-// Deprecated since Moodle 4.0.
-$string['timelimit'] = 'Time limit in seconds';
-$string['timelimit_desc'] = 'Maximum recording length allowed for the audio/video clips';

lib/editor/atto/plugins/recordrtc/lang/en/deprecated.txt

@@ -1,2 +0,0 @@
-timelimit,atto_recordrtc
-timelimit_desc,atto_recordrtc

lib/tests/string_manager_standard_test.php

@@ -83,11 +83,11 @@ class string_manager_standard_test extends \advanced_testcase {
         $this->assertFalse($stringman->string_deprecated('hidden', 'grades'));
 
         // Check deprecated string, make sure to update once that chosen below is finally removed.
-        $this->assertTrue($stringman->string_deprecated('coursepage', 'core_admin'));
+        $this->assertTrue($stringman->string_deprecated('selectdevice', 'core_admin'));
-        $this->assertTrue($stringman->string_exists('coursepage', 'core_admin'));
+        $this->assertTrue($stringman->string_exists('selectdevice', 'core_admin'));
         $this->assertDebuggingNotCalled();
-        $this->assertEquals('Course page', get_string('coursepage', 'core_admin'));
+        $this->assertEquals('Select device', get_string('selectdevice', 'core_admin'));
-        $this->assertDebuggingCalled('String [coursepage,core_admin] is deprecated. '.
+        $this->assertDebuggingCalled('String [selectdevice,core_admin] is deprecated. '.
             'Either you should no longer be using that string, or the string has been incorrectly deprecated, in which case you should report this as a bug. '.
             'Please refer to https://moodledev.io/general/projects/api/string-deprecation');
     }

media/player/videojs/lang/en/deprecated.txt

@@ -1,4 +0,0 @@
-configrtmp,media_videojs
-configuseflash,media_videojs
-rtmp,media_videojs
-useflash,media_videojs

media/player/videojs/lang/en/media_videojs.php

@@ -39,9 +39,3 @@ $string['privacy:metadata'] = 'The VideoJS player media plugin does not store an
 $string['videoextensions'] = 'Video file extensions';
 $string['videocssclass'] = 'CSS class for video';
 $string['youtube'] = 'YouTube videos';
-
-// Deprecated since Moodle 4.0.
-$string['configrtmp'] = 'If enabled, links that start with rtmp:// will be handled by the plugin, irrespective of whether the extension is enabled in the Video file extensions (videoextensions) setting. Flash fallback must be enabled for RTMP to work.';
-$string['configuseflash'] = 'Use Flash player if video format is not natively supported by the browser and/or natively by the VideoJS player. If enabled, VideoJS will be engaged for any file extension from the above list without browser check. Please note that Flash is not available in mobile browsers and discouraged in many desktop ones.';
-$string['rtmp'] = 'RTMP streams';
-$string['useflash'] = 'Use Flash fallback';

mod/chat/lang/en/chat.php

@@ -175,6 +175,3 @@ $string['usingchat_help'] = 'The chat module contains some features to make chat
 * Beeps - You can send a sound to other participants by clicking the "beep" link next to their name. A useful shortcut to beep all the people in the chat at once is to type "beep all".
 * HTML - If you know some HTML code, you can use it in your text to do things like insert images, play sounds or create different coloured text';
 $string['viewreport'] = 'Past sessions';
-
-// Deprecated since Moodle 4.0.
-$string['nextsession'] = 'Next scheduled session';

mod/chat/lang/en/deprecated.txt

@@ -1 +0,0 @@
-nextsession,mod_chat

mod/forum/lang/en/deprecated.txt

@@ -1 +1,5 @@
-postmailinfolink,mod_forum
+completionpostsgroup,mod_forum
+completiondiscussionsgroup,mod_forum
+completiondiscussionshelp,mod_forum
+completionrepliesgroup,mod_forum
+completionreplieshelp,mod_forum

mod/forum/lang/en/forum.php

@@ -792,11 +792,6 @@ $string['showmoreusers'] = 'Show more users';
 $string['viewconversation'] = 'View discussion';
 $string['viewgrades'] = 'View grades';
 
-// Deprecated since Moodle 4.0.
-$string['postmailinfolink'] = 'This is a copy of a message posted in {$a->coursename}.
-
-To reply click on this link: {$a->replylink}';
-
 // Deprecated since Moodle 4.3.
 $string['completionpostsgroup'] = 'Require posts';
 $string['completiondiscussionsgroup'] = 'Require discussions';

mod/glossary/lang/en/deprecated.txt

@@ -1,2 +1 @@
-waitingapproval,mod_glossary
 completionentriesgroup,mod_glossary

mod/glossary/lang/en/glossary.php

@@ -339,8 +339,5 @@ $string['withoutauthor'] = 'Concepts without author';
 $string['writtenby'] = 'by';
 $string['youarenottheauthor'] = 'You are not the author of this comment, so you are not allowed to edit it.';
 
-// Deprecated since 4.0.
-$string['waitingapproval'] = 'Waiting approval';
-
 // Deprecated since 4.3.
 $string['completionentriesgroup'] = 'Require entries';

mod/page/lang/en/deprecated.txt

@@ -1,2 +0,0 @@
-printheading,mod_page
-printheadingexplain,mod_page

mod/page/lang/en/page.php

@@ -72,7 +72,3 @@ $string['printlastmodified'] = 'Display last modified date';
 $string['printlastmodifiedexplain'] = 'Display last modified date below content?';
 $string['privacy:metadata'] = 'The Page resource plugin does not store any personal data.';
 $string['search:activity'] = 'Page';
-
-// Deprecated since 4.0.
-$string['printheading'] = 'Display page name';
-$string['printheadingexplain'] = 'Display page name above content?';

mod/quiz/lang/en/deprecated.txt

@@ -1,9 +1,3 @@
-completionpass,mod_quiz
-completionpassdesc,mod_quiz
-completionpass_help,mod_quiz
-completiondetail:passgrade,mod_quiz
-gradetopassnotset,mod_quiz
-basicideasofquiz,mod_quiz
 completionminattemptsgroup,mod_quiz
 grade,mod_quiz
 timetaken,mod_quiz

mod/quiz/lang/en/quiz.php

@@ -1078,14 +1078,6 @@ $string['questionversionlatest'] = 'v{$a} (latest)';
 $string['alwayslatest'] = 'Always latest';
 $string['gobacktoquiz'] = 'Go back';
 
-// Deprecated since Moodle 4.0.
-$string['completionpass'] = 'Require passing grade';
-$string['completionpassdesc'] = 'Student must achieve a passing grade to complete this activity';
-$string['completionpass_help'] = 'If enabled, this activity is considered complete when the student receives a pass grade (as specified in the Grade section of the quiz settings) or higher.';
-$string['completiondetail:passgrade'] = 'Receive a pass grade';
-$string['gradetopassnotset'] = 'This quiz does not yet have a grade to pass set. It may be set in the Grade section of the quiz settings.';
-$string['basicideasofquiz'] = 'The basic ideas of quiz-making';
-
 // Deprecated since Moodle 4.3.
 $string['completionminattemptsgroup'] = 'Require attempts';
 

mod/quiz/report/grading/lang/en/deprecated.txt

@@ -1,8 +1 @@
-bydate,quiz_grading
-bystudentidnumber,quiz_grading
-bystudentfirstname,quiz_grading
-bystudentlastname,quiz_grading
-gradingattemptwithidnumber,quiz_grading
-orderattempts,quiz_grading
-randomly,quiz_grading
 grade,quiz_grading

mod/quiz/report/grading/lang/en/quiz_grading.php

@@ -77,12 +77,5 @@ $string['total'] = 'Total';
 $string['unknownquestion'] = 'Unknown question';
 $string['updategrade'] = 'update grades';
 
-// Deprecated since Moodle 4.0.
+// Deprecated since Moodle 4.4.
-$string['bydate'] = 'By date';
-$string['bystudentidnumber'] = 'By student ID number';
-$string['bystudentfirstname'] = 'By student first name';
-$string['bystudentlastname'] = 'By student last name';
-$string['gradingattemptwithidnumber'] = 'Attempt number {$a->attempt} for {$a->fullname} ({$a->idnumber})';
-$string['orderattempts'] = 'Order attempts';
-$string['randomly'] = 'Randomly';
 $string['grade'] = 'grade';

mod/scorm/lang/en/deprecated.txt

@@ -1,3 +1 @@
-info,mod_scorm
+completionscorerequired_help,mod_scorm
-displayactivityname,mod_scorm
-displayactivityname_help,mod_scorm

mod/scorm/lang/en/scorm.php

@@ -456,10 +456,5 @@ $string['width'] = 'Width';
 $string['window'] = 'Window';
 $string['youmustselectastatus'] = 'You must select a status to require';
 
-// Deprecated since Moodle 4.0.
-$string['info'] = 'Info';
-$string['displayactivityname'] = 'Display activity name';
-$string['displayactivityname_help'] = 'Whether or not to display the activity name above the SCORM player.';
-
 // Deprecated since Moodle 4.3.
 $string['completionscorerequired_help'] = 'Enabling this setting will require a user to have at least the minimum score entered to be marked complete in this SCORM activity, as well as any other Activity Completion requirements.';

mod/survey/lang/en/deprecated.txt

@@ -1,3 +0,0 @@
-clicktocontinue,mod_survey
-viewsurveyresponses,mod_survey
-allquestions,mod_survey

mod/survey/lang/en/survey.php

@@ -281,8 +281,3 @@ $string['thanksforanswers'] = 'Thanks for answering this survey, {$a}';
 $string['time'] = 'Time';
 $string['notyetanswered'] = 'Not yet answered';
 $string['allquestionrequireanswer'] = 'All questions are required and must be answered.';
-
-// Deprecated since Moodle 4.0.
-$string['clicktocontinue'] = 'Click here to continue';
-$string['viewsurveyresponses'] = 'View {$a} survey responses';
-$string['allquestions'] = 'All questions in order, all students';

report/security/lang/en/deprecated.txt

@@ -1,4 +0,0 @@
-check_mediafilterswf_details,report_security
-check_mediafilterswf_error,report_security
-check_mediafilterswf_name,report_security
-check_mediafilterswf_ok,report_security

report/security/lang/en/report_security.php

@@ -144,9 +144,3 @@ $string['pluginname'] = 'Security checks';
 $string['security:view'] = 'View security report';
 $string['timewarning'] = 'Data processing may take a long time, please be patient...';
 $string['privacy:metadata'] = 'The Security overview plugin does not store any personal data.';
-
-// Deprecated since Moodle 4.0.
-$string['check_mediafilterswf_details'] = '<p>Automatic swf embedding is very dangerous - any registered user may launch an XSS attack against other server users. Please disable it on production servers.</p>';
-$string['check_mediafilterswf_error'] = 'Flash media filter is enabled - this is very dangerous for the majority of servers.';
-$string['check_mediafilterswf_name'] = 'Enabled .swf media filter';
-$string['check_mediafilterswf_ok'] = 'Flash media filter is not enabled.';

repository/dropbox/lang/en/deprecated.txt

@@ -1,3 +0,0 @@
-apikey,repository_dropbox
-secret,repository_dropbox
-instruction,repository_dropbox

repository/dropbox/lang/en/repository_dropbox.php

@@ -37,8 +37,3 @@ $string['logoutdesc'] = '(Logout when you finish using Dropbox)';
 $string['oauth2redirecturi'] = 'OAuth 2 Redirect URI';
 $string['privacy:metadata:repository_dropbox'] = 'The Dropbox repository plugin does not store any personal data, but does transmit user data from Moodle to the remote system.';
 $string['privacy:metadata:repository_dropbox:query'] = 'The Dropbox repository user search text query.';
-
-// Deprecated since Moodle 4.0.
-$string['apikey'] = 'Dropbox API key';
-$string['secret'] = 'Dropbox secret';
-$string['instruction'] = 'You can get your API Key and secret from <a href="https://www.dropbox.com/developers/apps">Dropbox developers</a>. When setting up your key please select "Full Dropbox" as the "Access level".';

theme/boost/lang/en/deprecated.txt

@@ -1,4 +1,3 @@
-totop,theme_boost
 privacy:drawernavclosed,theme_boost
 privacy:drawernavopen,theme_boost
 currentinparentheses,theme_boost

theme/boost/lang/en/theme_boost.php

@@ -59,9 +59,6 @@ $string['privacy:drawerindexopen'] = 'The current preference for the index drawe
 $string['privacy:drawerblockclosed'] = 'The current preference for the block drawer is closed.';
 $string['privacy:drawerblockopen'] = 'The current preference for the block drawer is open.';
 
-// Deprecated since Moodle 4.0.
-$string['totop'] = 'Go to top';
-
 // Deprecated since Moodle 4.1.
 $string['currentinparentheses'] = '(current)';
 $string['privacy:drawernavclosed'] = 'The current preference for the navigation drawer is closed.';