MDL-10311 Group import broken - missing lang strings & slight helpfile update

merged from MOODLE_18_STABLE

diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php
index 77cabf26cf7e213ed2dfa0ffd15faef9ceb395db..e119a186251a8383954e735fdb5308d960688a25 100644 (file)
--- a/lang/en_utf8/error.php
+++ b/lang/en_utf8/error.php
@@ -30,6 +30,8 @@ $string['fieldrequired'] = '\"$a\" is a required field';
 $string['filenotfound'] = 'Sorry, the requested file could not be found';
 $string['forumblockingtoomanyposts'] = 'You have exceeded the posting threshold set for this forum.';
 $string['groupalready'] = 'User already belongs to group $a';
+$string['groupexistforcourse'] = 'Group \"$a\" already exists for this course';
+$string['groupnotaddederror'] = 'Group \"$a\" not added';
 $string['groupunknown'] = 'Group $a not associated to specified course';
 $string['guestnoeditprofile'] = 'The guest user cannot edit their profile';
 $string['guestnoeditprofileother'] = 'The guest user profile cannot be edited';
@@ -39,6 +41,7 @@ $string['invalidfiletype'] = '\"$a\" is not a valid file type';
 $string['invalidmd5'] = 'Invalid md5';
 $string['invalidrequest'] = 'Invalid request';
 $string['invalidrole'] = 'Invalid role';
+$string['invalidurl'] = 'Invalid url';
 $string['invalidxmlfile'] = '\"$a\" is not a valid XML file';
 $string['listnopeers'] = 'No peers of item found.';
 $string['listnoitem'] = 'Item not found.';
@@ -78,6 +81,7 @@ $string['sessionipnomatch'] = 'Sorry, but your IP number seems to have changed f
 $string['statscatchupmode'] = 'Statistics is currently in catchup mode. So far $a->daysdone day(s) have been processed and $a->dayspending are pending. Check back soon!';
 $string['unicodeupgradeerror'] = 'Sorry, but your database is not already in Unicode, and this version of Moodle is not able to migrate your database to Unicode.  Please upgrade to Moodle 1.7.x first and perform the Unicode migration from the Admin page.  After that is done you should be able to migrate to Moodle $a';
 $string['unknowncourse'] = 'Unknown course named \"$a\"';
+$string['unknowncourseidnumber'] = 'Unknown Course ID \"$a\"';
 $string['unknownuseraction'] = 'Sorry, I do not understand this user action.';
 $string['usernotaddederror'] = 'User \"$a\" not added - unknown error';
 $string['usernotaddedregistered'] = 'User \"$a\" not added - already registered';

diff --git a/lang/en_utf8/help/uploadgroups.html b/lang/en_utf8/help/uploadgroups.html
index ebfcb179e516479d9e9d5488118c9e7976f53dbe..8ac2ceafb8a23c526d03ab9c87717626d2aea89e 100644 (file)
--- a/lang/en_utf8/help/uploadgroups.html
+++ b/lang/en_utf8/help/uploadgroups.html
@@ -14,7 +14,7 @@
       <p><strong>Default fieldnames:</strong> these are optional - if they are not included then the values are taken from the current language and current course</p>
       <p><code class="example1">idnumber, coursename, lang</code> </p>
       <p><strong>Optional fieldnames: </strong>all of these are completely optional. </p>
-      <p> <code class="example1">description, picture, hidepicture</code></p>
+      <p> <code class="example1">description, enrolmentkey, picture, hidepicture</code></p>
     </blockquote>
     </li>
   <li>Commas within the data should be encoded as &amp;#44 - the script will automatically decode these back to commas. </li>