diff --git a/admin/tool/dataprivacy/lang/en/deprecated.txt b/admin/tool/dataprivacy/lang/en/deprecated.txt deleted file mode 100644 index c400ae86878..00000000000 --- a/admin/tool/dataprivacy/lang/en/deprecated.txt +++ /dev/null @@ -1 +0,0 @@ -statuspreprocessing,tool_dataprivacy diff --git a/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php b/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php index 54d9c5be690..46d7af262b8 100644 --- a/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php +++ b/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php @@ -344,6 +344,3 @@ $string['role_help'] = 'The role which the override should apply to.'; $string['duplicaterole'] = 'Role already specified'; $string['purposeoverview'] = 'A purpose describes the intended use and retention policy for stored data. The basis for storing and retaining that data is also described in the purpose.'; $string['roleoverrideoverview'] = 'The default retention policy can be overridden for specific user roles, allowing you to specify a longer, or a shorter, retention policy. A user is only expired when all of their roles have expired.'; - -// Deprecated since Moodle 3.6. -$string['statuspreprocessing'] = 'Pre-processing'; diff --git a/blocks/myoverview/lang/en/block_myoverview.php b/blocks/myoverview/lang/en/block_myoverview.php index 9763156cd24..491b55537c3 100644 --- a/blocks/myoverview/lang/en/block_myoverview.php +++ b/blocks/myoverview/lang/en/block_myoverview.php @@ -86,24 +86,6 @@ $string['hiddencourses'] = 'Removed from view'; $string['show'] = 'Restore to view'; $string['privacy:request:preference:set'] = 'The value of the setting \'{$a->name}\' was \'{$a->value}\''; -// Deprecated since Moodle 3.6. -$string['defaulttab'] = 'Default tab'; -$string['defaulttab_desc'] = 'The tab that will be displayed when a user first views their course overview. When returning to their course overview, the user\'s active tab is remembered.'; -$string['morecourses'] = 'More courses'; -$string['nocoursesinprogress'] = 'No in progress courses'; -$string['nocoursesfuture'] = 'No future courses'; -$string['nocoursespast'] = 'No past courses'; -$string['noevents'] = 'No upcoming activities due'; -$string['next30days'] = 'Next 30 days'; -$string['next7days'] = 'Next 7 days'; -$string['recentlyoverdue'] = 'Recently overdue'; -$string['sortbycourses'] = 'Sort by courses'; -$string['sortbydates'] = 'Sort by dates'; -$string['timeline'] = 'Timeline'; -$string['viewcoursename'] = 'View course {$a}'; -$string['privacy:metadata:overviewlasttab'] = 'This stores the last tab selected by the user on the overview block.'; -$string['viewcourse'] = 'View course'; - // Deprecated since Moodle 3.7. $string['complete'] = 'complete'; $string['nocourses'] = 'No courses'; diff --git a/blocks/myoverview/lang/en/deprecated.txt b/blocks/myoverview/lang/en/deprecated.txt index fb6f86cc4af..c70ee8b748e 100644 --- a/blocks/myoverview/lang/en/deprecated.txt +++ b/blocks/myoverview/lang/en/deprecated.txt @@ -1,17 +1,2 @@ -defaulttab,block_myoverview -defaulttab_desc,block_myoverview -morecourses,block_myoverview -nocoursesinprogress,block_myoverview -nocoursesfuture,block_myoverview -nocoursespast,block_myoverview -noevents,block_myoverview -next30days,block_myoverview -next7days,block_myoverview -recentlyoverdue,block_myoverview -sortbycourses,block_myoverview -sortbydates,block_myoverview -timeline,block_myoverview -viewcoursename,block_myoverview -privacy:metadata:overviewlasttab,block_myoverview nocourses,block_myoverview -complete,block_myoverview \ No newline at end of file +complete,block_myoverview diff --git a/lang/en/badges.php b/lang/en/badges.php index 62e4b4f9e2d..a98db31c5ec 100644 --- a/lang/en/badges.php +++ b/lang/en/badges.php @@ -572,13 +572,6 @@ $string['version_help'] = 'The version field may be used to keep track of the ba $string['warnexpired'] = ' (This badge has expired!)'; $string['year'] = 'Year(s)'; -// Deprecated since Moodle 3.6. -$string['error:invalidbadgeurl'] = 'Invalid issuer URL format. The URL should have a prefix http:// or https://.'; -$string['backpackbadges'] = 'You have {$a->totalbadges} badge(s) displayed from {$a->totalcollections} collection(s). Change backpack settings.'; -$string['error:nogroups'] = '
There are no public collections of badges available in your backpack.
Only public collections are shown. Visit your backpack to create some public collections.
'; -$string['nobackpackbadges'] = 'There are no badges in the collections you have selected. Add more collections.'; -$string['nobackpackcollections'] = 'No badge collections have been selected. Add collections.'; - // Deprecated since Moodle 3.9. $string['editsettings'] = 'Edit settings'; $string['sitebackpackverify'] = 'Backpack connection'; diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt index 949af229621..f5887d5ad12 100644 --- a/lang/en/deprecated.txt +++ b/lang/en/deprecated.txt @@ -5,28 +5,8 @@ myfilesmanage,core mypreferences,core_grades myprofile,core viewallmyentries,core_blog -formattexttype,core -currentlyselectedusers,core -emailuserhasnone,core -emaildisplayhidden,core -sitemessage,core -coursemessage,core -addedrecip,core -addedrecips,core messagecontactrequestsnotification,core_message messagecontactrequestsnotificationsubject,core_message -messagingdisabled,core_message -messagedselectedcountusersfailed,core -backtoparticipants,core -keepsearching,core -allfieldsrequired,core -previewhtml,core -messagedselecteduserfailed,core -eventmessagecontactblocked,core_message -eventmessagecontactunblocked,core_message -userisblockingyou,core_message -userisblockingyounoncontact,core_message -error:invalidbadgeurl,core_badges nomessages,core_message searchallavailablecourses_desc,core_admin search:mycourse,core_search @@ -41,10 +21,6 @@ undockall,core_block undockblock,core_block undockitem,core_block canceledit,core_message -backpackbadges,core_badges -nobackpackbadges,core_badges -nobackpackcollections,core_badges -error:nogroups,core_badges purgedefinitionsuccess,core_cache purgestoresuccess,core_cache eventrolecapabilitiesupdated,core_role diff --git a/lang/en/message.php b/lang/en/message.php index 61ed582056c..77a5b181ab2 100644 --- a/lang/en/message.php +++ b/lang/en/message.php @@ -262,8 +262,6 @@ $string['unreadnewgroupconversationmessage'] = 'New message from {$a->name} in { $string['unreadnewmessage'] = 'New message from {$a}'; $string['useentertosend'] = 'Use enter to send'; $string['usercantbemessaged'] = 'You can\'t message {$a} due to their message preferences. Try adding them as a contact.'; -$string['userisblockingyou'] = 'This user has blocked you from sending messages to them'; -$string['userisblockingyounoncontact'] = '{$a} only accepts messages from their contacts.'; $string['userwouldliketocontactyou'] = '{$a} would like to contact you'; $string['viewfullnotification'] = 'View full notification'; $string['viewmessageswith'] = 'View messages with {$a}'; @@ -275,13 +273,6 @@ $string['you'] = 'You:'; $string['youhaveblockeduser'] = 'You have blocked this user.'; $string['yourcontactrequestpending'] = 'Your contact request is pending with {$a}'; -// Deprecated since Moodle 3.6. -$string['eventmessagecontactblocked'] = 'Message contact blocked'; -$string['eventmessagecontactunblocked'] = 'Message contact unblocked'; -$string['messagingdisabled'] = 'Messaging is disabled on this site, emails will be sent instead'; -$string['userisblockingyou'] = 'This user has blocked you from sending messages to them.'; -$string['userisblockingyounoncontact'] = '{$a} only accepts messages from their contacts.'; - // Deprecated since Moodle 3.7. $string['nomessages'] = 'No messages'; $string['outputdisabled'] = 'Output disabled'; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index 9d7065e0244..2d8bd7267fe 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -2283,22 +2283,6 @@ $string['yourwordforx'] = 'Your word for \'{$a}\''; $string['zippingbackup'] = 'Zipping backup'; $string['deprecatedeventname'] = '{$a} (no longer in use)'; -// Deprecated since Moodle 3.6. -$string['addedrecip'] = 'Added {$a} new recipient'; -$string['addedrecips'] = 'Added {$a} new recipients'; -$string['allfieldsrequired'] = 'All fields are required'; -$string['backtoparticipants'] = 'Back to participants list'; -$string['currentlyselectedusers'] = 'Currently selected users'; -$string['coursemessage'] = 'Message course users'; -$string['emaildisplayhidden'] = 'Email hidden'; -$string['emailuserhasnone'] = 'There is no email address for the user.'; -$string['formattexttype'] = 'Formatting'; -$string['keepsearching'] = 'Keep searching'; -$string['messagedselectedcountusersfailed'] = 'A problem occurred and {$a} messages have not been sent.'; -$string['messagedselecteduserfailed'] = 'The message was not sent to user {$a->fullname}.'; -$string['previewhtml'] = 'HTML format preview'; -$string['sitemessage'] = 'Message users'; - // Deprecated since Moodle 3.9. $string['participantscount'] = 'Number of participants: {$a}'; $string['userfilterplaceholder'] = 'Search keyword or select filter';