Merge branch 'MDL-72063-310-en_fix' of git://github.com/mudrd8mz/moodle into MOODLE_310_STABLE

lang/en/admin.php

@@ -223,8 +223,8 @@ $string['configdisableuserimages'] = 'Disable the ability for users to change us
 $string['configdisplayloginfailures'] = 'This will display information to users about previous failed logins.';
 $string['configdndallowtextandlinks'] = 'Enable or disable the dragging and dropping of text and links onto a course page, alongside the dragging and dropping of files. Note that the dragging of text into Firefox or between different browsers is unreliable and may result in no data being uploaded, or corrupted text being uploaded.';
 $string['configdoclang'] = 'This language will be used in links for the documentation pages.';
-$string['configdocroot'] = 'Defines the path to the Moodle Docs for providing context-specific documentation via \'Moodle Docs for this page\' links in the footer of each page. If the field is left blank, links will not be displayed.';
+$string['configdocroot'] = 'Defines the path to Moodle Docs for providing context-specific documentation via \'Help and documentation\' links in the footer of each page. If the field is left blank, links will not be displayed.';
-$string['configdoctonewwindow'] = 'If you enable this, then links to Moodle Docs will be shown in a new window.';
+$string['configdoctonewwindow'] = 'If enabled, then links to Moodle Docs will be shown in a new window.';
 $string['configeditordictionary'] = 'This value will be used if aspell doesn\'t have dictionary for users own language.';
 $string['configeditorfontlist'] = 'Select the fonts that should appear in the editor\'s drop-down list.';
 $string['configemailchangeconfirmation'] = 'Require an email confirmation step when users change their email address in their profile.';
@@ -1058,7 +1058,7 @@ $string['proxyuser'] = 'Proxy username';
 $string['query'] = 'Query';
 $string['question'] = 'Question';
 $string['questionbehaviours'] = 'Question behaviours';
-$string['questioncwqpfscheck'] = 'One or more \'random\' questions in a quiz are set up to select questions from a mixture of shared and unshared question categories. There is a more detailed report <a href="{$a->reporturl}">here</a> and see Moodle Docs page <a href="{$a->docsurl}">here</a>.';
+$string['questioncwqpfscheck'] = 'One or more random questions in a quiz are set up to select questions from a mixture of shared and unshared question categories. See the <a href="{$a->reporturl}">random questions report</a> and the <a href="{$a->docsurl}">documentation</a>.';
 $string['questioncwqpfsok'] = 'Good. There are no \'random\' questions in your quizzes that are set up to select questions from a mixture of shared and unshared question categories.';
 $string['questiontype'] = 'Question type';
 $string['questiontypes'] = 'Question types';

lang/en/form.php

@@ -39,7 +39,7 @@ $string['err_minlength'] = 'You must enter at least {$a->format} characters here
 $string['err_nonzero'] = 'You must enter a number not starting with a 0 here.';
 $string['err_nopunctuation'] = 'You must enter no punctuation characters here.';
 $string['err_numeric'] = 'You must enter a number here.';
-$string['err_positiveint'] = 'You must enter a number that greater than 0 here.';
+$string['err_positiveint'] = 'You must enter a number that is greater than 0.';
 $string['err_rangelength'] = 'You must enter between {$a->format[0]} and {$a->format[1]} characters here.';
 $string['err_required'] = 'You must supply a value here.';
 $string['err_wrappingwhitespace'] = 'The value must not start or end with whitespace.';

lang/en/moodle.php

@@ -1309,7 +1309,7 @@ $string['modulesetup'] = 'Setting up module tables';
 $string['modulesuccess'] = '{$a} tables have been set up correctly';
 $string['modulesused'] = 'Modules used';
 $string['moodledocs'] = 'Moodle Docs';
-$string['moodledocslink'] = 'Moodle Docs for this page';
+$string['moodledocslink'] = 'Help and documentation';
 $string['moodleversion'] = 'Moodle version';
 $string['moodlerelease'] = 'Moodle release';
 $string['more'] = 'more';

lang/en/question.php

@@ -426,9 +426,9 @@ $string['privacy:metadata:database:question_attempts'] = 'The information about
 $string['privacy:metadata:database:question_attempts:flagged'] = 'An indication that the user has flagged this question within the attempt.';
 $string['privacy:metadata:database:question_attempts:responsesummary'] = 'A summary of the question response.';
 $string['privacy:metadata:database:question_attempts:timemodified'] = 'The time that the question attempt was updated.';
-$string['privacy:metadata:link:qbehaviour'] = 'The Question subsystem makes use of the Question Behaviour plugintype.';
+$string['privacy:metadata:link:qbehaviour'] = 'The question subsystem makes use of the Question behaviours plugin type.';
-$string['privacy:metadata:link:qformat'] = 'The Question subsystem makes use of the Question Format plugintype for the purpose of importing and exporting questions in different formats.';
+$string['privacy:metadata:link:qformat'] = 'The question subsystem makes use of the Question import/export formats plugin type for the purpose of importing and exporting questions in different formats.';
-$string['privacy:metadata:link:qtype'] = 'The Question subsystem interacts with the Question Type plugintype which contains the different types of questions.';
+$string['privacy:metadata:link:qtype'] = 'The question subsystem interacts with the Question types plugin type which contains the different types of questions.';
 $string['questionbehaviouradminsetting'] = 'Question behaviour settings';
 $string['questionbehavioursdisabled'] = 'Question behaviours to disable';
 $string['questionbehavioursdisabledexplained'] = 'Enter a comma-separated list of behaviours you do not want to appear in the drop-down menu.';

mod/forum/lang/en/forum.php

@@ -291,7 +291,7 @@ $string['forum:cantogglefavourite'] = 'Star discussions';
 $string['forum:grade'] = 'Grade forum';
 $string['forumauthorhidden'] = 'Author (hidden)';
 $string['forumblockingalmosttoomanyposts'] = 'You are approaching the posting threshold. You have posted {$a->numposts} times in the last {$a->blockperiod} and the limit is {$a->blockafter} posts.';
-$string['forumbodyhidden'] = 'This post cannot be viewed by you, probably because you have not posted in the discussion, the maximum editing time hasn\'t passed yet, the discussion has not started or the discussion has expired.';
+$string['forumbodyhidden'] = 'This post is currently hidden, most likely because you need to post in the discussion first and forum post notifications must be sent. Another possibility is that the current time is not within the display period set for the post.';
 $string['forum:canposttomygroups'] = 'Post to all groups you have access to';
 $string['forum:createattachment'] = 'Create attachments';
 $string['forum:deleteanypost'] = 'Delete any posts (anytime)';

mod/quiz/lang/en/quiz.php

@@ -489,7 +489,7 @@ $string['matchanswer'] = 'Matching answer';
 $string['matchanswerno'] = 'Matching answer {$a}';
 $string['messageprovider:attempt_overdue'] = 'Warning when your quiz attempt becomes overdue';
 $string['messageprovider:confirmation'] = 'Confirmation of your own quiz submissions';
-$string['messageprovider:submission'] = 'Notification of quiz submissions';
+$string['messageprovider:submission'] = 'Notification of your students\' quiz submissions';
 $string['max'] = 'Max';
 $string['maxmark'] = 'Maximum mark';
 $string['min'] = 'Min';
@@ -714,9 +714,9 @@ $string['quizcloses'] = 'Quiz closes';
 $string['quizeventcloses'] = '{$a} closes';
 $string['quizcloseson'] = 'This quiz will close on {$a}.';
 $string['quiz:deleteattempts'] = 'Delete quiz attempts';
-$string['quiz:emailconfirmsubmission'] = 'Get a confirmation message when submitting';
+$string['quiz:emailconfirmsubmission'] = 'Receive confirmation of your own quiz submissions';
-$string['quiz:emailnotifysubmission'] = 'Get a notification message when an attempt is submitted';
+$string['quiz:emailnotifysubmission'] = 'Receive notification of your students\' quiz submissions';
-$string['quiz:emailwarnoverdue'] = 'Get a notification message when an attempt becomes overdue and needs to be submitted.';
+$string['quiz:emailwarnoverdue'] = 'Receive warning when your quiz attempt becomes overdue';
 $string['quiz:grade'] = 'Grade quizzes manually';
 $string['quiz:ignoretimelimits'] = 'Ignore quiz time limit';
 $string['quizisclosed'] = 'This quiz is closed';

mod/quiz/report/grading/tests/behat/grading.feature

@@ -95,16 +95,16 @@ Feature: Basic use of the Manual grading report
     When I set the following fields to these values:
       | Questions per page | 0 |
     And I press "Change options"
-    Then I should see "You must enter a number that greater than 0 here"
+    Then I should see "You must enter a number that is greater than 0."
     And I set the following fields to these values:
       | Questions per page | -1 |
     And I press "Change options"
-    And I should see "You must enter a number that greater than 0 here"
+    And I should see "You must enter a number that is greater than 0."
     And I set the following fields to these values:
       | Questions per page | abc |
     And I press "Change options"
-    And I should see "You must enter a number that greater than 0 here"
+    And I should see "You must enter a number that is greater than 0."
     And I set the following fields to these values:
       | Questions per page | 1 |
     And I press "Change options"
-    And I should not see "You must enter a number that greater than 0 here"
+    And I should not see "You must enter a number that is greater than 0."

repository/nextcloud/lang/en/repository_nextcloud.php

@@ -64,4 +64,4 @@ $string['pathnotcreated'] = 'Folder path {$a} could not be created in the system
 $string['endpointnotdefined'] = 'Endpoint {$a} not defined.';
 
 // Warnings.
-$string['externalpubliclinkwarning'] = '<b>Warning:</b> This file will become public.';
+$string['externalpubliclinkwarning'] = 'Warning: This file will become public.';