Merge branch 'MDL-32188' of git://github.com/timhunt/moodle

Conflicts:
	lib/db/upgrade.php
This commit is contained in:
Sam Hemelryk 2013-10-08 14:43:36 +13:00
commit cbf34f34cc
74 changed files with 1680 additions and 298 deletions

View file

@ -413,6 +413,7 @@ $string['submitted'] = 'Submit: {$a}';
$string['technicalinfo'] = 'Technical information';
$string['technicalinfo_help'] = 'This technical information is probably only useful for developers working on new question types. It may also be helpful when trying to diagnose problems with questions.';
$string['technicalinfominfraction'] = 'Minimum fraction: {$a}';
$string['technicalinfomaxfraction'] = 'Maximum fraction: {$a}';
$string['technicalinfoquestionsummary'] = 'Question summary: {$a}';
$string['technicalinforightsummary'] = 'Right answer summary: {$a}';
$string['technicalinfostate'] = 'Question state: {$a}';