MDL-14698 Improve language in actions list on course participants page, merged from 19

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index ad1ba127c00583faea26cc487accb338cbda28d5..6d68c2ab085d044a0cfc01fc76a082bace87d685 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -508,7 +508,7 @@ If you need help, please contact the site administrator,
 $a->admin';
 $string['emailpasswordconfirmationsubject'] = '$a: Change password confirmation';
 $string['emailpasswordconfirmmaybesent'] = '<p>If you supplied a correct username or email address then an email should have been sent to you.</p>
-   <p>It contains easy instructions to confirm and complete this password change.
+   <p>It contains easy instructions to confirm and complete this password change.\r
 If you continue to have difficulty, please contact the site administrator.</p>';
 $string['emailpasswordconfirmsent'] = 'An email should have been sent to your address at <b>$a</b>.
 <br />It contains easy instructions to confirm and complete this password change.
@@ -617,8 +617,8 @@ This is a notification that your enrolment in the course $a->course will expire
 Please contact $a->teacherstr for any further enquiries.';
 $string['expirythreshold'] = 'Threshold';
 $string['explanation'] = 'Explanation';
-$string['extendenrol'] = 'Extend enrolment';
-$string['groupextendenrol'] = 'Extend enrolment for all';
+$string['extendenrol'] = 'Extend enrolment (individual)';
+$string['groupextendenrol'] = 'Extend enrolment (common)';
 $string['courseenrolstartdate'] = 'Course enrolment start date';
 $string['courseenrolenddate'] = 'Course enrolment end date';
 $string['startingfrom'] = 'Starting from';

diff --git a/lang/en_utf8/notes.php b/lang/en_utf8/notes.php
index b0cb41d7d407e6b5ce63a9518ad83818e6fe31c9..4c990d8b4e2ac744424e86bd379128b7e3a07c7c 100755 (executable)
--- a/lang/en_utf8/notes.php
+++ b/lang/en_utf8/notes.php
@@ -8,9 +8,9 @@ $string['personalnotes'] = 'Personal notes';
 $string['created'] = 'created';
 $string['nonotes'] = 'There are no notes of this type yet';
 $string['notesnotvisible'] = 'You are not allowed to view the notes.';
-$string['addnewnote'] = 'Add a new note';
+$string['addnewnote'] = 'Add a new note';    
 $string['addnewnoteselect'] = 'Select users to write notes about';
-$string['groupaddnewnote'] = 'Add a new note for all';
+$string['groupaddnewnote'] = 'Add a common note';
 $string['deleteconfirm'] = 'Delete this note?';
 $string['content'] = 'Content';
 $string['nocontent'] = 'Note content can not be empty';