Merge branch 'MDL-80221-401-enfix' of https://github.com/mudrd8mz/moodle into MOODLE_401_STABLE

blocks/myoverview/lang/en/block_myoverview.php

@@ -30,7 +30,7 @@ $string['aria:allcoursesincludinghidden'] = 'Show all courses';
 $string['aria:allcourses'] = 'Show all courses except courses removed from view';
 $string['aria:card'] = 'Switch to card view';
 $string['aria:controls'] = 'Course overview controls';
-$string['aria:courseactions'] = 'Actions for current course';
+$string['aria:courseactions'] = 'Actions for course';
 $string['aria:coursesummary'] = 'Course summary text:';
 $string['aria:courseprogress'] = 'Course progress:';
 $string['aria:customfield'] = 'Show {$a} courses';

course/tests/behat/course_request.feature

@@ -29,7 +29,7 @@ Feature: Users can request and approve courses
       | Course short name | Mynewcourse   |
       | Supporting information | pretty please |
     And I press "Request a course"
-    And I should see "Your course request has been saved successfully."
+    And I should see "Course request submitted."
     And I press "Continue"
     And I am on course index
     And I should not see "My new course"

enrol/self/lang/en/enrol_self.php

@@ -92,7 +92,7 @@ If an enrolment key is specified, any user attempting to enrol in the course wil
 $string['passwordinvalid'] = 'Incorrect enrolment key, please try again';
 $string['passwordinvalidhint'] = 'That enrolment key was incorrect, please try again<br />
 (Here\'s a hint - it starts with \'{$a}\')';
-$string['passwordmatchesgroupkey'] = 'Enrolment key matches an existing group enrolment key';
+$string['passwordmatchesgroupkey'] = 'This enrolment key is already used as a group enrolment key.';
 $string['pluginname'] = 'Self enrolment';
 $string['pluginname_desc'] = 'The self enrolment plugin allows users to choose which courses they want to participate in. The courses may be protected by an enrolment key. Internally the enrolment is done via the manual enrolment plugin which has to be enabled in the same course.';
 $string['requirepassword'] = 'Require enrolment key';

enrol/self/tests/self_test.php

@@ -800,7 +800,7 @@ class self_test extends \advanced_testcase {
         ] + (array) $instance, [], $instance, $context);
 
         $this->assertArrayHasKey('password', $errors);
-        $this->assertEquals('Enrolment key matches an existing group enrolment key', $errors['password']);
+        $this->assertEquals('This enrolment key is already used as a group enrolment key.', $errors['password']);
     }
 
     /**

lang/en/moodle.php

@@ -408,7 +408,7 @@ $string['courserequestfailed'] = 'For some reason, your course request could not
 $string['courserequestintro'] = 'Use this form to request a course to be created for you.<br />Try and fill in as much information as you can to allow<br />the administrators to understand your reasons for wanting this course.';
 $string['courserequestreason'] = 'Reasons for wanting this course';
 $string['courserequestroleerror'] = 'The creators\' role in new courses configuration is invalid. Please see <a href="{$a}">user policies</a>.';
-$string['courserequestsuccess'] = 'Your course request has been saved successfully. You will be sent an email to inform you whether your request was approved.';
+$string['courserequestsuccess'] = 'Course request submitted.';
 $string['courserequestsupport'] = 'Supporting information to help the administrator evaluate this request';
 $string['courserequestwarning'] = 'The user requesting this course will be automatically enrolled and assigned the role of {$a}.';
 $string['courserestore'] = 'Course restore';
@@ -2332,7 +2332,7 @@ $string['weeks'] = 'weeks';
 $string['weekhide'] = 'Hide this week from {$a}';
 $string['weeklyoutline'] = 'Weekly outline';
 $string['weekshow'] = 'Show this week to {$a}';
-$string['welcomeback'] = 'Welcome back, {$a->firstname}! 👋';
+$string['welcomeback'] = 'Hi, {$a->firstname}! 👋';
 $string['welcometosite'] = 'Welcome, {$a->firstname}! 👋';
 $string['welcometocourse'] = 'Welcome to {$a}';
 $string['welcometocoursetext'] = 'Welcome to {$a->coursename}!

mod/assign/lang/en/assign.php

@@ -152,7 +152,7 @@ $string['currentattempt'] = 'This is attempt {$a}.';
 $string['currentattemptof'] = 'This is attempt {$a->attemptnumber} ( {$a->maxattempts} attempts allowed ).';
 $string['cutoffdate'] = 'Cut-off date';
 $string['cutoffdatecolon'] = 'Cut-off date: {$a}';
-$string['cutoffdate_help'] = 'If set, the assignment will not accept submissions after this date without an extension.';
+$string['cutoffdate_help'] = 'If set, submissions will not be accepted after this date without an extension. If not set, submissions will always be accepted.';
 $string['cutoffdatevalidation'] = 'Cut-off date cannot be earlier than the due date.';
 $string['cutoffdatefromdatevalidation'] = 'Cut-off date cannot be earlier than the allow submissions from date.';
 $string['defaultlayout'] = 'Restore default layout';
@@ -282,7 +282,7 @@ $string['filterrequiregrading'] = 'Requires grading';
 $string['filtersubmitted'] = 'Submitted';
 $string['graded'] = 'Graded';
 $string['gradedby'] = 'Graded by';
-$string['gradedfollowupsubmit'] = 'Graded - follow-up submission received';
+$string['gradedfollowupsubmit'] = 'Graded - resubmitted';
 $string['gradedon'] = 'Graded on';
 $string['gradebelowzero'] = 'Grade must be greater than or equal to zero.';
 $string['gradebreakdown'] = 'Grade breakdown';

mod/assign/tests/behat/grading_status.feature

@@ -137,10 +137,10 @@ Feature: View the grading status of an assignment
       | Online text | I'm the student's second submission |
     And I press "Save changes"
     And I log out
-    # Teacher marks the submission again after noticing the 'Graded - follow-up submission received'.
+    # Teacher marks the submission again after noticing the 'Graded - resubmitted'.
     And I am on the "Test assignment name" "assign activity" page logged in as teacher1
     And I follow "View all submissions"
-    And I should see "Graded - follow-up submission received" in the "Student 1" "table_row"
+    And I should see "Graded - resubmitted" in the "Student 1" "table_row"
     And I wait "10" seconds
     And I click on "Grade" "link" in the "Student 1" "table_row"
     And I should see "1 of 1"

mod/h5pactivity/lang/en/h5pactivity.php

@@ -32,7 +32,7 @@ $string['answer_fail'] = 'Incorrect answer';
 $string['answer_incorrect'] = 'Your answer is incorrect';
 $string['answer_pass'] = 'Correct answer';
 $string['answer_unchecked'] = 'Answer unchecked';
-$string['answer_unknown'] = 'Unkown answer';
+$string['answer_unknown'] = 'Unknown answer';
 $string['answer_text'] = 'Answer text';
 $string['answer_noanswer'] = 'None';
 $string['areapackage'] = 'Package file';

my/tests/behat/welcome.feature

@@ -29,4 +29,4 @@ Feature: Welcome message
     And I log out
     And I should see "You are not logged in" in the "page-footer" "region"
     And I log in as "admin"
-    Then I should see "Welcome back, Admin!" in the "page-header" "region"
+    Then I should see "Hi, Admin!" in the "page-header" "region"