Merge branch 'MDL-48971-master' of https://github.com/lucaboesch/moodle
authorSara Arjona <sara@moodle.com>
Tue, 22 Jan 2019 11:02:24 +0000 (12:02 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 22 Jan 2019 11:02:24 +0000 (12:02 +0100)
1  2 
lang/en/moodle.php

diff --combined lang/en/moodle.php
@@@ -502,6 -502,7 +502,7 @@@ $string['deletingolddata'] = 'Deleting 
  $string['department'] = 'Department';
  $string['desc'] = 'Descending';
  $string['description'] = 'Description';
+ $string['descriptiona'] = 'Description: {$a}';
  $string['deselectall'] = 'Deselect all';
  $string['detailedless'] = 'Less detailed';
  $string['detailedmore'] = 'More detailed';
@@@ -2166,6 -2167,8 +2167,6 @@@ $string['withchosenfiles'] = 'With chos
  $string['withdisablednote'] = '{$a} (disabled)';
  $string['withoutuserdata'] = 'without user data';
  $string['withselectedusers'] = 'With selected users...';
 -$string['withselectedusers_help'] = '* Send message - For sending a message to one or more participants
 -* Add a new note - For adding a note to a selected participant';
  $string['withuserdata'] = 'with user data';
  $string['wordforstudent'] = 'Your word for Student';
  $string['wordforstudenteg'] = 'eg Student, Participant etc';