MDL-58749 lang: Merge English strings from the en_fix language pack

Significant string change:

* errorinvalidbyhour,core_calendar - correcting number from 59 to 23

enrol/ldap/lang/en/enrol_ldap.php

@@ -62,8 +62,8 @@ $string['course_summary'] = 'Optional: LDAP attribute to get the summary from';
 $string['course_summary_key'] = 'Summary';
 $string['course_summary_updateonsync'] = 'Update summary during synchronization script';
 $string['course_summary_updateonsync_key'] = 'Update summary';
-$string['createcourseextid'] = 'CREATE User enrolled to a nonexistant course \'{$a->courseextid}\'';
-$string['createnotcourseextid'] = 'User enrolled to a nonexistant course \'{$a->courseextid}\'';
+$string['createcourseextid'] = 'CREATE User enrolled to a non-existing course \'{$a->courseextid}\'';
+$string['createnotcourseextid'] = 'User enrolled to a non-existing course \'{$a->courseextid}\'';
 $string['creatingcourse'] =  'Creating course \'{$a}\'...';
 $string['duplicateshortname'] = "Course creation failed. Duplicate short name. Skipping course with idnumber '{\$a->idnumber}'...";
 $string['editlock'] = 'Lock value';

lang/en/admin.php

@@ -599,7 +599,7 @@ $string['iplookupinfo'] = 'By default Moodle uses the free online NetGeo (The In
 It is recommended to install local copy of free GeoLite City database from MaxMind.<br />
 IP address location is displayed on simple map or using Google Maps. Please note that you need to have a Google account and apply for free Google Maps API key to enable interactive maps.';
 $string['iplookupmaxmindnote'] = 'This product includes GeoLite data created by MaxMind, available from <a href="http://www.maxmind.com/">http://www.maxmind.com/</a>.';
-$string['ishttpswarning'] = 'It has been detected that your site is not secured using HTTPS. For increased security and improved integrations with other systems is highly recommended to migrate your site to HTTPS.';
+$string['ishttpswarning'] = 'It has been detected that your site is not secured using HTTPS. It is strongly recommended to migrate your site to HTTPS for increased security and improved integration with other systems.';
 $string['keeptagnamecase'] = 'Keep tag name casing';
 $string['lang'] = 'Default language';
 $string['langcache'] = 'Cache language menu';

lang/en/badges.php

@@ -85,9 +85,9 @@ $string['backpackconnection_help'] = 'This page allows you to set up connection
 
 Currently, only <a href="http://backpack.openbadges.org">Mozilla OpenBadges Backpack</a> is supported. You need to sign up for a backpack service before trying to set up backpack connection on this page.';
 $string['backpackconnectioncancelattempt'] = 'Connect using a different email address';
-$string['backpackconnectionconnect'] = 'Connect to Backpack';
+$string['backpackconnectionconnect'] = 'Connect to backpack';
 $string['backpackconnectionresendemail'] = 'Resend verification email';
-$string['backpackconnectionunexpectedresult'] = 'There was a problem contacting the Backpack. Please try again.<br><br>If this problem persists, please contact your system administrator.';
+$string['backpackconnectionunexpectedresult'] = 'There was a problem connecting to your backpack. Please try again.<br><br>If the problem persists, contact your administrator.';
 $string['backpackdetails'] = 'Backpack settings';
 $string['backpackemail'] = 'Email address';
 $string['backpackemail_help'] = 'The email address associated with your backpack. While you are connected, any badges earned on this site will be associated with this email address.';
@@ -100,7 +100,7 @@ $string['backpackemailverifyemailbody'] = 'Hi,
 
 A new connection to your OpenBadges backpack has been requested from \'{$a->sitename}\' using your email address.
 
-To confirm and activate the connection to your backpack, please click the link below.
+To confirm and activate the connection to your backpack, please go to
 
 {$a->link}
 
@@ -110,7 +110,7 @@ If you need help, please contact the site administrator,
 {$a->admin}';
 $string['backpackemailverifyemailsubject'] = '{$a}: OpenBadges Backpack email verification';
 $string['backpackemailverifypending'] = 'A verification email has been sent to <strong>{$a}</strong>. Click on the verification link in the email to activate your Backpack connection.';
-$string['backpackemailverifysuccess'] = 'Thanks for verifying your email address. You are now connected to your Backpack.';
+$string['backpackemailverifysuccess'] = 'Thanks for verifying your email address. You are now connected to your backpack.';
 $string['backpackemailverifytokenmismatch'] = 'The token in the link you clicked does not match the stored token. Make sure you clicked the link in most recent email you received.';
 $string['backpackimport'] = 'Badge import settings';
 $string['backpackimport_help'] = 'After the backpack connection is successfully established, badges from your backpack can be displayed on your badges page and your profile page.

lang/en/calendar.php

@@ -64,7 +64,7 @@ $string['errorcannotimport'] = 'You cannot set up a calendar subscription at thi
 $string['errorhasuntilandcount'] = 'Either UNTIL or COUNT may appear in a recurrence rule, but UNTIL and COUNT MUST NOT occur in the same recurrence rule.';
 $string['errorinvalidbydaysuffix'] = 'Valid values for the day of the week parts of the BYDAY rule are MO, TU, WE, TH, FR, SA and SU';
 $string['errorinvalidbydayprefix'] = 'Integer values preceding BYDAY rules can only be present for MONTHLY or YEARLY RRULE.';
-$string['errorinvalidbyhour'] = 'Valid values for the BYHOUR rule are 0 to 59.';
+$string['errorinvalidbyhour'] = 'Valid values for the BYHOUR rule are 0 to 23.';
 $string['errorinvalidinterval'] = 'The value for the INTERVAL rule must be a positive integer.';
 $string['errorinvalidbyminute'] = 'Valid values for the BYMINUTE rule are 0 to 59.';
 $string['errorinvalidbymonth'] = 'Valid values for the BYMONTH rule are 1 to 12.';

lang/en/error.php

@@ -390,7 +390,7 @@ $string['moduledisable'] = 'This module ({$a}) has been disabled for this partic
 $string['moduledoesnotexist'] = 'This module does not exist';
 $string['moduleinstancedoesnotexist'] = 'The instance of this module does not exist';
 $string['modulemissingcode'] = 'Module {$a} is missing the code needed to perform this function';
-$string['movecatcontentstoroot'] = 'Moving the category content to root is not allowed. You must move the contents to an existant category!';
+$string['movecatcontentstoroot'] = 'Moving the category content to root is not allowed. You must move the contents to an existing category!';
 $string['movecategorynotpossible'] = 'You cannot move category \'{$a}\' into the selected category.';
 $string['movecategoryownparent'] = 'You cannot make category \'{$a}\' a parent of itself.';
 $string['movecategoryparentconflict'] = 'You cannot make category \'{$a}\' a subcategory of one of its own subcategories.';

lang/en/install.php

@@ -217,7 +217,7 @@ $string['pathswrongadmindir'] = 'Admin directory does not exist';
 $string['pgsqlextensionisnotpresentinphp'] = 'PHP has not been properly configured with the PGSQL extension so that it can communicate with PostgreSQL.  Please check your php.ini file or recompile PHP.';
 $string['phpextension'] = '{$a} PHP extension';
 $string['phpversion'] = 'PHP version';
-$string['phpversionhelp'] = '<p>Moodle requires a PHP version of at least 5.4.4 (7.x has some engine limitations).</p>
+$string['phpversionhelp'] = '<p>Moodle requires a PHP version of at least 5.4.4 (7.0.x has some engine limitations).</p>
 <p>You are currently running version {$a}.</p>
 <p>You must upgrade PHP or move to a host with a newer version of PHP.</p>';
 $string['releasenoteslink'] = 'For information about this version of Moodle, please see the release notes at {$a}';