Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle

diff --combined mod/scorm/lang/en/scorm.php
index 56bdd9d,1148ac2..d353e78
--- 1/mod/scorm/lang/en/scorm.php
--- 2/mod/scorm/lang/en/scorm.php
+++ b/mod/scorm/lang/en/scorm.php
@@@ -109,6 -109,12 +109,12 @@@ $string['element'] = 'Element'
  $string['enter'] = 'Enter';
  $string['entercourse'] = 'Enter course';
  $string['errorlogs'] = 'Errors log';
+ $string['eventattemptdeleted'] = 'Attempt deleted';
+ $string['eventinteractionsviewed'] = 'Interactions viewed';
+ $string['eventreportviewed'] = 'Report viewed';
+ $string['eventscolaunched'] = 'Sco launched';
+ $string['eventtracksviewed'] = 'Tracks viewed';
+ $string['eventuserreportviewed'] = 'User report viewed';
  $string['everyday'] = 'Every day';
  $string['everytime'] = 'Every time it\'s used';
  $string['exceededmaxattempts'] = 'You have reached the maximum number of attempts.';
@@@ -234,14 -240,14 +240,14 @@@ SCORM activities may be use
  $string['modulename_link'] = 'mod/scorm/view';
  $string['modulenameplural'] = 'SCORM packages';
  $string['nav'] = 'Show Navigation';
 -$string['nav_help'] = 'This setting specifies wether to show or hide the navigation buttons and their position.
 +$string['nav_help'] = 'This setting specifies whether to show or hide the navigation buttons and their position.
  
  There are 3 options:
  
 -* No - Do not show the navigation buttons
 -* Under content - Show the navigation buttons under SCORM package content
 -* Float - Allows to manually specify the navigation buttons position from left and from top with respect to the window.';
 -$string['navdesc'] = 'This setting specifies wether to show/hide navigation buttons and their position.';
 +* No - Navigation buttons are not shown
 +* Under content - Navigation buttons are shown below the SCORM package content
 +* Floating - Navigation buttons are shown floating, with the postition from the top and from the left determined by the package.';
 +$string['navdesc'] = 'This setting specifies whether to show or hide navigation buttons and their position.';
  $string['navpositionleft'] = 'Position of navigation buttons from left in pixels.';
  $string['navpositiontop'] = 'Position of navigation buttons from top in pixels.';
  $string['newattempt'] = 'Start a new attempt';