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

Conflicts:
	mod/lti/lang/en/lti.php
This commit is contained in:
Eloy Lafuente (stronk7) 2011-11-21 00:58:12 +01:00
commit 8efcee5f8c

View 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';
$string['viewsubmissions'] = 'View submissions and grading screen';