Merging from 1.9

diff --git a/grade/edit/tree/item_form.php b/grade/edit/tree/item_form.php
index cdf70f331adc60b63fc22de93a8407386928b619..3654e268ed57d3bd7430de04693f35d62272ec01 100644 (file)
--- a/grade/edit/tree/item_form.php
+++ b/grade/edit/tree/item_form.php
@@ -66,7 +66,7 @@ class edit_item_form extends moodleform {
             }
         }
         $mform->addElement('select', 'scaleid', get_string('scale'), $options);
-        $mform->setHelpButton('scaleid', array(false, get_string('scale'),
+        $mform->setHelpButton('scaleid', array(false, get_string('scale', 'grades'),
                 false, true, false, get_string('scaleidhelp', 'grades', get_string('gradeitem', 'grades'))));
         $mform->disabledIf('scaleid', 'gradetype', 'noteq', GRADE_TYPE_SCALE);