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

calendar/lib.php

@@ -2695,7 +2695,7 @@ function calendar_get_eventtype_choices($courseid) {
         $choices[0] = get_string('userevents', 'calendar');
     }
     if ($allowed->site) {
-        $choices[SITEID] = get_string('globalevents', 'calendar');
+        $choices[SITEID] = get_string('siteevents', 'calendar');
     }
     if (!empty($allowed->courses)) {
         $choices[$courseid] = get_string('courseevents', 'calendar');

lang/en/calendar.php

@@ -161,6 +161,7 @@ $string['showglobalevents'] = 'Show global events';
 $string['showgroupsevents'] = 'Show group events';
 $string['showuserevents'] = 'Show user events';
 $string['shown'] = 'shown';
+$string['siteevents'] = 'Site events';
 $string['spanningevents'] = 'Events underway';
 $string['subscriptions'] = 'Subscriptions';
 $string['subscriptionname'] = 'Calendar name';