Merge branch 'MDL-68248-master' of https://github.com/DinhHien0307/moodle

diff --cc blocks/myoverview/lang/en/block_myoverview.php
index 76f83fb,185316a..9763156
--- 1/blocks/myoverview/lang/en/block_myoverview.php
--- 2/blocks/myoverview/lang/en/block_myoverview.php
+++ b/blocks/myoverview/lang/en/block_myoverview.php
@@@ -44,6 -44,7 +44,7 @@@ $string['aria:list'] = 'Switch to list 
  $string['aria:title'] = 'Sort courses by course name';
  $string['aria:past'] = 'Show past courses';
  $string['aria:removefromfavourites'] = 'Remove star for';
 -$string['aria:shortname'] = 'Sort course by course short name';
++$string['aria:shortname'] = 'Sort courses by course short name';
  $string['aria:summary'] = 'Switch to summary view';
  $string['aria:sortingdropdown'] = 'Sorting drop-down menu';
  $string['availablegroupings'] = 'Available filters';