Merge branch 'MDL-45752_m32v3' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Sep 2016 15:36:51 +0000 (17:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Sep 2016 15:36:51 +0000 (17:36 +0200)
1  2 
lang/en/moodle.php
version.php

diff --combined lang/en/moodle.php
@@@ -727,13 -727,16 +727,16 @@@ $string['eventcommentsviewed'] = 'Comme
  $string['eventcoursecategorycreated'] = 'Category created';
  $string['eventcoursecategorydeleted'] = 'Category deleted';
  $string['eventcoursecategoryupdated'] = 'Category updated';
+ $string['eventcoursecategoryviewed'] = 'Category viewed';
  $string['eventcoursecontentdeleted'] = 'Course content deleted';
  $string['eventcoursecreated'] = 'Course created';
  $string['eventcoursedeleted'] = 'Course deleted';
+ $string['eventcourseinformationviewed'] = 'Course summary viewed';
  $string['eventcoursemodulecreated'] = 'Course module created';
  $string['eventcoursemoduledeleted'] = 'Course module deleted';
  $string['eventcoursemoduleupdated'] = 'Course module updated';
  $string['eventcoursemoduleviewed'] = 'Course module viewed';
+ $string['eventcoursessearched'] = 'Courses searched';
  $string['eventcourseresetended'] = 'Course reset ended';
  $string['eventcourseresetstarted'] = 'Course reset started';
  $string['eventcourserestored'] = 'Course restored';
@@@ -750,7 -753,6 +753,7 @@@ $string['eventemailfailed'] = 'Email fa
  $string['eventname'] = 'Event name';
  $string['eventrecentactivityviewed'] = 'Recent activity viewed';
  $string['eventsearchindexed'] = 'Search data indexed';
 +$string['eventsearchresultsviewed'] = 'Search results viewed';
  $string['eventunknownlogged'] = 'Unknown event';
  $string['eventusercreated'] = 'User created';
  $string['eventuserdeleted'] = 'User deleted';
@@@ -2036,4 -2038,4 +2039,4 @@@ $string['maxbytesforfile'] = 'The file 
  
  // Deprecated since Moodle 3.2.
  $string['modchooserenable'] = 'Activity chooser on';
 -$string['modchooserdisable'] = 'Activity chooser off';
 +$string['modchooserdisable'] = 'Activity chooser off';
diff --combined version.php
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2016091900.03;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2016090800.02;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2016092000.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.
  
 -$release  = '3.2dev (Build: 20160908)'; // Human-friendly version name
 +$release  = '3.2dev (Build: 20160915)'; // Human-friendly version name
  
  $branch   = '32';                       // This version's branch.
  $maturity = MATURITY_ALPHA;             // This version's maturity level.