Fix alphabetical order among the cannot... strings, and fix one typo.

diff --git a/grade/edit/tree/grade.php b/grade/edit/tree/grade.php
index 923e0a5af601b298f6d7d0e3f11d97e22565eb8f..b6894f7cd9d843273f19b2588149352eeb137e12 100644 (file)
--- a/grade/edit/tree/grade.php
+++ b/grade/edit/tree/grade.php
@@ -70,7 +70,7 @@ if (!empty($id)) {
 }
 
 if (!$grade_item = grade_item::fetch(array('id'=>$itemid, 'courseid'=>$courseid))) {
-    print_error('cannofindgradeitem');
+    print_error('cannotfindgradeitem');
 }
 
 // now verify grading user has access to all groups or is member of the same group when separate groups used in course

diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php
index 0863bfeaa72295733c2f3b934e5a00d99eb3e03b..5ec665fcf3723e1f6241c4e76d1de01a5ab45df7 100644 (file)
--- a/lang/en_utf8/error.php
+++ b/lang/en_utf8/error.php
@@ -11,9 +11,6 @@ $string['blockcannotconfig'] = 'This block does not support global configuration
 $string['blocknameconflict'] = 'Naming conflict: block $a->name has the same title with an existing block: $a->conflict!';
 $string['backupcontainexternal'] = 'This backup file contains external Moodle Network Hosts that are not configured locally';
 $string['backuptablefail'] = 'Backup tables could NOT be set up successfully!';
-$string['cannotassignanthing'] = 'Cannot assign moodle/site:doanything';
-$string['cannotassignrole'] = 'Cannot assign role in course';
-$string['cannotassignselfasparent'] = 'Cannot assign self as parent!';
 $string['cannotaddblock'] = '$a block could not be added to the block list!';
 $string['cannotaddcoursemodule'] = 'Could not add a new course module';
 $string['cannotaddcoursemoduletosection'] = 'Could not add the new course module to that section';
@@ -22,12 +19,10 @@ $string['cannotaddrss'] = 'You do not have permission to add rss feeds';
 $string['cannotaddmodule'] = '$a module could not be added to the module list!';
 $string['cannotaddnewmodule'] = 'Could not add a new module of $a';
 $string['cannotaddnewinstance'] = 'Could not add a new instance of $a';
+$string['cannotassignanthing'] = 'Cannot assign moodle/site:doanything';
+$string['cannotassignrole'] = 'Cannot assign role in course';
 $string['cannotassignrolehere'] = 'You are not allowed to assign this role (id = $a->roleid) in this context ($a->context)';
-$string['cannotsaveconfig'] = 'Problem saving config \"$a->name\" as \"$a->value\" for plugin \"$a->plugin\"';
-$string['cannotsavecomment'] = 'Cannot save comment';
-$string['cannotsavefile'] = 'Cannot save the file \"$a\"!';
-$string['cannotsavedata'] = 'Cannot save data';
-$string['cannotsaveagreement'] = 'Could not save your agreement';
+$string['cannotassignselfasparent'] = 'Cannot assign self as parent!';
 $string['cannotcallscript'] = 'You cannot call this script in that way';
 $string['cannotcreatebackupdir'] = 'Could not create backupdata folder.  The site administrator needs to fix the file permissions';
 $string['cannotcreatecategory'] = 'The category was not inserted';
@@ -65,7 +60,7 @@ $string['cannotfindcomponent'] = 'Cannot find component';
 $string['cannotfindcontext'] = 'Could not find context';
 $string['cannotfindcategory'] = 'Cannot find category record from database by ID - $a';
 $string['cannotfinddocs'] = 'Cannot find \"$a\" language docs files';
-$string['cannofindgradeitem'] = 'Cannot find grade_item';
+$string['cannoffindgradeitem'] = 'Cannot find grade_item';
 $string['cannotfindgroup'] = 'Unable to find group';
 $string['cannotfindhelp'] = 'Cannot find \"$a\" language help files';
 $string['cannotfindinfo'] = 'Cannot find info for: \"$a\"';
@@ -73,28 +68,34 @@ $string['cannotfindlang'] = 'Cannot find \"$a\" language pack!';
 $string['cannotfindsite'] = 'Cannot find site-level course';
 $string['cannotfindteacher'] = 'Cannot find teacher';
 $string['cannotfinduser'] = 'Cannot find user named \"$a\"';
-$string['cannotimport'] = 'Import error';
-$string['cannotimportgrade'] = 'Grade import error';
-$string['cannotimportformat'] = 'Sorry, importing this format is not yet implemented!';
-$string['cannotnetgeo'] = 'Cannot connect to NetGeo server at http://netgeo.caida.org, please check proxy settings or better install MaxMind GeoLite City data file';
 $string['cannotgetblock'] = 'Could not retrieve blocks from the database';
 $string['cannotgetcats'] = 'Cannot get category record';
 $string['cannotgetdata'] = 'Cannot get data';
 $string['cannotgradeuser'] = 'Cannot grade this user';
 $string['cannothaveparentcate'] = 'Course category cannot have parent!';
+$string['cannotimport'] = 'Import error';
+$string['cannotimportgrade'] = 'Grade import error';
+$string['cannotimportformat'] = 'Sorry, importing this format is not yet implemented!';
+$string['cannotinsertcategory'] = 'Weird error. The category was not inserted.';
+$string['cannotinsertcomment'] = 'Could not insert this new comment';
+$string['cannotinsertgrade'] = 'Cannot insert grade item without course id!';
+$string['cannotinsertrate'] = 'Could not insert a new rating ($a->id = $a->rating)';
+$string['cannotinsertrecord'] = 'Could not insert new record ID $a';
+$string['cannotinsertkey'] = 'Cannot insert new key';
 $string['cannotmailconfirm'] = 'Error sending password change confirmation email';
 $string['cannotmanualctrack'] = 'Activity does not provide manual completion tracking';
 $string['cannotmapfield'] = 'Mapping collision detected - two fields maps to the same grade item $a';
 $string['cannotmarktopic'] = 'Could not mark that topic for this course';
+$string['cannotmetacourse'] = 'Cannot not add the selected course to this meta course!';
 $string['cannotmoverolewithid'] = 'Cannot move role with ID $a';
 $string['cannotmodulename'] = 'Cannot get the module name in build navigation';
 $string['cannotmoduletype'] = 'Cannot get the module type in build navigation';
-$string['cannotmetacourse'] = 'Cannot not add the selected course to this meta course!';
-$string['cannotoverridebaserole'] = 'Cannot override base role capabilities';
+$string['cannotnetgeo'] = 'Cannot connect to NetGeo server at http://netgeo.caida.org, please check proxy settings or better install MaxMind GeoLite City data file';
 $string['cannotopencsv'] = 'Cannot open CSV file';
 $string['cannotopenforwrit'] = 'Cannot open for writing: $a';
 $string['cannotopenfile'] = 'Cannot open file ($a)';
 $string['cannotopentemplate'] = 'Cannot open template file ($a)';
+$string['cannotoverridebaserole'] = 'Cannot override base role capabilities';
 $string['cannotreadtmpfile'] = 'Error reading temporary file';
 $string['cannotreaduploadfile'] = 'Could not read uploaded file';
 $string['cannotreadfile'] = 'Cannot read file ($a)';
@@ -102,15 +103,15 @@ $string['cannotremovefrommeta'] = 'Could not remove the selected course from thi
 $string['cannotrestore'] = 'An error has occurred and the restore could not be completed!';
 $string['cannotresetguestpwd'] = 'You cannot reset the guest password';
 $string['cannotresetmail'] = 'Error resetting password and mailing you';
+$string['cannotrestoreadminorcreator'] = 'You need to be a creator or admin user to restore into new course!';
+$string['cannotrestoreadminoredit'] = 'You need to be a editing teacher or admin user to restore into selected course!';
 $string['cannotsaveblock'] = 'Error saving block configuration';
 $string['cannotsavefile'] = 'Cannot save the file \"$a\"';
-$string['cannotinsertcategory'] = 'Weird error. The category was not inserted.';
-$string['cannotinsertcomment'] = 'Could not insert this new comment';
-$string['cannotinsertgrade'] = 'Cannot insert grade item without course id!';
-$string['cannotinsertrecord'] = 'Could not insert new record ID $a';
-$string['cannotinsertrate'] = 'Could not insert a new rating ($a->id = $a->rating)';
-$string['cannotinsertkey'] = 'Cannot insert new key';
-$string['cannotsavecomment'] = 'Error while saving comment';
+$string['cannotsaveagreement'] = 'Could not save your agreement';
+$string['cannotsavecomment'] = 'Cannot save comment';
+$string['cannotsaveconfig'] = 'Problem saving config \"$a->name\" as \"$a->value\" for plugin \"$a->plugin\"';
+$string['cannotsavedata'] = 'Cannot save data';
+$string['cannotsavefile'] = 'Cannot save the file \"$a\"!';
 $string['cannotsavemd5file'] = 'Cannot save md5 file';
 $string['cannotsavezipfile'] = 'Cannot save ZIP file';
 $string['cannotsetparentforcatoritem'] = 'Cannot set parent for category or course item!';
@@ -151,12 +152,10 @@ $string['cannotupdatesummary'] = 'Could not update the summary!';
 $string['cannotupdatesubcate'] = 'Could not update a child category!';
 $string['cannotupdatesubcourse'] = 'Could not update a child course!';
 $string['cannotuploadfile'] = 'Error processing upload file';
-$string['cannotuseadmin'] = 'You need to be an admin user to use this page';
-$string['cannotuseadminadminorteacher'] = 'You need to be a teacher or admin user to use this page';
 $string['cannotunassignrolefrom'] = 'Cannot unassign this user from role id: $a';
 $string['cannotunassigncap'] = 'Could not unassign deprecated capability $a->cap from role $a->role';
-$string['cannotrestoreadminorcreator'] = 'You need to be a creator or admin user to restore into new course!';
-$string['cannotrestoreadminoredit'] = 'You need to be a editing teacher or admin user to restore into selected course!';
+$string['cannotuseadmin'] = 'You need to be an admin user to use this page';
+$string['cannotuseadminadminorteacher'] = 'You need to be a teacher or admin user to use this page';
 $string['cannotusepage'] = 'Only teachers and administrators can use this page';
 $string['cannotusepage2'] = 'Sorry, you may not use this page';
 $string['cannotviewprofile'] = 'You cannot view the profile of this user';