MDL-10301 Applying language patch; merging from MOODLE_19_STABLE

diff --git a/lang/en_utf8/help/coursegrades.html b/lang/en_utf8/help/coursegrades.html
index b157752a9c4bc9fefffbf05a2b13f0bdea24f474..6e5bf1e68512de47dbb4fe918192518de795de57 100644 (file)
--- a/lang/en_utf8/help/coursegrades.html
+++ b/lang/en_utf8/help/coursegrades.html
@@ -6,9 +6,11 @@
    course can be seen in the Grades page, available 
    from the main course page.</p>
 
-<p>If a teacher is not interested in using grades in a 
-   course, or just wants to hide grades from students, 
-   then they can disable the display of grades in the 
-   Course Settings.  This does not prevent individual 
-   activities from using or setting grades, it just 
-   disables the results being displayed to students.</p>
+<p>If a teacher is not interested in using grades in a
+   course, or just wants to hide the gradebook from students,
+   then they can disable the display of the gradebook in
+   the Course Settings.  This does not prevent individual
+   activities from using or setting grades,
+   <strong>nor</strong> does it prevent the grade from being
+   displayed to students within the individual activities.</p>
+

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 6afbed3bb17a5fb98c8d25ab677bd6fff55f56d2..74d251f78dd7f4c7a717bb6460e8c75eac2a9620 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -1360,7 +1360,7 @@ $string['showalltopics'] = 'Show all topics';
 $string['showallusers'] = 'Show all users';
 $string['showallweeks'] = 'Show all weeks';
 $string['showblockcourse'] = 'Show list of courses containing block';
-$string['showgrades'] = 'Show grades';
+$string['showgrades'] = 'Show gradebook to students';
 $string['showlistofcourses'] = 'Show list of courses';
 $string['showmodulecourse'] = 'Show list of courses containing activity';
 $string['showonly'] = 'Show only';