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

admin/tool/mobile/lang/en/tool_mobile.php

@@ -29,8 +29,8 @@
 $string['apppolicy_help'] = 'The URL of a policy for app users which is listed on the About page in the app. If the field is left empty, the site policy URL will be used instead.';
 $string['apprequired'] = 'This functionality is only available when accessed via the Moodle mobile or desktop app.';
 $string['autologinkeygenerationlockout'] = 'Auto-login key generation is blocked. You need to wait {$a} minutes between requests.';
-$string['autologinmintimebetweenreq'] = 'Minimum time between auto-login requests.';
-$string['autologinmintimebetweenreq_desc'] = 'This setting determines the minimum time between auto-login requests from the app. You should set this setting to a low value if mobile app users are frequently asked to enter their credentials when visualising content embedded from the site.';
+$string['autologinmintimebetweenreq'] = 'Minimum time between auto-login requests';
+$string['autologinmintimebetweenreq_desc'] = 'The minimum time between auto-login requests from the mobile app. If app users are frequently asked to enter their credentials when viewing content embedded from the site, then set a lower value.';
 $string['autologinnotallowedtoadmins'] = 'Auto-login is not allowed for site admins.';
 $string['cachedef_plugininfo'] = 'This stores the list of plugins with mobile addons';
 $string['cachedef_subscriptiondata'] = 'This stores the Moodle app subscription information.';
@@ -124,7 +124,7 @@
 $string['qrcodetypeurl'] = 'QR code with site URL';
 $string['qrcodetypelogin'] = 'QR code with automatic login';
 $string['qrkeyttl'] = 'QR authentication key duration';
-$string['qrkeyttl_desc'] = 'Length of time for which a QR code for authentication is valid. Empty values are not allowed, in that case the default value for the setting will be used.';
+$string['qrkeyttl_desc'] = 'The length of time for which a QR code for automatic login is valid.';
 $string['readingthisemailgettheapp'] = 'Reading this in an email? <a href="{$a}">Download the mobile app and receive notifications on your mobile device</a>.';
 $string['remoteaddons'] = 'Remote add-ons';
 $string['scanqrcode'] = 'Scan QR code';

admin/tool/oauth2/lang/en/tool_oauth2.php

@@ -22,8 +22,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['acceptrisk'] = 'I understand that disabling email verification can be a security issue';
-$string['acceptrisk_help'] = 'Disabling email verification can be a security issue. As it potentially allows users to authenticate as another in the right circumstances.';
+$string['acceptrisk'] = 'I understand that disabling email verification can be a security issue.';
+$string['acceptrisk_help'] = 'Disabling email verification can potentially allow a user to authenticate as another user.';
 $string['authconfirm'] = 'This action will grant permanent API access to Moodle for the authenticated account. This is intended to be used as a system account for managing files owned by Moodle.';
 $string['authconnected'] = 'The system account is now connected for offline access';
 $string['authnotconnected'] = 'The system account was not connected for offline access';

admin/tool/oauth2/tests/behat/email_verification.feature

@@ -16,10 +16,10 @@ Feature: OAuth2 email verification
       | Name                       | Testing service                           |
       | Client ID                  | thisistheclientid                         |
       | Client secret              | supersecret                               |
-    Then I should not see "I understand that disabling email verification can be a security issue"
+    Then I should not see "I understand that disabling email verification can be a security issue."
     And I click on "Require email verification" "checkbox"
-    And I should see "I understand that disabling email verification can be a security issue"
-    And I click on "I understand that disabling email verification can be a security issue" "checkbox"
+    And I should see "I understand that disabling email verification can be a security issue."
+    And I click on "I understand that disabling email verification can be a security issue." "checkbox"
     And I press "Save changes"
     And I should see "Changes saved"
     And I click on "Edit" "link" in the "Testing service" "table_row"

blocks/accessreview/lang/en/block_accessreview.php

@@ -46,7 +46,7 @@
 $string['smile'] = '0 errors, congratulations!';
 $string['status:successalt'] = 'Passed';
 $string['status:success'] = 'Passed';
-$string['status:errors'] = 'Failed - errors: {$a->errorCount} ({$a->failureRate}% of all checks)';
+$string['status:errors'] = 'Failed - error count: {$a->errorCount}';
 $string['status:errorsalt'] = 'Errors';
 $string['toggleaccessreview'] = 'Toggle highlighting';
 $string['toolpage'] = 'Toolkit page to show';

blocks/myoverview/lang/en/block_myoverview.php

@@ -35,7 +35,7 @@
 $string['aria:courseprogress'] = 'Course progress:';
 $string['aria:customfield'] = 'Show {$a} courses';
 $string['aria:displaydropdown'] = 'Display drop-down menu';
-$string['aria:favourites'] = 'Show starred courses';
+$string['aria:favourites'] = 'Show starred courses only';
 $string['aria:future'] = 'Show future courses';
 $string['aria:groupingdropdown'] = 'Grouping drop-down menu';
 $string['aria:inprogress'] = 'Show courses in progress';

enrol/lti/lang/en/enrol_lti.php

@@ -26,7 +26,7 @@
 $string['adddeployment:name'] = 'Deployment name';
 $string['adddeployment:deploymentid'] = 'Deployment ID';
 $string['adddeployment:deploymentid_help'] = 'Each deployment of the tool (this site) in a platform will be assigned a Deployment ID that is unique to the registration. The Deployment ID must be registered with the tool (this site) before launches from the respective tool deployment are allowed.';
-$string['adddeployment:invaliddeploymentiderror'] = 'Invalid Deployment ID. That Deployment ID already exists for this app registration.';
+$string['adddeployment:invaliddeploymentiderror'] = 'Invalid deployment ID. The deployment ID already exists for this app registration.';
 $string['addtocourse'] = 'Add to course';
 $string['addtogradebook'] = 'Add to gradebook';
 $string['allowframeembedding'] = 'Note: It is recommended that the site administration setting \'Allow frame embedding\' is enabled, so that tools are displayed within a frame rather than in a new window.';
@@ -39,7 +39,7 @@
 $string['deploymentadd'] = 'Add a deployment';
 $string['deploymentaddnotice'] = 'Deployment added';
 $string['deploymentdelete'] = 'Delete deployment';
-$string['deploymentdeleteconfirm'] = 'Warning: Deleting a deployment will result in a loss of access for any users following resource links tied to this tool deployment in the platform. Member and grade sync services will also be removed for these resources. Are you sure you want to delete deploymentid \'{$a}\'?';
+$string['deploymentdeleteconfirm'] = 'Warning: Deleting a deployment will result in a loss of access for any users following resource links tied to this tool deployment in the platform. Member and grade sync services will also be removed for these resources. Are you sure you want to delete deployment ID \'{$a}\'?';
 $string['deploymentdeletenotice'] = 'Deployment deleted';
 $string['deploymentid'] = 'Deployment ID';
 $string['deployments'] = 'Deployments';
@@ -71,8 +71,8 @@
 $string['ltiadvdynregerror:invalidopenidconfigjson'] = "There was a problem fetching the OpenID configuration from the platform. The result was not valid JSON. This may also be caused by blocked hosts configuration. Please make sure your site is configured to connect to the platform domain and try again using a new registration URL.";
 $string['ltiadvlauncherror:missingid'] = 'Invalid launch data. The custom claim field \'id\' is required to launch an activity or resource over LTI Advantage.';
 $string['ltiadvlauncherror:invalidid'] = 'Invalid launch data. The resource \'{$a}\' is unavailable or does not exist.';
-$string['ltiadvlauncherror:invalidregistration'] = 'Invalid launch data or tool configuration. A platform registration could not be found (issuer: {$a->platform}, clientid: {$a->clientid}).';
-$string['ltiadvlauncherror:invaliddeployment'] = 'Invalid launch data or tool configuration. The deployment could not be found (deployment_id: {$a}).';
+$string['ltiadvlauncherror:invalidregistration'] = 'Invalid launch data or tool configuration. A platform registration could not be found (issuer: {$a->platform}, client ID: {$a->clientid}).';
+$string['ltiadvlauncherror:invaliddeployment'] = 'Invalid launch data or tool configuration. The deployment could not be found (deployment ID: {$a}).';
 $string['ltilegacy'] = 'Legacy LTI (1.1/2.0)';
 $string['ltilegacydeprecatednotice'] = 'Legacy LTI (1.1/2.0) tools are deprecated. Content should now be shared using LTI Advantage.';
 $string['lti13'] = 'LTI Advantage';
@@ -110,7 +110,7 @@
 $string['opensslconfiginvalid'] = 'LTI 1.3 requires a valid openssl.cnf to be configured and available to your web server. Please contact the site administrator to configure and enable openssl for this site.';
 $string['opentool'] = 'Open tool';
 $string['publishedcontent'] = 'Published content';
-$string['publishedcontent_help'] = 'A published resource or activity can be used in registered platforms via the content selection (deep linking) flow. Additionally, a resource link can be created manually in the platform by using the launch url and the custom properties provided.';
+$string['publishedcontent_help'] = 'A published resource or activity can be used in registered platforms via the content selection (deep linking) flow. Additionally, a resource link can be created manually in the platform by using the launch URL and the custom properties provided.';
 $string['platformdetails'] = 'Platform details';
 $string['platformdetailsinfo'] = 'Once the tool has been set up in the platform, details from the platform must be recorded here to complete the registration.
 <ul>
@@ -130,7 +130,7 @@
 $string['provisioningmode_help'] = 'This setting determines how accounts are handled on first launch. Several modes are supported:
 <ul>
 <li>New accounts only (automatic). Accounts will be automatically created for users launching from the platform. This is the default for student launches.</li>
-<li>Existing and new accounts (prompt). The user will be given a choice of what to do. They can decide to link an existing account, or have a new account created for them. This is the most flexible option and the default for Teacher launches.</li>
+<li>Existing and new accounts (prompt). The user will be given a choice of what to do. They can decide to link an existing account, or have a new account created for them. This is the most flexible option and the default for teacher launches.</li>
 <li>Existing accounts only (prompt). The user will be asked to link an existing account and cannot access the tool resources without doing so.</li>
 </ul>';
 $string['registerplatform:accesstokenurl'] = 'Access token URL';
@@ -139,7 +139,7 @@
 $string['registerplatform:authrequesturl_help'] = 'The URL to which OpenID Connect authentication requests will be sent by the tool. Will be provided by the platform.';
 $string['registerplatform:clientid'] = 'Client ID';
 $string['registerplatform:clientid_help'] = 'A string used to identify the tool registration on the platform. Will be provided by the platform.';
-$string['registerplatform:duplicateregistrationerror'] = 'Invalid Client ID. This Client ID is already registered for the Platform ID provided.';
+$string['registerplatform:duplicateregistrationerror'] = 'Invalid client ID. This client ID is already registered for the platform ID provided.';
 $string['registerplatform:jwksurl'] = 'Public keyset URL';
 $string['registerplatform:jwksurl_help'] = 'The public keyset or JWKS URL, used to get the platform\'s public key. Will be provided by the platform.';
 $string['registerplatform:name'] = 'Platform name';

enrol/lti/tests/behat/lti_adv_tool_registration.feature

@@ -124,7 +124,7 @@ Feature: Register a platform with the tool
       | Public keyset URL          | https://lms.example.com/jwks |
       | Access token URL           | https://lms.example.com/token |
     And I press "Save changes"
-    Then I should see "Invalid Client ID. This Client ID is already registered for the Platform ID provided."
+    Then I should see "Invalid client ID. This client ID is already registered for the platform ID provided."
 
   Scenario: An admin can add deployment ids for a given platform registration
     Given the following "enrol_lti > application registrations" exist:

lang/en/admin.php

@@ -317,7 +317,7 @@
 $string['configpathtodu'] = 'Path to du. Probably something like /usr/bin/du. If you enter this, pages that display directory contents will run much faster for directories with a lot of files.';
 $string['configpathtophp'] = 'Path to PHP CLI. Probably something like /usr/bin/php. If you enter this, cron scripts can be executed from admin web interface.';
 $string['configperfdebug'] = 'If you turn this on, performance info will be printed in the footer of the standard theme';
-$string['configprofileroles'] = 'List of roles that are visible on user profiles and participation page.';
+$string['configprofileroles'] = 'Roles that are listed in user profiles and on the participants page.';
 $string['configprofilesforenrolledusersonly'] = 'To prevent misuse by spammers, profile descriptions of users who are not yet enrolled in any course are hidden. New users must enrol in at least one course before they can add a profile description.';
 $string['configprotectusernames'] = 'If enabled, the forgotten password form will not display any hints allowing account usernames or email addresses to be guessed.';
 $string['configproxybypass'] = 'Comma separated list of (partial) hostnames or IPs that should bypass proxy (e.g., 192.168., .mydomain.com)';
@@ -375,9 +375,9 @@
 $string['configstatsuserthreshold'] = 'This setting specifies the minimum number of enrolled users for a course to be included in statistics calculations.';
 $string['configstrictformsrequired'] = 'If enabled, users are prevented from entering a space or line break only in required fields in forms.';
 $string['configstripalltitletags'] = 'Uncheck this setting to allow HTML tags in activity and resource names.';
-$string['configsupportemail'] = 'If SMTP is configured on this site and a support page is not configured, this email address will be sent general help requests submitted through the support form (for example, when new users create their own accounts). If sending fails, this email address will be displayed to logged in users.';
-$string['configsupportname'] = 'This is the name of a person or other entity offering general help via the support email or web address.';
-$string['configsupportpage'] = 'This web address will be published to users of this site as the one to go to when they need general help (for example, when new users create their own accounts). If this address is left blank then a link to the support email form will be supplied.';
+$string['configsupportemail'] = 'If SMTP is configured on this site and a support page is not set, this email address will receive messages submitted through the support form. If sending fails, the email address will be displayed to logged-in users.';
+$string['configsupportname'] = 'The name of the person or other entity providing support via the support form or support page.';
+$string['configsupportpage'] = 'A link to this page will be provided for users to contact the site support. If the field is left blank then a link to a support form will be provided instead.';
 $string['configtempdatafoldercleanup'] = 'Remove temporary data files from the data folder that are older than the selected time.';
 $string['configthemedesignermode'] = 'Normally all theme images and style sheets are cached in browsers and on the server for a very long time, for performance. If you are designing themes or developing code then you probably want to turn this mode on so that you are not served cached versions.  Warning: this will make your site slower for all users!  Alternatively, you can also reset the theme caches manually from the Theme selection page.';
 $string['configthemelist'] = 'Leave this blank to allow any valid theme to be used.  If you want to shorten the theme menu, you can specify a comma-separated list of names here (Don\'t use spaces!).
@@ -562,8 +562,8 @@
 $string['enablecourserelativedates_desc'] = 'Allow courses to be set up to display dates relative to the user\'s start date in the course.';
 $string['enablecourserequests'] = 'Enable course requests';
 $string['enabled'] = 'Enabled';
-$string['enabledashboard'] = 'Enable dashboard';
-$string['enabledashboard_help'] = 'The Dashboard shows Timeline, Calendar and Recently accessed items by default. You can set a different default Dashboard for everyone and allow users to customise their own Dashboard.';
+$string['enabledashboard'] = 'Enable Dashboard';
+$string['enabledashboard_help'] = 'The Dashboard shows Timeline, Calendar and Recently accessed items by default. You can set a different default Dashboard for everyone and allow users to customise their own Dashboard. If disabled, you need to set \'Start page for users\' to a value other than Dashboard.';
 $string['enabledevicedetection'] = 'Enable device detection';
 $string['enableglobalsearch'] = 'Enable global search';
 $string['enableglobalsearch_desc'] = 'If enabled, data will be indexed and synchronised by a scheduled task.';

lang/en/block.php

@@ -42,7 +42,7 @@
 $string['deletecheck_modal'] = 'Delete block?';
 $string['deleteblock'] = 'Delete {$a} block';
 $string['deleteblockcheck'] = 'Are you sure that you want to delete this block titled {$a}?';
-$string['deleteblockinprogress'] = 'The block {$a} is currently being removed from this page.';
+$string['deleteblockinprogress'] = 'Block {$a} removal in progress...';
 $string['deleteblockwarning'] = '<p>You are about to delete a block that appears elsewhere.</p><p>Original block location: {$a->location}<br />Display on page types: {$a->pagetype}</p><p>Are you sure you want to continue?</p>';
 $string['hideblock'] = 'Hide {$a} block';
 $string['hidepanel'] = 'Hide panel';

lang/en/moodle.php

@@ -777,7 +777,7 @@
 $string['enable'] = 'Enable';
 $string['encryptedcode'] = 'Encrypted code';
 $string['enddate'] = 'Course end date';
-$string['enddate_help'] = 'The course end date is used for determining whether a course should be included in a user\'s list of courses. When the end date is past, the course is no longer listed in the navigation and is listed as past in the course overview. The course end date may also be used by custom reports. Users can still enter the course after the end date; in other words the date does not restrict access.';
+$string['enddate_help'] = 'The course end date determines whether a course is listed as past in the course overview. The course end date may also be used by custom reports. Note that users can still enter the course after the end date; in other words the date does not restrict access.';
 $string['english'] = 'English';
 $string['enrolmentmethods'] = 'Enrolment methods';
 $string['entercourse'] = 'Click to enter this course';
@@ -1965,7 +1965,7 @@
 $string['showdescription'] = 'Display description on course page';
 $string['showdescription_help'] = 'If enabled, the description above will be displayed on the course page just below the link to the activity or resource.';
 $string['showgrades'] = 'Show gradebook to students';
-$string['showgrades_help'] = 'Many activities in the course allow grades to be set. This setting determines whether a student can view a list of all their grades for the course via a grades link in the navigation drawer or block.';
+$string['showgrades_help'] = 'Many activities allow grades to be set. This setting determines whether a student can view a list of all their grades in the course.';
 $string['showingacourses'] = 'Showing all {$a} courses';
 $string['showingxofycourses'] = 'Showing courses {$a->start} to {$a->end} of {$a->total} courses';
 $string['showlistofcourses'] = 'Show list of courses';

lang/en/my.php

@@ -23,7 +23,7 @@
  */
 
 $string['coursemanagementoptions'] = 'Course management options';
-$string['error:dashboardisdisabled'] = 'The dashboard has been disabled by the administrator.';
+$string['error:dashboardisdisabled'] = 'The Dashboard has been disabled by an administrator.';
 $string['mymoodle'] = 'Dashboard';
 $string['nocourses'] = 'No course information to show.';
 $string['noguest'] = 'The Dashboard page is not available to guest users';