From: Dan Poltawski <dan@moodle.com>
Date: Wed, 5 Nov 2014 11:18:22 +0000 (+0000)
Subject: Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle
X-Git-Tag: v2.8.0-rc2~39
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=7ea14bb81953008f67a9af5a1842dde670feed58

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

7ea14bb81953008f67a9af5a1842dde670feed58
diff --cc admin/tool/monitor/lang/en/tool_monitor.php
index cd972ae9569,4714ccb441a..474629e8918
--- a/admin/tool/monitor/lang/en/tool_monitor.php
+++ b/admin/tool/monitor/lang/en/tool_monitor.php
@@@ -29,9 -29,10 +29,10 @@@ $string['allevents'] = 'All events'
  $string['allmodules'] = 'All instances';
  $string['area'] = 'Area';
  $string['areatomonitor'] = 'Area to monitor';
+ $string['contactadmin'] = 'Contact your administrator to enable it.';
  $string['core'] = 'Core';
  $string['currentsubscriptions'] = 'Your current subscriptions';
 -$string['defaultmessagetemplate'] = 'The rule "{rulename}" you have subscribed to has occurred - please find further details at {link}';
 +$string['defaultmessagetemplate'] = 'Rule name: {rulename}<br />Description: {description}<br />Event name: {eventname}';
  $string['deleterule'] = 'Delete rule';
  $string['deletesubscription'] = 'Delete subscription';
  $string['description'] = 'Description:';
@@@ -67,9 -70,11 +70,12 @@@ $string['messagetemplate_help'] = 'A no
  * Rule name {rulename}<br />
  * Description {description}<br />
  * Event {eventname}';
 +$string['messagetemplate_link'] = 'admin/tool/monitor/managerules';
  $string['moduleinstance'] = 'Instance';
+ $string['monitorenabled'] = 'Event monitoring is currently enabled. ';
+ $string['monitordisabled'] = 'Event monitoring is currently disabled.';
  $string['monitor:managerules'] = 'Manage event monitor rules';
+ $string['monitor:managetool'] = 'Enable/disable event monitoring';
  $string['monitor:subscribe'] = 'Subscribe to event monitor rules';
  $string['norules'] = 'There are no event monitoring rules.';
  $string['pluginname'] = 'Event monitor';