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

admin/tool/behat/tests/behat/data_generators.feature

@@ -156,7 +156,7 @@ Feature: Set up contextual data for tests
     And I log in as "user5"
     And I should see "You are logged in as"
     And I am on "Course 1" course homepage
-    And I should see "You can not enrol yourself in this course."
+    And I should see "You cannot enrol yourself in this course."
 
   Scenario: Add modules
     Given the following "courses" exist:

course/tests/behat/course_browsing.feature

@@ -79,7 +79,7 @@ Feature: Restricting access to course lists
     And I should not see "Humanities"
     And I should not see "Other category"
     And I follow "English Y2"
-    And I should see "You can not enrol yourself in this course."
+    And I should see "You cannot enrol yourself in this course."
     And I log out
 
   Scenario: Browse courses as a user who has access to several but not all categories
@@ -102,5 +102,5 @@ Feature: Restricting access to course lists
     And the "Course categories" select box should contain "English category"
     And the "Course categories" select box should not contain "Other category"
     And I follow "Biology Y1"
-    And I should see "You can not enrol yourself in this course."
+    And I should see "You cannot enrol yourself in this course."
     And I log out

enrol/self/tests/behat/self_enrolment.feature

@@ -62,7 +62,7 @@ Feature: Users can auto-enrol themself in courses where self enrolment is allowe
   Scenario: Self-enrolment disabled
     Given I log in as "student1"
     When I am on "Course 1" course homepage
-    Then I should see "You can not enrol yourself in this course"
+    Then I should see "You cannot enrol yourself in this course"
 
   Scenario: Self-enrolment enabled requiring a group enrolment key
     Given I log in as "teacher1"

lang/en/admin.php

@@ -154,7 +154,7 @@ $string['configallcountrycodes'] = 'This is the list of countries that may be se
 $string['configallowassign'] = 'You can allow people who have the roles on the left side to assign some of the column roles to other people';
 $string['configallowcategorythemes'] = 'If you enable this, then themes can be set at the category level. This will affect all child categories and courses unless they have specifically set their own theme. WARNING: Enabling category themes may affect performance.';
 $string['configallowcohortthemes'] = 'If you enable this, then themes can be set at the cohort level. This will affect all users with only one cohort or more than one but with the same theme.';
-$string['configallowcoursethemes'] = 'If you enable this, then courses will be allowed to set their own themes.  Course themes override all other theme choices (site, user, or session themes)';
+$string['configallowcoursethemes'] = 'If enabled, then courses will be allowed to set their own themes.  Course themes override all other theme choices (site, user, category, cohort or URL-defined themes).';
 $string['configallowedemaildomains'] = 'List email domains that are allowed to be disclosed in the "From" section of outgoing email. The default of "Empty" will use the No-reply address for all outgoing email. The use of wildcards is allowed e.g. *.example.com will allow emails sent from any subdomain of example.com, but not example.com itself. This will require separate entry.';
 $string['configallowemailaddresses'] = 'To restrict new email addresses to particular domains, list them here separated by spaces. All other domains will be rejected. To allow subdomains, add the domain with a preceding \'.\'. To allow a root domain together with its subdomains, add the domain twice - once with a preceding \'.\' and once without e.g. .ourcollege.edu.au ourcollege.edu.au.';
 $string['configallowemojipicker'] = 'The emoji picker enables users to select emojis, such as smilies, to add to messages and other text areas via an emoji picker button in the Atto toolbar.';
@@ -696,7 +696,7 @@ $string['incompatibleblocks'] = 'Incompatible blocks';
 $string['indexdata'] = 'Index data';
 $string['indexinginfo'] = 'The recommended way to index your site\'s contents is by using the \'Global search indexing\' scheduled task.';
 $string['installhijacked'] = 'Installation must be finished from the original IP address, sorry.';
-$string['installsessionerror'] = 'Can not initialise PHP session, please verify that your browser accepts cookies.';
+$string['installsessionerror'] = 'Cannot initialise PHP session. Please verify that your browser accepts cookies.';
 $string['intlrecommended'] = 'Intl extension is used to improve internationalization support, such as locale aware sorting.';
 $string['intlrequired'] = 'Intl extension is required to improve internationalization support, such as locale aware sorting and international domain names.';
 $string['invalidagedigitalconsent'] = 'The digital age of consent is not valid: {$a}';
@@ -1426,7 +1426,7 @@ $string['upgradepluginsfirst'] = 'It is recommended to install all available upd
 $string['upgradepluginsinfo'] = 'Updating plugins';
 $string['upgradepluginsinfo_help'] = 'There are available updates for some of your plugins. You should install them all prior to upgrading Moodle database. If your site does not support automatic updates deployment, you have to download and install new plugin versions at your server manually.';
 $string['upgradepluginsinfo_link'] = 'admin/upgradepluginsinfo';
-$string['upgradeerror'] = 'Unknown error upgrading {$a->plugin} to version {$a->version}, can not continue.';
+$string['upgradeerror'] = 'Unknown error upgrading {$a->plugin} to version {$a->version}. Cannot continue.';
 $string['upgradeforumread'] = 'A new feature has been added in Moodle 1.5 to track read/unread forum posts.<br />To use this functionality you need to <a href="{$a}">update your tables</a>.';
 $string['upgradeforumreadinfo'] = 'A new feature has been added in Moodle 1.5 to track read/unread forum posts.  To use this functionality you need to update your tables with all the tracking information for existing posts.  Depending on the size of your site this can take a long time (hours) and can be quite taxing on the database, so it\'s best to do it during a quiet period.  However, your site will continue functioning during this upgrade and users won\'t be affected.  Once you start this process you should let it finish (keep your browser window open).  However, if you stop the process by closing the window: don\'t worry, you can start over.<br /><br />Do you want to start the upgrading process now?';
 $string['upgradekeyreq'] = 'Upgrade key required';
@@ -1497,7 +1497,7 @@ $string['verifychangedemail'] = 'Restrict domains when changing email';
 $string['warningcurrentsetting'] = 'Invalid current value: {$a}';
 $string['warningiconvbuggy'] = 'Your version of the iconv library does not support the //IGNORE modifier. You should install the mbstring extension which can be used instead for cleaning strings containing invalid UTF-8 characters.';
 $string['webproxy'] = 'Web proxy';
-$string['webproxyinfo'] = 'Fill in following options if your Moodle server can not access internet directly. Internet access is required for download of environment data, language packs, RSS feeds, timezones, etc.<br /><em>PHP cURL extension is highly recommended.</em>';
+$string['webproxyinfo'] = 'Fill in the following options if your Moodle server cannot access the internet directly. Internet access is required for the download of environment data, language packs, RSS feeds, timezones, etc.<br /><em>The PHP cURL extension is highly recommended.</em>';
 $string['xmlrpcrecommended'] = 'The XMLRPC extension is useful for web services and Moodle networking.';
 $string['yuicomboloading'] = 'YUI combo loading';
 $string['ziprequired'] = 'The Zip PHP extension is now required by Moodle, info-ZIP binaries or PclZip library are not used anymore.';

lang/en/debug.php

@@ -38,7 +38,7 @@ $string['invalideventdata'] = 'Incorrect event data submitted: {$a}';
 $string['invalidparameter'] = 'Invalid parameter value detected';
 $string['invalidresponse'] = 'Invalid response value detected';
 $string['line'] = 'Line';
-$string['missingconfigversion'] = 'Config table does not contain version, can not continue, sorry.';
+$string['missingconfigversion'] = 'Config table does not contain the version. You cannot continue.';
 $string['modulenotexist'] = '{$a} module doesn\'t exist';
 $string['morethanonerecordinfetch'] = 'Found more than one record in fetch() !';
 $string['mustbeoveride'] = 'Abstract {$a} method must be overridden.';

lang/en/enrol.php

@@ -108,7 +108,7 @@ $string['noexistingparticipants'] = 'No existing participants';
 $string['nogroup'] = 'No group';
 $string['noguestaccess'] = 'Guests cannot access this course. Please log in.';
 $string['none'] = 'None';
-$string['notenrollable'] = 'You can not enrol yourself in this course.';
+$string['notenrollable'] = 'You cannot enrol yourself in this course.';
 $string['notenrolledusers'] = 'Other users';
 $string['otheruserdesc'] = 'The following users are not enrolled in this course but do have roles, inherited or assigned within it.';
 $string['participationactive'] = 'Active';
@@ -140,7 +140,7 @@ $string['unenrol'] = 'Unenrol';
 $string['unenrolleduser'] = 'The user "{$a->fullname}" was unenrolled from the course';
 $string['unenrolconfirm'] = 'Do you really want to unenrol "{$a->user}" (previously enrolled via "{$a->enrolinstancename}") from "{$a->course}"?';
 $string['unenrolme'] = 'Unenrol me from {$a}';
-$string['unenrolnotpermitted'] = 'You do not have permission or can not unenrol this user from this course.';
+$string['unenrolnotpermitted'] = 'You do not have permission to unenrol this user from the course.';
 $string['unenrolroleusers'] = 'Unenrol users';
 $string['uninstallmigrating'] = 'Migrating "{$a}" enrolments';
 $string['unknowajaxaction'] = 'Unknown action requested';

lang/en/error.php

@@ -73,7 +73,7 @@ $string['cannotdeletefile'] = 'Cannot delete this file';
 $string['cannotdeleterole'] = 'It cannot be deleted, because {$a}';
 $string['cannotdeleterolewithid'] = 'Could not delete role with ID {$a}';
 $string['cannotdeletethisrole'] = 'You cannot delete this role because it is used by the system, or because it is the last role with administrator capabilities.';
-$string['cannotdisableformat'] = 'You can not disable the default format';
+$string['cannotdisableformat'] = 'The default format cannot be disabled.';
 $string['cannotdownloadcomponents'] = 'Cannot download components';
 $string['cannotdownloadlanguageupdatelist'] = 'Cannot download list of language updates from download.moodle.org';
 $string['cannotdownloadzipfile'] = 'Cannot download ZIP file';
@@ -122,7 +122,7 @@ $string['cannotopencsv'] = 'Cannot open CSV file';
 $string['cannotopenfile'] = 'Cannot open file ({$a})';
 $string['cannotopenforwrit'] = 'Cannot open for writing: {$a}';
 $string['cannotopentemplate'] = 'Cannot open template file ({$a})';
-$string['cannotopenzip'] = 'Can not open zip file, probably zip extension bug on 64bit os';
+$string['cannotopenzip'] = 'Cannot open zip file, probably because of a zip extension bug on 64-bit OS.';
 $string['cannotoverridebaserole'] = 'Cannot override base role capabilities';
 $string['cannotoverriderolehere'] = 'You are not allowed to override this role (id = {$a->roleid}) in this context ({$a->context})';
 $string['cannotreadfile'] = 'Cannot read file ({$a})';
@@ -143,7 +143,7 @@ $string['cannotsavedata'] = 'Cannot save data';
 $string['cannotsavefile'] = 'Cannot save the file "{$a}"!';
 $string['cannotsavemd5file'] = 'Cannot save md5 file';
 $string['cannotsavezipfile'] = 'Cannot save ZIP file';
-$string['cannotservefile'] = 'Can not serve file - server configuration problem.';
+$string['cannotservefile'] = 'Cannot serve file due to a server configuration problem.';
 $string['cannotsetparentforcatoritem'] = 'Cannot set parent for category or course item!';
 $string['cannotsetpassword'] = 'Could not set user password!';
 $string['cannotsetprefgrade'] = 'Could not set preference aggregationview to {$a} for this grade category';
@@ -222,7 +222,7 @@ $string['ddltablenotexist'] = 'Table "{$a}" does not exist';
 $string['ddlunknownerror'] = 'Unknown DDL library error';
 $string['ddlxmlfileerror'] = 'XML database file errors found';
 $string['destinationcmnotexit'] = 'The destination course module does not exist';
-$string['detectedbrokenplugin'] = 'Plugin "{$a}" is defective or outdated, can not continue, sorry.';
+$string['detectedbrokenplugin'] = 'The plugin {$a} is defective or outdated; sorry you cannot continue.';
 $string['dmlexceptiononinstall'] = '<p>A database error has occurred [{$a->errorcode}].<br />{$a->debuginfo}</p>';
 $string['dmlparseexception'] = 'Error parsing SQL query';
 $string['dmlreadexception'] = 'Error reading from database';
@@ -385,10 +385,10 @@ $string['invalidxmlfile'] = '"{$a}" is not a valid XML file';
 $string['iplookupfailed'] = 'Cannot find geo information about this IP address {$a}';
 $string['iplookupprivate'] = 'Cannot display lookup of private IP address';
 $string['ipmismatch'] = 'Client IP address mismatch';
-$string['listcantmovedown'] = 'Failed to move item down, as it is the last of it\'s peers';
+$string['listcantmovedown'] = 'Failed to move item down, as it is the last of its peers.';
 $string['listcantmoveleft'] = 'Failed to move item left, as it has no parent';
 $string['listcantmoveright'] = 'Failed to move item right, as there is no peer to make it a child of. Move it below another peer and then you can move it right.';
-$string['listcantmoveup'] = 'Failed to move the item up, as it is the first of it\'s peers';
+$string['listcantmoveup'] = 'Failed to move item up, as it is the first of its peers.';
 $string['listnochildren'] = 'No children of item found';
 $string['listnoitem'] = 'Item not found';
 $string['listnopeers'] = 'No peers of item found';
@@ -418,7 +418,7 @@ $string['moduledoesnotexist'] = 'This module does not exist';
 $string['moduleinstancedoesnotexist'] = 'The instance of this module does not exist';
 $string['modulemissingcode'] = 'Module {$a} is missing the code needed to perform this function';
 $string['movecatcontentstoroot'] = 'Moving the category content to root is not allowed. You must move the contents to an existing category!';
-$string['movecatcontentstoselected'] = 'Some of the category content can not be moved into selected category.';
+$string['movecatcontentstoselected'] = 'Some category content cannot be moved into the selected category.';
 $string['movecategorynotpossible'] = 'You cannot move category \'{$a}\' into the selected category.';
 $string['movecategoryownparent'] = 'You cannot make category \'{$a}\' a parent of itself.';
 $string['movecategoryparentconflict'] = 'You cannot make category \'{$a}\' a subcategory of one of its own subcategories.';
@@ -460,7 +460,7 @@ $string['nopermissiontorate'] = 'Rating of items not allowed!';
 $string['nopermissiontoshow'] = 'No permission to see this!';
 $string['nopermissiontounlock'] = 'No permission to unlock!';
 $string['nopermissiontoupdatecalendar'] = 'Sorry, but you do not have permission to update the calendar event.';
-$string['nopermissiontoviewgrades'] = 'Can not view grades.';
+$string['nopermissiontoviewgrades'] = 'Cannot view grades.';
 $string['nopermissiontoviewletergrade'] = 'Missing permission to view letter grades';
 $string['nopermissiontoviewpage'] = 'You are not allowed to look at this page';
 $string['nosite'] = 'Could not find a top-level course!';
@@ -510,7 +510,7 @@ $string['restore_path_element_missingmethod'] = 'Restore method {$a} is missing.
 $string['restore_path_element_noobject'] = 'Restore object {$a} is not an object.';
 $string['restrictedcontextexception'] = 'Sorry, execution of external function violates context restriction.';
 $string['restricteduser'] = 'Sorry, but your current account "{$a}" is restricted from doing that';
-$string['reverseproxyabused'] = 'Reverse proxy enabled, server can not be accessed directly, sorry.<br />Please contact server administrator.';
+$string['reverseproxyabused'] = 'Reverse proxy enabled so the server cannot be accessed directly.<br />Please contact the server administrator.';
 $string['rpcerror'] = 'Ooops! Your MNET communication has failed! Here\'s that error message to pass on to your administrator: {$a}';
 $string['secretalreadyused'] = 'Change password confirmation link was already used, password was not changed';
 $string['sectionnotexist'] = 'This section does not exist';
@@ -537,11 +537,11 @@ $string['sslonlyaccess'] = 'For security reasons only https connections are allo
 $string['statscatchupmode'] = 'Statistics is currently in catchup mode. So far {$a->daysdone} day(s) have been processed and {$a->dayspending} are pending. Check back soon!';
 $string['statsdisable'] = 'Statistics are not enabled.';
 $string['statsnodata'] = 'There is no available data for that combination of course and time period';
-$string['storedfilecannotcreatefile'] = 'Can not create local file pool file, please verify permissions in dataroot and available disk space.';
-$string['storedfilecannotcreatefiledirs'] = 'Can not create local file pool directories, please verify permissions in dataroot.';
+$string['storedfilecannotcreatefile'] = 'Cannot create local file pool file. Please verify permissions in dataroot and available disk space.';
+$string['storedfilecannotcreatefiledirs'] = 'Cannot create local file pool directories. Please verify permissions in dataroot.';
 $string['storedfilecannotread'] = 'Cannot read file. Either the file does not exist or there is a permission problem.';
 $string['storedfilecannotreadfile'] = 'Cannot read file \'{$a}\'. Either the file does not exist or there is a permission problem.';
-$string['storedfilenotcreated'] = 'Can not create file "{$a->contextid}/{$a->component}/{$a->filearea}/{$a->itemid}{$a->filepath}{$a->filename}"';
+$string['storedfilenotcreated'] = 'Cannot create file {$a->contextid}/{$a->component}/{$a->filearea}/{$a->itemid}{$a->filepath}{$a->filename}';
 $string['storedfileproblem'] = 'Unknown exception related to local files ({$a})';
 $string['tagdisabled'] = 'Tags are disabled!';
 $string['tagnotfound'] = 'The specified tag was not found in the database';
@@ -568,7 +568,7 @@ $string['unknownevent'] = 'Unknown event';
 $string['unknownfiletype'] = 'Error unknown filtertype';
 $string['unknowngroup'] = 'Unknown group "{$a}"';
 $string['unknownhelp'] = 'Unknown help topic {$a}';
-$string['unknownjsinrequirejs'] = 'Can not find JS library: {$a}';
+$string['unknownjsinrequirejs'] = 'Cannot find JavaScript library {$a}.';
 $string['unknownmodulename'] = 'Unknown module name for form';
 $string['unknownrole'] = 'Unknown role "{$a}"';
 $string['unknownsortcolumn'] = 'Unknown sort column {$a}';
@@ -586,7 +586,7 @@ $string['upgraderequires19'] = 'Error: New Moodle version was installed on serve
 $string['upgraderunning'] = 'Site is being upgraded, please retry later.';
 $string['urlnotdefinerss'] = 'URL not defined for RSS feed';
 $string['useradmineditadmin'] = 'Only administrators are allowed to modify other administrator accounts';
-$string['useradminodelete'] = 'Administrator accounts can not be deleted';
+$string['useradminodelete'] = 'Administrator accounts cannot be deleted.';
 $string['userautherror'] = 'Unknown auth plugin';
 $string['userauthunsupported'] = 'Auth plugin not supported here';
 $string['useremailduplicate'] = 'Duplicate address';
@@ -595,7 +595,7 @@ $string['usernamelowercase'] = 'The username must be in lower case';
 $string['usernotaddederror'] = 'User not added - error';
 $string['usernotaddedregistered'] = 'User not added - already registered';
 $string['usernotavailable'] = 'The details of this user are not available to you';
-$string['usernotdeletedadmin'] = 'User not deleted - can not delete administrator accounts';
+$string['usernotdeletedadmin'] = 'User not deleted as administrator accounts cannot be deleted.';
 $string['usernotdeleteddeleted'] = 'This user has already been deleted.';
 $string['usernotdeletederror'] = 'User not deleted - error';
 $string['usernotdeletedmissing'] = 'User not deleted - could not find the username';

lang/en/hub.php

@@ -110,7 +110,7 @@ $string['registerwithmoodleorginfo'] = 'We\'d love to stay in touch and provide
 $string['registerwithmoodleorginfoapp'] = 'About the Moodle app';
 $string['registerwithmoodleorginfostats'] = 'Moodle statistics';
 $string['registerwithmoodleorginfosites'] = 'Other sites in my country';
-$string['registerwithmoodleorgremove'] = 'You are going to unregister your site. If you continue, you will no longer have access to important notifications and security alerts. Your users will not be able to receive push notifications from your site to their Moodle mobile app. Are you sure you want to unregister your site?';
+$string['registerwithmoodleorgremove'] = 'You are about to unregister your site. You will no longer receive security alert notifications and users will not be able to receive push notifications from your site to their Moodle app. However, you will be able to re-register at any time! Are you sure you want to continue?';
 $string['registrationconfirmed'] = 'Site registration confirmed';
 $string['registrationconfirmedon'] = 'Thank you for registering your site. Registration information will be kept up to date by the \'Site registration\' scheduled task.';
 $string['renewregistration'] = 'Renew registration';

lang/en/message.php

@@ -247,7 +247,7 @@ $string['shownotificationwindowwithcount'] = 'Show notification window with {$a}
 $string['togglenotificationmenu'] = 'Toggle notifications menu';
 $string['togglemessagemenu'] = 'Toggle messaging drawer';
 $string['totalconversations'] = '{$a} total conversations';
-$string['touserdoesntexist'] = 'You can not send a message to a user id ({$a}) that doesn\'t exist';
+$string['touserdoesntexist'] = 'You cannot send a message to a user ID ({$a}) that doesn\'t exist.';
 $string['unabletomessage'] = 'You are unable to message this user';
 $string['unblock'] = 'Unblock';
 $string['unblockcontact'] = 'Unblock contact';

lang/en/moodle.php

@@ -648,7 +648,7 @@ $string['emaildisable'] = 'This email address is disabled';
 $string['emaildisableclick'] = 'Click here to disable all email from being sent to this address';
 $string['emaildisplay'] = 'Email display';
 $string['emaildisplay_help'] = 'Privileged users (such as teachers and managers) will always be able to see your email address.';
-$string['emaildisplaycourse'] = 'Allow only other course members to see my email address';
+$string['emaildisplaycourse'] = 'Allow only other course participants to see my email address';
 $string['emaildisplaycoursemembersonly'] = '(Visible to other course participants)';
 $string['emaildisplayeveryone'] = '(Visible to everyone)';
 $string['emaildisplayhide'] = '(Hidden from all non-privileged users)';

lang/en/plugin.php

@@ -67,7 +67,7 @@ $string['moodleversion'] = 'Moodle {$a}';
 $string['noneinstalled'] = 'No plugins of this type are installed';
 $string['notes'] = 'Notes';
 $string['notdownloadable'] = 'Can not download the package';
-$string['notdownloadable_help'] = 'ZIP package with the update can not be downloaded automatically. Please refer to the documentation page for more help.';
+$string['notdownloadable_help'] = 'The ZIP package with the update cannot be downloaded automatically.';
 $string['notdownloadable_link'] = 'admin/mdeploy/notdownloadable';
 $string['notsupported'] = 'Plugin may not be compatible with Moodle version {$a}';
 $string['notwritable'] = 'Plugin files not writable';

lang/en/question.php

@@ -183,7 +183,7 @@ $string['formquestionnotinids'] = 'Form contained question that is not in questi
 $string['fractionsnomax'] = 'One of the answers should have a score of 100% so it is possible to get full marks for this question.';
 $string['getcategoryfromfile'] = 'Get category from file';
 $string['getcontextfromfile'] = 'Get context from file';
-$string['changepublishstatuscat'] = '<a href="{$a->caturl}">Category "{$a->name}"</a> in course "{$a->coursename}" will have it\'s sharing status changed from <strong>{$a->changefrom} to {$a->changeto}</strong>.';
+$string['changepublishstatuscat'] = '<a href="{$a->caturl}">Category "{$a->name}"</a> in course "{$a->coursename}" will have its sharing status changed from {$a->changefrom} to {$a->changeto}.';
 $string['chooseqtypetoadd'] = 'Choose a question type to add';
 $string['editquestions'] = 'Edit questions';
 $string['idnumber'] = 'ID number';

lang/en/repository.php

@@ -29,7 +29,7 @@ $string['add'] = 'Add';
 $string['addfile'] = 'Add...';
 $string['addfiletext'] = 'Add file';
 $string['addplugin'] = 'Add a repository plugin';
-$string['aliaseschange'] = 'There are {$a} alias/shortcut files that use this file as their source. If you proceed then those aliases will be converted to true copies.';
+$string['aliaseschange'] = 'There are {$a} links to this file. If you proceed then locations which currently link to the file will be automatically updated to use a copy of the file instead.';
 $string['allowexternallinks'] = 'Allow external links';
 $string['areamainfile'] = 'Main file';
 $string['coursebackup'] = 'Course backups';
@@ -73,10 +73,10 @@ $string['confirmdelete'] = 'Are you sure you want to delete the repository {$a}?
 $string['confirmdeletefile'] = 'Are you sure you want to delete this file?';
 $string['confirmdeleteselectedfile'] = 'Are you sure you want to delete the selected {$a} file(s)?';
 $string['confirmrenamefile'] = 'Are you sure you want to rename/move this file?';
-$string['confirmdeletefilewithhref'] = 'Are you sure you want to delete this file? There are {$a} alias/shortcut files that use this file as their source. If you proceed then those aliases will be converted to true copies.';
+$string['confirmdeletefilewithhref'] = 'Are you sure you want to delete this file? There are {$a} links to this file. If you proceed then locations which currently link to the file will be automatically updated to use a copy of the file instead.';
 $string['confirmdeletefolder'] = 'Are you sure you want to delete this folder? All files and subfolders will be deleted.';
 $string['confirmremove'] = 'Are you sure you want to remove this repository plugin, its options and <strong>all of its instances</strong> - {$a}? If you choose "Continue and download", file references to external contents will be downloaded to Moodle. This could take a long time to process.';
-$string['confirmrenamefolder'] = ' Are you sure you want to move/rename this folder? Any alias/shortcut files that reference files in this folder will be converted into true copies.';
+$string['confirmrenamefolder'] = 'Are you sure you want to move/rename this folder? Any locations which currently link to files in this folder will be automatically updated to use copies of the file instead.';
 $string['continueuninstall'] = 'Continue';
 $string['continueuninstallanddownload'] = 'Continue and download';
 $string['copying'] = 'Copying';
@@ -113,7 +113,7 @@ $string['enter'] = 'Enter';
 $string['entername'] = 'Please enter folder name';
 $string['enternewname'] = 'Please enter the new file name';
 $string['error'] = 'An unknown error occurred!';
-$string['errordoublereference'] = 'Unable to overwrite file with a shortcut/alias because shortcuts to this file already exist.';
+$string['errordoublereference'] = 'Unable to overwrite file with a link because links to this file already exist.';
 $string['errornotyourfile'] = 'You can only pick files which you added.';
 $string['erroruniquename'] = 'Repository instance name should be unique';
 $string['errorpostmaxsize'] = 'The file you tried to upload is too large for the server to process.';
@@ -132,7 +132,7 @@ $string['filepicker'] = 'File picker';
 $string['filesizenull'] = 'File size cannot be determined';
 $string['folderexists'] = 'Folder name already being used, please use another name';
 $string['foldernotfound'] = 'Folder not found';
-$string['folderrecurse'] = 'Folder can not be moved to it\'s own subfolder';
+$string['folderrecurse'] = 'Folder cannot be moved to its own subfolder.';
 $string['getfile'] = 'Select this file';
 $string['getfiletimeout'] = 'Get file timeout';
 $string['help'] = 'Help';
@@ -206,8 +206,8 @@ $string['popupblockeddownload'] = 'The downloading window is blocked, please all
 $string['preview'] = 'Preview';
 $string['privatefilesof'] = '{$a} Private files';
 $string['readonlyinstance'] = 'You cannot edit/delete a read-only instance';
-$string['referencesexist'] = 'There are {$a} alias/shortcut files that use this file as their source';
-$string['referenceslist'] = 'Aliases/Shortcuts';
+$string['referencesexist'] = 'There are {$a} links to this file';
+$string['referenceslist'] = 'Links';
 $string['refresh'] = 'Refresh';
 $string['refreshnonjsfilepicker'] = 'Please close this window and refresh non-javascript file picker';
 $string['removed'] = 'Repository removed';

lang/en/role.php

@@ -97,7 +97,7 @@ $string['calendar:managegroupentries'] = 'Manage group calendar entries';
 $string['calendar:manageownentries'] = 'Manage own calendar entries';
 $string['capabilities'] = 'Capabilities';
 $string['capability'] = 'Capability';
-$string['category:viewcourselist'] = 'View list of courses you are not enrolled in';
+$string['category:viewcourselist'] = 'View course category and courses within it';
 $string['category:create'] = 'Create categories';
 $string['category:delete'] = 'Delete categories';
 $string['category:manage'] = 'Manage categories';

lang/en/webservice.php

@@ -78,7 +78,7 @@ $string['errorcodes'] = 'Error message';
 $string['errorcoursecontextnotvalid'] = 'You cannot execute functions in the course context (course id:{$a->courseid}). The context error message was: {$a->message}';
 $string['errorinvalidparam'] = 'The param "{$a}" is invalid.';
 $string['errornotemptydefaultparamarray'] = 'The web service description parameter named \'{$a}\' is an single or multiple structure. The default can only be empty array. Check web service description.';
-$string['erroroptionalparamarray'] = 'The web service description parameter named \'{$a}\' is an single or multiple structure. It can not be set as VALUE_OPTIONAL. Check web service description.';
+$string['erroroptionalparamarray'] = 'The web service description parameter named \'{$a}\' is a single or multiple structure. It cannot be set as VALUE_OPTIONAL. Check the web service description.';
 $string['eventwebservicefunctioncalled'] = 'Web service function called';
 $string['eventwebserviceloginfailed'] = 'Web service login failed';
 $string['eventwebserviceservicecreated'] = 'Web service created';

lib/filestorage/file_exceptions.php

@@ -46,7 +46,7 @@ class file_exception extends moodle_exception {
 }
 
 /**
- * Can not create file exception.
+ * Cannot create file exception.
  *
  * @package   core_files
  * @category  files

lib/filestorage/tests/file_storage_test.php

@@ -324,7 +324,7 @@ class core_files_file_storage_testcase extends advanced_testcase {
 
         // Try break it.
         $this->expectException('file_exception');
-        $this->expectExceptionMessage('Can not create file "1/core/unittest/0/test/newtest.txt" (file exists, cannot rename)');
+        $this->expectExceptionMessage('Cannot create file 1/core/unittest/0/test/newtest.txt (file exists, cannot rename)');
         // This shall throw exception.
         $originalfile->rename($newpath, $newname);
     }
@@ -1478,7 +1478,7 @@ class core_files_file_storage_testcase extends advanced_testcase {
 
         // Creating a file validating unique constraint.
         $this->expectException(stored_file_creation_exception::class);
-        $this->expectExceptionMessage('Can not create file "1/core/phpunit/0/testfile.txt"');
+        $this->expectExceptionMessage('Cannot create file 1/core/phpunit/0/testfile.txt');
         $fs->create_file_from_storedfile($filerecord, $file1->get_id());
     }
 
@@ -1835,7 +1835,7 @@ class core_files_file_storage_testcase extends advanced_testcase {
 
         // Creating a file validating unique constraint.
         $this->expectException(stored_file_creation_exception::class);
-        $this->expectExceptionMessage('Can not create file "1/core/phpunit/0/testfile.txt"');
+        $this->expectExceptionMessage('Cannot create file 1/core/phpunit/0/testfile.txt');
         $file2 = $fs->create_file_from_pathname($filerecord, $path);
     }
 

lib/filestorage/tests/file_system_filedir_test.php

@@ -154,7 +154,7 @@ class core_files_file_system_filedir_testcase extends advanced_testcase {
         // This should generate an exception.
         $this->expectException('file_exception');
         $this->expectExceptionMessageMatches(
-            '/Can not create local file pool directories, please verify permissions in dataroot./');
+            '/Cannot create local file pool directories. Please verify permissions in dataroot./');
 
         new file_system_filedir();
     }
@@ -178,7 +178,7 @@ class core_files_file_system_filedir_testcase extends advanced_testcase {
         // This should generate an exception.
         $this->expectException('file_exception');
         $this->expectExceptionMessageMatches(
-            '/Can not create local file pool directories, please verify permissions in dataroot./');
+            '/Cannot create local file pool directories. Please verify permissions in dataroot./');
 
         new file_system_filedir();
     }
@@ -835,7 +835,7 @@ class core_files_file_system_filedir_testcase extends advanced_testcase {
 
         $this->expectException('file_exception');
         $this->expectExceptionMessageMatches(
-            "/Can not create local file pool directories, please verify permissions in dataroot./");
+            "/Cannot create local file pool directories. Please verify permissions in dataroot./");
 
         // Attempt to add the file to the file pool.
         $fs = new file_system_filedir();
@@ -893,7 +893,7 @@ class core_files_file_system_filedir_testcase extends advanced_testcase {
 
         $this->expectException('file_exception');
         $this->expectExceptionMessageMatches(
-            "/Can not create local file pool directories, please verify permissions in dataroot./");
+            "/Cannot create local file pool directories. Please verify permissions in dataroot./");
 
         // Attempt to add the file to the file pool.
         $fs = new file_system_filedir();

mod/assign/lang/en/assign.php

@@ -110,7 +110,7 @@ $string['batchoperationreverttodraft'] = 'revert submissions to draft';
 $string['batchsetallocatedmarker'] = 'Set allocated marker for {$a} selected user(s).';
 $string['batchsetmarkingworkflowstateforusers'] = 'Set marking workflow state for {$a} selected user(s).';
 $string['blindmarking'] = 'Anonymous submissions';
-$string['blindmarkingenabledwarning'] = 'Anonymous submissions are enabled for this activity.';
+$string['blindmarkingenabledwarning'] = 'Anonymous submissions are enabled for this activity. Grades will not be added to the gradebook until student identities are revealed via the grading action menu.';
 $string['blindmarking_help'] = 'Anonymous submissions hide the identity of students from markers. Anonymous submission settings will be locked once a submission or grade has been made in relation to this assignment.';
 $string['calendardue'] = '{$a} is due';
 $string['calendargradingdue'] = '{$a} is due to be graded';

mod/feedback/lang/en/feedback.php

@@ -259,7 +259,7 @@ $string['searchcourses'] = 'Search courses';
 $string['searchcourses_help'] = 'Search for the code or name of the course(s) that you wish to associate with this feedback.';
 $string['selected_dump'] = 'Selected indexes of $SESSION variable are dumped below:';
 $string['send'] = 'Send';
-$string['send_message'] = 'Send message';
+$string['send_message'] = 'Send notification';
 $string['show_all'] = 'Show all';
 $string['show_analysepage_after_submit'] = 'Show analysis page';
 $string['show_entries'] = 'Show responses';

mod/quiz/lang/en/quiz.php

@@ -741,7 +741,7 @@ $string['quizopenclose'] = 'Open and close dates';
 $string['quizopenclose_help'] = 'Students can only start their attempt(s) after the open time and they must complete their attempts before the close time.';
 $string['quizopenclose_link'] = 'mod/quiz/timing';
 $string['quizopened'] = 'This quiz is open.';
-$string['quizopenedon'] = 'This quiz opened at {$a}';
+$string['quizopenedon'] = 'This quiz opened on {$a}';
 $string['quizopens'] = 'Quiz opens';
 $string['quizopenwillclose'] = 'This quiz is open, will close on {$a} at';
 $string['quizordernotrandom'] = 'Order of quiz not shuffled';