Merged some new strings

lang/en/moodle.php

@@ -108,6 +108,7 @@ $string['backupkeephelp'] = 'How many recent backups for each course do you want
 $string['backuplogdetailed'] = 'Detailed execution log';
 $string['backuploglaststatus'] = 'Last execution log';
 $string['backuplogshelp'] = 'If enabled, then course logs will be included in automated backups';
+$string['backupmetacoursehelp'] = 'If enabled, then metacourse info (inherited enrolments) will be included in automated backups';
 $string['backupnameformat'] = '%%Y%%m%%d-%%H%%M';
 $string['backupnoneusersinfo'] = 'Notice: You have selected to backup \"none\" users, so all the modules backup have been switched to \"without user data\" mode. Please note that the \"exercise\" and \"workshop\" modules aren\'t compatible with this type of backup, so they have been deactivated completely.';
 $string['backuporiginalname'] = 'Backup Name';
@@ -141,6 +142,7 @@ $string['checkingcourse'] = 'Checking course';
 $string['checkinginstances'] = 'Checking instances';
 $string['checkingsections'] = 'Checking sections';
 $string['checklanguage'] = 'Check language';
+$string['childcoursenotfound'] = 'Child course not found!';
 $string['choose'] = 'Choose';
 $string['choosecourse'] = 'Choose a course';
 $string['chooseenrolmethod'] = 'Primary method of enrolment';
@@ -271,6 +273,7 @@ $string['creatingcoursemodules'] = 'Creating course modules';
 $string['creatingevents'] = 'Creating events';
 $string['creatinggroups'] = 'Creating groups';
 $string['creatinglogentries'] = 'Creating log entries';
+$string['creatingmetacoursedata'] = 'Creating metacourse info';
 $string['creatingnewcourse'] = 'Creating new course';
 $string['creatingscales'] = 'Creating scales';
 $string['creatingsections'] = 'Creating sections';
@@ -697,6 +700,7 @@ $string['metaalreadycourses'] = 'Courses already assigned';
 $string['metaalreadyhascourses'] = 'This meta course already has child courses.';
 $string['metaalreadyhasenrolments'] = 'This course already has normal enrolments.';
 $string['metaalreadyinmeta'] = 'This course is already part of a meta course.';
+$string['metacourse'] = 'Metacourse';
 $string['metanoalreadycourses'] = 'No courses already assigned';
 $string['metapotentialcourses'] = 'Courses available';
 $string['metanopotentialcourses'] = 'No courses available';
@@ -806,6 +810,9 @@ $string['nopotentialadmins'] = 'No potential admins';
 $string['nopotentialcreators'] = 'No potential course creators';
 $string['nopotentialstudents'] = 'No potential students';
 $string['nopotentialteachers'] = 'No potential teachers';
+$string['noreplyname'] = 'Do not reply to this email';
+$string['noreplybouncemessage'] = 'You have replied to a no-reply email address. If you were atttempting to reply to a forum post, please instead reply using the $a forums. '."\n\n".'Following is the content of your email:'."\n\n";
+$string['noreplybouncesubject'] = '$a - bounced email.';
 $string['noresults'] = 'No results';
 $string['normal'] = 'Normal';
 $string['normalfilter'] = 'Normal search';
@@ -845,6 +852,9 @@ $string['other'] = 'Other';
 $string['outline'] = 'Outline';
 $string['page'] = 'Page';
 $string['pageheaderconfigablock'] = 'Configuring a block in %%fullname%%';
+$string['parentcoursenotfound'] = 'Parent course not found!';
+$string['parentcoursenotmetacourse'] = 'Parent course not metacourse!';
+$string['parentfolder'] = 'Parent folder';
 $string['participants'] = 'Participants';
 $string['password'] = 'Password';
 $string['passwordchanged'] = 'Password has been changed';
@@ -1036,6 +1046,7 @@ $string['timezone'] = 'Timezone';
 $string['to'] = 'To';
 $string['today'] = 'Today';
 $string['todaylogs'] = 'Today\'s logs';
+$string['toomanybounces'] = 'That email address has had too many bounces. You <b>must</b> change it to continue.';
 $string['toomanytoshow'] = 'There are too many users to show.';
 $string['top'] = 'Top';
 $string['topic'] = 'Topic';