Merge branch 'MDL-63730-master-enfix' of git://github.com/mudrd8mz/moodle

diff --cc admin/tool/dataprivacy/lang/en/tool_dataprivacy.php
index 64c094a,5e2e834..0c5ac5f
--- 1/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php
--- 2/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php
+++ b/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php
@@@ -92,8 -92,7 +92,8 @@@ $string['deletecategorytext'] = 'Are yo
  $string['deletedefaults'] = 'Delete defaults: {$a}';
  $string['deletedefaultsconfirmation'] = 'Are you sure you want to delete the default category and purpose for {$a} modules?';
  $string['deleteexpiredcontextstask'] = 'Delete expired contexts';
- $string['deleteexpireddatarequeststask'] = 'Delete files from completed data requests that have expired';
+ $string['deleteexpireddatarequeststask'] = 'Delete expired data request export files';
 +$string['deletemyaccount'] = 'Delete my account';
  $string['deletepurpose'] = 'Delete purpose';
  $string['deletepurposetext'] = 'Are you sure you want to delete the purpose \'{$a}\'?';
  $string['defaultssaved'] = 'Defaults saved';

diff --cc admin/tool/dataprivacy/tests/behat/datadelete.feature
Simple merge

diff --cc admin/tool/dataprivacy/tests/behat/dataexport.feature
Simple merge

diff --cc blocks/myoverview/lang/en/block_myoverview.php
index 6de059d,d535543..9500656
--- 1/blocks/myoverview/lang/en/block_myoverview.php
--- 2/blocks/myoverview/lang/en/block_myoverview.php
+++ b/blocks/myoverview/lang/en/block_myoverview.php
@@@ -47,41 -41,29 +47,41 @@@ $string['aria:removefromfavourites'] = 
  $string['aria:summary'] = 'Switch to summary view';
  $string['aria:sortingdropdown'] = 'Sorting dropdown';
  $string['card'] = 'Card';
 -$string['courseprogress'] = 'Course progress:';
 +$string['cards'] = 'Cards';
  $string['complete'] = 'Complete';
 -$string['favorite'] = 'Favourite';
 +$string['favourite'] = 'Starred course';
 +$string['favourites'] = 'Starred';
  $string['future'] = 'Future';
 -$string['future:aria'] = 'View future courses';
 -$string['hidden'] = 'Hidden';
  $string['inprogress'] = 'In progress';
 -$string['inprogress:aria'] = 'View in progress courses';
 +$string['notfavourite'] = 'Not starred';
  $string['lastaccessed'] = 'Last accessed';
 -$string['lastaccessed:aria'] = 'Sort course by lastaccessed';
  $string['list'] = 'List';
 -$string['morecourses'] = 'More courses';
  $string['myoverview:addinstance'] = 'Add a new course overview block';
  $string['myoverview:myaddinstance'] = 'Add a new course overview block to Dashboard';
 -$string['nocoursesfuture'] = 'No future courses';
 -$string['nocoursesinprogress'] = 'No in progress courses';
  $string['nocourses'] = 'No courses';
 -$string['nocoursespast'] = 'No past courses';
  $string['past'] = 'Past';
  $string['pluginname'] = 'Course overview';
- $string['privacy:metadata:overviewsortpreference'] = 'The myoverview block sort preference.';
- $string['privacy:metadata:overviewviewpreference'] = 'The myoverview block view preference.';
- $string['privacy:metadata:overviewgroupingpreference'] = 'The myoverview block grouping preference.';
 -$string['privacy:metadata'] = 'The Course overview block does not store any personal data.';
++$string['privacy:metadata:overviewsortpreference'] = 'The Course overview block sort preference.';
++$string['privacy:metadata:overviewviewpreference'] = 'The Course overview block view preference.';
++$string['privacy:metadata:overviewgroupingpreference'] = 'The Course overview block grouping preference.';
 +$string['removefromfavourites'] = 'Unstar this course';
  $string['summary'] = 'Summary';
  $string['title'] = 'Title';
 +
 +// 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['viewcourse'] = 'View course';
 +$string['privacy:metadata:overviewlasttab'] = 'This stores the last tab selected by the user on the overview block.';
  

diff --cc lang/en/admin.php
Simple merge

diff --cc lang/en/group.php
Simple merge

diff --cc lang/en/message.php
Simple merge