Merge branch 'MDL-40063_master' of https://github.com/markn86/moodle

This commit is contained in:
Dan Poltawski 2014-04-11 14:31:27 +08:00
commit 34f7e31ffb
38 changed files with 2339 additions and 51 deletions

View file

@ -137,6 +137,7 @@ $string['errorprocess'] = 'Error occurred during processing!';
$string['errorprocessingresponses'] = 'An error occurred while processing your responses ({$a}). Click continue to return to the page you were on and try again.';
$string['errorsavingcomment'] = 'Error saving the comment for question {$a->name} in the database.';
$string['errorupdatingattempt'] = 'Error updating attempt {$a->id} in the database.';
$string['eventquestioncategorycreated'] = 'Question category created';
$string['exportcategory'] = 'Export category';
$string['exportcategory_help'] = 'This setting determines the category from which the exported questions will be taken.