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

…odle

admin/tool/componentlibrary/lang/en/tool_componentlibrary.php

@@ -25,15 +25,15 @@
 $string['copied'] = 'Copied!';
 $string['copy'] = 'Copy';
 $string['copytoclipboard'] = 'Copy to clipboard';
-$string['installer'] = '<h3>Please setup this component library</h3>
+$string['installer'] = '<h3>Component library setup</h3>
     <p>Before you can see the content of the component library you will need to have shell access to your Moodle installation and be able to write to folder /admin/tool/componentlibrary and have npm installed on your Moodle server.</p>
     <p>If you meet these requirements you can navigate to your Moodle root folder and run:</p>
     <pre>$ npm install</pre>
     <pre>$ npm install grunt</pre>
     <p>This will fetch all the required packages for building the component library docs.</p>
     <p>Once they are installed you can run:</p>
     <pre>$ grunt componentlibrary</pre>
-    <p>For more info see the README.md file in this plugin</p>';
+    <p>For more info see the README.md file in this plugin.</p>';
 $string['pluginname'] = 'UI Component library';
 $string['privacy:metadata'] = 'The Component library plugin does not store any personal data.';
 $string['showboth'] = 'Show with both';

lang/en/admin.php

@@ -1305,7 +1305,7 @@
 $string['task_stats:dbreads'] = '{$a} reads';
 $string['task_stats:dbwrites'] = '{$a} writes';
 $string['task_status'] = 'Task status';
-$string['task_status_desc'] = 'The task <q>{$a->name}</q> is <strong>{$a->status}</strong>.<br />See its <a href="{$a->gotourl}">details</a>.<br />Class: {$a->class}{$a->extradescription}';
+$string['task_status_desc'] = 'The task \'{$a->name}\' is {$a->status}. For details, see {$a->class}{$a->extradescription} in <a href="{$a->gotourl}">Scheduled tasks</a>.';
 $string['task_starttime'] = 'Start time';
 $string['task_duration'] = 'Duration';
 $string['task_dbstats'] = 'Database';
@@ -1360,7 +1360,7 @@
 $string['testoutgoingmailconf'] = 'Test outgoing mail configuration';
 $string['testoutgoingmaildetail'] = 'Note: Before testing, please save your configuration.<br />{$a}';
 $string['testoutgoingmailconf_errorcommunications'] = 'Your site couldn\'t communicate with your mail server. Please check your outgoing mail configuration.';
-$string['testoutgoingmailconf_message'] = "This is a test message to confirm that you have successfully configured your site's outgoing mail.\n\n Sent:" . '{$a}';
+$string['testoutgoingmailconf_message'] = 'This is a test message to confirm that you have successfully configured your site\'s outgoing mail.  Sent: {$a}';
 $string['testoutgoingmailconf_fromemail'] = 'From username or email address';
 $string['testoutgoingmailconf_fromemail_help'] = 'This field emulates sending the message from that user, but the From header used in the real email sent will depend on other settings such as allowedemaildomains';
 $string['testoutgoingmailconf_fromemail_invalid'] = 'Invalid From username or email. Must be a valid email format or an existing username in Moodle.';

lang/en/backup.php

@@ -289,7 +289,7 @@
 $string['overwrite'] = 'Overwrite';
 $string['pendingasyncdetail'] = 'Asynchronous backups only allow a user to have one pending backup for a resource at a time. <br/> Multiple asynchronous backups of the same resource can\'t be queued, as this would likely result in multiple backups with the same content.';
 $string['pendingasyncdeletedetail'] = 'This course has an asynchronous backup pending. <br/> Courses can\'t be deleted until this backup finishes.';
-$string['pendingasyncedit'] = 'There is a pending asynchronous backup for this course. Please do not edit this course until backup is complete.';
+$string['pendingasyncedit'] = 'There is a pending backup or copy requested for this course. Please do not edit the course until this is complete.';
 $string['pendingasyncerror'] = 'Backup pending for this resource';
 $string['previousstage'] = 'Previous';
 $string['preparingui'] = 'Preparing to display page';

lang/en/badges.php

@@ -140,9 +140,7 @@
 $string['badges'] = 'Badges';
 $string['badgedetails'] = 'Badge details';
 $string['badgeimage'] = 'Image';
-$string['badgeimage_help'] = 'This is an image that will be used when this badge is issued.
-
-To add a new image, browse and select an image (in JPG or PNG format) then click "Save changes". The image will be cropped to a square and resized to match badge image requirements. ';
+$string['badgeimage_help'] = 'The image should be at least 300 x 300 pixels in size. It will be displayed as 300 x 300 pixels on the badge page and 100 x 100 pixels on the user\'s profile page.';
 
 $string['badgeprivacysetting'] = 'Badge privacy settings';
 $string['badgeprivacysetting_help'] = 'Badges you earn can be displayed on your account profile page. This setting allows you to automatically set the visibility of the newly earned badges.

lang/en/calendar.php

@@ -279,7 +279,7 @@
 $string['whendate'] = 'When: {$a}';
 $string['yesterday'] = 'Yesterday';
 $string['youcandeleteallrepeats'] = 'This event is part of a repeating event series. You can delete this event only, or all {$a} events in the series at once.';
-$string['yoursubscriptions'] = 'Your Subscriptions';
+$string['yoursubscriptions'] = 'Your subscriptions';
 
 // Deprecated since Moodle 4.0.
 $string['calendarurl'] = 'Calendar URL: {$a}';

lang/en/completion.php

@@ -80,9 +80,7 @@
 $string['completion-y'] = 'Completed';
 $string['completion-y-override'] = 'Completed (set by {$a})';
 $string['completion_automatic'] = 'Show activity as complete when conditions are met';
-$string['completion_help'] = 'If enabled, activity completion is tracked, either manually or automatically, based on certain conditions. Multiple conditions may be set if desired. If so, the activity will only be considered complete when ALL conditions are met.
-
-A tick next to the activity name on the course page indicates when the activity is complete.';
+$string['completion_help'] = 'If enabled, activity completion is tracked, either manually or automatically, based on certain conditions. Multiple conditions may be set if desired. If so, the activity will only be considered complete when ALL conditions are met.';
 $string['completion_link'] = 'activity/completion';
 $string['completion_manual'] = 'Students can manually mark the activity as completed';
 $string['completion_none'] = 'Do not indicate activity completion';
@@ -91,7 +89,7 @@
 $string['completiondisabled'] = 'Disabled, not shown in activity settings';
 $string['completionenabled'] = 'Enabled, control via completion and activity settings';
 $string['completionexpected'] = 'Expect completed on';
-$string['completionexpected_help'] = 'This setting specifies the date when the activity is expected to be completed.';
+$string['completionexpected_help'] = 'This setting specifies the date when the activity is expected to be completed. When the date is upcoming, the activity is listed in the Timeline block on the Dashboard.';
 $string['completionexpecteddesc'] = 'Completion expected on {$a}';
 $string['completionexpectedfor'] = '{$a->instancename} should be completed';
 $string['completionicons'] = 'Completion tick boxes';
@@ -110,7 +108,7 @@
 $string['completionsettingslocked'] = 'Completion settings locked';
 $string['completionusegrade'] = 'Require grade';
 $string['completionusegrade_desc'] = 'Student must receive a grade to complete this activity';
-$string['completionusegrade_help'] = 'If enabled, the activity is considered complete when a student receives a grade. Pass and fail icons may be displayed if a pass grade for the activity has been set.';
+$string['completionusegrade_help'] = 'If enabled, the activity is considered complete when a student receives a grade. If a pass grade for the activity is set, then pass and fail icons are displayed in the activity completion report.';
 $string['completionupdated'] = 'Updated completion for activity <b>{$a}</b>';
 $string['completionview'] = 'Require view';
 $string['completionview_desc'] = 'Student must view this activity to complete it';

lang/en/h5p.php

@@ -91,7 +91,7 @@
 $string['fullscreen'] = 'Fullscreen';
 $string['gpl'] = 'General Public License v3';
 $string['h5p'] = 'H5P';
-$string['h5peditor'] = 'H5P Editor';
+$string['h5peditor'] = 'H5P editor';
 $string['h5ptitle'] = 'Visit h5p.org to check out more content.';
 $string['h5pfilenotfound'] = 'H5P file not found';
 $string['h5pinvalidurl'] = 'Invalid H5P content URL.';

lang/en/hub.php

@@ -120,7 +120,7 @@
 $string['search'] = 'Search';
 $string['sendingsize'] = 'Please wait the course file is uploading ({$a->total}Mb)...';
 $string['sendfollowinginfo'] = 'More information';
-$string['sendfollowinginfo_help'] = 'The following information will be sent to Moodle each time your site registration is updated (by default weekly, when the \'Site registration\' scheduled task is run). The information contributes to overall statistics only and will not be made public on any site listing.';
+$string['sendfollowinginfo_help'] = 'The following information will be sent to Moodle each time your site registration is updated (by default weekly, when the \'Site registration\' scheduled task is run). The information contributes to overall statistics only and will not be made public on any site listing. In addition, your Moodle release version is recorded by the weekly automated site link check.';
 $string['sent'] = '...finished';
 $string['siteadmin'] = 'Administrator';
 $string['siteadmin_help'] = 'The full name of the site administrator.';

mod/forum/lang/en/forum.php

@@ -499,7 +499,7 @@
 $string['permalink'] = 'Permalink';
 $string['permanentlinktopost'] = 'Permanent link to this post';
 $string['permanentlinktoparentpost'] = 'Permanent link to the parent of this post';
-$string['postisprivatereply'] = 'This is a private reply. It is not visible to other participants.';
+$string['postisprivatereply'] = 'This is a private reply. It is only visible to you and anyone with the capability to view private replies, such as teachers or managers.';
 $string['pindiscussion'] = 'Pin this discussion';
 $string['pinupdated'] = 'The pin option has been updated.';
 $string['posttomygroups'] = 'Post a copy to all groups';
@@ -679,7 +679,7 @@
 $string['subscription_help'] = 'If you are subscribed to a forum it means you will receive notification of new forum posts. Usually you can choose whether you wish to be subscribed, though sometimes subscription is forced so that everyone receives notifications.';
 $string['subscriptionandtracking'] = 'Subscription and tracking';
 $string['subscriptionmode'] = 'Subscription mode';
-$string['subscriptionmodeconfirm'] = 'Are you sure you want to change the subscription mode to "{$a}"';
+$string['subscriptionmodeconfirm'] = 'Are you sure you want to change the subscription mode to {$a}?';
 $string['subscriptionmode_help'] = 'When a participant is subscribed to a forum it means they will receive forum post notifications. There are 4 subscription mode options:
 
 * Optional subscription - Participants can choose whether to be subscribed

mod/forum/tests/behat/forum_subscriptions_management.feature

@@ -61,7 +61,7 @@ Feature: A teacher can control the subscription to a forum
       | forcesubscribe | <initialmode> |
     When I am on the "Test forum" "forum activity" page logged in as "teacher"
     And I navigate to "Subscription mode > <updatedmode>" in current page administration
-    And I should see "Are you sure you want to change the subscription mode to \"<updatedmode>\"" in the "Confirmation" "dialogue"
+    And I should see "Are you sure you want to change the subscription mode to <updatedmode>" in the "Confirmation" "dialogue"
     And I click on "Yes" "button" in the "Confirmation" "dialogue"
     Then I should see "<updatedmodeconfirmed>"
     Examples:

mod/forum/tests/behat/inpage_reply.feature

@@ -42,6 +42,6 @@ Feature: Students can reply to a discussion in page.
       | post | Discussion contents 1, third message |
       | privatereply | 1                            |
     Then I should see "Discussion contents 1, third message"
-    Then I should see "This is a private reply. It is not visible to other participants."
+    Then I should see "This is a private reply. It is only visible to you and anyone with the capability to view private replies, such as teachers or managers."
     When I reload the page
     Then I should see "Discussion contents 1, third message"

question/bank/deletequestion/lang/en/qbank_deletequestion.php

@@ -23,6 +23,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Delete question bank feature';
-$string['privacy:metadata'] = 'Delete question plugin will questions, it does not store any user data.';
+$string['pluginname'] = 'Delete question';
+$string['privacy:metadata'] = 'The Delete question question bank plugin does not store any personal data.';
 $string['deletequestion'] = 'Delete selected question';

question/bank/editquestion/lang/en/qbank_editquestion.php

@@ -23,5 +23,5 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Edit question bank feature';
-$string['privacy:metadata'] = 'Edit question plugin add/edit/copy a question, it does not store any user data.';
+$string['pluginname'] = 'Edit questions';
+$string['privacy:metadata'] = 'The Edit questions question bank plugin does not store any user data.';

question/bank/exportquestions/lang/en/qbank_exportquestions.php

@@ -23,5 +23,5 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Export question bank feature';
-$string['privacy:metadata'] = 'The Export Questions plugin does not store any personal data.';
+$string['pluginname'] = 'Export questions';
+$string['privacy:metadata'] = 'The Export questions question bank plugin does not store any personal data.';

question/bank/importquestions/lang/en/qbank_importquestions.php

@@ -23,5 +23,5 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Import question bank feature';
-$string['privacy:metadata'] = 'The import question bank will import questions from a file according to the selected file format.';
+$string['pluginname'] = 'Import questions';
+$string['privacy:metadata'] = 'The Import questions question bank plugin imports questions from a file according to the selected file format.';