Added and corrected a number of language strings.

diff --git a/admin/settings/grades.php b/admin/settings/grades.php
index 6fc0a772b660758078c03671b2960a1e94cc5565..be3d7edb23e6118ac36515f57d10713a46993e97 100644 (file)
--- a/admin/settings/grades.php
+++ b/admin/settings/grades.php
@@ -4,10 +4,10 @@
 
 // General settings
 
-$temp = new admin_settingpage('gradessettings', get_string('gradessettings'));
+$temp = new admin_settingpage('gradessettings', get_string('gradessettings', 'grades'));
 $temp->add(new admin_setting_special_gradeexport());
 // enable outcomes checkbox
-$temp->add(new admin_setting_configcheckbox('enableoutcomes', get_string('enableoutcomes', 'admin'), get_string('configenableoutcomes', 'admin'), 0, PARAM_INT));
+$temp->add(new admin_setting_configcheckbox('enableoutcomes', get_string('enableoutcomes', 'grades'), get_string('configenableoutcomes', 'grades'), 0, PARAM_INT));
 $ADMIN->add('grades', $temp);
 
 // The plugins must implement a settings.php file that adds their admin settings to the $settings object
@@ -20,8 +20,8 @@ foreach (get_list_of_plugins('grade/report') as $plugin) {
     if ($first) {
         $ADMIN->add('grades', new admin_category('gradereports', get_string('reports')));
         $first = false;
-    }    
-    
+    }
+
     if ($plugin == 'outcomes') {
         $settings = new admin_externalpage('gradereport'.$plugin, get_string('modulename', 'gradereport_'.$plugin), $CFG->wwwroot.'/grade/report/outcomes/settings.php');
         $ADMIN->add('gradereports', $settings);

diff --git a/grade/report/outcomes/settings.php b/grade/report/outcomes/settings.php
index ccb4aa23058516369b5367732e7492f43d26eddc..b7dc4c373301ac7211c93029b0fc36b107a28ead 100755 (executable)
--- a/grade/report/outcomes/settings.php
+++ b/grade/report/outcomes/settings.php
@@ -38,7 +38,10 @@ print_paging_bar($totalcount, $page, $perpage, $baseurl);
 if ($outcomes = get_recordset('grade_outcomes', '', '', '', '*', $page * $perpage, $perpage)) {
 
     $tablecolumns = array('outcome', 'edit', 'usedgradeitems', 'usedcourses');
-    $tableheaders = array(get_string('outcomes'), get_string('operations'), get_string('usedgradeitem'), get_string('usedcourses'));
+    $tableheaders = array(get_string('outcomes', 'grades'),
+                          get_string('operations', 'grades'),
+                          get_string('usedgradeitem', 'grades'),
+                          get_string('usedcourses', 'grades'));
 
     $table = new flexible_table('outcomes');
     $table->define_columns($tablecolumns);

diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php
index ecaf46777b068ae59e435ec053f9bd7d4c5f2746..3e4f5da22fb599f1d887fa3db7eb2d2860a6bdb9 100644 (file)
--- a/lang/en_utf8/grades.php
+++ b/lang/en_utf8/grades.php
@@ -52,6 +52,7 @@ $string['configaveragesdisplaytype'] = 'Specifies how to display the averages fo
 $string['configbulkcheckboxes'] = 'Checkboxes near each grade for Bulk grade operations.';
 $string['configdecimalpoints'] = 'The number of decimal points to display for each grade. This can be overriden per grading item.';
 $string['configenableajax'] = 'Adds a layer of AJAX functionality to the grader report, simplifying and speeding up common operations. Depends on Javascript being switched on at the user\'s browser level.';
+$string['configenableoutcomes'] = 'Support for Outcomes (also known as Competencies, Goals, Standards or Criteria) means that we can grade things using one or more scales that are tied to outcome statements. Enabling outcomes makes such special grading possible throughout the site.';
 $string['configgradeboundary'] = 'A percentage boundary over which grades will be assigned a grade letter (if the Letter grade display type is used). ';
 $string['configgradedisplaytype'] = 'Grades can be shown as real grades, as percentages (in reference to the minimum and maximum grades) or as letters (A, B, C etc..)';
 $string['configgradeletter'] = 'A letter or other symbol used to represent a range of grades.';
@@ -88,8 +89,10 @@ $string['dropxlowestwarning'] = 'Note: If you use drop x lowest the grading assu
 $string['editcalculation'] = 'Edit Calculation';
 $string['editfeedback'] = 'Edit Feedback';
 $string['editgrade'] = 'Edit Grade';
+$string['editoutcomes'] = 'Edit outcomes';
 $string['edittree'] = 'Categories';
 $string['enableajax'] = 'Enable AJAX';
+$string['enableoutcomes'] = 'Enable outcomes';
 $string['encoding'] = 'Encoding';
 $string['errorgradevaluenonnumeric'] = 'Received non-numeric for low or high grade for';
 $string['errorcalculationunknown'] = 'Invalid formula';
@@ -135,12 +138,11 @@ $string['gradeletternote'] = 'To delete a grade letter just empty any of the<br
 $string['grademax'] = 'Maximum grade';
 $string['grademin'] = 'Minimum grade';
 $string['gradepass'] = 'Grade to pass';
+$string['gradessettings'] = 'Grade settings';
 $string['groupavg'] = 'Group average';
 $string['hidden'] = 'Hidden';
 $string['importplugins'] = 'Import plugins';
 $string['itemsedit'] = 'Edit grade item';
-$string['multfactor'] = 'Multiplicator';
-$string['plusfactor'] = 'Offset';
 $string['gradepreferences'] = 'Grade Preferences';
 $string['gradepreferenceshelp'] = 'Grade Preferences Help';
 $string['grades'] = 'Grades';
@@ -195,6 +197,7 @@ $string['median'] = 'Median';
 $string['min'] = 'Lowest';
 $string['mode'] = 'Mode';
 $string['movingelement'] = 'Moving $a';
+$string['multfactor'] = 'Multiplicator';
 $string['newcategory'] = 'New category';
 $string['no'] = 'No';
 $string['nocategories'] = 'Grade categories could not be added or found for this course';
@@ -210,7 +213,10 @@ $string['noselectedcategories'] = 'no categories were selected.';
 $string['noselecteditems'] = 'no items were selected.';
 $string['notteachererror'] = 'You must be a teacher to use this feature.';
 $string['onascaleof'] = ' on a scale of $a->grademin to $a->grademax';
+$string['operations'] = 'Operations';
 $string['outcome'] = 'Outcome';
+$string['outcomereport'] = 'Outcome report';
+$string['outcomes'] = 'Outcomes';
 $string['overridden'] = 'Overridden';
 $string['pctoftotalgrade'] = '%% of total grade';
 $string['percent'] = 'Percent';
@@ -218,6 +224,7 @@ $string['percentage'] = 'Percentage';
 $string['percentascending'] = 'Sort by percent ascending';
 $string['percentdescending'] = 'Sort by percent descending';
 $string['percentshort'] = '%%';
+$string['plusfactor'] = 'Offset';
 $string['points'] = 'points';
 $string['pointsascending'] = 'Sort by points ascending';
 $string['pointsdescending'] = 'Sort by points descdending';
@@ -285,6 +292,8 @@ $string['unlock'] = 'Unlock';
 $string['unused'] = 'Unused';
 $string['uploadgrades'] = 'Upload grades';
 $string['useadvanced'] = 'Use Advanced Features';
+$string['usedcourses'] = 'Used courses';
+$string['usedgradeitem'] = 'Used grade item';
 $string['usenooutcome'] = 'Use no outcome';
 $string['usenoscale'] = 'Use no scale';
 $string['usepercent'] = 'Use Percent';