Merge branch 'MDL-69998-38-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_38_STABLE

enrol/manual/lang/en/enrol_manual.php

@@ -80,6 +80,6 @@ $string['unenroluser'] = 'Do you really want to unenrol "{$a->user}" from course
 $string['unenrolusers'] = 'Unenrol users';
 $string['wscannotenrol'] = 'Plugin instance cannot manually enrol a user in the course id = {$a->courseid}';
 $string['wsnoinstance'] = 'Manual enrolment plugin instance doesn\'t exist or is disabled for the course (id = {$a->courseid})';
-$string['wsusercannotassign'] = 'You don\'t have the permission to assign this role ({$a->roleid}) to this user ({$a->userid}) in this course({$a->courseid}).';
+$string['wsusercannotassign'] = 'You don\'t have the permission to assign this role ({$a->roleid}) to this user ({$a->userid}) in this course ({$a->courseid}).';
 $string['manualpluginnotinstalled'] = 'The "Manual" plugin has not yet been installed';
 $string['privacy:metadata'] = 'The Manual enrolments plugin does not store any personal data.';

group/tests/behat/overview.feature

@@ -67,8 +67,8 @@ Feature: Group overview
     # Following groups should exist in groupings.
     Then the group overview should include groups "Group 1, Group 2" in grouping "Grouping 1"
     And the group overview should include groups "Group 2,Group 3" in grouping "Grouping 2"
-    And the group overview should include groups "Group 4" in grouping "[Not in a grouping]"
-    And the group overview should include groups "No group" in grouping "[Not in a group]"
+    And the group overview should include groups "Group 4" in grouping "Not in a grouping"
+    And the group overview should include groups "No group" in grouping "Not in a group"
     # Following members should exit in group.
     And "Student 0" "text" should exist in the "Group 1" "table_row"
     And "Student 1" "text" should exist in the "Group 1" "table_row"
@@ -121,8 +121,8 @@ Feature: Group overview
     And I select "No grouping" from the "Grouping" singleselect
     And I select "All" from the "group" singleselect
     # Following groups should exist in groupings.
-    And the group overview should include groups "Group 4" in grouping "[Not in a grouping]"
-    And the group overview should include groups "No group" in grouping "[Not in a group]"
+    And the group overview should include groups "Group 4" in grouping "Not in a grouping"
+    And the group overview should include groups "No group" in grouping "Not in a group"
     # Following groups should not exits
     And "Group 1" "table_row" should not exist
     And "Group 2" "table_row" should not exist
@@ -185,7 +185,7 @@ Feature: Group overview
     And I select "All" from the "Grouping" singleselect
     And I select "No group" from the "group" singleselect
     # Following groups should exist in groupings.
-    And the group overview should include groups "No group" in grouping "[Not in a group]"
+    And the group overview should include groups "No group" in grouping "Not in a group"
     # Following groups should not exits
     And "Group 1" "table_row" should not exist
     And "Group 2" "table_row" should not exist

lang/en/admin.php

@@ -573,7 +573,7 @@ $string['extramemorylimit'] = 'Extra PHP memory limit';
 $string['fatalsessionautostart'] = '<p>Serious configuration error detected, please notify server administrator.</p><p> To operate properly, Moodle requires that administrator changes PHP settings.</p><p><code>session.auto_start</code> must be set to <code>off</code>.</p><p>This setting is controlled by editing <code>php.ini</code>, Apache/IIS <br />configuration or <code>.htaccess</code> file on the server.</p>';
 $string['filescleanupperiod'] = 'Clean up trash pool files';
 $string['filescleanupperiod_help'] = 'How often trash pool files are deleted. These are files that are associated with a context that no longer exists, for example when a course is deleted. Please note: This setting can result in missing files in a course which is backed up, deleted and then restored if the setting \'Include files\' (backup_auto_files) in \'Automated backup settings\' is disabled.';
-$string['fileconversioncleanuptask'] = 'Cleanup of temporary records for file conversions.';
+$string['fileconversioncleanuptask'] = 'Cleanup of temporary records for file conversions';
 $string['filecreated'] = 'New file created';
 $string['filesizeunits'] = 'file size units';
 $string['filestoredin'] = 'Save file into folder :';

lang/en/error.php

@@ -347,7 +347,7 @@ $string['invalidmodule'] = 'Invalid module';
 $string['invalidmoduleid'] = 'Invalid module ID: {$a}';
 $string['invalidmodulename'] = 'Invalid module name: {$a}';
 $string['invalidnum'] = 'Invalid numeric value';
-$string['invalidnumkey'] = '$conditions array may not contain numeric keys, please fix the code!';
+$string['invalidnumkey'] = 'The array $conditions may not contain numeric keys. Please fix the code!';
 $string['invalidoutcome'] = 'Incorrect outcome ID';
 $string['invalidpagesize'] = 'Invalid page size';
 $string['invalidpasswordpolicy'] = 'Invalid password policy';

lang/en/group.php

@@ -165,8 +165,8 @@ $string['nogroupsassigned'] = 'No groups assigned';
 $string['nopermissionforcreation'] = 'Can\'t create group "{$a}" as you don\'t have the required permissions';
 $string['nosmallgroups'] = 'Prevent last small group';
 $string['notingroup'] = 'Ignore users in groups';
-$string['notingrouping'] = '[Not in a grouping]';
-$string['notingrouplist'] = '[Not in a group]';
+$string['notingrouping'] = 'Not in a grouping';
+$string['notingrouplist'] = 'Not in a group';
 $string['nousersinrole'] = 'There are no suitable users in the selected role';
 $string['number'] = 'Group/member count';
 $string['numgroups'] = 'Number of groups';

lang/en/role.php

@@ -289,7 +289,7 @@ $string['mainadmin'] = 'Main administrator';
 $string['mainadminset'] = 'Set main admin';
 $string['manageadmins'] = 'Manage site administrators';
 $string['manager'] = 'Manager';
-$string['managerdescription'] = 'Managers can access course and modify them, they usually do not participate in courses.';
+$string['managerdescription'] = 'Managers can access courses and modify them, but usually do not participate in them.';
 $string['manageroles'] = 'Manage roles';
 $string['maybeassignedin'] = 'Context types where this role may be assigned';
 $string['morethan'] = 'More than {$a}';

mod/feedback/lang/en/feedback.php

@@ -247,7 +247,7 @@ $string['resetting_data'] = 'Reset feedback responses';
 $string['resetting_feedbacks'] = 'Resetting feedbacks';
 $string['response_nr'] = 'Response number';
 $string['responses'] = 'Responses';
-$string['responsetime'] = 'Responsestime';
+$string['responsetime'] = 'Responses time';
 $string['save_as_new_item'] = 'Save as new question';
 $string['save_as_new_template'] = 'Save as new template';
 $string['save_entries'] = 'Submit your answers';

mod/feedback/tests/behat/question_types_non_anon.feature

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

repository/onedrive/lang/en/repository_onedrive.php

@@ -39,7 +39,7 @@ $string['mysitenotfound'] = 'You have never logged into OneDrive before. You mus
 $string['oauth2serviceslink'] = '<a href="{$a}" title="Link to OAuth 2 services configuration">OAuth 2 services configuration</a>';
 $string['owner'] = 'Owned by: {$a}';
 $string['pluginname'] = 'Microsoft OneDrive';
-$string['removetempaccesstask'] = 'Remove temporary write access from controlled links.';
+$string['removetempaccesstask'] = 'Remove temporary write access from controlled links';
 $string['searchfor'] = 'Search for {$a}';
 $string['servicenotenabled'] = 'Access not configured.';
 $string['skydrivefilesexist'] = 'Files found in the Microsoft SkyDrive repository. This repository has been deprecated by Microsoft, however the files may be imported to the Microsoft OneDrive repository.';