Changing string for Overall average (was logged under MDL-11233 even though that...

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index a081f632ee2e7801420a6a9999515d9667296872..4595f8f146c3f458f682f35cd5bee45811f5dff3 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -802,7 +802,7 @@ class grade_report_grader extends grade_report {
             $groupwheresql = $this->groupwheresql;
             $avgcssclass = 'groupavg';
         } else {
-            $straverage = get_string('completeaverage', 'grades');
+            $straverage = get_string('overallaverage', 'grades');
             $showaverages = $this->get_pref('showaverages');
             $groupsql = null;
             $groupwheresql = null;

diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php
index 37a5b2a4aafdbd416e5e8e35b17a3bf383d4db68..12cbe59d20ef8706590ff53fda96046a5c365a11 100644 (file)
--- a/lang/en_utf8/grades.php
+++ b/lang/en_utf8/grades.php
@@ -57,7 +57,6 @@ $string['categorytotal'] = 'Category total';
 $string['changesitedefaults'] = 'Change site defaults';
 $string['choosecategory'] = 'Select Category';
 $string['compact'] = 'Compact';
-$string['completeaverage'] = 'Complete average';
 $string['configaggregationposition'] = 'The position of the aggregation column in the grader report table, in reference to the real grades.';
 $string['configaggregationview'] = 'Each category can be displayed in three ways: Full mode (aggregated column and grade item columns), the aggregated column only, or the grade items alone.';
 $string['configaveragesdecimalpoints'] = 'The number of decimal points to display for each average (group or whole), below a column of grades. This can be overriden per grading item.';
@@ -298,6 +297,7 @@ $string['outcomesstandardavailable'] = 'Available standard outcomes';
 $string['outcomestandard'] = 'Standard outcome';
 $string['outcomestandardhelp'] = 'A Standard outcome is available site-wide, for all courses.';
 $string['outcomes'] = 'Outcomes';
+$string['overallaverage'] = 'Overall average';
 $string['overridden'] = 'Overridden';
 $string['overriddenhelp'] = 'When on, the overridden flag prevents any future attempts to automatically adjust the value of the grade. This flag is often set internally by the gradebook, but can be switched on and off manually using this form element.';
 $string['overallavg'] = 'Overall average';