Merge branch 'MDL-80725-403-enfix' of https://github.com/mudrd8mz/moodle

 into MOODLE_403_STABLE

admin/tool/customlang/tests/behat/customisation_create.feature

@@ -22,12 +22,12 @@ Feature: Within a moodle instance, an administrator should be able to modify lan
   Scenario: Edit an string but don't save it to lang pack.
     When I press "Apply changes and continue editing"
     Then I should not see "moodle documents" in the "page-footer" "region"
-    And I should see "Help and documentation" in the "page-footer" "region"
+    And I should see "Documentation for this page" in the "page-footer" "region"
 
   @javascript
   Scenario: Customize an string as admin and save it to lang pack.
     Given I press "Save changes to the language pack"
     And I should see "There are 1 modified strings."
     When I click on "Continue" "button"
-    Then I should not see "Help and documentation" in the "page-footer" "region"
+    Then I should not see "Documentation for this page" in the "page-footer" "region"
     And I should see "moodle documents" in the "page-footer" "region"

cohort/tests/behat/reportbuilder.feature

@@ -88,7 +88,7 @@ Feature: Manage custom reports for cohorts
     And I click on "Show/hide 'Sorting'" "button"
     And I click on "Move sorting for column 'Last name'" "button"
     And I click on "To the top of the list" "link" in the "Move sorting for column 'Last name'" "dialogue"
-    And I click on "Enable initial sorting for column Last name" "checkbox"
+    And I click on "Enable initial sorting for column 'Last name'" "checkbox"
     # "New system cohort" has fewer members than "Another one" cohort.
     And "New system cohort" "table_row" should appear before "Another one" "table_row"
     When I click on "Sort column 'Last name' descending" "button"

course/format/topics/lang/en/format_topics.php

@@ -35,8 +35,8 @@
 $string['privacy:metadata'] = 'The Topics format plugin does not store any personal data.';
 $string['indentation'] = 'Allow indentation on course page';
 $string['indentation_help'] = 'Allow teachers, and other users with the manage activities capability, to indent items on the course page.';
-$string['section_highlight_feedback'] = 'Section {$a->name} is highlighted.';
-$string['section_unhighlight_feedback'] = 'Highlight removed from section {$a->name}.';
+$string['section_highlight_feedback'] = 'Section {$a->name} highlighted.';
+$string['section_unhighlight_feedback'] = 'Highlighting removed from section {$a->name}.';
 $string['section0name'] = 'General';
 $string['sectionavailability_title'] = 'Topic availability';
 $string['sectiondelete_title'] = 'Delete topic?';

lang/en/admin.php

@@ -242,7 +242,7 @@
 $string['configdisplayloginfailures'] = 'This will display information to users about previous failed logins.';
 $string['configdndallowtextandlinks'] = 'Enable or disable the dragging and dropping of text and links onto a course page, alongside the dragging and dropping of files. Note that the dragging of text into Firefox or between different browsers is unreliable and may result in no data being uploaded, or corrupted text being uploaded.';
 $string['configdoclang'] = 'This language will be used in links for the documentation pages.';
-$string['configdocroot'] = 'Defines the path to Moodle Docs for providing context-specific documentation via \'Help and documentation\' links in the footer of each page. If the field is left blank, links will not be displayed.';
+$string['configdocroot'] = 'Defines the path to Moodle Docs for providing context-specific documentation via \'Documentation for this page\' links in the footer of each page. If the field is left blank, links will not be displayed.';
 $string['configdoctonewwindow'] = 'If enabled, then links to Moodle Docs will be shown in a new window.';
 $string['configduration_low'] = 'This value is too low. The minimum value is {$a}.';
 $string['configduration_high'] = 'This value is too high. The maximum value is {$a}.';
@@ -506,7 +506,7 @@
 $string['debugstringids'] = 'Show origin of languages strings';
 $string['debugstringids_desc'] = 'If enabled, language string components and identifiers are displayed when ?strings=1 or &strings=1 is appended to the page URL.';
 $string['debugtemplateinfo'] = 'Show template information';
-$string['debugtemplateinfo_desc'] = 'If enabled, templates used for rendering are shown as comments in the page HTML. Use for temporary debugging only, as it produces HTML validation errors and could break some page scripts.';
+$string['debugtemplateinfo_desc'] = 'If enabled, templates used for rendering are shown as comments in the page HTML. After changing the setting, you need to purge caches. Use for temporary debugging only, as it produces HTML validation errors and can break page scripts. It can also break core functionality!';
 $string['debugvalidators'] = 'Show validator links';
 $string['defaultcity'] = 'Default city';
 $string['defaultcity_help'] = 'A city entered here will be the default city when creating new user accounts.';

lang/en/courseformat.php

@@ -33,20 +33,20 @@
 $string['bulkcancel'] = 'Close bulk actions';
 $string['bulkselection'] = '{$a} selected';
 $string['bulkselection_plural'] = '{$a} selected';
-$string['cm_delete_feedback'] = '{$a->name} has been deleted.';
-$string['cm_delete_feedback_batch'] = 'The selected {$a->count} activities have been deleted.';
-$string['cm_duplicate_feedback'] = '{$a->name} has been duplicated.';
-$string['cm_duplicate_feedback_batch'] = 'The selected {$a->count} activities have been duplicated.';
+$string['cm_delete_feedback'] = '{$a->name} deleted.';
+$string['cm_delete_feedback_batch'] = 'Selected {$a->count} activities deleted.';
+$string['cm_duplicate_feedback'] = '{$a->name} duplicated.';
+$string['cm_duplicate_feedback_batch'] = 'Selected {$a->count} activities duplicated.';
 $string['cm_hide_feedback'] = '{$a->name} is now hidden.';
 $string['cm_hide_feedback_batch'] = 'The selected {$a->count} activities are now hidden.';
-$string['cm_moveleft_feedback'] = '{$a->name} has been moved to the left.';
-$string['cm_moveright_feedback'] = '{$a->name} has been moved to the right.';
-$string['cm_nogroups_feedback'] = '{$a->name}\'s group mode has been changed to "No groups".';
-$string['cm_separategroups_feedback'] = '{$a->name}\'s group mode has been changed to "Separate groups".';
+$string['cm_moveleft_feedback'] = '{$a->name} moved left.';
+$string['cm_moveright_feedback'] = '{$a->name} moved right.';
+$string['cm_nogroups_feedback'] = '{$a->name} group mode changed to No groups.';
+$string['cm_separategroups_feedback'] = '{$a->name} group mode changed to Separate groups.';
 $string['cm_show_feedback'] = '{$a->name} is now shown.';
 $string['cm_show_feedback_batch'] = 'The selected {$a->count} activities are now shown.';
 $string['cm_stealth_feedback'] = '{$a->name} is now available but not shown on the course page.';
-$string['cm_visiblegroups_feedback'] = '{$a->name}\'s group mode has been changed to "Visible groups".';
+$string['cm_visiblegroups_feedback'] = '{$a->name} group mode changed to Visible groups.';
 $string['cmavailability'] = 'Activity availability';
 $string['cmdelete_info'] = 'This will delete {$a->name} and any user data it contains.';
 $string['cmdelete_title'] = 'Delete activity?';
@@ -64,12 +64,12 @@
 $string['nobulkaction'] = 'No bulk actions available';
 $string['preference:coursesectionspreferences'] = 'Section user preferences for course {$a}';
 $string['privacy:metadata:preference:coursesectionspreferences'] = 'Section user preferences like collapsed and expanded.';
-$string['section_hide_feedback'] = 'The course section {$a->name} has been hidden.';
-$string['section_hide_feedback_batch'] = 'The selected {$a->count} course sections have been hidden.';
-$string['section_show_feedback'] = 'The course section {$a->name} has been shown.';
-$string['section_show_feedback_batch'] = 'The selected {$a->count} course sections have been shown.';
-$string['section_delete_feedback'] = 'The course section {$a->name} has been deleted';
-$string['section_delete_feedback_batch'] = 'The selected {$a->count} course sections have been deleted';
+$string['section_hide_feedback'] = 'Course section {$a->name} hidden.';
+$string['section_hide_feedback_batch'] = 'Selected {$a->count} course sections hidden.';
+$string['section_show_feedback'] = 'Course section {$a->name} shown.';
+$string['section_show_feedback_batch'] = 'Selected {$a->count} course sections shown.';
+$string['section_delete_feedback'] = 'Course section {$a->name} deleted.';
+$string['section_delete_feedback_batch'] = 'Selected {$a->count} course sections deleted.';
 $string['sectionavailability_title'] = 'Section availability';
 $string['sectiondelete_info'] = 'This will delete {$a->name} and all the activities it contains.';
 $string['sectiondelete_title'] = 'Delete section?';

lang/en/moodle.php

@@ -1376,7 +1376,7 @@
 $string['modulesuccess'] = '{$a} tables have been set up correctly';
 $string['modulesused'] = 'Modules used';
 $string['moodledocs'] = 'Moodle Docs';
-$string['moodledocslink'] = 'Help and documentation';
+$string['moodledocslink'] = 'Documentation for this page';
 $string['moodleversion'] = 'Moodle version';
 $string['moodlerelease'] = 'Moodle release';
 $string['moodleservicesandsupport'] = 'Services and support';

lang/en/reportbuilder.php

@@ -66,8 +66,8 @@
 $string['columnmoved'] = 'Moved column \'{$a}\'';
 $string['columnsortdirectionasc'] = 'Sort column \'{$a}\' ascending';
 $string['columnsortdirectiondesc'] = 'Sort column \'{$a}\' descending';
-$string['columnsortdisable'] = 'Disable initial sorting for column {$a}';
-$string['columnsortenable'] = 'Enable initial sorting for column {$a}';
+$string['columnsortdisable'] = 'Disable initial sorting for column \'{$a}\'';
+$string['columnsortenable'] = 'Enable initial sorting for column \'{$a}\'';
 $string['columnsortupdated'] = 'Updated sorting for column \'{$a}\'';
 $string['conditionadded'] = 'Added condition \'{$a}\'';
 $string['conditiondeleted'] = 'Deleted condition \'{$a}\'';

lib/pagelib.php

@@ -78,7 +78,7 @@
  *      course table. (Also available as $COURSE global.) If we are not inside
  *      an actual course, this will be the site course.
  * @property-read string $devicetypeinuse The name of the device type in use
- * @property-read string $docspath The path to the Help and documentation.
+ * @property-read string $docspath The path to the Documentation for this page.
  * @property-read string $focuscontrol The id of the HTML element to be focused when the page has loaded.
  * @property-read bool $headerprinted True if the page header has already been printed.
  * @property-read string $heading The main heading that should be displayed at the top of the <body>.
@@ -214,7 +214,7 @@ class moodle_page {
     protected $_subpage = '';
 
     /**
-     * @var string Set a different path to use for the 'Help and documentation' link.
+     * @var string Set a different path to use for the 'Documentation for this page' link.
      * By default, it uses the path of the file for instance mod/quiz/attempt.
      */
     protected $_docspath = null;
@@ -658,7 +658,7 @@ protected function magic_get_headingmenu() {
 
     /**
      * Please do not call this method directly, use the ->docspath syntax. {@link moodle_page::__get()}.
-     * @return string the path to the Help and documentation.
+     * @return string the path to the Documentation for this page.
      */
     protected function magic_get_docspath() {
         if (is_string($this->_docspath)) {
@@ -1462,7 +1462,7 @@ public function set_category_by_id($categoryid) {
     }
 
     /**
-     * Set a different path to use for the 'Help and documentation' link.
+     * Set a different path to use for the 'Documentation for this page' link.
      *
      * By default, it uses the pagetype, which is normally the same as the
      * script name. So, for example, for mod/quiz/attempt.php, pagetype is

mod/assign/lang/en/assign.php

@@ -475,7 +475,9 @@
 $string['requiresubmissionstatement'] = 'Require that students accept the submission statement';
 $string['requiresubmissionstatement_help'] = 'Require that students accept the submission statement for all submissions to this assignment.';
 $string['requireallteammemberssubmit'] = 'Require all group members submit';
-$string['requireallteammemberssubmit_help'] = 'If enabled, all members of the student group must click the submit button for this assignment before the group submission will be considered as submitted. If disabled, the group submission will be considered as submitted as soon as any member of the student group clicks the submit button.';
+$string['requireallteammemberssubmit_help'] = 'This setting must be used together with the \'Require students to click the submit button\' in Submission settings.
+
+If enabled, all group members must click the submit button for the group submission to be considered as submitted. If disabled, any group member can click the submit button.';
 $string['recordid'] = 'Identifier';
 $string['removesubmission'] = 'Remove submission';
 $string['removesubmissionforstudent'] = 'Remove submission for student: (id={$a->id}, fullname={$a->fullname}).';

mod/feedback/lang/en/feedback.php

@@ -159,7 +159,7 @@
 $string['insufficient_responses_help'] = 'For the feedback to be anonymous, there must be at least 2 responses.';
 $string['item_label'] = 'Label';
 $string['item_name'] = 'Question';
-$string['label'] = 'Label';
+$string['label'] = 'Text and media area';
 $string['labelcontents'] = 'Contents';
 $string['mapcourseinfo'] = 'This is a site-wide feedback that is available to all courses using the feedback block. You can however limit the courses to which it will appear by mapping them. Search the course and map it to this feedback.';
 $string['mapcoursenone'] = 'No courses mapped. Feedback available to all courses';

mod/feedback/tests/behat/export_import.feature

@@ -28,7 +28,7 @@ Feature: Exporting and importing feedbacks
       | Question         | this is an information question |
       | Label            | info                            |
       | Information type | Course                          |
-    And I add a "Label" question to the feedback with:
+    And I add a "Text and media area" question to the feedback with:
       | Contents | label text |
     And I add a "Longer text answer" question to the feedback with:
       | Question         | this is a longer text answer |

mod/feedback/tests/behat/multichoice.feature

@@ -31,7 +31,7 @@ Feature: Testing multichoice questions in feedback
       | Label            | multichoice1                |
       | Multiple choice type | Multiple choice - single answer |
       | Multiple choice values | option a\noption b\noption c  |
-    And I add a "Label" question to the feedback with:
+    And I add a "Text and media area" question to the feedback with:
       | Contents | this is the first page of the feedback |
     And I select "Add a page break" from the "typ" singleselect
     And I add a "Multiple choice" question to the feedback with:
@@ -40,7 +40,7 @@ Feature: Testing multichoice questions in feedback
       | Multiple choice type | Multiple choice - single answer |
       | Multiple choice values | option d\noption e\noption f  |
       | Required | 1 |
-    And I add a "Label" question to the feedback with:
+    And I add a "Text and media area" question to the feedback with:
       | Contents | this is the second page of the feedback |
     And I select "Add a page break" from the "typ" singleselect
     And I add a "Multiple choice" question to the feedback with:
@@ -51,7 +51,7 @@ Feature: Testing multichoice questions in feedback
       | Hide the "Not selected" option | Yes                   |
       | Dependence item                | multichoice2          |
       | Dependence value               | option d              |
-    And I add a "Label" question to the feedback with:
+    And I add a "Text and media area" question to the feedback with:
       | Contents | this is the third page of the feedback |
     And I log out
     And I am on the "Learning experience" "feedback activity" page logged in as student1
@@ -171,7 +171,7 @@ Feature: Testing multichoice questions in feedback
       | Label            | multichoice1                |
       | Multiple choice type | Multiple choice - multiple answers |
       | Multiple choice values | option a\noption b\noption c  |
-    And I add a "Label" question to the feedback with:
+    And I add a "Text and media area" question to the feedback with:
       | Contents | this is the first page of the feedback |
     And I select "Add a page break" from the "typ" singleselect
     And I add a "Multiple choice" question to the feedback with:
@@ -180,7 +180,7 @@ Feature: Testing multichoice questions in feedback
       | Multiple choice type | Multiple choice - multiple answers |
       | Multiple choice values | option d\noption e\noption f  |
       | Required | 1 |
-    And I add a "Label" question to the feedback with:
+    And I add a "Text and media area" question to the feedback with:
       | Contents | this is the second page of the feedback |
     And I select "Add a page break" from the "typ" singleselect
     And I add a "Multiple choice" question to the feedback with:
@@ -190,7 +190,7 @@ Feature: Testing multichoice questions in feedback
       | Multiple choice values | option g\noption h\noption i  |
       | Dependence item                | multichoice2          |
       | Dependence value               | option d              |
-    And I add a "Label" question to the feedback with:
+    And I add a "Text and media area" question to the feedback with:
       | Contents | this is the third page of the feedback |
     And I log out
     # Login as the first student.
@@ -310,7 +310,7 @@ Feature: Testing multichoice questions in feedback
       | Label            | multichoice1                |
       | Multiple choice type | Multiple choice - single answer allowed (drop-down menu) |
       | Multiple choice values | option a\noption b\noption c  |
-    And I add a "Label" question to the feedback with:
+    And I add a "Text and media area" question to the feedback with:
       | Contents | this is the first page of the feedback |
     And I select "Add a page break" from the "typ" singleselect
     And I add a "Multiple choice" question to the feedback with:
@@ -319,7 +319,7 @@ Feature: Testing multichoice questions in feedback
       | Multiple choice type | Multiple choice - single answer allowed (drop-down menu) |
       | Multiple choice values | option d\noption e\noption f  |
       | Required | 1 |
-    And I add a "Label" question to the feedback with:
+    And I add a "Text and media area" question to the feedback with:
       | Contents | this is the second page of the feedback |
     And I select "Add a page break" from the "typ" singleselect
     And I add a "Multiple choice" question to the feedback with:
@@ -329,7 +329,7 @@ Feature: Testing multichoice questions in feedback
       | Multiple choice values | option g\noption h\noption i  |
       | Dependence item                | multichoice2          |
       | Dependence value               | option d              |
-    And I add a "Label" question to the feedback with:
+    And I add a "Text and media area" question to the feedback with:
       | Contents | this is the third page of the feedback |
     And I log out
     And I am on the "Learning experience" "feedback activity" page logged in as student1

mod/feedback/tests/behat/question_types.feature

@@ -28,7 +28,7 @@ Feature: Test creating different types of feedback questions for anonymous feedb
       | Question         | this is an information question |
       | Label            | info                            |
       | Information type | Course                          |
-    And I add a "Label" question to the feedback with:
+    And I add a "Text and media area" question to the feedback with:
       | Contents | label text |
     And I add a "Longer text answer" question to the feedback with:
       | Question         | this is a longer text answer |

mod/feedback/tests/behat/question_types_non_anon.feature

@@ -32,7 +32,7 @@ Feature: Test creating different types of feedback questions for non-anonymous f
       | Question         | this is a response time question |
       | Label            | curtime                          |
       | Information type | Responses time                   |
-    And I add a "Label" question to the feedback with:
+    And I add a "Text and media area" question to the feedback with:
       | Contents | label text |
     And I add a "Longer text answer" question to the feedback with:
       | Question         | this is a longer text answer |