MDL-63249 lang: Merge English strings from the en_fix language pack

Significant string changes:

* completionpass_help, gradetopassnotset in mod_quiz - grade to pass
  set in quiz settings not gradebook
* namecolumnmissing,core_cohort - fixing incorrect message about adding
  users to a cohort

admin/tool/cohortroles/lang/en/tool_cohortroles.php

@@ -43,10 +43,10 @@
 $string['taskname'] = 'Sync cohort role assignments';
 $string['thisuserroles'] = 'Roles assigned relative to this user';
 $string['privacy:metadata:tool_cohortroles'] = 'The Cohort roles management plugin stores user cohort role mappings.';
-$string['privacy:metadata:tool_cohortroles:id'] = 'The ID of the cohort role mapping record.';
-$string['privacy:metadata:tool_cohortroles:cohortid'] = 'The ID of the cohort.';
-$string['privacy:metadata:tool_cohortroles:roleid'] = 'The ID of the role.';
-$string['privacy:metadata:tool_cohortroles:userid'] = 'The ID of the user.';
-$string['privacy:metadata:tool_cohortroles:timecreated'] = 'The date/time of when the cohort  role mapping was created.';
-$string['privacy:metadata:tool_cohortroles:timemodified'] = 'The date/time of when the cohort role mapping was modified.';
-$string['privacy:metadata:tool_cohortroles:usermodified'] = 'The ID of the user who last modified the cohort role mapping.';
+$string['privacy:metadata:tool_cohortroles:id'] = 'The ID of the cohort role mapping record';
+$string['privacy:metadata:tool_cohortroles:cohortid'] = 'The ID of the cohort';
+$string['privacy:metadata:tool_cohortroles:roleid'] = 'The ID of the role';
+$string['privacy:metadata:tool_cohortroles:userid'] = 'The ID of the user';
+$string['privacy:metadata:tool_cohortroles:timecreated'] = 'The time when the cohort role mapping was created';
+$string['privacy:metadata:tool_cohortroles:timemodified'] = 'The time when the cohort role mapping was modified';
+$string['privacy:metadata:tool_cohortroles:usermodified'] = 'The ID of the user who last modified the cohort role mapping';

admin/tool/customlang/lang/en/tool_customlang.php

@@ -30,7 +30,7 @@
 $string['checkout'] = 'Open language pack for editing';
 $string['checkoutdone'] = 'Language pack loaded';
 $string['checkoutinprogress'] = 'Loading language pack';
-$string['confirmcheckin'] = 'You are about to save modifications to your local language pack. This will export the customised strings from the translator into you Moodle data directory and Moodle will start using the modified strings. Press \'Continue\' to proceed with saving.';
+$string['confirmcheckin'] = 'You are about to save modifications to your local language pack. This will export the customised strings from the translator into your site data directory and your site will start using the modified strings. Press \'Continue\' to proceed with saving.';
 $string['customlang:edit'] = 'Edit local translation';
 $string['customlang:view'] = 'View local translation';
 $string['filter'] = 'Filter strings';

admin/tool/dataprivacy/lang/en/tool_dataprivacy.php

@@ -195,7 +195,7 @@
 $string['privacy:metadata:request:dpocomment'] = 'Any comments made by the site\'s privacy officer regarding the request.';
 $string['privacy:metadata:request:timecreated'] = 'The timestamp indicating when the request was made by the user.';
 $string['privacyrequestexpiry'] = 'Data request expiry';
-$string['privacyrequestexpiry_desc'] = 'The amount of time that approved data requests will be available for download before expiring. 0 means no time limit.';
+$string['privacyrequestexpiry_desc'] = 'The time that approved data requests will be available for download before expiring. If set to zero, then there is no time limit.';
 $string['protected'] = 'Protected';
 $string['protectedlabel'] = 'The retention of this data has a higher legal precedent over a user\'s request to be forgotten. This data will only be deleted after the retention period has expired.';
 $string['purpose'] = 'Purpose';
@@ -221,7 +221,7 @@
 $string['requestsubmitted'] = 'Your request has been submitted to the privacy officer';
 $string['requesttype'] = 'Type';
 $string['requesttypeuser'] = '{$a->typename} ({$a->user})';
-$string['requesttype_help'] = 'Select the reason why you would like to contact the privacy officer';
+$string['requesttype_help'] = 'Select the reason for contacting the privacy officer. Be aware that deletion of all personal  data will result in you no longer being able to log in to the site.';
 $string['requesttypedelete'] = 'Delete all of my personal data';
 $string['requesttypedeleteshort'] = 'Delete';
 $string['requesttypeexport'] = 'Export all of my personal data';

admin/tool/log/store/database/lang/en/logstore_database.php

@@ -52,7 +52,7 @@
 $string['privacy:metadata:log:other'] = 'Additional information about the event';
 $string['privacy:metadata:log:realuserid'] = 'The ID of the real user behind the event, when masquerading a user.';
 $string['privacy:metadata:log:relateduserid'] = 'The ID of a user related to this event';
-$string['privacy:metadata:log:timecreated'] = 'The time at which the event occurred';
+$string['privacy:metadata:log:timecreated'] = 'The time when the event occurred';
 $string['privacy:metadata:log:userid'] = 'The ID of the user who triggered this event';
 $string['read'] = 'Read';
 $string['tablenotfound'] = 'Specified table was not found';

admin/tool/log/store/legacy/lang/en/logstore_legacy.php

@@ -31,7 +31,7 @@
 $string['privacy:metadata:log:action'] = 'A description of the action';
 $string['privacy:metadata:log:info'] = 'Additional information';
 $string['privacy:metadata:log:ip'] = 'The IP address used at the time of the event';
-$string['privacy:metadata:log:time'] = 'The date at wich the action took place';
+$string['privacy:metadata:log:time'] = 'The time when the action took place';
 $string['privacy:metadata:log:url'] = 'The URL related to the event';
 $string['privacy:metadata:log:userid'] = 'The ID of the user who performed the action';
 $string['taskcleanup'] = 'Legacy log table cleanup';

admin/tool/log/store/standard/lang/en/logstore_standard.php

@@ -33,6 +33,6 @@
 $string['privacy:metadata:log:other'] = 'Additional information about the event';
 $string['privacy:metadata:log:realuserid'] = 'The ID of the real user behind the event, when masquerading a user.';
 $string['privacy:metadata:log:relateduserid'] = 'The ID of a user related to this event';
-$string['privacy:metadata:log:timecreated'] = 'The time at which the event occurred';
+$string['privacy:metadata:log:timecreated'] = 'The time when the event occurred';
 $string['privacy:metadata:log:userid'] = 'The ID of the user who triggered this event';
 $string['taskcleanup'] = 'Log table cleanup';

admin/tool/messageinbound/lang/en/tool_messageinbound.php

@@ -96,9 +96,9 @@
 $string['pluginname'] = 'Inbound message configuration';
 $string['privacy:metadata:coreuserkey'] = 'User\'s keys to validate the email received';
 $string['privacy:metadata:messagelist'] = 'A list of message identifiers which failed validation and requires further authorisation';
-$string['privacy:metadata:messagelist:address'] = 'The address at which the email was sent';
+$string['privacy:metadata:messagelist:address'] = 'The address where the email was sent';
 $string['privacy:metadata:messagelist:messageid'] = 'The message ID';
-$string['privacy:metadata:messagelist:timecreated'] = 'The time at which the record was made';
+$string['privacy:metadata:messagelist:timecreated'] = 'The time when the record was made';
 $string['privacy:metadata:messagelist:userid'] = 'The ID of user who need to approve the message';
 $string['replysubjectprefix'] = 'Re:';
 $string['requirevalidation'] = 'Validate sender address';

auth/ldap/lang/en/auth_ldap.php

@@ -149,7 +149,7 @@
 $string['start_tls_key'] = 'Use TLS';
 $string['updateremfail'] = 'Error updating LDAP record. Error code: {$a->errno}; Error string: {$a->errstring}<br/>Key ({$a->key}) - old moodle value: \'{$a->ouvalue}\' new value: \'{$a->nuvalue}\'';
 $string['updateremfailamb'] = 'Failed to update LDAP with ambiguous field {$a->key}; old moodle value: \'{$a->ouvalue}\', new value: \'{$a->nuvalue}\'';
-$string['updateremfailfield'] = 'Failed to update LDAP with non-existent field (\'{$a->ldapkey}\'). Key ({$a->key}) - old moodle value: \'{$a->ouvalue}\' new value: \'{$a->nuvalue}\'';
+$string['updateremfailfield'] = 'Failed to update LDAP with non-existent field (\'{$a->ldapkey}\'). Key ({$a->key}) - old Moodle value: \'{$a->ouvalue}\' new value: \'{$a->nuvalue}\'';
 $string['updatepasserror'] = 'Error in user_update_password(). Error code: {$a->errno}; Error string: {$a->errstring}';
 $string['updatepasserrorexpire'] = 'Error in user_update_password() when reading password expiry time. Error code: {$a->errno}; Error string: {$a->errstring}';
 $string['updatepasserrorexpiregrace'] = 'Error in user_update_password() when modifying expirationtime and/or gracelogins. Error code: {$a->errno}; Error string: {$a->errstring}';

enrol/flatfile/lang/en/enrol_flatfile.php

@@ -63,10 +63,10 @@
    add, student, 21, CF101, 1091115000, 1091215000
 </pre>';
 $string['privacy:metadata:enrol_flatfile'] = 'The Flat file (CSV) enrolment plugin may store personal data relating to future enrolments in the enrol_flatfile table.';
-$string['privacy:metadata:enrol_flatfile:action'] = 'The enrolment action expected at the given date.';
+$string['privacy:metadata:enrol_flatfile:action'] = 'The enrolment action expected on the given date';
 $string['privacy:metadata:enrol_flatfile:courseid'] = 'The course ID to which the enrolment relates';
 $string['privacy:metadata:enrol_flatfile:roleid'] = 'The ID of the role to be assigned or unassigned';
-$string['privacy:metadata:enrol_flatfile:timestart'] = 'The time at which the enrolment change starts.';
-$string['privacy:metadata:enrol_flatfile:timeend'] = 'The time at which the enrolment change ends.';
-$string['privacy:metadata:enrol_flatfile:timemodified'] = 'The modification time of this enrolment change.';
+$string['privacy:metadata:enrol_flatfile:timestart'] = 'The time when the enrolment starts';
+$string['privacy:metadata:enrol_flatfile:timeend'] = 'The time when the enrolment ends';
+$string['privacy:metadata:enrol_flatfile:timemodified'] = 'The time when the enrolment is modified';
 $string['privacy:metadata:enrol_flatfile:userid'] = 'The ID of the user to which the role assignment relates';

enrol/lti/lang/en/enrol_lti.php

@@ -66,8 +66,8 @@
 $string['privacy:metadata:enrol_lti_users'] = 'The list of users enrolled via an LTI provider';
 $string['privacy:metadata:enrol_lti_users:userid'] = 'The ID of the user';
 $string['privacy:metadata:enrol_lti_users:lastgrade'] = 'The last grade the user was recorded of having';
-$string['privacy:metadata:enrol_lti_users:lastaccess'] = 'The date at which the user was enrolled';
-$string['privacy:metadata:enrol_lti_users:timecreated'] = 'The date at which the user was enrolled';
+$string['privacy:metadata:enrol_lti_users:lastaccess'] = 'The time when the user last accessed the course';
+$string['privacy:metadata:enrol_lti_users:timecreated'] = 'The time when the user was enrolled';
 $string['registration'] = 'Published tool registration';
 $string['registrationurl'] = 'Registration URL';
 $string['registrationurl_help'] = 'If a registration URL (also called proxy URL) is used, then the tool is automatically configured.';

lang/en/auth.php

@@ -142,8 +142,8 @@
 $string['privacy:metadata:userpref:forcepasswordchange'] = 'Indicates whether the user should change their password upon logging in';
 $string['privacy:metadata:userpref:loginfailedcount'] = 'The number of times the user failed to log in';
 $string['privacy:metadata:userpref:loginfailedcountsincesuccess'] = 'The number of times the user failed to login since their last successful login';
-$string['privacy:metadata:userpref:loginfailedlast'] = 'The date at which the last failed login attempt was recorded';
-$string['privacy:metadata:userpref:loginlockout'] = 'Indicates whether the user\'s account is locked due to failed login attempts, and the date at which the account entered the lockout state';
+$string['privacy:metadata:userpref:loginfailedlast'] = 'The date when the last failed login attempt was recorded';
+$string['privacy:metadata:userpref:loginlockout'] = 'Whether the user\'s account is locked due to failed login attempts, and the date when the account was locked';
 $string['privacy:metadata:userpref:loginlockoutignored'] = 'Indicates that a user\'s account should never be subject to lockouts';
 $string['privacy:metadata:userpref:loginlockoutsecret'] = 'When locked, the secret the user must use for unlocking their account';
 $string['potentialidps'] = 'Log in using your account on:';

lang/en/backup.php

@@ -231,8 +231,8 @@
 $string['privacy:metadata:backup_controllers'] = 'The list of backup operations';
 $string['privacy:metadata:backup_controllers:itemid'] = 'The ID of the course';
 $string['privacy:metadata:backup_controllers:operation'] = 'The operation that was performed, eg. restore.';
-$string['privacy:metadata:backup_controllers:timecreated'] = 'The date at which the action was created';
-$string['privacy:metadata:backup_controllers:timemodified'] = 'The date at which the action was modified';
+$string['privacy:metadata:backup_controllers:timecreated'] = 'The time when the action was created';
+$string['privacy:metadata:backup_controllers:timemodified'] = 'The time when the action was modified';
 $string['privacy:metadata:backup_controllers:type'] = 'The type of the item being operated on, eg. activity.';
 $string['qcategory2coursefallback'] = 'The questions category "{$a->name}", originally at system/course category context in backup file, will be created at course context by restore';
 $string['qcategorycannotberestored'] = 'The questions category "{$a->name}" cannot be created by restore';
@@ -326,7 +326,7 @@
 $string['title'] = 'Title';
 $string['totalcategorysearchresults'] = 'Total categories: {$a}';
 $string['totalcoursesearchresults'] = 'Total courses: {$a}';
-$string['undefinedrolemapping'] = 'Role mapping undefined for: \'{$a}\' archetype';
+$string['undefinedrolemapping'] = 'Role mapping undefined for \'{$a}\' archetype.';
 $string['unnamedsection'] = 'Unnamed section';
 $string['userinfo'] = 'Userinfo';
 $string['module'] = 'Module';

lang/en/badges.php

@@ -408,7 +408,7 @@
 $string['privacy:metadata:external:backpacks:issuer'] = 'Some information about the issuer';
 $string['privacy:metadata:external:backpacks:url'] = 'The Moodle URL where the issued badge information can be seen';
 $string['privacy:metadata:issued'] = 'A record of badges awarded';
-$string['privacy:metadata:issued:dateexpire'] = 'The date at which the award expires';
+$string['privacy:metadata:issued:dateexpire'] = 'The date when the badge expires';
 $string['privacy:metadata:issued:dateissued'] = 'The date of the award';
 $string['privacy:metadata:issued:userid'] = 'The ID of the user who was awarded a badge';
 $string['privacy:metadata:manualaward'] = 'A record of manual awards';

lang/en/blog.php

@@ -132,22 +132,22 @@
 $string['privacy:metadata:core_files'] = 'Files attached to blog entries';
 $string['privacy:metadata:core_tag'] = 'Tags associated with blog entries';
 $string['privacy:metadata:external'] = 'A link to an external RSS feed';
-$string['privacy:metadata:external:userid'] = 'The ID of the user who added the external blog entry.';
+$string['privacy:metadata:external:userid'] = 'The ID of the user who added the external blog entry';
 $string['privacy:metadata:external:name'] = 'The name of the feed';
 $string['privacy:metadata:external:description'] = 'The description of the feed';
 $string['privacy:metadata:external:url'] = 'The URL of the feed';
 $string['privacy:metadata:external:filtertags'] = 'The list of tags to filter the entries with';
-$string['privacy:metadata:external:timemodified'] = 'Date at which the association was last modified';
-$string['privacy:metadata:external:timefetched'] = 'Date at which the feed was last fetched';
+$string['privacy:metadata:external:timemodified'] = 'The time when the association was last modified';
+$string['privacy:metadata:external:timefetched'] = 'The time when the feed was last fetched';
 $string['privacy:metadata:post'] = 'The information related to blog entries';
-$string['privacy:metadata:post:userid'] = 'The ID of the user who added the blog entry.';
-$string['privacy:metadata:post:subject'] = 'Blog entry title.';
-$string['privacy:metadata:post:summary'] = 'Blog entry.';
-$string['privacy:metadata:post:content'] = 'The content of an external blog entry.';
+$string['privacy:metadata:post:userid'] = 'The ID of the user who added the blog entry';
+$string['privacy:metadata:post:subject'] = 'The blog entry title';
+$string['privacy:metadata:post:summary'] = 'The blog entry text';
+$string['privacy:metadata:post:content'] = 'The content of an external blog entry';
 $string['privacy:metadata:post:uniquehash'] = 'A unique identifier for an external entry, typically a URL';
 $string['privacy:metadata:post:publishstate'] = 'Whether the entry is visible to others or not';
-$string['privacy:metadata:post:created'] = 'Date when the entry was created.';
-$string['privacy:metadata:post:lastmodified'] = 'Date when the entry was last modified.';
+$string['privacy:metadata:post:created'] = 'The date when the blog entry was created';
+$string['privacy:metadata:post:lastmodified'] = 'The date when the blog entry was last modified';
 $string['privacy:metadata:post:usermodified'] = 'The user who last modified the entry';
 $string['privacy:path:blogassociations'] = 'Associated blog posts';
 $string['privacy:unknown'] = 'Unknown';

lang/en/cohort.php

@@ -62,7 +62,7 @@
 $string['idnumber'] = 'Cohort ID';
 $string['memberscount'] = 'Cohort size';
 $string['name'] = 'Name';
-$string['namecolumnmissing'] = 'There is something wrong with the format of the CSV file. Please check that it includes the correct column names. Note that Upload cohorts only allows you to add new users to an existing cohort and does not allow removal from an existing cohort.';
+$string['namecolumnmissing'] = 'There is something wrong with the format of the CSV file. Please check that it includes the correct column names. To add users to a cohort, go to \'Upload users\' in the Site administration.';
 $string['namefieldempty'] = 'Field name can not be empty';
 $string['newnamefor'] = 'New name for cohort {$a}';
 $string['newidnumberfor'] = 'New ID number for cohort {$a}';

lang/en/competency.php

@@ -146,10 +146,10 @@
 $string['privacy:metadata:plan:duedate'] = 'The due date of the learning plan';
 $string['privacy:metadata:plan:name'] = 'The name of the learning plan';
 $string['privacy:metadata:plan:reviewerid'] = 'The ID of the reviewer of the learning plan';
-$string['privacy:metadata:plan:status'] = 'The status of the learning palan';
+$string['privacy:metadata:plan:status'] = 'The status of the learning plan';
 $string['privacy:metadata:plan:userid'] = 'The ID of the user whose learning plan it is';
-$string['privacy:metadata:timecreated'] = 'The date at which the record was created';
-$string['privacy:metadata:timemodified'] = 'The date at which the record was edited';
+$string['privacy:metadata:timecreated'] = 'The time when the record was created';
+$string['privacy:metadata:timemodified'] = 'The time when the record was edited';
 $string['privacy:metadata:usercomp:grade'] = 'The grade given for the competency';
 $string['privacy:metadata:usercomp:proficiency'] = 'Whether proficiency is achieved';
 $string['privacy:metadata:usercomp:reviewerid'] = 'The ID of the reviewer';