Merge branch 'MDL-64186-master-enfix' of git://github.com/mudrd8mz/mo…

…odle

lang/en/admin.php

@@ -177,7 +177,7 @@
 $string['configcoursegraceperiodafter'] = 'Classify past courses as in progress for these many days after the course end date.';
 $string['configcoursegraceperiodbefore'] = 'Classify future courses as in progress for these many days prior to the course start date.';
 $string['configcourseoverviewfilesext'] = 'A comma-separated list of allowed course image file extensions.';
-$string['configcourseoverviewfileslimit'] = 'The maximum number of files that can be displayed next to the course summary on the list of courses page. The first file added is used as the course image in the course overview on users\' Dashboards; any additional files are displayed on the list of courses page only.';
+$string['configcourseoverviewfileslimit'] = 'The maximum number of files that can be displayed next to the course summary on the list of courses page. The first image file added is used as the course image in the course overview on users\' Dashboards; any additional files are displayed on the list of courses page only.';
 $string['configcourserequestnotify'] = 'Type username of user to be notified when new course requested.';
 $string['configcourserequestnotify2'] = 'Users who will be notified when a course is requested. Only users who can approve course requests are listed here.';
 $string['configcoursesperpage'] = 'Enter the number of courses to be displayed per page in a course listing.';

lang/en/favourites.php

@@ -20,11 +20,11 @@
  * @copyright 2018 Jake Dallimore <[email protected]>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-$string['privacy:metadata:favourite'] = 'Stores references to items which have been marked as favourites.';
-$string['privacy:metadata:favourite:component'] = 'The component to which the favourite belongs to. E.g. core_user.';
-$string['privacy:metadata:favourite:itemid'] = 'The identifier for the item being marked as a favourite.';
-$string['privacy:metadata:favourite:itemtype'] = 'The type of the favourite item. E.g. course.';
-$string['privacy:metadata:favourite:ordering'] = 'A number used to order the favourites of the same type.';
-$string['privacy:metadata:favourite:timecreated'] = 'The time at which the item was marked as a favourite.';
-$string['privacy:metadata:favourite:timemodified'] = 'The time at which favourite was last modified.';
-$string['privacy:metadata:favourite:userid'] = 'The user who created the favourite.';
+$string['privacy:metadata:favourite'] = 'Stores references to items which have been starred.';
+$string['privacy:metadata:favourite:component'] = 'The component which the starred item belongs to e.g. core_user';
+$string['privacy:metadata:favourite:itemid'] = 'The identifier for the item being starred';
+$string['privacy:metadata:favourite:itemtype'] = 'The starred item type e.g. course';
+$string['privacy:metadata:favourite:ordering'] = 'A number used to order starred items of the same type';
+$string['privacy:metadata:favourite:timecreated'] = 'The time when the item was starred';
+$string['privacy:metadata:favourite:timemodified'] = 'The time when the starred item was last modified';
+$string['privacy:metadata:favourite:userid'] = 'The ID of the user who starred the item';

lang/en/message.php

@@ -25,9 +25,9 @@
 $string['acceptandaddcontact'] = 'Accept and add to contacts';
 $string['addcontact'] = 'Add contact';
 $string['addcontactconfirm'] = 'Are you sure you want to add {$a} to your contacts?';
-$string['addtoyourcontacts'] = 'Add to your contacts';
-$string['addtoyourcontactsandmessage'] = 'Add to your contacts and message';
-$string['addtofavourites'] = 'Add to favourites';
+$string['addtoyourcontacts'] = 'Add to contacts';
+$string['addtoyourcontactsandmessage'] = 'Add to contacts and message';
+$string['addtofavourites'] = 'Star';
 $string['ago'] = '{$a} ago';
 $string['allusers'] = 'All messages from all users';
 $string['backto'] = 'Back to {$a}';
@@ -109,11 +109,11 @@
 $string['newonlymsg'] = 'Show only new';
 $string['newmessage'] = 'New message';
 $string['newmessagesearch'] = 'Select or search for a contact to send a new message.';
-$string['nofavourites'] = 'No favourites';
+$string['nofavourites'] = 'No starred messages';
 $string['noframesjs'] = 'Use more accessible interface';
 $string['nocontactrequests'] = 'No contact requests';
 $string['nocontacts'] = 'No contacts';
-$string['nocontactsgetstarted'] = "Try searching for someone to add them as a contact";
+$string['nocontactsgetstarted'] = 'No contacts';
 $string['nogroupmessages'] = 'No group messages';
 $string['nomessages'] = 'No messages';
 $string['nomessagesfound'] = 'No messages were found';
@@ -195,8 +195,8 @@
 $string['removecontact'] = 'Remove contact';
 $string['removecontactconfirm'] = 'Are you sure you want to remove {$a} from your contacts?';
 $string['removecoursefilter'] = 'Remove filter for course {$a}';
-$string['removefromyourcontacts'] = 'Remove from your contacts';
-$string['removefromfavourites'] = 'Remove from favourites';
+$string['removefromyourcontacts'] = 'Remove from contacts';
+$string['removefromfavourites'] = 'Unstar';
 $string['requirecontacttomessage'] = 'You need to request {$a} to add you as a contact to be able to message them.';
 $string['requiresconfiguration'] = 'Requires configuration';
 $string['searchforuser'] = 'Search for a user';
@@ -226,7 +226,7 @@
 $string['shownotificationwindownonew'] = 'Show notification window with no new notifications';
 $string['shownotificationwindowwithcount'] = 'Show notification window with {$a} new notifications';
 $string['togglenotificationmenu'] = 'Toggle notifications menu';
-$string['togglemessagemenu'] = 'Toggle messages menu';
+$string['togglemessagemenu'] = 'Toggle messaging drawer';
 $string['touserdoesntexist'] = 'You can not send a message to a user id ({$a}) that doesn\'t exist';
 $string['unabletomessage'] = 'You are unable to message this user';
 $string['unblock'] = 'Unblock';

lang/en/moodle.php

@@ -808,7 +808,7 @@
 $string['explanation'] = 'Explanation';
 $string['explanationdigitalminor'] = 'This information is required to determine if your age is over the digital age of consent. This is the age when an individual can consent to terms and conditions and their data being legally stored and processed.';
 $string['extendperiod'] = 'Extended period';
-$string['favourites'] = 'Favourites';
+$string['favourites'] = 'Starred';
 $string['failedloginattempts'] = '{$a->attempts} failed logins since your last login';
 $string['feedback'] = 'Feedback';
 $string['file'] = 'File';

lang/en/privacy.php

@@ -22,7 +22,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['broughtbymoodle'] = 'This data export provided by Moodle';
+$string['broughtbymoodle'] = 'This data export is provided by Moodle.';
 $string['exportfrom'] = 'Exported from {$a}';
 $string['exporttime'] = 'Exported on {$a}';
 $string['exportuser'] = 'Data for {$a}';

lib/editor/atto/plugins/equation/lang/en/atto_equation.php

@@ -27,7 +27,7 @@
 $string['librarygroup1_desc'] = 'TeX commands listed on the operators tab.';
 $string['librarygroup2'] = 'Arrows';
 $string['librarygroup2_desc'] = 'TeX commands listed on the arrows tab.';
-$string['librarygroup3'] = 'Greek Symbols';
+$string['librarygroup3'] = 'Greek symbols';
 $string['librarygroup3_desc'] = 'TeX commands listed on the Greek symbols tab.';
 $string['librarygroup4'] = 'Advanced';
 $string['librarygroup4_desc'] = 'TeX commands listed on the advanced tab.';