Merge branch 'MDL-62354-33-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_33_STABLE

auth/oauth2/lang/en/auth_oauth2.php

@@ -88,15 +88,15 @@ $string['notenabled'] = 'Sorry, OAuth 2 authentication plugin is not enabled';
 $string['plugindescription'] = 'This authentication plugin displays a list of the configured identity providers on the login page. Selecting an identity provider allows users to login with their credentials from an OAuth 2 provider.';
 $string['pluginname'] = 'OAuth 2';
 $string['alreadylinked'] = 'This external account is already linked to an account on this site';
-$string['privacy:metadata:auth_oauth2'] = 'OAuth2 authentication';
+$string['privacy:metadata:auth_oauth2'] = 'OAuth 2 authentication';
 $string['privacy:metadata:auth_oauth2:authsubsystem'] = 'This plugin is connected to the authentication subsystem.';
 $string['privacy:metadata:auth_oauth2:confirmtoken'] = 'The confirmation token.';
-$string['privacy:metadata:auth_oauth2:confirmtokenexpires'] = 'Indicates the timestamp the confirmation token expires.';
+$string['privacy:metadata:auth_oauth2:confirmtokenexpires'] = 'The timestamp when the confirmation token expires.';
 $string['privacy:metadata:auth_oauth2:email'] = 'The external email that maps to this account.';
-$string['privacy:metadata:auth_oauth2:issuerid'] = 'The identifier of the OAuth2 issuer for this OAuth2 login.';
-$string['privacy:metadata:auth_oauth2:tableexplanation'] = 'OAuth2 accounts linked to a user\'s Moodle account are being stored here.';
-$string['privacy:metadata:auth_oauth2:timecreated'] = 'Indicates the timestamp when the user account was linked to the OAuth2 login.';
-$string['privacy:metadata:auth_oauth2:timemodified'] = 'Indicates the timestamp when this record was modified.';
-$string['privacy:metadata:auth_oauth2:userid'] = 'The user ID of the  user account this OAuth2 login is linked to.';
+$string['privacy:metadata:auth_oauth2:issuerid'] = 'The identifier of the OAuth 2 issuer for this OAuth 2 login.';
+$string['privacy:metadata:auth_oauth2:tableexplanation'] = 'OAuth 2 accounts linked to a user\'s Moodle account.';
+$string['privacy:metadata:auth_oauth2:timecreated'] = 'The timestamp when the user account was linked to the OAuth 2 login.';
+$string['privacy:metadata:auth_oauth2:timemodified'] = 'The timestamp when this record was modified.';
+$string['privacy:metadata:auth_oauth2:userid'] = 'The ID of the user account which the OAuth 2 login is linked to.';
 $string['privacy:metadata:auth_oauth2:usermodified'] = 'The ID of the user who modified this account.';
 $string['privacy:metadata:auth_oauth2:username'] = 'The external username that maps to this account.';

enrol/cohort/lang/en/enrol_cohort.php

@@ -32,4 +32,4 @@ $string['pluginname'] = 'Cohort sync';
 $string['pluginname_desc'] = 'Cohort enrolment plugin synchronises cohort members with course participants.';
 $string['status'] = 'Active';
 $string['creategroup'] = 'Create new group';
-$string['privacy:metadata'] = 'The Cohort sync enrolments plugin does not store any personal data.';
+$string['privacy:metadata'] = 'The Cohort sync enrolment plugin does not store any personal data.';

enrol/database/lang/en/enrol_database.php

@@ -73,4 +73,4 @@ $string['settingsheadernewcourses'] = 'Creation of new courses';
 $string['remoteuserfield_desc'] = 'The name of the field in the remote table that we are using to match entries in the user table.';
 $string['templatecourse'] = 'New course template';
 $string['templatecourse_desc'] = 'Optional: auto-created courses can copy their settings from a template course. Type here the shortname of the template course.';
-$string['privacy:metadata'] = 'The External database enrolments plugin does not store any personal data.';
+$string['privacy:metadata'] = 'The External database enrolment plugin does not store any personal data.';

enrol/flatfile/lang/en/enrol_flatfile.php

@@ -61,4 +61,4 @@ It could look something like this:
    del, student, 17, CF101
    add, student, 21, CF101, 1091115000, 1091215000
 </pre>';
-$string['privacy:metadata'] = 'The Flat file (CSV) enrolments plugin does not store any personal data.';
+$string['privacy:metadata'] = 'The Flat file (CSV) enrolment plugin does not store any personal data.';

enrol/guest/lang/en/enrol_guest.php

@@ -43,4 +43,4 @@ $string['status_help'] = 'This setting determines whether a user can access the
 $string['status_link'] = 'enrol/guest';
 $string['usepasswordpolicy'] = 'Use password policy';
 $string['usepasswordpolicy_desc'] = 'Use standard password policy for guest access passwords.';
-$string['privacy:metadata'] = 'The Guest access enrolments plugin does not store any personal data.';
+$string['privacy:metadata'] = 'The Guest access enrolment plugin does not store any personal data.';

enrol/imsenterprise/lang/en/enrol_imsenterprise.php

@@ -92,4 +92,4 @@ $string['zeroisnotruncation'] = '0 indicates no truncation';
 $string['roles'] = 'Roles';
 $string['ignore'] = 'Ignore';
 $string['importimsfile'] = 'Import IMS Enterprise file';
-$string['privacy:metadata'] = 'The IMS Enterprise file enrolments plugin does not store any personal data.';
+$string['privacy:metadata'] = 'The IMS Enterprise file enrolment plugin does not store any personal data.';

enrol/meta/lang/en/enrol_meta.php

@@ -37,4 +37,4 @@ $string['pluginname'] = 'Course meta link';
 $string['pluginname_desc'] = 'Course meta link enrolment plugin synchronises enrolments and roles in two different courses.';
 $string['syncall'] = 'Synchronise all enrolled users';
 $string['syncall_desc'] = 'If enabled all enrolled users are synchronised even if they have no role in parent course, if disabled only users that have at least one synchronised role are enrolled in child course.';
-$string['privacy:metadata'] = 'The Course meta link enrolments plugin does not store any personal data.';
+$string['privacy:metadata'] = 'The Course meta link enrolment plugin does not store any personal data.';

enrol/self/lang/en/enrol_self.php

@@ -115,5 +115,5 @@ $string['welcometocoursetext'] = 'Welcome to {$a->coursename}!
 If you have not done so already, you should edit your profile page so that we can learn more about you:
 
   {$a->profileurl}';
-$string['privacy:metadata'] = 'The Self enrolments plugin does not store any personal data.';
+$string['privacy:metadata'] = 'The Self enrolment plugin does not store any personal data.';
 

lang/en/badges.php

@@ -368,13 +368,13 @@ $string['privacy:metadata:backpack:backpackurl'] = 'The backpack URL';
 $string['privacy:metadata:backpack:email'] = 'The email associated with the backpack';
 $string['privacy:metadata:backpack:userid'] = 'The ID of the user whose backpack it is';
 $string['privacy:metadata:badge'] = 'A collection of badges';
-$string['privacy:metadata:badge:timecreated'] = 'The date at which the badge was created';
-$string['privacy:metadata:badge:timemodified'] = 'The date at which the badge was last modified';
+$string['privacy:metadata:badge:timecreated'] = 'The time when the badge was created';
+$string['privacy:metadata:badge:timemodified'] = 'The time when the badge was last modified';
 $string['privacy:metadata:badge:usercreated'] = 'The ID of the user who created the badge';
 $string['privacy:metadata:badge:usermodified'] = 'The ID of the user who modified the badge';
-$string['privacy:metadata:criteriamet'] = 'A collection of criteria met';
-$string['privacy:metadata:criteriamet:datemet'] = 'The date at which the criteria was met';
-$string['privacy:metadata:criteriamet:userid'] = 'The ID of the user whose criteria is met';
+$string['privacy:metadata:criteriamet'] = 'A collection of criteria which have been met';
+$string['privacy:metadata:criteriamet:datemet'] = 'The date when the criteria was met';
+$string['privacy:metadata:criteriamet:userid'] = 'The ID of the user who has met the criteria';
 $string['privacy:metadata:external:backpacks'] = 'Information shared when users submit their badges to an external backpack';
 $string['privacy:metadata:external:backpacks:badge'] = 'The name of the badge';
 $string['privacy:metadata:external:backpacks:description'] = 'The description of the badge';
@@ -386,7 +386,7 @@ $string['privacy:metadata:issued:dateexpire'] = 'The date at which the award exp
 $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';
-$string['privacy:metadata:manualaward:datemet'] = 'The date at which the manual award was met';
+$string['privacy:metadata:manualaward:datemet'] = 'The date when the user was awarded the badge';
 $string['privacy:metadata:manualaward:issuerid'] = 'The ID of the user awarding the badge';
 $string['privacy:metadata:manualaward:issuerrole'] = 'The role of the user awarding the badge';
 $string['privacy:metadata:manualaward:recipientid'] = 'The ID of the user who is manually awarded a badge';

lang/en/completion.php

@@ -174,22 +174,22 @@ $string['overallaggregation_all'] = 'Course is complete when ALL conditions are
 $string['overallaggregation_any'] = 'Course is complete when ANY of the conditions are met';
 $string['pending'] = 'Pending';
 $string['periodpostenrolment'] = 'Period post enrolment';
-$string['privacy:metadata:completionstate'] = 'If the course module has been completed.';
+$string['privacy:metadata:completionstate'] = 'If the activity has been completed';
 $string['privacy:metadata:course'] = 'A course identifier.';
-$string['privacy:metadata:coursecompletedsummary'] = 'Holds information about students that have completed criteria in a course.';
-$string['privacy:metadata:coursemoduleid'] = 'The identifier to the course module.';
-$string['privacy:metadata:coursemodulesummary'] = 'Stores the course module completion data for a user.';
+$string['privacy:metadata:coursecompletedsummary'] = 'Stores information about users who have completed criteria in a course';
+$string['privacy:metadata:coursemoduleid'] = 'The activity ID';
+$string['privacy:metadata:coursemodulesummary'] = 'Stores activity completion data for a user';
 $string['privacy:metadata:coursesummary'] = 'Stores the course completion data for a user.';
-$string['privacy:metadata:gradefinal'] = 'Final grade recieved for the course completion.';
-$string['privacy:metadata:overrideby'] = 'The user ID of the person who overrode the module completion.';
+$string['privacy:metadata:gradefinal'] = 'Final grade received for course completion';
+$string['privacy:metadata:overrideby'] = 'The user ID of the person who overrode the activity completion';
 $string['privacy:metadata:reaggregate'] = 'If the course completion was reaggregated.';
 $string['privacy:metadata:timecompleted'] = 'The time that the course was completed.';
-$string['privacy:metadata:timeenrolled'] = 'The time that the user was enrolled into the course.';
-$string['privacy:metadata:timemodified'] = 'The time the course module completion was modified.';
+$string['privacy:metadata:timeenrolled'] = 'The time that the user was enrolled in the course';
+$string['privacy:metadata:timemodified'] = 'The time that the activity completion was modified';
 $string['privacy:metadata:timestarted'] = 'The time the course was started.';
-$string['privacy:metadata:viewed'] = 'If the course module was viewed.';
-$string['privacy:metadata:userid'] = 'Course and activity completion is stored against this user.';
-$string['privacy:metadata:unenroled'] = 'If the user has been unenroled from the course.';
+$string['privacy:metadata:viewed'] = 'If the activity was viewed';
+$string['privacy:metadata:userid'] = 'The user ID of the person with course and activity completion data';
+$string['privacy:metadata:unenroled'] = 'If the user has been unenrolled from the course';
 $string['progress'] = 'Student progress';
 $string['progress-title'] = '{$a->user}, {$a->activity}: {$a->state} {$a->date}';
 $string['progresstotal'] = 'Progress: {$a->complete} / {$a->total}';

lang/en/files.php

@@ -34,6 +34,6 @@ $string['privacy:metadata:files:filesize'] = 'The size of the file';
 $string['privacy:metadata:files:license'] = 'The license of the file\'s content';
 $string['privacy:metadata:files:mimetype'] = 'The MIME type of the file';
 $string['privacy:metadata:files:source'] = 'The source of the file';
-$string['privacy:metadata:files:timecreated'] = 'The date at which the file was created';
-$string['privacy:metadata:files:timemodified'] = 'The date at which the file was last modified';
+$string['privacy:metadata:files:timecreated'] = 'The time when the file was created';
+$string['privacy:metadata:files:timemodified'] = 'The time when the file was last modified';
 $string['privacy:metadata:files:userid'] = 'The user who created the file';

lang/en/notes.php

@@ -63,7 +63,7 @@ $string['privacy:metadata:core_notes:lastmodified'] = 'The last modified date/ti
 $string['privacy:metadata:core_notes:publishstate'] = 'The publish state of the note.';
 $string['privacy:metadata:core_notes:userid'] = 'The Id of the user associated with the note.';
 $string['publishstate'] = 'Context';
-$string['publishstate_help'] = 'A note\'s context determines who can see the note.
+$string['publishstate_help'] = 'A note\'s context determines who can see the note in everyday use. Users should be aware that all notes, including personal ones, may be disclosed under the laws of their jurisdictions such as Data Protection law requests, Discovery Orders from courts or warrants.
 
 * Personal - The note will be visible only to you
 * Course - The note will be visible to teachers in this course

mod/chat/lang/en/chat.php

@@ -117,7 +117,7 @@ $string['pluginname'] = 'Chat';
 $string['privacy:metadata:messages'] = 'A record of the messages sent during a chat session';
 $string['privacy:metadata:messages:issystem'] = 'Whether the message is a system-generated message';
 $string['privacy:metadata:messages:message'] = 'The message';
-$string['privacy:metadata:messages:timestamp'] = 'The time at which the message was sent';
+$string['privacy:metadata:messages:timestamp'] = 'The time when the message was sent.';
 $string['privacy:metadata:messages:userid'] = 'The user ID of the author of the message';
 $string['refreshroom'] = 'Refresh room';
 $string['refreshuserlist'] = 'Refresh user list';

mod/lesson/lang/en/lesson.php

@@ -458,7 +458,7 @@ $string['privacy:metadata:branch:nextpageid'] = 'The next page ID';
 $string['privacy:metadata:branch'] = 'A record of the pages viewed';
 $string['privacy:metadata:overrides:userid'] = 'The user ID';
 $string['privacy:metadata:overrides:available'] = 'Time at which the students can start attempting the lesson';
-$string['privacy:metadata:overrides:deadline'] = 'Time by which students must have completed their attempt';
+$string['privacy:metadata:overrides:deadline'] = 'The deadline for completing the lesson.';
 $string['privacy:metadata:overrides:timelimit'] = 'Time limit to complete the lesson, in seconds.';
 $string['privacy:metadata:overrides:review'] = 'Whether trying a question again is allowed';
 $string['privacy:metadata:overrides:maxattempts'] = 'The maximium number of attempts';

question/type/ddimageortext/lang/en/qtype_ddimageortext.php

@@ -61,7 +61,7 @@ $string['pluginnameediting'] = 'Editing drag and drop onto image';
 $string['pluginnamesummary'] = 'Images or text labels are dragged and dropped into drop zones on a background image.';
 $string['previewareaheader'] = 'Preview';
 $string['previewareamessage'] = 'Select a background image, specify draggable items and define drop zones on the background image into which they must be dragged.';
-$string['privacy:metadata'] = 'The Drag and drop onto image question type does not store any personal data.';
+$string['privacy:metadata'] = 'The Drag and drop onto image question type plugin does not store any personal data.';
 $string['refresh'] = 'Refresh preview';
 $string['shuffleimages'] = 'Shuffle drag items each time question is attempted';
 $string['summarisechoice'] = '{$a->no}. {$a->text}';

question/type/ddmarker/lang/en/qtype_ddmarker.php

@@ -69,7 +69,7 @@ $string['pluginnameediting'] = 'Editing drag and drop markers';
 $string['pluginnamesummary'] = 'Markers are dragged and dropped onto a background image.';
 $string['previewareaheader'] = 'Preview';
 $string['previewareamessage'] = 'Select a background image file, enter text labels for markers and define the drop zones on the background image to which they must be dragged.';
-$string['privacy:metadata'] = 'The Drag and drop markers question type does not store any personal data.';
+$string['privacy:metadata'] = 'The Drag and drop markers question type plugin does not store any personal data.';
 $string['refresh'] = 'Refresh preview';
 $string['clearwrongparts'] = 'Move incorrectly placed markers back to default start position below image';
 $string['shape'] = 'Shape';

question/type/ddwtos/lang/en/qtype_ddwtos.php

@@ -34,4 +34,4 @@ $string['pluginname_link'] = 'question/type/ddwtos';
 $string['pluginnameadding'] = 'Adding a drag and drop into text';
 $string['pluginnameediting'] = 'Editing a drag and drop into text';
 $string['pluginnamesummary'] = 'Missing words in the question text are filled in using drag and drop.';
-$string['privacy:metadata'] = 'The Drag and drop into text question type does not store any personal data.';
+$string['privacy:metadata'] = 'The Drag and drop into text question type plugin does not store any personal data.';

question/type/essay/lang/en/qtype_essay.php

@@ -44,7 +44,7 @@ $string['pluginname_link'] = 'question/type/essay';
 $string['pluginnameadding'] = 'Adding an Essay question';
 $string['pluginnameediting'] = 'Editing an Essay question';
 $string['pluginnamesummary'] = 'Allows a response of a file upload and/or online text. This must then be graded manually.';
-$string['privacy:metadata'] = 'The Essay question type does not store any personal data.';
+$string['privacy:metadata'] = 'The Essay question type plugin does not store any personal data.';
 $string['responsefieldlines'] = 'Input box size';
 $string['responseformat'] = 'Response format';
 $string['responseoptions'] = 'Response Options';

question/type/match/lang/en/qtype_match.php

@@ -42,4 +42,4 @@ $string['pluginname_link'] = 'question/type/match';
 $string['pluginnameadding'] = 'Adding a Matching question';
 $string['pluginnameediting'] = 'Editing a Matching question';
 $string['pluginnamesummary'] = 'The answer to each of a number of sub-question must be selected from a list of possibilities.';
-$string['privacy:metadata'] = 'The Matching question type does not store any personal data.';
+$string['privacy:metadata'] = 'The Matching question type plugin does not store any personal data.';

question/type/missingtype/lang/en/qtype_missingtype.php

@@ -32,5 +32,5 @@ $string['missing'] = 'Question of a type that is not installed on this system';
 $string['pluginname'] = 'Missing type';
 $string['pluginnameadding'] = 'Adding a question of a type that is not installed on this system';
 $string['pluginnameediting'] = 'Editing a question of a type that is not installed on this system';
-$string['privacy:metadata'] = 'The Missing type question type does not store any personal data.';
+$string['privacy:metadata'] = 'The Select missing words question type plugin does not store any personal data.';
 $string['warningmissingtype'] = '<b>This question is of a type that has not been installed on your Moodle yet.<br />Please alert your Moodle administrator.</b>';

question/type/multichoice/lang/en/qtype_multichoice.php

@@ -62,7 +62,7 @@ $string['pluginname_link'] = 'question/type/multichoice';
 $string['pluginnameadding'] = 'Adding a Multiple choice question';
 $string['pluginnameediting'] = 'Editing a Multiple choice question';
 $string['pluginnamesummary'] = 'Allows the selection of a single or multiple responses from a pre-defined list.';
-$string['privacy:metadata'] = 'The Multiple choice question type does not store any personal data.';
+$string['privacy:metadata'] = 'The Multiple choice question type plugin does not store any personal data.';
 $string['selectmulti'] = 'Select one or more:';
 $string['selectone'] = 'Select one:';
 $string['shuffleanswers'] = 'Shuffle the choices?';

question/type/randomsamatch/lang/en/qtype_randomsamatch.php

@@ -32,7 +32,7 @@ $string['pluginname_link'] = 'question/type/randomsamatch';
 $string['pluginnameadding'] = 'Adding a Random short-answer matching question';
 $string['pluginnameediting'] = 'Editing a Random short-answer matching question';
 $string['pluginnamesummary'] = 'Like a Matching question, but created randomly from the short answer questions in a particular category.';
-$string['privacy:metadata'] = 'The Random short-answer matching question type does not store any personal data.';
+$string['privacy:metadata'] = 'The Random short-answer matching question type plugin does not store any personal data.';
 $string['randomsamatchnumber'] = 'Number of questions to select';
 $string['randomsamatch'] = 'Random short-answer matching';
 $string['randomsamatchintro'] = 'For each of the following questions, select the matching answer from the menu.';

question/type/shortanswer/lang/en/qtype_shortanswer.php

@@ -41,4 +41,4 @@ $string['pluginname_link'] = 'question/type/shortanswer';
 $string['pluginnameadding'] = 'Adding a short answer question';
 $string['pluginnameediting'] = 'Editing a Short answer question';
 $string['pluginnamesummary'] = 'Allows a response of one or a few words that is graded by comparing against various model answers, which may contain wildcards.';
-$string['privacy:metadata'] = 'The Short answer question type does not store any personal data.';
+$string['privacy:metadata'] = 'The Short answer question type plugin does not store any personal data.';