Merge branch 'master_MDL-28017' of git://github.com/danmarsden/moodle

Conflicts:
	mod/scorm/version.php
This commit is contained in:
Eloy Lafuente (stronk7) 2011-07-12 16:28:36 +02:00
commit dd8f2538b6
4 changed files with 6 additions and 4 deletions

View file

@ -278,7 +278,6 @@ $string['typelocalsync'] = 'Downloaded package';
$string['unziperror'] = 'An error occurs during package unzip';
$string['updatefreq'] = 'Auto-update frequency';
$string['updatefreqdesc'] = 'This preference sets the default auto-update frequency of an activity';
$string['updatetime'] = 'Synchronisation time';
$string['validateascorm'] = 'Validate a package';
$string['validation'] = 'Validation result';
$string['validationtype'] = 'This preference set the DOMXML library used for validating SCORM Manifest. If you don\'t know leave the selected choice.';