Merge branch 'MDL-85507-405-enfix' of https://github.com/mudrd8mz/moodle into MOODLE_405_STABLE

lang/en/admin.php

@@ -257,7 +257,7 @@ $string['configemaildkimselector'] = 'The DKIM selector is arbitrary and your DN
 $string['configenablecalendarexport'] = 'Enable exporting or subscribing to calendars.';
 $string['configenablecomments'] = 'Enable comments';
 $string['configenablecourserequests'] = 'If enabled, users with the capability to request new courses (moodle/course:request) will have the option to request a course. This capability is not allowed for any of the default roles. It may be applied in the system or category context.';
-$string['configenablemobilewebservice'] = 'Enable mobile service for the official Moodle app or other app requesting it. For more information, read the {$a}';
+$string['configenablemobilewebservice'] = 'Mobile web services are required for the Moodle app. If your site uses HTTPS, mobile web services are enabled by default. For more information, see the {$a}.';
 $string['configenablerssfeeds'] = 'If enabled, RSS feeds are generated by various features across the site, such as blogs, forums, database activities and glossaries. Note that RSS feeds also need to be enabled for the particular activity modules.';
 $string['configenablerssfeedsdisabled'] = 'It is not available because RSS feeds are disabled in all the Site. To enable them, go to the Variables settings under Admin Configuration.';
 $string['configenablerssfeedsdisabled2'] = 'RSS feeds are currently disabled at site level. They may be enabled in Advanced features in the Site administration.';
@@ -708,7 +708,7 @@ $string['gotofirst'] = 'Go to first missing string';
 $string['gradebook'] = 'Gradebook';
 $string['gradebookroles'] = 'Graded roles';
 $string['gravatardefaulturl'] = 'Gravatar default image URL';
-$string['gravatardefaulturl_help'] = 'Gravatar needs a default image to display if it is unable to find a picture for a given user. Provide a full URL for an image. If you leave this setting empty, Moodle will attempt to use the most appropriate default image for the page you are viewing. Note also that Gravatar has a number of codes which can be used to <a href="https://en.gravatar.com/site/implement/images/#default-image">generate default images</a>.';
+$string['gravatardefaulturl_help'] = 'Gravatar needs a default image to display if it is unable to find a picture for a given user. Provide a full URL for an image. Codes for generating default images are available from <a href="https://docs.gravatar.com/api/avatars/images/">Gravatar for Developers - Avatar Requests</a>.';
 $string['gradeexport'] = 'Primary grade export methods';
 $string['gradeexportdefault'] = 'Default grade export method';
 $string['guestroleid'] = 'Role for guest';
@@ -762,10 +762,9 @@ $string['taskh5pcleanup'] = 'Unused H5P files cleanup';
 $string['iconvrequired'] = 'Installing ICONV extension is required.';
 $string['igbinary322buggyversion'] = 'The php-igbinary extension installed on the site can lead to problems when running with PHP 7.2. You are recommended to either upgrade to php-igbinary 3.2.5 or later, or alternatively to upgrade to PHP 7.3 or later.';
 $string['ignore'] = 'Ignore';
-$string['importantupdates_content'] = '<p>In the next Moodle 5.0, planned for release in April 2025, the Chat and Survey activities will
-be removed from core Moodle. They will be available as plugins in the
+$string['importantupdates_content'] = '<p>In Moodle 5.0, Chat and Survey activities are removed from core Moodle. They are available as plugins in the
 <a href="https://moodle.org/plugins/">Moodle plugins directory</a>.</p>
-<p>If you wish to continue using Chat or Survey in your site, you will be able to install them as plugins before upgrading to Moodle 5.0.</p>';
+<p>If you wish to continue using Chat or Survey on your site, you can install them as plugins when upgrading to Moodle 5.0.</p>';
 $string['importantupdates_title'] = 'Important update about Chat and Survey activities';
 $string['includemoduleuserdata'] = 'Include module user data';
 $string['incompatibleblocks'] = 'Incompatible blocks';

lang/en/courseformat.php

@@ -35,8 +35,8 @@ $string['bulkcancel'] = 'Close bulk actions';
 $string['bulkselection'] = '{$a} selected';
 $string['bulkselection_plural'] = '{$a} selected';
 $string['cm_add_feedback'] = '{$a->modname} added.';
-$string['cm_complete_feedback'] = '{$a->name} marked as completed.';
-$string['cm_complete_feedback_batch'] = 'Selected {$a->count} activities marked as completed.';
+$string['cm_complete_feedback'] = '{$a->name} marked as done.';
+$string['cm_complete_feedback_batch'] = 'Selected {$a->count} activities marked as done.';
 $string['cm_delete_feedback'] = '{$a->name} deleted.';
 $string['cm_delete_feedback_batch'] = 'Selected {$a->count} activities deleted.';
 $string['cm_duplicate_feedback'] = '{$a->name} duplicated.';
@@ -51,8 +51,8 @@ $string['cm_show_feedback'] = '{$a->name} is now shown.';
 $string['cm_show_feedback_batch'] = 'The selected {$a->count} activities are now shown.';
 $string['cm_stealth_feedback'] = '{$a->name} is now available but not shown on the course page.';
 $string['cm_stealth_feedback_batch'] = 'The selected {$a->count} activities are now available but not shown on the course page.';
-$string['cm_uncomplete_feedback'] = '{$a->name} marked as uncompleted.';
-$string['cm_uncomplete_feedback_batch'] = 'Selected {$a->count} activities marked as uncompleted.';
+$string['cm_uncomplete_feedback'] = '{$a->name} marked as undone.';
+$string['cm_uncomplete_feedback_batch'] = 'Selected {$a->count} activities marked as undone.';
 $string['cm_visiblegroups_feedback'] = '{$a->name} group mode changed to Visible groups.';
 $string['cmavailability'] = 'Activity availability';
 $string['cmdelete_info'] = 'This will delete {$a->name} and any user data it contains.';

lang/en/grades.php

@@ -508,7 +508,9 @@ $string['missingitemtypeoreid'] = 'Array key (itemtype or eid) missing';
 $string['missingscale'] = 'Scale must be selected';
 $string['mode'] = 'Mode';
 $string['modgrade'] = 'Grade';
-$string['modgrade_help'] = 'Select the type of grading used for this activity. If \'scale\' is chosen, you can then choose the scale from the drop-down menu. If using point grading, you can then enter the maximum grade available for this activity.';
+$string['modgrade_help'] = '* Point - A numerical value
+* None - Feedback only
+* Scale - An item from a list';
 $string['modgradecantchangegradetype'] = 'You cannot change the type, as grades already exist for this item.';
 $string['modgradecantchangegradetypemsg'] = 'Some grades have already been awarded, so the grade type cannot be changed. If you wish to change the maximum grade, you must first choose whether or not to rescale existing grades.';
 $string['modgradecantchangegradetyporscalemsg'] = 'Some grades have already been awarded, so the grade type and scale cannot be changed.';

lang/en/payment.php

@@ -43,7 +43,7 @@ $string['gatewaydisabled'] = 'Disabled';
 $string['gatewayenabled'] = 'Enabled';
 $string['gatewaynotfound'] = 'Gateway not found';
 $string['gotomanageplugins'] = 'Enable and disable payment gateways and set surcharges via {$a}.';
-$string['gotopaymentaccounts'] = 'You can create multiple payment accounts using any of these gateways on the {$a} page';
+$string['gotopaymentaccounts'] = 'Create payment accounts using any of these gateways in {$a}.';
 $string['hidearchived'] = 'Hide archived';
 $string['noaccountsavilable'] = 'No payment accounts are available.';
 $string['nocurrencysupported'] = 'No payment in any currency is supported. Please make sure that at least one payment gateway is enabled.';

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

@@ -49,7 +49,7 @@ $string['premiumplugin:tinymcespellchecker'] = 'Spell Checker Pro';
 $string['premiumplugin:typography'] = 'Advanced Typography';
 $string['premiumplugins'] = 'Premium plugins';
 $string['premiumplugins_desc'] = 'Access to TinyMCE Premium plugins requires an API key. Not all listed plugins may be available with your TinyMCE Premium subscription. You can check available plugins on your <a href="https://www.tiny.cloud">Tiny Cloud</a> account page.';
-$string['privacy:metadata'] = 'The Tiny premium plugin for TinyMCE does not store any personal data.';
+$string['privacy:metadata'] = 'The Tiny Premium plugin for TinyMCE does not store any personal data.';
 
 // Deprecated since Moodle 4.5.
 $string['helplinktext'] = 'Premium plugins';

mod/assign/lang/en/assign.php

@@ -219,7 +219,7 @@ $string['editingstatus'] = 'Editing status';
 $string['enabled'] = 'Enabled';
 $string['enabletimelimit'] = 'Enable timed assignments';
 $string['enabletimelimit_help'] = 'If enabled, you can set a time limit on assignment settings page.';
-$string['errorgradechangessaveddetail'] = 'The changes to the grade and feedback failed to save';
+$string['errorgradechangessaveddetail'] = 'The changes to the grade and feedback were not saved.';
 $string['eventallsubmissionsdownloaded'] = 'All the submissions are being downloaded.';
 $string['eventassessablesubmitted'] = 'A submission has been submitted.';
 $string['eventbatchsetmarkerallocationviewed'] = 'Batch set marker allocation viewed';
@@ -654,9 +654,9 @@ $string['subplugintype_assignsubmission'] = 'Submission plugin';
 $string['subplugintype_assignsubmission_plural'] = 'Submission plugins';
 $string['subplugintype_assignfeedback'] = 'Feedback plugin';
 $string['subplugintype_assignfeedback_plural'] = 'Feedback plugins';
-$string['teamname'] = 'Team: {$a}';
+$string['teamname'] = 'Group: {$a}';
 $string['teamsubmission'] = 'Students submit in groups';
-$string['teamsubmission_help'] = 'If enabled, students will be divided into groups based on the default set of groups or a custom grouping. A group submission will be shared among group members and all members of the group will see each others\' changes to the submission.';
+$string['teamsubmission_help'] = 'If enabled, students will be divided into groups based on the default set of groups or a custom grouping. A group submission will be shared among group members and all members of the group will see each others\' changes to the submission. Note: You cannot change this setting if there are submissions already.';
 $string['teamsubmissiongroupingid'] = 'Grouping for student groups';
 $string['teamsubmissiongroupingid_help'] = 'This is the grouping that the assignment will use to find groups for student groups. If not set, the default set of groups will be used.';
 $string['textinstructions'] = 'Assignment instructions';

mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php

@@ -122,9 +122,9 @@ $string['seb:managetemplates'] = 'Manage SEB configuration templates';
 $string['seb_activateurlfiltering'] = 'Enable URL filtering';
 $string['seb_activateurlfiltering_help'] = 'If enabled, URLs will be filtered when loading web pages. The filter set has to be defined below.';
 $string['seb_allowcapturecamera'] = 'Allow browser access to camera';
-$string['seb_allowcapturecamera_help'] = 'If enabled, users will be asked to grant access to the camera for SEB before the exam session is started. In macOS 12/iOS 15 or later, disabling this setting prevents web applications from accessing the camera in any case, i. e. video recording via WebRTC will not be possible.';
+$string['seb_allowcapturecamera_help'] = 'If enabled, users will be asked to grant access to the camera for SEB before the exam session is started. In macOS 12/iOS 15 or later, disabling this setting prevents web applications from accessing the camera i.e. video recording via WebRTC will not be possible.';
 $string['seb_allowcapturemicrophone'] = 'Allow browser access to microphone';
-$string['seb_allowcapturemicrophone_help'] = 'If enabled, users will be asked to grant access to the microphone for SEB before the exam session is started. In macOS 12/iOS 15 or later, disabling this setting prevents web applications from accessing the microphone in any case, i. e. audio recording via WebRTC will not be possible.';
+$string['seb_allowcapturemicrophone_help'] = 'If enabled, users will be asked to grant access to the microphone for SEB before the exam session is started. In macOS 12/iOS 15 or later, disabling this setting prevents web applications from accessing the microphone i.e. audio recording via WebRTC will not be possible.';
 $string['seb_allowedbrowserexamkeys'] = 'Allowed browser exam keys';
 $string['seb_allowedbrowserexamkeys_help'] = 'In this field you can enter the allowed browser exam keys for versions of Safe Exam Browser that are permitted to access this quiz. If no keys are entered, then browser exam keys are not checked.';
 $string['seb_allowreloadinexam'] = 'Enable reload in exam';