Merge branch 'MDL-41726-master-2nd' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 21:13:50 +0000 (23:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 21:13:50 +0000 (23:13 +0200)
Conflicts:
lang/en/moodle.php

1  2 
lang/en/moodle.php
lib/moodlelib.php
mod/quiz/locallib.php

@@@ -665,9 -665,8 +665,11 @@@ $string['eventcoursecategorydeleted'] 
  $string['eventcoursecontentdeleted'] = 'Course content deleted';
  $string['eventcoursecreated'] = 'Course created';
  $string['eventcoursedeleted'] = 'Course deleted';
 +$string['eventcoursemodulecreated'] = 'Course module created';
 +$string['eventcoursemoduledeleted'] = 'Course module deleted';
 +$string['eventcoursemoduleupdated'] = 'Course module updated';
+ $string['eventcourseresetended'] = 'Course reset ended';
+ $string['eventcourseresetstarted'] = 'Course reset started';
  $string['eventcourserestored'] = 'Course restored';
  $string['eventcourseupdated'] = 'Course updated';
  $string['eventcoursesectionupdated'] = ' Course section updated';
Simple merge
Simple merge