Merge branch 'MDL-79323-master-enfix' of https://github.com/vmdef/moodle

admin/tool/mfa/factor/admin/lang/en/factor_admin.php

@@ -25,6 +25,6 @@
 
 $string['info'] = 'This factor allows for NOT being an administrator to count as a factor. Its intended use is to ensure administators require tighter security, so regular users get the weight for free, while admins must use other factors.';
 $string['pluginname'] = 'Non-administrator';
-$string['privacy:metadata'] = 'The Admin factor plugin does not store any personal data';
+$string['privacy:metadata'] = 'The Non-administrator factor plugin does not store any personal data.';
 $string['settings:weight_help'] = 'Weight is given to regular users for this factor, so admins must have more factors than a regular user to pass.';
 $string['summarycondition'] = 'is not an admin';

admin/tool/mfa/factor/auth/lang/en/factor_auth.php

@@ -23,9 +23,9 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['info'] = 'Check the type of authentication used to login as an MFA factor.';
+$string['info'] = 'Check the type of authentication used to log in as an MFA factor.';
 $string['pluginname'] = 'Authentication type';
-$string['privacy:metadata'] = 'The Auth Factor plugin does not store any personal data';
+$string['privacy:metadata'] = 'The Authentication type factor plugin does not store any personal data.';
 $string['settings:goodauth'] = 'Factor authentication types';
 $string['settings:goodauth_help'] = 'Select all authentication types to use as a factor for MFA. Any types not selected will not be treated as a FAIL in MFA.';
 $string['summarycondition'] = 'has an authentication type of {$a}';

admin/tool/mfa/factor/capability/lang/en/factor_capability.php

@@ -25,7 +25,7 @@
 
 $string['capability:cannotpassfactor'] = 'STOPS a role from passing the MFA user capability factor.';
 $string['pluginname'] = 'User capability';
-$string['privacy:metadata'] = 'The  user capability factor plugin does not store any personal data';
+$string['privacy:metadata'] = 'The User capability factor plugin does not store any personal data.';
 $string['settings:adminpasses'] = 'Site admins can pass this factor';
 $string['settings:adminpasses_help'] = 'By default admins pass all capability checks, including this one which uses \'factor/capability:cannotpassfactor\', which means they will fail this factor.
     If checked then all site admins will pass this factor if they do not have this capability from another role.

admin/tool/mfa/factor/cohort/lang/en/factor_cohort.php

@@ -23,8 +23,8 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Cohort Factor';
-$string['privacy:metadata'] = 'The cohort membership factor plugin does not store any personal data';
+$string['pluginname'] = 'Cohort';
+$string['privacy:metadata'] = 'The Cohort factor plugin does not store any personal data.';
 $string['settings:cohort'] = 'Non-passing cohorts';
 $string['settings:cohort_help'] = 'Select the cohorts that will not pass this factor. This allows you to force these cohorts to use other factors to authenticate.';
 $string['summarycondition'] = 'does NOT have any of the following cohorts assigned in any context: {$a}';

admin/tool/mfa/factor/email/lang/en/factor_email.php

@@ -23,14 +23,13 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['email:accident'] = 'If you did not request this email, click continue to attempt to invalidate the login attempt.
-    If you clicked this link by accident, click cancel, and no action will be taken.';
+$string['email:accident'] = 'If you didn\'t request the email, click continue to invalidate the login attempt. If you clicked the link by accident, click cancel, and no action will be taken.';
 $string['email:browseragent'] = 'The browser details for this request are: \'{$a}\'';
 $string['email:geoinfo'] = 'This request appears to have originated from approximately:';
 $string['email:greeting'] = 'Hello {$a} 👋';
 $string['email:ipinfo'] = 'Login request details:';
-$string['email:link'] = 'this verification link';
-$string['email:loginlink'] = 'Or, if you\'re on the same device, use {$a}.';
+$string['email:link'] = 'verification link';
+$string['email:loginlink'] = 'Or, if you\'re on the same device, use this {$a}.';
 $string['email:message'] = 'Here\'s your verification code for {$a->sitename} ({$a->siteurl}).';
 $string['email:originatingip'] = 'This login request was made from \'{$a}\'';
 $string['email:revokelink'] = 'If this wasn\'t you, you can {$a}.';
@@ -44,22 +43,22 @@ $string['error:badcode'] = 'Code was not found. This may be an old link, a new c
 $string['error:parameters'] = 'Incorrect page parameters.';
 $string['error:wrongverification'] = 'Wrong code. Try again.';
 $string['event:unauthemail'] = 'Unauthorised email received';
-$string['info'] = '<p>Built-in factor. Uses e-mail address mentioned in user profile for sending verification codes</p>';
+$string['info'] = 'Built-in factor. A verification code is sent to the user\'s email.';
 $string['logindesc'] = 'We\'ve just sent a 6-digit code to your email: {$a}';
 $string['loginoption'] = 'Have a code emailed to you';
 $string['loginskip'] = "I didn't receive a code";
 $string['loginsubmit'] = 'Continue';
 $string['logintitle'] = "Verify it's you by email";
-$string['pluginname'] = 'E-Mail Factor';
-$string['privacy:metadata'] = 'The E-Mail Factor plugin does not store any personal data';
+$string['pluginname'] = 'Email';
+$string['privacy:metadata'] = 'The Email factor plugin does not store any personal data';
 $string['settings:duration'] = 'Validity duration';
 $string['settings:duration_help'] = 'The period of time that the code is valid.';
 $string['settings:suspend'] = 'Suspend unauthorised accounts';
 $string['settings:suspend_help'] = 'Check this to suspend user accounts if an unauthorised email verification is received.';
-$string['setupfactor'] = 'E-Mail Factor setup';
+$string['setupfactor'] = 'Email factor setup';
 $string['summarycondition'] = 'has valid email setup';
-$string['unauthloginattempt'] = 'The user with id {$a->userid} made an unauthorised login attempt using email verification from
-IP {$a->ip} with browser agent {$a->useragent}';
-$string['unauthemail'] = 'Unauthorised Email';
+$string['unauthloginattempt'] = 'The user with ID {$a->userid} made an unauthorised login attempt using email verification from
+IP {$a->ip} with browser agent {$a->useragent}.';
+$string['unauthemail'] = 'Unauthorised email';
 $string['verificationcode'] = 'Enter verification code for confirmation';
-$string['verificationcode_help'] = 'Verification code has been sent to your email address';
+$string['verificationcode_help'] = 'A verification code has been sent to your email.';

admin/tool/mfa/factor/grace/lang/en/factor_grace.php

@@ -28,15 +28,14 @@ $string['pluginname'] = 'Grace period';
 $string['preferences'] = 'User preferences';
 $string['privacy:metadata'] = 'The Grace period factor plugin does not store any personal data';
 $string['redirectsetup'] = 'You must complete setup for Multi-factor authentication before you can proceed.';
-$string['revokeexpiredfactors'] = 'Revoke expired gracemode factors';
+$string['revokeexpiredfactors'] = 'Revoke expired grace period factors';
 $string['settings:customwarning'] = 'Warning banner content';
 $string['settings:customwarning_help'] = 'Add content here to replace the grace warning notification with custom HTML contents. Adding {timeremaining} in text will replace it with the current grace duration for the user, and {setuplink} will replace with the URL of the setup page for the user.';
 $string['settings:forcesetup'] = 'Force factor setup';
-$string['settings:forcesetup_help'] = 'Forces a user to the preferences page to setup MFA when the gracemode period expires. If set to off, users will be unable to authenticate when the grace period expires.';
+$string['settings:forcesetup_help'] = 'Forces a user to the preferences page to set up multi-factor authentication when the grace period expires. If unchecked, users will be unable to authenticate when the grace period expires.';
 $string['settings:graceperiod'] = 'Grace period';
-$string['settings:graceperiod_help'] = 'Period of time when users can access Moodle without configured and enabled factors';
+$string['settings:graceperiod_help'] = 'Period of time when users can access the site without configured and enabled factors.';
 $string['settings:ignorelist'] = 'Ignored factors';
-$string['settings:ignorelist_help'] = 'Grace will not give points if there are other factors that users can use to authenticate with MFA. Any factors here will not be counted by grace when deciding whether to give points. This can allow Grace to allow authentication if another factor like email, is suffering configuration or system issues.';
-$string['setupfactors'] = 'You are currently in grace mode, and may not have enough factors setup to login once the grace period is over.
-    Visit {$a->url} to check your authentication status, and setup more authentication factors. Your grace period expires in {$a->time}.';
+$string['settings:ignorelist_help'] = 'Grace period will not give points if there are other factors that users can use to authenticate with multi-factor authentication. Any factors here will not be counted by Grace period when deciding whether to give points. This can allow Grace period to allow authentication if another factor like email, has configuration or system issues.';
+$string['setupfactors'] = 'You are currently in the grace period, and may not have enough factors set up to log in once the grace period expires. Go to {$a->url} to check your authentication status and set up more authentication factors. Your grace period expires in {$a->time}.';
 $string['summarycondition'] = 'is within grace period';

admin/tool/mfa/factor/iprange/lang/en/factor_iprange.php

@@ -23,11 +23,11 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['allowedipsempty'] = 'Nobody will pass this factor! You can add your own IP address (<i>{$a->ip}</i>)';
+$string['allowedipsempty'] = 'Nobody will currently pass this factor! You can add your own IP address (<i>{$a->ip}</i>)';
 $string['allowedipshasmyip'] = 'Your IP (<i>{$a->ip}</i>) is in the list and you will pass this factor.';
 $string['allowedipshasntmyip'] = 'Your IP (<i>{$a->ip}</i>) is not in the list and you will not pass this factor.';
-$string['pluginname'] = 'IP Range Factor';
-$string['privacy:metadata'] = 'The IP Range Factor plugin does not store any personal data';
+$string['pluginname'] = 'IP range';
+$string['privacy:metadata'] = 'The IP range factor plugin does not store any personal data.';
 $string['settings:safeips'] = 'Safe IP ranges';
-$string['settings:safeips_help'] = 'Enter a list of IP addresses or subnets to be counted as a pass in factor. If empty noone will pass this factor. {$a->info} {$a->syntax}';
+$string['settings:safeips_help'] = 'Enter a list of IP addresses or subnets to be counted as a pass in factor. If empty nobody will pass this factor. {$a->info} {$a->syntax}';
 $string['summarycondition'] = 'is on a secured network';

admin/tool/mfa/factor/nosetup/lang/en/factor_nosetup.php

@@ -24,7 +24,7 @@
  */
 
 $string['deleteunusablefactors'] = 'Delete unusable Nosetup factors';
-$string['info'] = 'This factor passes if the user has no other factors setup.';
+$string['info'] = 'This factor passes if the user has no other factors set up.';
 $string['pluginname'] = 'No other factors';
 $string['privacy:metadata'] = 'The No other factors plugin does not store any personal data';
-$string['summarycondition'] = 'has no other factors setup';
+$string['summarycondition'] = 'has no other factors set up';

admin/tool/mfa/factor/role/lang/en/factor_role.php

@@ -23,8 +23,8 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Role Factor';
-$string['privacy:metadata'] = 'The  user capability factor plugin does not store any personal data';
+$string['pluginname'] = 'Role';
+$string['privacy:metadata'] = 'The Role factor plugin does not store any personal data.';
 $string['settings:roles'] = 'Non-passing roles';
 $string['settings:roles_help'] = 'Select the roles that will not pass this factor. This allows you to force these roles to use other factors to authenticate.';
 $string['summarycondition'] = 'does NOT have any of the following roles assigned in any context: {$a}';

admin/tool/mfa/factor/token/lang/en/factor_token.php

@@ -26,10 +26,10 @@
 $string['event:token_created'] = 'MFA token created.';
 $string['form:trust'] = 'Trust this device for {$a}.';
 $string['pluginname'] = 'Trust this device';
-$string['privacy:metadata'] = 'The token factor plugin does not store any personal data.';
+$string['privacy:metadata'] = 'The Trust this device factor plugin does not store any personal data.';
 $string['settings:expireovernight'] = 'Expire trust overnight';
-$string['settings:expireovernight_help'] = 'This forces tokens to expire overnight, preventing mid-day interruptions for users. Instead they will be asked to MFA authenticate at the start of a day after expiry.';
+$string['settings:expireovernight_help'] = 'This forces tokens to expire overnight, preventing midday interruptions for users. Instead they will be asked to multi-factor authenticate at the start of a day after expiry.';
 $string['settings:expiry'] = 'Trust duration';
-$string['settings:expiry_help'] = 'The duration a device is trusted before requiring a new MFA authentication.';
+$string['settings:expiry_help'] = 'The duration a device is trusted before requiring a new multi-factor authentication.';
 $string['summarycondition'] = 'the user has previously trusted this device';
-$string['tokenstoredindevice'] = 'The user with id {$a->userid} had an MFA token stored on their device. <br> Information: {$a->string}.';
+$string['tokenstoredindevice'] = 'The user with ID {$a->userid} has a multi-factor authentication token stored on their device. <br> Information: {$a->string}.';

admin/tool/mfa/factor/totp/lang/en/factor_totp.php

@@ -24,22 +24,22 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['action:revoke'] = 'Revoke TOTP authenticator';
+$string['action:revoke'] = 'Revoke time-based one-time password (TOTP) authenticator';
 $string['devicename'] = 'Device label';
-$string['devicename_help'] = 'This is the device you have an authenticator app installed on. You can setup multiple devices so this label helps track which ones are being used. You should setup each device with their own unique code so they can be revoked separately.';
+$string['devicename_help'] = 'This is the device you have an authenticator app installed on. You can set up multiple devices so this label helps track which ones are being used. You should set up each device with their own unique code so they can be revoked separately.';
 $string['devicenameexample'] = 'eg "Work iPhone 11"';
-$string['error:alreadyregistered'] = 'This TOTP secret has already been registered';
+$string['error:alreadyregistered'] = 'This time-based one-time password (TOTP) secret has already been registered.';
 $string['error:codealreadyused'] = 'This code has already been used to authenticate. Please wait for a new code to be generated, and try again.';
 $string['error:futurecode'] = 'This code is invalid. Please verify the time on your authenticator device is correct and try again.
     Current system time is {$a}.';
 $string['error:oldcode'] = 'This code is too old. Please verify the time on your authenticator device is correct and try again.
     Current system time is {$a}.';
 $string['error:wrongverification'] = 'Incorrect verification code';
-$string['factorsetup'] = 'Setup App';
-$string['info'] = '<p>Use any TOTP authenticator app to get a verification code on your phone even when it is offline.</p>
-eg. <ul><li><a href="https://authy.com/download/">Twilio Authy</a></li>
-<li><a href="https://www.microsoft.com/en-us/account/authenticator#getapp">Microsoft Authenticator</a></li>
-<li>Google Authenticator for <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> or <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a></li></ul>
+$string['factorsetup'] = 'App setup';
+$string['info'] = '<p>Use any time-based one-time password (TOTP) authenticator app on your device to generate a verification code, even when it is offline.</p>
+
+<p>For example <a href="https://2fas.com/">2FAS Auth</a>, <a href="https://freeotp.github.io/">FreeOTP</a>, Google Authenticator, Microsoft Authenticator or Twilio Authy.</p>
+
 <p>Note: Please ensure your device time and date has been set to "Auto" or "Network provided".</p>';
 $string['logindesc'] = 'Use the authenticator app in your mobile device to generate a code.';
 $string['loginoption'] = 'Use Authenticator application';
@@ -47,7 +47,7 @@ $string['loginskip'] = 'I don\'t have my device';
 $string['loginsubmit'] = 'Continue';
 $string['logintitle'] = 'Verify it\'s you by mobile app';
 $string['pluginname'] = 'Authenticator app';
-$string['privacy:metadata'] = 'The TOTP factor plugin does not store any personal data';
+$string['privacy:metadata'] = 'The Authenticator app factor plugin does not store any personal data.';
 $string['settings:totplink'] = 'Show mobile app setup link';
 $string['settings:totplink_help'] = 'If enabled the user will see a 3rd setup option with a direct otpauth:// link';
 $string['settings:window'] = 'TOTP verification window';

admin/tool/mfa/factor/webauthn/lang/en/factor_webauthn.php

@@ -37,8 +37,8 @@ $string['loginoption'] = 'Use authenticator token';
 $string['loginskip'] = 'I don\'t have my security key';
 $string['loginsubmit'] = 'Continue';
 $string['logintitle'] = 'Verify it\'s you by authenticator token';
-$string['pluginname'] = 'Security Key';
-$string['privacy:metadata'] = 'The WebAuthn factor plugin does not store any personal data';
+$string['pluginname'] = 'Security key';
+$string['privacy:metadata'] = 'The Security key factor plugin does not store any personal data.';
 $string['register'] = 'Register authenticator';
 $string['settings:authenticatortypes'] = 'Types of authenticator';
 $string['settings:authenticatortypes_help'] = 'Toggle certain types of authenticators';

admin/tool/mfa/lang/en/tool_mfa.php

@@ -34,37 +34,36 @@ $string['created'] = 'Created';
 $string['createdfromip'] = 'Created from IP';
 $string['debugmode:heading'] = 'Debug mode';
 $string['devicename'] = 'Device';
-$string['email:subject'] = 'Unable to login to {$a}';
+$string['email:subject'] = 'Unable to log in to {$a}';
 $string['enablefactor'] = 'Enable factor';
 $string['error:actionnotfound'] = 'Action \'{$a}\' not supported';
 $string['error:directaccess'] = 'This page shouldn\'t be accessed directly';
-$string['error:factornotenabled'] = 'MFA Factor \'{$a}\' not enabled';
-$string['error:factornotfound'] = 'MFA Factor \'{$a}\' not found';
+$string['error:factornotenabled'] = 'Multi-factor authentication factor \'{$a}\' not enabled';
+$string['error:factornotfound'] = 'Multi-factor authentication factor \'{$a}\' not found';
 $string['error:notenoughfactors'] = 'Unable to authenticate';
-$string['error:reauth'] = 'We couldn\'t confirm your identity sufficiently to meet this sites authentication security policy.<br>This may be due to: <br> 1) Steps being locked - please wait a few minutes and try again.
-     <br> 2) Steps being failed - please double check the details in each step. <br> 3) Steps were skipped - please reload this page or try logging in again.';
-$string['error:revoke'] = 'Can not revoke factor';
-$string['error:setupfactor'] = 'Can not setup factor';
-$string['error:support'] = 'If you are still unable to login, or believe you are seeing this in error,
-     please send an email to the following address for support:';
-$string['error:wrongfactorid'] = 'Factor id \'{$a}\' is incorrect';
-$string['event:failfactor'] = 'MFA Authentication failed due to a failed factor.';
-$string['event:faillockout'] = 'MFA Authentication failed due to too many attempts.';
-$string['event:failnotenoughfactors'] = 'MFA Authentication failed due to not enough satisfied factors.';
-$string['event:userdeletedfactor'] = 'Factor Deleted';
-$string['event:userfailedmfa'] = 'User failed MFA authentication';
+$string['error:reauth'] = 'We couldn\'t confirm your identity sufficiently to meet the site authentication security policy.<br>This may be due to: <br> 1) Steps being locked - please wait a few minutes and try again.
+     <br> 2) Steps being failed - please double check the details for each step. <br> 3) Steps were skipped - please reload this page or try logging in again.';
+$string['error:revoke'] = 'Can\'t revoke factor';
+$string['error:setupfactor'] = 'Can\'t set up factor';
+$string['error:support'] = 'If you are still unable to log in, or believe you are seeing this in error, please email:';
+$string['error:wrongfactorid'] = 'Factor ID \'{$a}\' is incorrect';
+$string['event:failfactor'] = 'Multi-factor authentication failed due to a failed factor.';
+$string['event:faillockout'] = 'Multi-factor authentication failed due to too many attempts.';
+$string['event:failnotenoughfactors'] = 'Multi-factor authentication failed due to not enough satisfied factors.';
+$string['event:userdeletedfactor'] = 'Factor deleted';
+$string['event:userfailedmfa'] = 'User failed multi-factor authentication';
 $string['event:userpassedmfa'] = 'Verification passed';
 $string['event:userrevokedfactor'] = 'Factor revocation';
 $string['event:usersetupfactor'] = 'Factor setup';
 $string['factor'] = 'Factor';
 $string['factorreport'] = 'All factor report';
-$string['factorreset'] = 'Your MFA \'{$a->factor}\' has been reset by a site administrator. You may need to set up this factor again. {$a->url}';
-$string['factorresetall'] = 'All your MFA factors have been reset by a site administrator. You may need to set up these factors again. {$a}';
+$string['factorreset'] = 'Your multi-factor authentication \'{$a->factor}\' has been reset by a site administrator. You may need to set up this factor again. {$a->url}';
+$string['factorresetall'] = 'All your multi-factor authentication factors have been reset by a site administrator. You may need to set up these factors again. {$a}';
 $string['factorrevoked'] = 'Factor \'{$a}\' successfully revoked.';
-$string['factorsetup'] = 'Factor \'{$a}\' successfully setup.';
+$string['factorsetup'] = 'Factor \'{$a}\' successfully set up.';
 $string['fallback'] = 'Fallback factor';
 $string['fallback_info'] = 'This factor is a fallback if no other factors are configured. This factor will always fail.';
-$string['guidance'] = 'MFA user guide';
+$string['guidance'] = 'Multi-factor authentication user guide';
 $string['inputrequired'] = 'User input';
 $string['ipatcreation'] = 'IP address when factor created';
 $string['lastverified'] = 'Last verified';
@@ -72,10 +71,10 @@ $string['locked'] = '{$a} (Unavailable)';
 $string['lockedusersforallfactors'] = 'Locked users: All factors';
 $string['lockedusersforfactor'] = 'Locked users: {$a}';
 $string['lockoutnotification'] = 'You have {$a} attempts left.';
-$string['mfa'] = 'MFA';
+$string['mfa'] = 'Multi-factor authentication';
 $string['mfa:mfaaccess'] = 'Interact with MFA';
 $string['mfareports'] = 'MFA reports';
-$string['mfasettings'] = 'Manage MFA';
+$string['mfasettings'] = 'Manage multi-factor authentication';
 $string['na'] = 'n/a';
 $string['needhelp'] = 'Need help?';
 $string['nologinusers'] = 'Not logged in';
@@ -89,22 +88,22 @@ $string['preferences:availablefactors'] = 'Available factors';
 $string['preferences:header'] = 'Multi-factor authentication preferences';
 $string['preferenceslink'] = 'Click here to go to user preferences.';
 $string['privacy:metadata:tool_mfa'] = 'Data with configured MFA factors';
-$string['privacy:metadata:tool_mfa:createdfromip'] = 'IP that the factor was setup from';
+$string['privacy:metadata:tool_mfa:createdfromip'] = 'IP that the factor was set up from.';
 $string['privacy:metadata:tool_mfa:factor'] = 'Factor type';
 $string['privacy:metadata:tool_mfa:id'] = 'Record ID';
-$string['privacy:metadata:tool_mfa:label'] = 'label for factor instance, eg device or email';
+$string['privacy:metadata:tool_mfa:label'] = 'Label for factor instance, e.g. device or email.';
 $string['privacy:metadata:tool_mfa:lastverified'] = 'Time user was last verified with this factor';
 $string['privacy:metadata:tool_mfa:secret'] = 'Any secret data for factor';
-$string['privacy:metadata:tool_mfa:timecreated'] = 'Time the factor instance was setup';
+$string['privacy:metadata:tool_mfa:timecreated'] = 'Time the factor instance was set up.';
 $string['privacy:metadata:tool_mfa:timemodified'] = 'Time factor was last modified';
 $string['privacy:metadata:tool_mfa:userid'] = 'The ID of the user that factor belongs to';
-$string['privacy:metadata:tool_mfa_auth'] = 'This database table stores the last time a successful MFA auth was registered for a user id.';
+$string['privacy:metadata:tool_mfa_auth'] = 'The last time a successful multi-factor authentication was registered for a user ID.';
 $string['privacy:metadata:tool_mfa_auth:lastverified'] = 'Time user was last authenticated with';
 $string['privacy:metadata:tool_mfa_auth:userid'] = 'The user this timestamp is associated with.';
-$string['privacy:metadata:tool_mfa_secrets'] = 'This database table stores temporary secrets for user authentication.';
+$string['privacy:metadata:tool_mfa_secrets'] = 'Temporary secrets for user authentication.';
 $string['privacy:metadata:tool_mfa_secrets:factor'] = 'The factor this secret is associated with.';
 $string['privacy:metadata:tool_mfa_secrets:secret'] = 'The secret security code.';
-$string['privacy:metadata:tool_mfa_secrets:sessionid'] = 'The sessionid this secret is associated with.';
+$string['privacy:metadata:tool_mfa_secrets:sessionid'] = 'The session ID this secret is associated with.';
 $string['privacy:metadata:tool_mfa_secrets:userid'] = 'The user this secret is associated with.';
 $string['redirecterrordetected'] = 'Unsupported redirect detected, script execution terminated. Redirection error occured between MFA and {$a}.';
 $string['resetconfirm'] = 'Reset user factor';
@@ -135,11 +134,11 @@ $string['settings:guidancefiles_help'] = 'Add any files here to use in the guida
 $string['settings:guidancepage'] = 'Guidance page content';
 $string['settings:guidancepage_help'] = 'HTML here will be displayed on the guidance page. Enter filenames from the filearea to embed the file with the resolved path {{filename}} or as a html link using {{{filename}}}.';
 $string['settings:lockout'] = 'Lockout threshold';
-$string['settings:lockout_help'] = 'Amount of attempts a user has at answering input factors before they are not permitted to login.';
-$string['settings:redir_exclusions'] = 'Urls which should not redirect the MFA check';
+$string['settings:lockout_help'] = 'Number of attempts a user can answer input factors before they are prevented from logging in.';
+$string['settings:redir_exclusions'] = 'URLS which should not redirect the MFA check.';
 $string['settings:redir_exclusions_help'] = 'Each new line is a relative URL from the siteroot for which the MFA check will not redirect from';
 $string['settings:weight'] = 'Factor weight';
-$string['settings:weight_help'] = 'The weight of this factor if passed. A user needs at least 100 points to login.';
+$string['settings:weight_help'] = 'The weight of this factor if passed. A user needs at least 100 points to log in.';
 $string['setup'] = 'Setup';
 $string['setupfactor'] = 'Setup factor';
 $string['setuprequired'] = 'User setup';
@@ -156,7 +155,7 @@ $string['userempty'] = 'User cannot be empty.';
 $string['userlogs'] = 'User logs';
 $string['usernotfound'] = 'Unable to locate user.';
 $string['usersauthedinperiod'] = 'Logged in';
-$string['verification'] = '2-Step Verification';
+$string['verification'] = '2-step verification';
 $string['verification_desc'] = 'To keep your account safe, we need to check that this is really you.';
 $string['verificationcode'] = 'Enter code';
 $string['verificationcode_help'] = 'The verification code provided by the current authentication factor.';

availability/tests/behat/edit_availability.feature

@@ -235,16 +235,16 @@ Feature: edit_availability
     And I press "Add restriction..."
     And I click on "Date" "button" in the "Add restriction..." "dialogue"
     And I press "Save changes"
-    # Testing edit settings link
-    And "Edit settings" "link" should exist in the "section-1" "core_availability > Section availability"
-    When I click on "Edit settings" "link" in the "section-1" "core_availability > Section availability"
+    # Testing edit restrictions link
+    And "Edit restrictions" "link" should exist in the "section-1" "core_availability > Section availability"
+    When I click on "Edit restrictions" "link" in the "section-1" "core_availability > Section availability"
     Then I should see "Restrict access"
     And I should not see "General"
     And I should see "Collapse all"
     And I should not see "Expand all"
     And I click on "Cancel" "button"
     And I am on "Course 1" course homepage with editing mode off
-    And I should not see "Edit settings"
+    And I should not see "Edit restrictions"
 
   @javascript
   Scenario: Edit activity availability using course page link
@@ -254,12 +254,12 @@ Feature: edit_availability
     And I press "Add restriction..."
     And I click on "Date" "button" in the "Add restriction..." "dialogue"
     When I press "Save and return to course"
-    # Edit settings link not displayed when editing mode is off.
-    Then "Edit settings" "link" should not exist in the "MyForum" "core_availability > Activity availability"
-    # Testing edit settings link
+    # Edit restrictions link not displayed when editing mode is off.
+    Then "Edit restrictions" "link" should not exist in the "MyForum" "core_availability > Activity availability"
+    # Testing edit restrictions link
     But I am on "Course 1" course homepage with editing mode on
-    And "Edit settings" "link" should exist in the "MyForum" "core_availability > Activity availability"
-    And I click on "Edit settings" "link" in the "MyForum" "core_availability > Activity availability"
+    And "Edit restrictions" "link" should exist in the "MyForum" "core_availability > Activity availability"
+    And I click on "Edit restrictions" "link" in the "MyForum" "core_availability > Activity availability"
     And I should see "Restrict access"
     And I should not see "Content"
     And I should see "Collapse all"

contentbank/tests/behat/delete_content.feature

@@ -43,7 +43,7 @@ Feature: Delete H5P file from the content bank
     And I click on "Delete" "link" in the ".cb-toolbar-container" "css_element"
     And I click on "Delete" "button" in the "Delete content" "dialogue"
     And I wait until the page is ready
-    And I should see "The content has been deleted."
+    And I should see "Content deleted."
     And I should not see "content2delete.h5p"
 
   Scenario: Users without the required capability can only delete their own content
@@ -94,5 +94,5 @@ Feature: Delete H5P file from the content bank
     Then I should see "Are you sure you want to delete the content 'content2delete.h5p'"
     And I should see "The content will only be deleted from the content bank"
     And I click on "Delete" "button" in the "Delete content" "dialogue"
-    And I should see "The content has been deleted."
+    And I should see "Content deleted."
     And I should not see "content2delete.h5p"

enrol/self/lang/en/enrol_self.php

@@ -79,7 +79,7 @@ $string['maxenrolled'] = 'Max enrolled users';
 $string['maxenrolled_help'] = 'Specifies the maximum number of users that can self enrol. 0 means no limit.';
 $string['maxenrolledreached'] = 'Maximum number of users allowed to self-enrol was already reached.';
 $string['messageprovider:expiry_notification'] = 'Self enrolment expiry notifications';
-$string['newenrols'] = 'Allow new enrolments';
+$string['newenrols'] = 'Allow new self enrolments';
 $string['newenrols_desc'] = 'Allow users to self enrol into new courses by default.';
 $string['newenrols_help'] = 'This setting determines whether a user can enrol into this course.';
 $string['nopassword'] = 'No enrolment key required.';
@@ -109,9 +109,9 @@ $string['sendcoursewelcomemessage_help'] = 'When a user self enrols in the cours
 $string['sendexpirynotificationstask'] = "Self enrolment send expiry notifications task";
 $string['showhint'] = 'Show hint';
 $string['showhint_desc'] = 'Show first letter of the guest access key.';
-$string['status'] = 'Allow existing enrolments';
+$string['status'] = 'Keep current self enrolments active';
 $string['status_desc'] = 'Enable self enrolment method in new courses.';
-$string['status_help'] = 'If enabled together with \'Allow new enrolments\' disabled, only users who self enrolled previously can access the course. If disabled, this self enrolment method is effectively disabled, since all existing self enrolments are suspended and new users cannot self enrol.';
+$string['status_help'] = 'If set to No, any existing participants who enrolled themselves into the course will no longer have access.';
 $string['syncenrolmentstask'] = 'Synchronise self enrolments task';
 $string['unenrol'] = 'Unenrol user';
 $string['unenrolselfconfirm'] = 'Do you really want to unenrol yourself from course "{$a}"?';

grade/report/singleview/lang/en/gradereport_singleview.php

@@ -77,7 +77,7 @@ $string['userselect'] = 'Select activity';
 
 $string['ariareporttype'] = 'Select a report type to view';
 $string['viewby'] = 'View by';
-$string['viewsingleuser'] = 'Select a user above to view all their grades';
+$string['viewsingleuser'] = 'Search for a user to view all their grades';
 $string['viewsinglegradeitem'] = 'Select a grade item above';
 $string['selectagrade'] = 'Select a grade item';
 $string['selectgradeitemlink'] = 'Select a grade item';

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

@@ -171,23 +171,23 @@ Feature: We can use Single view
 
   Scenario: Teacher sees his last viewed singleview report type when navigating back to the gradebook singleview report.
     Given I navigate to "View > Single view" in the course gradebook
-    And I should see "Select a user above to view all their grades" in the "region-main" "region"
+    And I should see "Search for a user to view all their grades" in the "region-main" "region"
     And I click on "Grade items" "link"
     And I should see "Select a grade item above" in the "region-main" "region"
     When I am on the "Course 1" "grades > Single view > View" page
     Then I should see "Select a grade item above" in the "region-main" "region"
     And I am on the "Course 1" "grades > Single view > View" page logged in as "teacher3"
-    And I should see "Select a user above to view all their grades" in the "region-main" "region"
+    And I should see "Search for a user to view all their grades" in the "region-main" "region"
 
   Scenario: Teacher sees his last viewed user report when navigating back to the gradebook singleview report.
     Given I navigate to "View > Single view" in the course gradebook
     And I click on "Gronya,Beecham" in the "user" search widget
     And I should see "Gronya,Beecham" in the "region-main" "region"
     When I am on the "Course 1" "grades > Single view > View" page
-    Then I should not see "Select a user above to view all their grades" in the "region-main" "region"
+    Then I should not see "Search for a user to view all their grades" in the "region-main" "region"
     And I should see "Gronya,Beecham" in the "region-main" "region"
     And I am on the "Course 1" "grades > Single view > View" page logged in as "teacher3"
-    And I should see "Select a user above to view all their grades" in the "region-main" "region"
+    And I should see "Search for a user to view all their grades" in the "region-main" "region"
 
   Scenario: Teacher sees his last viewed grade item report when navigating back to the gradebook singleview report.
     Given I navigate to "View > Single view" in the course gradebook
@@ -198,7 +198,7 @@ Feature: We can use Single view
     Then I should not see "Select a grade item above" in the "region-main" "region"
     And I should see "Test assignment one" in the "region-main" "region"
     And I am on the "Course 1" "grades > Single view > View" page logged in as "teacher3"
-    And I should see "Select a user above to view all their grades" in the "region-main" "region"
+    And I should see "Search for a user to view all their grades" in the "region-main" "region"
 
   Scenario: Teacher sees his last viewed user report if the user is a part of the the current group.
     Given the following "groups" exist:
@@ -217,7 +217,7 @@ Feature: We can use Single view
     And I click on "Group 1" in the "group" search widget
     When I navigate to "View > Single view" in the course gradebook
     Then I should see "Nee,Chumlee" in the "region-main" "region"
-    And I should not see "Select a user above to view all their grades" in the "region-main" "region"
+    And I should not see "Search for a user to view all their grades" in the "region-main" "region"
 
   Scenario: Teacher does not see his last viewed user report if the user is not a part of the the current group.
     Given the following "groups" exist:
@@ -235,7 +235,7 @@ Feature: We can use Single view
     And I navigate to "View > Grader report" in the course gradebook
     And I click on "Group 1" in the "group" search widget
     When I navigate to "View > Single view" in the course gradebook
-    Then I should see "Select a user above to view all their grades" in the "region-main" "region"
+    Then I should see "Search for a user to view all their grades" in the "region-main" "region"
     And I should not see "Gronya,Beecham" in the "region-main" "region"
 
   Scenario: Teacher does not see his last viewed user report if that user is no longer enrolled in the course.
@@ -245,7 +245,7 @@ Feature: We can use Single view
     And I click on "Unenrol" "icon" in the "Gronya,Beecham" "table_row"
     And I click on "Unenrol" "button" in the "Unenrol" "dialogue"
     When I am on the "Course 1" "grades > Single view > View" page
-    Then I should see "Select a user above to view all their grades" in the "region-main" "region"
+    Then I should see "Search for a user to view all their grades" in the "region-main" "region"
     And I should not see "Gronya,Beecham" in the "region-main" "region"
 
   Scenario: Teacher does not see his last viewed grade item report if the item no longer exists in the course.

grade/report/user/lang/en/gradereport_user.php

@@ -31,7 +31,7 @@ $string['gotopreviousreport'] = 'Go to previous user report';
 $string['pluginname'] = 'User report';
 $string['user:view'] = 'View user report';
 $string['userreportdesc'] = 'User reports include a user’s grades, feedback and the course total.';
-$string['userreports'] = 'Select a user above to view their report';
+$string['userreports'] = 'Search for a user to view their report';
 $string['privacy:metadata:preference:gradereport_user_view_user'] = 'Whether to view report as current user or another user in the gradebook reports';
 $string['tablesummary'] = 'The table is arranged as a list of graded items including categories of graded items. When items are in a category they will be indicated as such.';
 $string['userreport_user'] = 'User report';

grade/report/user/tests/behat/view_usereport.feature

@@ -24,14 +24,14 @@ Feature: We can use the user report
       | teacher2 | C1     | editingteacher |
       | student1 | C1     | student        |
     And I am on the "Course 1" "grades > User report > View" page logged in as "teacher1"
-    And I should see "Select a user above to view their report" in the "region-main" "region"
+    And I should see "Search for a user to view their report" in the "region-main" "region"
     And I click on "Student 1" in the "user" search widget
     And I should see "Student 1" in the "region-main" "region"
     When I am on the "Course 1" "grades > User report > View" page
-    Then I should not see "Select a user above to view their report" in the "region-main" "region"
+    Then I should not see "Search for a user to view their report" in the "region-main" "region"
     And I should see "Student 1" in the "region-main" "region"
     And I am on the "Course 1" "grades > User report > View" page logged in as "teacher2"
-    And I should see "Select a user above to view their report" in the "region-main" "region"
+    And I should see "Search for a user to view their report" in the "region-main" "region"
 
   Scenario: Teacher sees his last viewed user report if the user is a part of the the current group.
     Given the following "groups" exist:
@@ -56,7 +56,7 @@ Feature: We can use the user report
     And I click on "Group 1" in the "group" search widget
     When I navigate to "View > User report" in the course gradebook
     Then I should see "Student 2" in the "region-main" "region"
-    And I should not see "Select a user above to view their report" in the "region-main" "region"
+    And I should not see "Search for a user to view their report" in the "region-main" "region"
 
   Scenario: Teacher does not see the last viewed user if the user is not a part of the the current group.
     Given the following "groups" exist:
@@ -80,7 +80,7 @@ Feature: We can use the user report
     And I navigate to "View > Grader report" in the course gradebook
     And I click on "Group 1" in the "group" search widget
     When I navigate to "View > User report" in the course gradebook
-    Then I should see "Select a user above to view their report" in the "region-main" "region"
+    Then I should see "Search for a user to view their report" in the "region-main" "region"
     And I should not see "Student 1" in the "region-main" "region"
 
   Scenario: Teacher does not see his last viewed user report if the user is no longer enrolled in the course.
@@ -102,5 +102,5 @@ Feature: We can use the user report
     And I click on "Unenrol" "button" in the "Unenrol" "dialogue"
     And I am on "Course 1" course homepage
     When I navigate to "View > User report" in the course gradebook
-    Then I should see "Select a user above to view their report" in the "region-main" "region"
+    Then I should see "Search for a user to view their report" in the "region-main" "region"
     And I should not see "Student 1" in the "region-main" "region"

lang/en/admin.php

@@ -24,8 +24,8 @@
 
 $string['accessdenied'] = 'Access denied';
 $string['accounts'] = 'Accounts';
-$string['accountunlocked'] = 'Your account has been unlocked successfully. You may now login below.';
-$string['accountlocked'] = 'Your account has been locked. An unlock link has been sent to the email address associated with your account.';
+$string['accountunlocked'] = 'Your account is unlocked. You can log in.';
+$string['accountlocked'] = 'Your account is locked. An unlock link has been sent via email.';
 $string['addcategory'] = 'Add a category';
 $string['additionalhtml'] = 'Additional HTML';
 $string['additionalhtml_heading'] = 'Additional HTML to be added to every page.';

lang/en/availability.php

@@ -28,7 +28,7 @@ $string['and'] = 'and';
 $string['condition_group'] = 'Restriction set';
 $string['condition_group_info'] = 'Add a set of nested restrictions to apply complex logic.';
 $string['disabled_verb'] = 'Cannot be changed as ruleset includes a rule containing private data.';
-$string['editsettings'] = 'Edit settings';
+$string['editsettings'] = 'Edit restrictions';
 $string['enableavailability'] = 'Enable restricted access';
 $string['enableavailability_desc'] = 'If enabled, conditions (based on date, grade, completion etc.) may be set to control whether an activity or resource can be accessed.';
 $string['error_list_nochildren'] = 'Restriction sets should contain at least one condition.';

lang/en/communication.php

@@ -33,9 +33,9 @@ $string['managecommunicationproviders'] = 'Manage communication providers';
 $string['nocommunicationinstance'] = 'No communication instance found.';
 $string['nocommunicationprovider'] = 'No communication provider found.';
 $string['nocommunicationselected'] = 'None';
-$string['privacy:metadata:communication_user'] = 'The communication user table stores the user id and communication id for communication provider mapping.';
-$string['privacy:metadata:communication_user:commid'] = 'The communication id for user mapping';
-$string['privacy:metadata:communication_user:userid'] = 'The user id for communication provider mapping for users';
+$string['privacy:metadata:communication_user'] = 'The communication user table stores the user ID and communication ID for communication provider mapping.';
+$string['privacy:metadata:communication_user:commid'] = 'The communication ID for user mapping';
+$string['privacy:metadata:communication_user:userid'] = 'The user ID for communication provider mapping for users';
 $string['privacy:metadata:communication_user:synced'] = 'The user is synced with the provider or not';
 $string['seleccommunicationprovider'] = 'Communication service';
 $string['seleccommunicationprovider_help'] = 'The tool available for chat and related communication methods.';

lang/en/contentbank.php

@@ -26,16 +26,16 @@ $string['author'] = 'Author';
 $string['contentbank'] = 'Content bank';
 $string['choosecontext'] = 'Choose course or category...';
 $string['contentbankpreferences'] = 'Content bank preferences';
-$string['contentcopied'] = 'Content copied';
-$string['contentdeleted'] = 'The content has been deleted.';
+$string['contentcopied'] = 'Content copied.';
+$string['contentdeleted'] = 'Content deleted.';
 $string['contentname'] = 'Content name';
 $string['contentnotdeleted'] = 'An error was encountered while trying to delete the content.';
 $string['contentnotrenamed'] = 'An error was encountered while trying to rename the content.';
-$string['contentrenamed'] = 'The content has been renamed.';
+$string['contentrenamed'] = 'Content renamed.';
 $string['contentsmoved'] = 'Content bank contents moved to {$a}.';
 $string['contenttypenoaccess'] = 'You cannot view this {$a} instance.';
 $string['contenttypenoedit'] = 'You can not edit this content';
-$string['contentvisibilitychanged'] = 'The content has been made {$a}.';
+$string['contentvisibilitychanged'] = 'Content is now {$a}.';
 $string['contentvisibilitynotset'] = 'An error was encountered while trying to set the content visibility.';
 $string['contentcreated'] = 'Content created.';
 $string['contentupdated'] = 'Content updated.';

lang/en/error.php

@@ -426,8 +426,8 @@ $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['moodlenet:invalidshareformat'] = 'Invalid MoodleNet share format';
-$string['moodlenet:invalidsharestatus'] = 'Invalid MoodleNet share status';
+$string['moodlenet:invalidshareformat'] = 'Incorrect MoodleNet share format';
+$string['moodlenet:invalidsharestatus'] = 'Incorrect MoodleNet share status';
 $string['moodlenet:invalidsharetype'] = 'Invalid MoodleNet share type';
 $string['moodlenet:usernotconfigured'] = 'You do not have permission to share content to MoodleNet, or your account is incorrectly configured.';
 $string['movecatcontentstoroot'] = 'Moving the category content to root is not allowed. You must move the contents to an existing category!';
@@ -501,7 +501,7 @@ $string['opensslsignerror'] = 'OpenSSL unable to sign data';
 $string['opensslsealerror'] = 'OpenSSL unable to seal data';
 $string['pagenotexisttitle'] = '404 Error: File not found';
 $string['pagenotexist'] = '<p>An unusual error occurred trying to view a page that does not exist:</p>{$a}';
-$string['passwordexceeded'] = 'Password cannot be more than {$a} characters!';
+$string['passwordexceeded'] = 'The password can\'t be more than {$a} characters.';
 $string['pathdoesnotstartslash'] = 'No valid arguments supplied, path does not start with slash!';
 $string['pleasereport'] = 'If you have time, please let us know what you were trying to do when the error occurred:';
 $string['pluginrequirementsnotmet'] = 'Plugin "{$a->pluginname}" ({$a->pluginversion}) could not be installed.  It requires a newer version of Moodle (currently you are using {$a->currentmoodle}, you need {$a->requiremoodle}).';

lang/en/moodle.php

@@ -1387,14 +1387,14 @@ $string['moodlenet:deletedactivity'] = 'Deleted activity';
 $string['moodlenet:deletedcourse'] = 'Deleted course';
 $string['moodlenet:eventresourceexported'] = 'Resource exported';
 $string['moodlenet:gotomoodlenet'] = 'Go to MoodleNet drafts';
-$string['moodlenet:issuerisnotauthorized'] = 'MoodleNet issuer is not authorized';
+$string['moodlenet:issuerisnotauthorized'] = 'MoodleNet issuer is not authorised';
 $string['moodlenet:issuerisnotenabled'] = 'MoodleNet issuer is not enabled';
 $string['moodlenet:issuerisnotset'] = 'MoodleNet issuer is not set at site administration';
-$string['moodlenet:nosharedresources'] = 'There are no shared resources to display at this time';
+$string['moodlenet:nosharedresources'] = 'There are no shared resources to display at this time.';
 $string['moodlenet:outboundsettings'] = 'MoodleNet outbound settings';
-$string['moodlenet:sharenotice'] = 'This {$a->type} is being shared with MoodleNet as a {$a->sharetype}';
-$string['moodlenet:sharenoticepartial'] = 'The selected activities are being shared with MoodleNet as a {$a}';
-$string['moodlenet:sharenoticepartialactivitynumber'] = '{$a} activities will be included in the course';
+$string['moodlenet:sharenotice'] = 'This {$a->type} is being shared with MoodleNet as a {$a->sharetype}.';
+$string['moodlenet:sharenoticepartial'] = 'The selected activities are being shared with MoodleNet as a {$a}.';
+$string['moodlenet:sharenoticepartialactivitynumber'] = '{$a} activities will be included in the course.';
 $string['moodlenet:sharefailtitle'] = 'Something went wrong';
 $string['moodlenet:sharefailtext'] = 'There was an error sharing your content to MoodleNet.<br>Please try again later.';
 $string['moodlenet:sharefailtextwithsitesupport'] = 'There was an error sharing your content to MoodleNet.<br>Please try again later or <a href="{$a}">contact site support</a>.';
@@ -1766,7 +1766,7 @@ $string['privacy:metadata:moodlenet_share_progress:courseid'] = 'The associated
 $string['privacy:metadata:moodlenet_share_progress:cmid'] = 'The associated course module ID';
 $string['privacy:metadata:moodlenet_share_progress:userid'] = 'The user that performed the share';
 $string['privacy:metadata:moodlenet_share_progress:timecreated'] = 'The time the share was performed';
-$string['privacy:metadata:moodlenet_share_progress:resourceurl'] = 'The returned url from MoodleNet after a successful share';
+$string['privacy:metadata:moodlenet_share_progress:resourceurl'] = 'The returned URL from MoodleNet after a successful share';
 $string['privacy:metadata:moodlenet_share_progress:status'] = 'The resulting status of the share';
 $string['privacy:metadata:oauth2_refresh_token'] = 'Refresh token used in OAuth 2.0 communication';
 $string['privacy:metadata:oauth2_refresh_token:issuerid'] = 'The ID of the issuer to which the token corresponds';

lang/en/role.php

@@ -177,7 +177,7 @@ $string['course:changeidnumber'] = 'Change course ID number';
 $string['course:changelockedcustomfields'] = 'Change locked custom fields';
 $string['course:changeshortname'] = 'Change course short name';
 $string['course:changesummary'] = 'Change course summary';
-$string['course:configurecustomfields'] = 'Configure custom fields';
+$string['course:configurecustomfields'] = 'Configure course custom fields';
 $string['course:configuredownloadcontent'] = 'Configure download course content';
 $string['course:downloadcoursecontent'] = 'Download course content';
 $string['course:enrolconfig'] = 'Configure enrol instances in courses';

lib/editor/tiny/plugins/html/lang/en/tiny_html.php

@@ -26,5 +26,5 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['helplinktext'] = 'HTML format helper';
-$string['pluginname'] = 'TinyMCE HTML formatter';
+$string['pluginname'] = 'Tiny HTML formatter';
 $string['privacy:metadata'] = 'The HTML formatter plugin for TinyMCE does not store any personal data.';

lib/editor/tiny/plugins/noautolink/lang/en/tiny_noautolink.php

@@ -25,8 +25,8 @@
 $string['buttontitle'] = 'No auto-link';
 $string['errorinvalidurl'] = 'The selected content is not a URL. Please try again.';
 $string['helplinktext'] = 'No auto-link helper';
-$string['infoaddsuccess'] = 'Added the auto-link prevention.';
+$string['infoaddsuccess'] = 'Auto-link prevention added.';
 $string['infoemptyselection'] = 'Select a URL and try again.';
-$string['inforemovesuccess'] = 'Removed the auto-link prevention.';
+$string['inforemovesuccess'] = 'Auto-link prevention removed.';
 $string['pluginname'] = 'Tiny no auto-link';
 $string['privacy:metadata'] = 'The tiny_noautolink plugin does not store any personal data.';

lib/editor/tiny/plugins/premium/lang/en/tiny_premium.php

@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$string['pluginname'] = 'Tiny Premium';
-$string['apikey'] = 'API Key';
-$string['apikey_desc'] = 'Your Tiny Premium API Key requires a paid subscription. You can obtain your key by accessing your Tiny Cloud account page.';
-$string['privacy:metadata'] = 'The Tiny Premium plugin for TinyMCE does not store any personal data.';
+$string['pluginname'] = 'Tiny premium';
+$string['apikey'] = 'API key';
+$string['apikey_desc'] = 'Your Tiny premium API key requires a paid subscription. You can find your key on your Tiny Cloud account page.';
+$string['privacy:metadata'] = 'The Tiny premium plugin for TinyMCE does not store any personal data.';

lib/tests/behat/moodlenet_outbound.feature

@@ -62,7 +62,7 @@ Feature: MoodleNet outbound send activity
     When I navigate to "Share to MoodleNet" in current page administration
     Then I should see "Assignment" in the "Share to MoodleNet" "dialogue"
     And I should see "Test Assignment 1" in the "Share to MoodleNet" "dialogue"
-    And I should see "This activity is being shared with MoodleNet as a resource" in the "Share to MoodleNet" "dialogue"
+    And I should see "This activity is being shared with MoodleNet as a resource." in the "Share to MoodleNet" "dialogue"
     And I click on "Share" "button" in the "Share to MoodleNet" "dialogue"
     And I switch to "moodlenet_auth" window
     And I press "Allow" and switch to main window
@@ -73,7 +73,7 @@ Feature: MoodleNet outbound send activity
   Scenario: User can see their shared resources on the MoodleNet share progress page
     Given I am on the "C1" course page logged in as teacher1
     When I navigate to "MoodleNet share progress" in current page administration
-    And I should see "There are no shared resources to display at this time"
+    And I should see "There are no shared resources to display at this time."
     And I am on "C1" course homepage
     And I navigate to "Share to MoodleNet" in current page administration
     And I click on "Share" "button" in the "Share to MoodleNet" "dialogue"

lib/tests/behat/moodlenet_share_course.feature

@@ -59,7 +59,7 @@ Feature: MoodleNet outbound share course
     When I navigate to "Share to MoodleNet" in current page administration
     Then I should see "Course" in the "Share to MoodleNet" "dialogue"
     And I should see "Test course 1" in the "Share to MoodleNet" "dialogue"
-    And I should see "This course is being shared with MoodleNet as a resource" in the "Share to MoodleNet" "dialogue"
+    And I should see "This course is being shared with MoodleNet as a resource." in the "Share to MoodleNet" "dialogue"
     And I click on "Share" "button" in the "Share to MoodleNet" "dialogue"
     And I switch to "moodlenet_auth" window
     And I press "Allow" and switch to main window

lib/tests/behat/moodlenet_share_partial_course.feature

@@ -69,8 +69,8 @@ Feature: MoodleNet outbound share selected activities in a course
     And I click on "Select activity Test Assignment 2" "checkbox"
     When I click on "Share to MoodleNet" "button" in the "sticky-footer" "region"
     Then I should see "Test course 1" in the "Share to MoodleNet" "dialogue"
-    And I should see "The selected activities are being shared with MoodleNet as a resource" in the "Share to MoodleNet" "dialogue"
-    And I should see "2 activities will be included in the course" in the "Share to MoodleNet" "dialogue"
+    And I should see "The selected activities are being shared with MoodleNet as a resource." in the "Share to MoodleNet" "dialogue"
+    And I should see "2 activities will be included in the course." in the "Share to MoodleNet" "dialogue"
     And I click on "Share" "button" in the "Share to MoodleNet" "dialogue"
     And I switch to "moodlenet_auth" window
     And I press "Allow" and switch to main window
@@ -85,8 +85,8 @@ Feature: MoodleNet outbound share selected activities in a course
     And I click on "Select activity Test Assignment 1" "checkbox"
     When I click on "Share to MoodleNet" "button" in the "sticky-footer" "region"
     Then I should see "Test Assignment 1" in the "Share to MoodleNet" "dialogue"
-    And I should see "This activity is being shared with MoodleNet as a resource" in the "Share to MoodleNet" "dialogue"
-    And I should not see "1 activities will be included in the course" in the "Share to MoodleNet" "dialogue"
+    And I should see "This activity is being shared with MoodleNet as a resource." in the "Share to MoodleNet" "dialogue"
+    And I should not see "1 activities will be included in the course." in the "Share to MoodleNet" "dialogue"
     And I click on "Share" "button" in the "Share to MoodleNet" "dialogue"
     And I switch to "moodlenet_auth" window
     And I press "Allow" and switch to main window

mod/forum/lang/en/forum.php

@@ -295,7 +295,7 @@ $string['forum:addinstance'] = 'Add a new forum';
 $string['forum:addnews'] = 'Add announcements';
 $string['forum:addquestion'] = 'Add question';
 $string['forum:allowforcesubscribe'] = 'Allow force subscribe';
-$string['forum:canmailnow'] = 'Can send mail without delay';
+$string['forum:canmailnow'] = 'Can post to Q and A forum without editing-time delay';
 $string['forum:canoverridecutoff'] = 'Post to forums after their cut-off date';
 $string['forum:canoverridediscussionlock'] = 'Reply to locked discussions';
 $string['forum:cantogglefavourite'] = 'Star discussions';

mod/label/lang/en/label.php

@@ -44,7 +44,7 @@ $string['indicator:socialbreadthdef_link'] = 'Learning_analytics_indicators#Soci
 $string['label:addinstance'] = 'Add a new Text and media area';
 $string['label:view'] = 'View Text and media area';
 $string['labelname'] = 'Name';
-$string['labelname_help'] = 'Will be shown in course index, activity completion, etc. If left empty, will automatically be generated from the first characters of the text.';
+$string['labelname_help'] = 'The name is only used to identify the Text and media area in the course index and for activity completion. If you leave this empty, a name will automatically be generated using the first characters of the text.';
 $string['labeltext'] = 'Text';
 $string['modulename'] = 'Text and media area';
 $string['modulename_help'] = 'The Text and media area enables you to display text and multimedia on the course page.

mod/lti/lang/en/lti.php

@@ -129,7 +129,7 @@ $string['courseid'] = 'Course ID number';
 $string['courseinformation'] = 'Course information';
 $string['courselink'] = 'Go to course';
 $string['coursemisconf'] = 'Course is misconfigured';
-$string['coursetooldeleted'] = '{$a} removed';
+$string['coursetooldeleted'] = '{$a} deleted';
 $string['createdon'] = 'Created on';
 $string['curllibrarymissing'] = 'PHP cURL extension required for the External tool.';
 $string['custom'] = 'Custom parameters';
@@ -343,7 +343,7 @@ $string['no_tp_configured'] = 'There are no unregistered external tool registrat
 $string['no_tp_pending'] = 'There are no pending external tool registrations.';
 $string['no_tp_rejected'] = 'There are no rejected external tool registrations.';
 $string['noattempts'] = 'No attempts have been made on this tool instance';
-$string['nocourseexternaltoolsnotice'] = 'There are no LTI external tools yet';
+$string['nocourseexternaltoolsnotice'] = 'There are no LTI External tools yet.';
 $string['noltis'] = 'There are no external tool instances';
 $string['noprofileservice'] = 'Profile service not found';
 $string['noservers'] = 'No servers found';
@@ -466,7 +466,7 @@ Tools which do not require secure communication from Moodle and do not provide a
 may not require a resource key.';
 $string['resourceurl'] = 'Resource URL';
 $string['restricttocategory'] = 'Restrict to category';
-$string['restricttocategory_help'] = 'To restrict use of this external tool on all courses within a category, select course category / categories from the list.';
+$string['restricttocategory_help'] = 'To restrict use of this tool to courses within a category, select the category or categories from the list.';
 $string['return_to_course'] = 'Click <a href="{$a->link}" target="_top">here</a> to return to the course.';
 $string['saveallfeedback'] = 'Save all my feedback';
 $string['search:activity'] = 'External tool - activity information';
@@ -600,7 +600,7 @@ $string['unabletocreatetooltype'] = 'Unable to create tool';
 $string['unabletofindtooltype'] = 'Unable to find tool for {$a->id}';
 $string['unknownstate'] = 'Unknown state';
 $string['update'] = 'Update';
-$string['usage'] = 'Usage';
+$string['usage'] = 'Usage count';
 $string['useraccountinformation'] = 'User account information';
 $string['userpersonalinformation'] = 'User personal information';
 $string['validurl'] = 'A valid URL must start with http(s)://';

mod/lti/tests/behat/managecoursetools.feature

@@ -19,11 +19,11 @@ Feature: Manage course tools
     Given I am on the "Course 1" course page logged in as teacher1
     And I navigate to "LTI External tools" in current page administration
     And I should see "LTI External tools are add-on apps"
-    And I should see "There are no LTI external tools yet"
+    And I should see "There are no LTI External tools yet."
     When I click on "Add tool" "link"
     And I press "Cancel"
     Then I should see "LTI External tools are add-on apps"
-    And I should see "There are no LTI external tools yet"
+    And I should see "There are no LTI External tools yet."
     And I click on "Add tool" "link"
     And I set the following fields to these values:
       | Tool name        | Teaching Tool 1                 |
@@ -128,7 +128,7 @@ Feature: Manage course tools
     And I choose "Delete" in the open action menu
     And I should see "This will delete Test tool from the available LTI tools in your course."
     And I click on "Delete" "button" in the "Delete Test tool" "dialogue"
-    And I should see "Test tool removed"
+    And I should see "Test tool deleted"
     And I should not see "Test tool" in the "reportbuilder-table" "table"
 
   @javascript

mod/quiz/lang/en/quiz.php

@@ -520,7 +520,7 @@ $string['manualgradequestion'] = 'Manually grade question {$a->question} in {$a-
 $string['mark'] = 'Submit';
 $string['markall'] = 'Submit page';
 $string['marks'] = 'Marks';
-$string['marks_help'] = 'The numerical marks for each question, and the overall attempt score.';
+$string['marks_help'] = 'The mark obtained for each question and the overall attempt score. You can only select Marks if Maximum marks is selected.';
 $string['match'] = 'Matching';
 $string['matchanswer'] = 'Matching answer';
 $string['matchanswerno'] = 'Matching answer {$a}';
@@ -530,14 +530,8 @@ $string['messageprovider:attempt_grading_complete'] = 'Notification that your at
 $string['messageprovider:submission'] = 'Notification of your students\' quiz submissions';
 $string['max'] = 'Max';
 $string['maxmark'] = 'Maximum mark';
-$string['maxmarks'] = 'Max Marks';
-$string['maxmarks_help'] = 'Max marks determines whether the grade information are hidden or how it is displayed:
-
-* To hide the grade information completely, do not tick this checkbox (Marks checkbox is disabled automatically).
-
-* To show Max marks only: tick this checkbox and not the Marks checkbox.
-
-* To show both Max marks and Marks, tick this checkbox as well as the Marks checkbox.';
+$string['maxmarks'] = 'Maximum marks';
+$string['maxmarks_help'] = 'The maximum mark available for each question.';
 
 $string['min'] = 'Min';
 $string['minutes'] = 'Minutes';