Merged branch 'MDL-22232_easier_turn_off_notifications' from git://github.com/andyjdavis/moodle.git with conflict resolution

This commit is contained in:
Sam Hemelryk 2011-09-12 20:18:27 +12:00
commit 32ec60d142
7 changed files with 62 additions and 9 deletions

View file

@ -44,6 +44,8 @@ $string['couldnotfindpreference'] = 'Could not load preference {$a}. Does the co
$string['defaultmessageoutputs'] = 'Default message outputs';
$string['defaults'] = 'Defaults';
$string['deletemessagesdays'] = 'Number of days before old messages are automatically deleted';
$string['disableall'] = 'Temporarily disable notifications';
$string['disableall_help'] = 'Temporarily disable all notifications except those marked as "forced" by the site administrator';
$string['disabled'] = 'Messaging is disabled on this site';
$string['disallowed'] = 'Disallowed';
$string['discussion'] = 'Discussion';