Merge branch 'MDL-30295' of git://github.com/scriby/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 20 Nov 2011 23:58:12 +0000 (00:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 20 Nov 2011 23:58:12 +0000 (00:58 +0100)
Conflicts:
mod/lti/lang/en/lti.php

mod/lti/lang/en/lti.php

index de1c72b..f2eda29 100644 (file)
@@ -230,6 +230,7 @@ $string['launchoptions'] = 'Launch Options';
 $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['types'] = 'Types';
 $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';
\ No newline at end of file
+$string['viewsubmissions'] = 'View submissions and grading screen';