Merge branch 'MDL-68167-master' of git://github.com/rezaies/moodle

group/tests/behat/create_groups.feature

@@ -56,7 +56,7 @@ Feature: Organize students into groups
     And I should see "Student 0"
     And I should see "Student 1"
     And I should not see "Student 2"
-    And I click on "Remove \"Group 1\" from filter" "button" in the "Filter 1" "fieldset"
+    And I click on "Group 1" "autocomplete_selection"
     And I click on ".form-autocomplete-downarrow" "css_element" in the "Filter 1" "fieldset"
     And I click on "Group 2" "list_item"
     And I click on "Apply filters" "button"

lang/en/form.php

@@ -80,6 +80,7 @@
 $string['showless'] = 'Show less...';
 $string['showmore'] = 'Show more...';
 $string['somefieldsrequired'] = 'There are required fields in this form marked {$a}.';
+$string['suggestions'] = 'Suggestions';
 $string['time'] = 'Time';
 $string['timeunit'] = 'Time unit';
 $string['timing'] = 'Timing';

lang/en/user.php

@@ -33,6 +33,7 @@
 $string['countparticipantsfound'] = '{$a} participants found';
 $string['filterrowlegend'] = 'Filter {$a}';
 $string['filtersetmatchdescription'] = 'How multiple filters should be combined';
+$string['filtertype'] = 'Filter type';
 $string['match'] = 'Match';
 $string['matchofthefollowing'] = 'of the following:';
 $string['moodlenetprofile'] = 'MoodleNet profile';