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

diff --cc mod/scorm/datamodels/aicclib.php
Simple merge

diff --cc mod/scorm/lang/en/scorm.php
index 7566a2e,eba24e9..5ca3aa8
--- 1/mod/scorm/lang/en/scorm.php
--- 2/mod/scorm/lang/en/scorm.php
+++ b/mod/scorm/lang/en/scorm.php
@@@ -34,9 -34,11 +34,11 @@@ $string['adminsettings'] = 'Admin setti
  $string['advanced'] = 'Parameters';
  $string['allowapidebug'] = 'Activate API debug and tracing (set the capture mask with apidebugmask)';
  $string['allowtypeexternal'] = 'Enable external package type';
+ $string['allowtypeexternalaicc'] = 'Enable direct AICC url';
+ $string['allowtypeexternalaicc_desc'] = 'If enabled this allows a direct url to a simple AICC package';
  $string['allowtypeimsrepository'] = 'Enable IMS package type';
  $string['allowtypelocalsync'] = 'Enable downloaded package type';
 -$string['allowtypeaicchacp'] = 'Enable AICC HACP';
 +$string['allowtypeaicchacp'] = 'Enable external AICC HACP';
  $string['allowtypeaicchacp_desc'] = 'If enabled this allows AICC HACP external communication without requiring user login for post requests from the external AICC package';
  $string['apidebugmask'] = 'API debug capture mask  - use a simple regex on <username>:<activityname> e.g. admin:.* will debug for admin user only';
  $string['areacontent'] = 'Content files';