Merged MDL-12294 Fixed some strings

diff --git a/admin/settings/grades.php b/admin/settings/grades.php
index aeac2007d63fa542cc0cffeb69c28afcda3e875e..668e15e3acc79487a28b6045f0e10496ee1e9e2f 100644 (file)
--- a/admin/settings/grades.php
+++ b/admin/settings/grades.php
@@ -161,7 +161,7 @@ if (has_capability('moodle/grade:manage', $systemcontext)
     }
 
     // Imports
-    $ADMIN->add('grades', new admin_category('gradeimports', get_string('imports')));
+    $ADMIN->add('grades', new admin_category('gradeimports', get_string('importsettings', 'grades')));
     foreach (get_list_of_plugins('grade/import') as $plugin) {
 
      // Include all the settings commands for this plugin if there are any
@@ -176,7 +176,7 @@ if (has_capability('moodle/grade:manage', $systemcontext)
 
 
     // Exports
-    $ADMIN->add('grades', new admin_category('gradeexports', get_string('exports')));
+    $ADMIN->add('grades', new admin_category('gradeexports', get_string('exportsettings', 'grades')));
     foreach (get_list_of_plugins('grade/export') as $plugin) {
      // Include all the settings commands for this plugin if there are any
         if (file_exists($CFG->dirroot.'/grade/export/'.$plugin.'/settings.php')) {

diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php
index db1f0b34472fced68aa3628c3d6d986ecc6eb00b..59196b2e576d253498a42b5534975f99da730f37 100644 (file)
--- a/lang/en_utf8/grades.php
+++ b/lang/en_utf8/grades.php
@@ -163,6 +163,7 @@ $string['export'] = 'Export';
 $string['exportfeedback'] = 'Include feedback in export';
 $string['exportplugins'] = 'Export plugins';
 $string['exportselectedoutcomes'] = 'Export selected outcomes';
+$string['exportsettings'] = 'Export settings';
 $string['exportto'] = 'Export to';
 $string['extracredit'] = 'Extra Credit';
 $string['extracreditwarning'] = 'Note: Setting all items for a category to extra credit will effectively remove them from the grade calculation. Since there will be no point total';
@@ -272,6 +273,7 @@ $string['importoutcomes'] = 'Import outcomes';
 $string['importoutcomesuccess'] = 'Imported outcome \"$a->name\" with ID #$a->id';
 $string['importplugins'] = 'Import plugins';
 $string['importpreview'] = 'Import preview';
+$string['importsettings'] = 'Import settings';
 $string['importstandard'] = 'Import as standard outcomes';
 $string['importskippednomanagescale'] = 'You don\'t have permission to add a new scale, so outcome "$a" was skipped as it required creating a new scale';
 $string['importskippedoutcome'] = 'An outcome with shortname \"$a\" already exists in this context, the one in the imported file was skipped.';