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

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

@@ -1 +0,0 @@
-openusingembeddedbrowser,tool_mobile

admin/tool/mobile/lang/en/tool_mobile.php

@@ -151,6 +151,3 @@ $string['privacy:metadata:core_userkey'] = 'User\'s keys used to create auto-log
 $string['responsivemainmenuitems'] = 'Responsive menu items';
 $string['switchaccount'] = 'Switch account';
 $string['viewqrcode'] = 'View QR code';
-
-// Deprecated since Moodle 3.11.
-$string['openusingembeddedbrowser'] = 'Open using embedded browser';

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

@@ -1,5 +0,0 @@
-createnewfacebookissuer,tool_oauth2
-createnewgoogleissuer,tool_oauth2
-createnewissuer,tool_oauth2
-createnewmicrosoftissuer,tool_oauth2
-createnewnextcloudissuer,tool_oauth2

admin/tool/oauth2/lang/en/tool_oauth2.php

@@ -125,10 +125,3 @@ $string['userfieldinternalfield'] = 'Internal field name';
 $string['userfieldmappingdeleted'] = 'User field mapping deleted';
 $string['userfieldmappingsforissuer'] = 'User field mappings for issuer: {$a}';
 $string['privacy:metadata'] = 'The OAuth 2 services plugin does not store any personal data.';
-
-// Deprecated since Moodle 3.11.
-$string['createnewfacebookissuer'] = 'Create new Facebook service';
-$string['createnewgoogleissuer'] = 'Create new Google service';
-$string['createnewissuer'] = 'Create new custom service';
-$string['createnewmicrosoftissuer'] = 'Create new Microsoft service';
-$string['createnewnextcloudissuer'] = 'Create new Nextcloud service';

auth/mnet/lang/en/auth_mnet.php

@@ -94,11 +94,3 @@ $string['privacy:metadata:mnet_session:useragent'] = 'User agent used to access
 $string['privacy:metadata:mnet_session:userid'] = 'ID of the user jumping to remote system.';
 $string['privacy:metadata:mnet_session:username'] = 'Username of the user jumping to remote system.';
 $string['unknownhost'] = 'Unknown host';
-
-// Deprecated since Moodle 3.11.
-$string['privacy:metadata:mnet_external:aim'] = 'The AIM identifier of the user';
-$string['privacy:metadata:mnet_external:icq'] = 'The ICQ number of the user.';
-$string['privacy:metadata:mnet_external:msn'] = 'The MSN identifier of the user';
-$string['privacy:metadata:mnet_external:skype'] = 'The Skype identifier of the user';
-$string['privacy:metadata:mnet_external:url'] = 'A URL related to this user.';
-$string['privacy:metadata:mnet_external:yahoo'] = 'The Yahoo identifier of the user';

auth/mnet/lang/en/deprecated.txt

@@ -1,6 +0,0 @@
-privacy:metadata:mnet_external:aim,auth_mnet
-privacy:metadata:mnet_external:icq,auth_mnet
-privacy:metadata:mnet_external:msn,auth_mnet
-privacy:metadata:mnet_external:skype,auth_mnet
-privacy:metadata:mnet_external:url,auth_mnet
-privacy:metadata:mnet_external:yahoo,auth_mnet

blocks/myprofile/lang/en/block_myprofile.php

@@ -43,10 +43,3 @@ $string['myprofile:myaddinstance'] = 'Add a new logged in user block to Dashboar
 $string['myprofile_settings'] = 'Visible user information';
 $string['pluginname'] = 'Logged in user';
 $string['privacy:metadata'] = 'The Logged in user block only shows information about the logged in user and does not store data itself.';
-
-// Deprecated since Moodle 3.11.
-$string['display_icq'] = 'Display ICQ';
-$string['display_skype'] = 'Display Skype';
-$string['display_yahoo'] = 'Display Yahoo';
-$string['display_aim'] = 'Display AIM';
-$string['display_msn'] = 'Display MSN';

blocks/myprofile/lang/en/deprecated.txt

@@ -1,5 +0,0 @@
-display_aim,block_myprofile
-display_icq,block_myprofile
-display_msn,block_myprofile
-display_skype,block_myprofile
-display_yahoo,block_myprofile

lang/en/admin.php

@@ -1597,12 +1597,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 3.11.
-$string['configenableactivitychooser'] = 'The activity chooser is a dialog box with a short description of each activity and resource. If disabled, separate resource and activity drop-down menus are provided instead.';
-$string['enableactivitychooser'] = 'Enable activity chooser';
-$string['configmodchooserdefault'] = 'Should the activity chooser be presented to users by default?';
-$string['modchooserdefault'] = 'Activity chooser default';
-
 // Deprecated since Moodle 4.0.
 $string['coursepage'] = 'Course page';
 $string['mediapluginswf'] = 'Enable .swf filter';

lang/en/badges.php

@@ -578,13 +578,6 @@ $string['warnexpired'] = ' (This badge has expired!)';
 $string['year'] = 'Year(s)';
 $string['includeauthdetails'] = "Include authentication details with the backpack";
 
-// Deprecated since Moodle 3.11.
-$string['addbackpack'] = 'Add backpack';
-$string['error:backpacknotavailable'] = 'Your site is not accessible from the Internet, so any badges issued from this site cannot be verified by external backpack services.';
-$string['error:backpackproblem'] = 'There was a problem connecting to your backpack service provider. Please try again later.';
-$string['sitebackpack'] = 'Active external backpack';
-$string['sitebackpack_help'] = 'The external backpack that users can connect to from this site. Note that changing this setting after users have connected their backpacks will require each user to go to their backpack settings page and disconnect then reconnect.';
-
 // Deprecated since Moodle 4.0.
 $string['evidence'] = 'Evidence';
 $string['recipientdetails'] = 'Recipient details';

lang/en/deprecated.txt

@@ -8,23 +8,6 @@ viewallmyentries,core_blog
 searchallavailablecourses_desc,core_admin
 search:mycourse,core_search
 calendarurl,core_calendar
-hidepicture,core_group
-hidepicture,core_moodle
-sitebackpack,core_badges
-sitebackpack_help,core_badges
-usernameoridnousererror,core_webservice
-usernameoridoccurenceerror,core_webservice
-addbackpack,core_badges
-error:backpacknotavailable,core_badges
-error:backpackproblem,core_badges
-grade,core
-aimid,core
-yahooid,core
-icqnumber,core
-msnid,core
-configenableactivitychooser,core_admin
-enableactivitychooser,core_admin
-coursepreferences,core
 yourprogress,core_completion
 importfrominstructions,core_calendar
 proceedtocourse,core_enrol

lang/en/group.php

@@ -216,6 +216,3 @@ $string['visibilitymembers'] = 'Only visible to members';
 $string['visibilityown'] = 'Only see own membership';
 $string['visibilitynone'] = 'Hidden';
 $string['memberofgroup'] = 'Group member of: {$a}';
-
-// Deprecated since Moodle 3.11.
-$string['hidepicture'] = 'Hide picture';

lang/en/moodle.php

@@ -2420,17 +2420,6 @@ $string['yourwordforx'] = 'Your word for \'{$a}\'';
 $string['zippingbackup'] = 'Zipping backup';
 $string['deprecatedeventname'] = '{$a} (no longer in use)';
 
-// Deprecated since Moodle 3.11.
-$string['hidepicture'] = 'Hide picture';
-$string['grade'] = 'Grade';
-$string['aimid'] = 'AIM ID';
-$string['yahooid'] = 'Yahoo ID';
-$string['skypeid'] = 'Skype ID';
-$string['icqnumber'] = 'ICQ number';
-$string['msnid'] = 'MSN ID';
-$string['coursepreferences'] = 'Course preferences';
-$string['registrationno'] = 'No, I do not wish to receive any emails';
-
 // Deprecated since Moodle 4.0.
 $string['createuserandpass'] = 'Choose your username and password';
 $string['descriptiona'] = 'Description: {$a}';

lang/en/webservice.php

@@ -230,9 +230,6 @@ $string['wsdocumentationlogin'] = 'or enter your web service username and passwo
 $string['wspassword'] = 'Web service password';
 $string['wsusername'] = 'Web service username';
 
-// Deprecated since Moodle 3.11.
-$string['usernameoridnousererror'] = 'No users were found with this username/user id.';
-$string['usernameoridoccurenceerror'] = 'More than one user was found with this username. Please enter the user id.';
 // Deprecated since Moodle 4.2.
 $string['missingversionfile'] = 'Coding error: version.php file is missing for the component {$a}';
 $string['cannotgetcoursecontents'] = 'Cannot get course contents';

mod/assign/lang/en/assign.php

@@ -661,9 +661,3 @@ $string['viewsubmissiongradingtable'] = 'View submission grading table.';
 $string['viewrevealidentitiesconfirm'] = 'View reveal student identities confirmation page.';
 $string['workflowfilter'] = 'Workflow filter';
 $string['xofy'] = '{$a->x} of {$a->y}';
-
-// Deprecated since Moodle 3.11.
-$string['allowsubmissionsfromdatesummary'] = 'This assignment will accept submissions from <strong>{$a}</strong>';
-$string['allowsubmissionsanddescriptionfromdatesummary'] = 'The assignment details and submission form will be available from <strong>{$a}</strong>';
-$string['relativedatessubmissionduedateafter'] = '{$a->datediffstr} after course start';
-$string['relativedatessubmissionduedatebefore'] = '{$a->datediffstr} before course start';

mod/assign/lang/en/deprecated.txt

@@ -1,4 +0,0 @@
-allowsubmissionsfromdatesummary,mod_assign
-allowsubmissionsanddescriptionfromdatesummary,mod_assign
-relativedatessubmissionduedateafter,mod_assign
-relativedatessubmissionduedatebefore,mod_assign

mod/chat/lang/en/chat.php

@@ -176,8 +176,5 @@ $string['usingchat_help'] = 'The chat module contains some features to make chat
 * 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 3.11.
-$string['sessionstart'] = 'The next chat session will start on {$a->date}, ({$a->fromnow} from now)';
-
 // Deprecated since Moodle 4.0.
 $string['nextsession'] = 'Next scheduled session';

mod/chat/lang/en/deprecated.txt

@@ -1,2 +1 @@
-sessionstart,mod_chat
 nextsession,mod_chat

mod/data/lang/en/data.php

@@ -475,9 +475,6 @@ $string['viewtodate'] = 'Read only to';
 $string['viewtodatevalidation'] = 'The read only to date cannot be before the read only from date.';
 $string['wrongdataid'] = 'Wrong data ID provided';
 
-// Deprecated since Moodle 3.11.
-$string['unsupportedexport'] = '({$a->fieldtype}) cannot be exported.';
-
 // Deprecated since Moodle 4.1.
 $string['buttons'] = 'Actions';
 $string['nolisttemplate'] = 'List view template is not yet defined';

mod/data/lang/en/deprecated.txt

@@ -1,4 +1,3 @@
-unsupportedexport,mod_data
 buttons,mod_data
 nosingletemplate,mod_data
 nolisttemplate,mod_data

mod/quiz/accessrule/openclosedate/lang/en/deprecated.txt

@@ -1 +0,0 @@
-quiznotavailable,quizaccess_openclosedate

mod/quiz/accessrule/openclosedate/lang/en/quizaccess_openclosedate.php

@@ -23,14 +23,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
-defined('MOODLE_INTERNAL') || die();
-
-
 $string['notavailable'] = 'This quiz is currently not available.';
 $string['pluginname'] = 'Open and close date access rule';
 $string['privacy:metadata'] = 'The Open and close date quiz access rule plugin does not store any personal data.';
-
-// Deprecated since Moodle 3.11.
-$string['quiznotavailable'] = 'The quiz will not be available until {$a}';
-

mod/quiz/lang/en/quiz.php

@@ -1074,9 +1074,6 @@ $string['questionversionlatest'] = 'v{$a} (latest)';
 $string['alwayslatest'] = 'Always latest';
 $string['gobacktoquiz'] = 'Go back';
 
-// Deprecated since Moodle 3.11.
-$string['completionattemptsexhausteddesc'] = 'Complete if all available attempts are exhausted';
-
 // Deprecated since Moodle 4.0.
 $string['completionpass'] = 'Require passing grade';
 $string['completionpassdesc'] = 'Student must achieve a passing grade to complete this activity';