Merge branch 'MDL-68753-master-enfix' of git://github.com/mudrd8mz/mo…

…odle

availability/condition/grade/tests/behat/availability_grade.feature

@@ -116,7 +116,7 @@ Feature: availability_grade
     And I click on "Grade" "link" in the "[email protected]" "table_row"
     And I set the field "Grade out of 100" to "40"
     And I click on "Save changes" "button"
-    And I press "Ok"
+    And I press "OK"
     And I click on "Edit settings" "link"
 
     # Log back in as student.

completion/tests/behat/restrict_activity_by_grade.feature

@@ -58,7 +58,7 @@ Feature: Restrict activity availability through grade conditions
     And I set the following fields to these values:
       | Grade | 21 |
     And I press "Save changes"
-    And I press "Ok"
+    And I press "OK"
     And I follow "Edit settings"
     And I log out
     And I log in as "student1"

completion/tests/behat/restrict_section_availability.feature

@@ -91,7 +91,7 @@ Feature: Restrict sections availability through completion or grade conditions
     And I set the following fields to these values:
       | Grade | 21 |
     And I press "Save changes"
-    And I press "Ok"
+    And I press "OK"
     And I follow "Edit settings"
     And I log out
     And I log in as "student1"

contentbank/tests/behat/sort_content.feature

@@ -21,7 +21,7 @@ Feature: Sort content in the content bank
     And I add the "Navigation" block if not present
     And I expand "Site pages" node
     And I click on "Content bank" "link"
-    When I click on "Display contentbank with file details" "button"
+    When I click on "Display content bank with file details" "button"
     And I click on "Sort by Content name ascending" "button"
     And "Dragon_santjordi.h5p" "text" should appear before "historybook.h5p" "text"
     And "historybook.h5p" "text" should appear before "mathsbook.h5p" "text"

grade/grading/form/guide/tests/behat/edit_guide.feature

@@ -83,7 +83,7 @@ Feature: Marking guides can be created and edited
     And I wait "1" seconds
     Then the field "Guide criterion B criterion remark" matches value "Comment \"4\""
     When I press "Save changes"
-    And I press "Ok"
+    And I press "OK"
     And I follow "Edit settings"
     And I follow "Test assignment 1 name"
     And I navigate to "View all submissions" in current page administration

grade/grading/tests/behat/behat_grading.php

@@ -156,7 +156,7 @@ public function i_set_activity_to_use_grading_form($activityname, $templatename)
     public function i_save_the_advanced_grading_form() {
 
         $this->execute('behat_forms::press_button', get_string('savechanges'));
-        $this->execute('behat_forms::press_button', 'Ok');
+        $this->execute('behat_forms::press_button', 'OK');
         $this->execute('behat_general::i_click_on', array($this->escape(get_string('editsettings')), 'link'));
         $this->execute('behat_forms::press_button', get_string('cancel'));
         $this->execute('behat_navigation::i_navigate_to_in_current_page_administration',

grade/report/singleview/tests/behat/bulk_insert_grades.feature

@@ -38,7 +38,7 @@ Feature: We can bulk insert grades for students in a course
     And I set the following fields to these values:
       | Grade out of 100 | 50 |
     And I press "Save changes"
-    And I press "Ok"
+    And I press "OK"
     And I am on "Course 1" course homepage
     And I navigate to "View > Grader report" in the course gradebook
     And I follow "Single view for Test assignment one"
@@ -79,7 +79,7 @@ Feature: We can bulk insert grades for students in a course
     And I set the following fields to these values:
       | Grade out of 100 | 50 |
     And I press "Save changes"
-    And I press "Ok"
+    And I press "OK"
     And I am on "Course 1" course homepage
     And I navigate to "View > Grader report" in the course gradebook
     # And I click on "input[title='Dock Navigation block']" "css_element"

grade/tests/behat/grade_scales.feature

@@ -55,23 +55,23 @@ Feature: View gradebook when scales are used
     And I click on "Grade" "link" in the "Student 1" "table_row"
     And I set the field "Grade" to "A"
     And I press "Save changes"
-    And I press "Ok"
+    And I press "OK"
     And I click on "[data-action=next-user]" "css_element"
     And I set the field "Grade" to "B"
     And I press "Save changes"
-    And I press "Ok"
+    And I press "OK"
     And I click on "[data-action=next-user]" "css_element"
     And I set the field "Grade" to "C"
     And I press "Save changes"
-    And I press "Ok"
+    And I press "OK"
     And I click on "[data-action=next-user]" "css_element"
     And I set the field "Grade" to "D"
     And I press "Save changes"
-    And I press "Ok"
+    And I press "OK"
     And I click on "[data-action=next-user]" "css_element"
     And I set the field "Grade" to "F"
     And I press "Save changes"
-    And I press "Ok"
+    And I press "OK"
     And I am on "Course 1" course homepage
     And I navigate to "Setup > Course grade settings" in the course gradebook
     And I set the field "Show weightings" to "Show"

grade/tests/behat/grade_single_item_scales.feature

@@ -51,7 +51,7 @@ Feature: View gradebook when single item scales are used
     And I click on "Grade" "link" in the "Student 1" "table_row"
     And I set the field "Grade" to "A"
     And I press "Save changes"
-    And I press "Ok"
+    And I press "OK"
     And I am on "Course 1" course homepage
     And I navigate to "Setup > Course grade settings" in the course gradebook
     And I set the field "Show weightings" to "Show"

h5p/h5plib/v124/lang/en/h5plib_v124.php

@@ -53,7 +53,7 @@
 $string['editor:contenttypebackbuttonlabel'] = 'Back';
 $string['editor:contenttypecacheoutdated'] = 'Content type list outdated';
 $string['editor:contenttypecacheoutdateddesc'] = 'Your site is having difficulties connecting to H5P.org to check for content type updates. You may not be able to update or install new content types.';
-$string['editor:contenttypedemobuttonlabel'] = 'Content Demo';
+$string['editor:contenttypedemobuttonlabel'] = 'Content demo';
 $string['editor:contenttypedetailbuttonlabel'] = 'Details';
 $string['editor:contenttypegetbuttonlabel'] = 'Get';
 $string['editor:contenttypeiconalttext'] = 'Icon';
@@ -67,21 +67,21 @@
 $string['editor:contenttypeowner'] = 'By :owner';
 $string['editor:contenttyperestricted'] = 'Restricted content type';
 $string['editor:contenttyperestricteddesc'] = 'The use of this content type has been restricted by an administrator.';
-$string['editor:contenttypesearchfieldplaceholder'] = 'Search for Content Types';
-$string['editor:contenttypesectionall'] = 'All Content Types';
+$string['editor:contenttypesearchfieldplaceholder'] = 'Search for content types';
+$string['editor:contenttypesectionall'] = 'All content types';
 $string['editor:contenttypeunsupportedapiversioncontent'] = 'Contact your system administrator to provide you with the necessary updates';
 $string['editor:contenttypeunsupportedapiversiontitle'] = 'This content type requires a newer core version';
 $string['editor:contenttypeupdateavailable'] = 'Update available';
 $string['editor:contenttypeupdatebuttonlabel'] = 'Update';
 $string['editor:contenttypeupdatesuccess'] = ':contentType successfully updated!';
 $string['editor:contenttypeupdatingbuttonlabel'] = 'Updating';
 $string['editor:contenttypeusebuttonlabel'] = 'Use';
-$string['editor:contributetranslations'] = 'If you want to complete the translation for :language you can learn about <a href=":url" target="_new">contributing translations to H5P</a>';
+$string['editor:contributetranslations'] = 'If you want to complete the translation for :language, see <a href=":url" target="_new">contributing translations to H5P</a>.';
 $string['editor:copiedbutton'] = 'Copied';
 $string['editor:copiedtoclipboard'] = 'Content is copied to the clipboard';
 $string['editor:copybutton'] = 'Copy';
 $string['editor:copytoclipboard'] = 'Copy H5P content to the clipboard';
-$string['editor:createcontenttablabel'] = 'Create Content';
+$string['editor:createcontenttablabel'] = 'Create content';
 $string['editor:currentmenuselected'] = 'current selection';
 $string['editor:editcopyright'] = 'Edit copyright';
 $string['editor:editimage'] = 'Edit image';
@@ -105,9 +105,9 @@
 $string['editor:filetolarge'] = 'The file you are trying to upload might be too large.';
 $string['editor:fillinthefieldsbelow'] = 'Fill in the fields below';
 $string['editor:gethelp'] = 'Get help';
-$string['editor:h5pfileuploadservererrorcontent'] = 'An unexpected error occured. Check your server error log for\' +  \' more details.';
+$string['editor:h5pfileuploadservererrorcontent'] = 'An unexpected error occurred. Check your server error log for more details.';
 $string['editor:h5pfileuploadservererrortitle'] = 'The H5P file could not be uploaded';
-$string['editor:h5pfilevalidationfailedcontent'] = 'Make sure the uploaded H5P contains valid H5P content. H5P\' +  \' files containing only libraries should be uploaded through the H5P Libraries page.';
+$string['editor:h5pfilevalidationfailedcontent'] = 'Make sure the uploaded H5P contains valid H5P content. H5P files containing only libraries should be uploaded through the H5P libraries page.';
 $string['editor:h5pfilevalidationfailedtitle'] = 'Could not validate H5P file.';
 $string['editor:h5pfilewrongextensioncontent'] = 'Only files with the .h5p extension are allowed.';
 $string['editor:h5pfilewrongextensiontitle'] = 'The selected file could not be uploaded';
@@ -126,15 +126,15 @@
 $string['editor:licensecandistribute'] = 'Can distribute';
 $string['editor:licensecanholdliable'] = 'Can hold liable';
 $string['editor:licensecanmodify'] = 'Can modify';
-$string['editor:licensecansublicense'] = 'Can sublicense';
+$string['editor:licensecansublicense'] = 'Can sub-licence';
 $string['editor:licensecanusecommercially'] = 'Can use commercially';
 $string['editor:licensecannotholdliable'] = 'Cannot hold liable';
-$string['editor:licensedescription'] = 'Some of the features of this license are indicated below. Click the info icon above to read the original license text.';
-$string['editor:licensefetchdetailsfailed'] = 'Failed fetching license details';
-$string['editor:licensemodalsubtitle'] = 'Select a license to view information about proper usage';
-$string['editor:licensemodaltitle'] = 'License Details';
+$string['editor:licensedescription'] = 'Some of the features of this licence are indicated below. Click the info icon above to read the original licence text.';
+$string['editor:licensefetchdetailsfailed'] = 'Failed fetching licence details';
+$string['editor:licensemodalsubtitle'] = 'Select a licence to view information about proper usage';
+$string['editor:licensemodaltitle'] = 'Licence details';
 $string['editor:licensemustincludecopyright'] = 'Must include copyright';
-$string['editor:licensemustincludelicense'] = 'Must include license';
+$string['editor:licensemustincludelicense'] = 'Must include licence';
 $string['editor:licenseunspecified'] = 'Unspecified';
 $string['editor:listbelowmin'] = 'The list needs at least :min items for the content to function properly.';
 $string['editor:listexceedsmax'] = 'The list exceeds the maximum of :max items.';
@@ -145,11 +145,11 @@
 $string['editor:loggedchanges'] = 'Logged changes';
 $string['editor:maxscoresemanticsmissing'] = 'Could not find the expected semantics in the content.';
 $string['editor:metadata'] = 'Metadata';
-$string['editor:metadatasharingandlicensinginfo'] = 'Metadata (sharing and licensing info)';
+$string['editor:metadatasharingandlicensinginfo'] = 'Metadata (sharing and licencing info)';
 $string['editor:missingproperty'] = 'Field :index is missing its :property property.';
 $string['editor:missingtranslation'] = '[Missing translation :key]';
 $string['editor:newchangehasbeenlogged'] = 'New change has been logged';
-$string['editor:newestfirst'] = 'Newest First';
+$string['editor:newestfirst'] = 'Newest first';
 $string['editor:nextimage'] = 'Next image';
 $string['editor:nochangeshavebeenlogged'] = 'No changes have been logged';
 $string['editor:nocontenttypesavailable'] = 'No content types are available';
@@ -159,7 +159,7 @@
 $string['editor:noresultsfound'] = 'No results found';
 $string['editor:noresultsfounddesc'] = 'There is no content type that matches your search criteria.';
 $string['editor:nosemantics'] = 'Error, could not load the content type form.';
-$string['editor:notalltextschanged'] = 'Not all texts were changed, there is only partial coverage for :language.';
+$string['editor:notalltextschanged'] = 'Not all texts were changed, as there is only partial coverage for :language.';
 $string['editor:notimagefield'] = '":path" is not an image.';
 $string['editor:notimageordimensionsfield'] = '":path" is not an image or dimensions field.';
 $string['editor:numresults'] = ':num results';
@@ -170,23 +170,23 @@
 $string['editor:orderitemdown'] = 'Order item down';
 $string['editor:orderitemup'] = 'Order item up';
 $string['editor:outofstep'] = 'The :property value can only be changed in steps of :step.';
-$string['editor:pasteandreplacebutton'] = 'Paste & Replace';
-$string['editor:pasteandreplacefromclipboard'] = 'Replace existing content with H5P Content from the clipboard';
+$string['editor:pasteandreplacebutton'] = 'Paste and replace';
+$string['editor:pasteandreplacefromclipboard'] = 'Replace existing content with H5P content from the clipboard';
 $string['editor:pastebutton'] = 'Paste';
-$string['editor:pastecontent'] = 'Replace Content';
+$string['editor:pastecontent'] = 'Replace content';
 $string['editor:pastecontentnotsupported'] = 'The content in the H5P clipboard is not supported in this context';
 $string['editor:pastecontentrestricted'] = 'The content in the clipboard has been restricted on this site';
 $string['editor:pasteerror'] = 'Cannot paste from clipboard';
 $string['editor:pastefromclipboard'] = 'Paste H5P content from the clipboard';
 $string['editor:pastenocontent'] = 'No H5P content on the clipboard';
-$string['editor:pastetoonew'] = 'The content in the H5P clipboard is of a higher version (:clip) than what is supported in this context (:local), if possible try to have this content upgraded first, and then try pasting the content here again.';
-$string['editor:pastetooold'] = 'The content in the H5P clipboard is of a lower version (:clip) than what is supported in this context (:local), if possible try to have the content you want to paste upgraded, copy it again and try pasting it here.';
-$string['editor:popularfirst'] = 'Popular First';
+$string['editor:pastetoonew'] = 'The content in the H5P clipboard is of a higher version (:clip) than what is supported in this context (:local). If possible, try to have this content upgraded first, then try pasting the content here again.';
+$string['editor:pastetooold'] = 'The content in the H5P clipboard is of a lower version (:clip) than what is supported in this context (:local). If possible, try to have the content you want to paste upgraded, then copy it again and try pasting it here.';
+$string['editor:popularfirst'] = 'Popular first';
 $string['editor:previousimage'] = 'Previous image';
 $string['editor:proceedbuttonlabel'] = 'Proceed to save';
 $string['editor:readless'] = 'Read less';
 $string['editor:readmore'] = 'Read more';
-$string['editor:recentlyusedfirst'] = 'Recently Used First';
+$string['editor:recentlyusedfirst'] = 'Recently used first';
 $string['editor:reloadbuttonlabel'] = 'Reload';
 $string['editor:removefile'] = 'Remove file';
 $string['editor:removeimage'] = 'Remove image';
@@ -197,19 +197,19 @@
 $string['editor:savemetadata'] = 'Save metadata';
 $string['editor:screenshots'] = 'Screenshots';
 $string['editor:scriptmissing'] = 'Could not load upgrades script for %lib.';
-$string['editor:searchresults'] = 'Search Results';
+$string['editor:searchresults'] = 'Search results';
 $string['editor:selectfiletoupload'] = 'Select file to upload';
 $string['editor:selectlibrary'] = 'Select the library you wish to use for your content.';
 $string['editor:semanticserror'] = 'Semantics error: :error';
 $string['editor:show'] = 'Show';
 $string['editor:showimportantinstructions'] = 'Show instructions';
-$string['editor:tabtitlebasicfileupload'] = 'File Upload';
+$string['editor:tabtitlebasicfileupload'] = 'File upload';
 $string['editor:tabtitleinputlinkurl'] = 'Link/URL';
 $string['editor:textfield'] = 'text field';
 $string['editor:thecontenttype'] = 'the content type';
 $string['editor:thiswillpotentially'] = 'This will potentially reset all the text and translations. You can\'t undo this. The content itself will not be changed. Do you want to proceed?';
 $string['editor:title'] = 'Title';
-$string['editor:toolong'] = 'Field value is too long, should contain :max letters or less.';
+$string['editor:toolong'] = 'Field value is too long; it should contain :max letters or less.';
 $string['editor:tryagain'] = 'Try again';
 $string['editor:tutorial'] = 'Tutorial';
 $string['editor:unabletointerpreterror'] = 'Unable to interpret response.';
@@ -219,7 +219,7 @@
 $string['editor:unknownlibrary'] = 'Unfortunately, the selected content type \'%lib\' isn\'t installed on this system.';
 $string['editor:untitled'] = 'Untitled :libraryTitle';
 $string['editor:uploadaudiotitle'] = 'Upload audio file';
-$string['editor:uploaderror'] = 'File Upload Error';
+$string['editor:uploaderror'] = 'File upload error';
 $string['editor:uploadfilebuttonchangelabel'] = 'Change file';
 $string['editor:uploadfilebuttonlabel'] = 'Upload a file';
 $string['editor:uploadinstructionscontent'] = 'You may start with examples from <a href="https://h5p.org/content-types-and-applications" target="blank">H5P.org</a>.';

lang/en/admin.php

@@ -242,7 +242,7 @@
 $string['configerrorlevel'] = 'Choose the amount of PHP warnings that you want to be displayed.  Normal is usually the best choice.';
 $string['configexportlookahead'] = 'Days to look ahead during export';
 $string['configexportlookback'] = 'Days to look back during export';
-$string['configextendedusernamechars'] = 'Enable this setting to allow students to use any characters in their usernames (note this does not affect their actual names).  The default is "false" which restricts usernames to be alphanumeric lowercase characters, underscore (_), hyphen (-), period (.) or at symbol (@).';
+$string['configextendedusernamechars'] = 'If enabled, usernames may include any characters except uppercase letters.  Otherwise, only alphanumeric characters with lowercase letters, underscore (_), hyphen (-), period (.) and at symbol (@) are allowed.';
 $string['configextramemorylimit'] = 'Some scripts like search, backup/restore or cron require more memory. Set higher values for large sites.';
 $string['configfilterall'] = 'Filter all strings, including headings, titles, navigation bar and so on.  This is mostly useful when using the multilang filter, otherwise it will just create extra load on your site for little gain.';
 $string['configfiltermatchoneperpage'] = 'Automatic linking filters will only generate a single link for the first matching text instance found on the complete page. All others are ignored.';

lang/en/auth.php

@@ -75,11 +75,11 @@
 $string['emailupdate'] = 'Email address update';
 $string['emailupdatemessage'] = 'Dear {$a->fullname},
 
-You have requested a change of your email address for your user account at {$a->site}. Please open the following URL in your browser in order to confirm this change.
+You have requested a change of your email address for your account on {$a->site}. To confirm this change, please go to the following web address:
 
-If you have any questions please contact support on: {$a->supportemail}
+{$a->url}
 
-{$a->url}';
+{$a->supportemail}';
 $string['emailupdatesuccess'] = 'Email address of user <em>{$a->fullname}</em> was successfully updated to <em>{$a->email}</em>.';
 $string['emailupdatetitle'] = 'Confirmation of email update at {$a->site}';
 $string['errormaxconsecutiveidentchars'] = 'Passwords must have at most {$a} consecutive identical characters.';