Merge branch 'MDL-30295' of git://github.com/scriby/moodle

Conflicts: mod/lti/lang/en/lti.php
moodle · Nov 20, 2011 · 8efcee5 · 8efcee5
2 parents 34087d7 + 532ae9a
commit 8efcee5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/mod/lti/lang/en/lti.php b/mod/lti/lang/en/lti.php
@@ -230,6 +230,7 @@
 $string['lti'] = 'LTI';
 $string['lti:addcoursetool'] = 'Grade LTI activities';
 $string['lti:grade'] = 'Grade LTI activities';
+$string['lti:manage'] = 'Edit LTI activities';
 $string['lti:requesttooladd'] = 'Submit a tool to admins for configuration';
 $string['lti:view'] = 'View LTI activities';
 $string['lti_administration'] = 'LTI Administration';
@@ -488,4 +489,4 @@
 $string['update'] = 'Update';
 $string['using_tool_configuration'] = 'Using tool configuration: ';
 $string['validurl'] = 'A valid URL must start with http(s)://';
-$string['viewsubmissions'] = 'View submissions and grading screen';
+$string['viewsubmissions'] = 'View submissions and grading screen';