Index: lang/en_utf8/lesson.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/lesson.php,v
retrieving revision 1.35
diff -u -r1.35 lesson.php
--- lang/en_utf8/lesson.php	15 Jun 2008 08:35:34 -0000	1.35
+++ lang/en_utf8/lesson.php	11 Nov 2008 09:03:57 -0000
@@ -130,6 +130,7 @@
 $string['eolstudentoutoftimenoanswers'] = 'You did not answer any questions.  You have received a 0 for this lesson.';
 $string['essay'] = 'Essay';
 $string['essayemailmessage'] = '<p>Essay prompt:<blockquote>$a->question</blockquote></p><p>Your response:<blockquote><em>$a->response</em></blockquote></p><p>$a->teacher\'s comments:<blockquote><em>$a->comment</em></blockquote></p><p>You have received $a->earned out of $a->outof for this essay question.</p><p>Your grade for the lesson has been changed to $a->newgrade&#37;.</p>';
+$string['essayemailmessage2'] = '<p>Essay prompt:<blockquote>$a->question</blockquote></p><p>Your response:<blockquote><em>$a->response</em></blockquote></p><p>Marker\'s comments:<blockquote><em>$a->comment</em></blockquote></p><p>You have received $a->earned out of $a->outof for this essay question.</p><p>Your grade for the lesson has been changed to $a->newgrade&#37;.</p>';
 $string['essayemailsubject'] = 'Your grade for $a question';
 $string['essays'] = 'Essays';
 $string['essayscore'] = 'Essay score';
@@ -174,6 +175,7 @@
 $string['lessonformating'] = 'Lesson formatting';
 $string['lessonmenu'] = 'Lesson menu';
 $string['lessonnotready'] = 'This lesson is not ready to be taken.  Please contact your $a.';
+$string['lessonnotready2'] = 'This lesson is not ready to be taken.';
 $string['lessonopen'] = 'This lesson will be open on $a.';
 $string['lessonopens'] = 'Lesson opens';
 $string['lessonpagelinkingbroken'] = 'First page not found.  Lesson page linking must be broken.  Please contact an admin.';
@@ -265,6 +267,7 @@
 $string['previouspage'] = 'Previous page';
 $string['progressbar'] = 'Progress Bar';
 $string['progressbarteacherwarning'] = 'Progress Bar does not display for $a';
+$string['progressbarteacherwarning2'] = 'You will not see the progress bar because you can edit this lesson';
 $string['deleteallattempts'] = 'Delete all lesson attempts';
 $string['qtype'] = 'Page type';
 $string['question'] = 'Question';
@@ -279,6 +282,7 @@
 $string['report'] = 'Report';
 $string['reports'] = 'Reports';
 $string['response'] = 'Response';
+$string['retakesallowed'] = 'Re-takes allowed';
 $string['returnto'] = 'Return to $a';
 $string['returntocourse'] = 'Return to the course';
 $string['review'] = 'Review';
@@ -330,6 +334,7 @@
 $string['viewgrades'] = 'View grades';
 $string['viewhighscores'] = 'View high scores list';
 $string['viewreports'] = 'View $a->attempts completed $a->student attempts';
+$string['viewreports2'] = 'View $a completed attempts';
 $string['welldone'] = 'Well done!';
 $string['whatdofirst'] = 'What would you like to do first?';
 $string['wronganswerjump'] = 'Wrong answer jump';
Index: lang/en_utf8/moodle.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/moodle.php,v
retrieving revision 1.208
diff -u -r1.208 moodle.php
--- lang/en_utf8/moodle.php	11 Nov 2008 02:26:03 -0000	1.208
+++ lang/en_utf8/moodle.php	11 Nov 2008 09:03:58 -0000
@@ -265,6 +265,7 @@
 $string['country'] = 'Country';
 $string['course'] = 'Course';
 $string['courseapprovedemail'] = 'Your requested course, $a->name, has been approved and you have been made a $a->teacher.  To access your new course, go to $a->url';
+$string['courseapprovedemail2'] = 'Your requested course, $a->name, has been approved.  To access your new course, go to $a->url';
 $string['courseapprovedfailed'] = 'Failed to save the course as approved!';
 $string['courseapprovedsubject'] = 'Your course has been approved!';
 $string['courseavailable'] = 'This course is available to students';
@@ -781,6 +782,8 @@
 $string['hidepicture'] = 'Hide picture';
 $string['hidesection'] = 'Hide section $a';
 $string['hidesettings'] = 'Hide settings';
+$string['hidetopic'] = 'Hide topic';
+$string['hideweek'] = 'Hide week';
 $string['hits'] = 'Hits';
 $string['hitsoncourse'] = 'Hits on $a->coursename by $a->username';
 $string['hitsoncoursetoday'] = 'Today\'s hits on $a->coursename by $a->username';
@@ -1383,6 +1386,8 @@
 $string['showreports'] = 'Show activity reports';
 $string['showsettings'] = 'Show settings';
 $string['showtheselogs'] = 'Show these logs';
+$string['showtopic'] = 'Show topic';
+$string['showweek'] = 'Show week';
 $string['since'] = 'Since';
 $string['sincelast'] = 'since last login';
 $string['site'] = 'Site';
Index: lang/en_utf8/glossary.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/glossary.php,v
retrieving revision 1.17
diff -u -r1.17 glossary.php
--- lang/en_utf8/glossary.php	9 Nov 2008 22:57:59 -0000	1.17
+++ lang/en_utf8/glossary.php	11 Nov 2008 09:03:57 -0000
@@ -181,6 +181,7 @@
 $string['ratingeveryone'] = 'Everyone can rate entries';
 $string['ratingno'] = 'No ratings';
 $string['ratingonlyteachers'] = 'Only $a can rate entries';
+$string['ratingonlywithpermissions'] = 'Only people with permission to rate entries';
 $string['ratings'] = 'Ratings';
 $string['ratingssaved'] = 'Ratings saved';
 $string['ratingsuse'] = 'Use ratings';
Index: mod/lesson/essay.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/lesson/essay.php,v
retrieving revision 1.17
diff -u -r1.17 essay.php
--- mod/lesson/essay.php	2 Aug 2008 00:04:30 -0000	1.17
+++ mod/lesson/essay.php	11 Nov 2008 09:04:09 -0000
@@ -205,16 +205,14 @@
                         $a->earned = $essayinfo->score;
                         $a->outof  = 1;
                     }
-                    
+
                     // Set rest of the message values
                     $a->question = format_text($pages[$attempt->pageid]->contents, FORMAT_MOODLE, $options);
                     $a->response = s($essayinfo->answer);
-                    $a->teacher  = $course->teacher;
                     $a->comment  = s($essayinfo->response);
-                    
-                    
+
                     // Fetch message HTML and plain text formats
-                    $message  = get_string('essayemailmessage', 'lesson', $a);
+                    $message  = get_string('essayemailmessage2', 'lesson', $a);
                     $plaintxt = format_text_email($message, FORMAT_HTML);
 
                     // Subject
@@ -265,7 +263,7 @@
             
             // Setup table
             $table = new stdClass;
-            $table->head = array($course->students, get_string('essays', 'lesson'), get_string('email', 'lesson'));
+            $table->head = array(get_string('name'), get_string('essays', 'lesson'), get_string('email', 'lesson'));
             $table->align = array('left', 'left', 'left');
             $table->wrap = array('nowrap', 'nowrap', 'nowrap');
 
Index: mod/lesson/highscores.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/lesson/highscores.php,v
retrieving revision 1.11
diff -u -r1.11 highscores.php
--- mod/lesson/highscores.php	12 Jun 2008 11:52:15 -0000	1.11
+++ mod/lesson/highscores.php	11 Nov 2008 09:04:09 -0000
@@ -174,7 +174,7 @@
                 $table->cellspacing = '10px';
                 $table->size = array('*', '*', '*');
             
-                $table->head = array(get_string("rank", "lesson"), $course->students, get_string("scores", "lesson"));
+                $table->head = array(get_string("rank", "lesson"), get_string('participants'), get_string("scores", "lesson"));
             
                 $printed = 0;
                 while (true) {
Index: mod/lesson/mod_form.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/lesson/mod_form.php,v
retrieving revision 1.25
diff -u -r1.25 mod_form.php
--- mod/lesson/mod_form.php	26 Jul 2008 15:15:26 -0000	1.25
+++ mod/lesson/mod_form.php	11 Nov 2008 09:04:10 -0000
@@ -74,8 +74,8 @@
         $mform->setDefault('grade', 0);
         $mform->setHelpButton('grade', array('grade', get_string('maximumgrade'), 'lesson'));
 
-        $mform->addElement('selectyesno', 'retake', get_string('canretake', 'lesson', $COURSE->student));
-        $mform->setHelpButton('retake', array('retake', get_string('canretake', 'lesson', $COURSE->student), 'lesson'));
+        $mform->addElement('selectyesno', 'retake', get_string('retakesallowed', 'lesson'));
+        $mform->setHelpButton('retake', array('retake', get_string('retakesallowed', 'lesson'), 'lesson'));
         $mform->setDefault('retake', 0);
 
         $options = array();
Index: mod/lesson/view.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/lesson/view.php,v
retrieving revision 1.140
diff -u -r1.140 view.php
--- mod/lesson/view.php	29 Jul 2008 17:22:48 -0000	1.140
+++ mod/lesson/view.php	11 Nov 2008 09:04:12 -0000
@@ -178,7 +178,7 @@
         // make sure there are pages to view
         if (!$DB->get_field('lesson_pages', 'id', array('lessonid' => $lesson->id, 'prevpageid' => 0))) {
             if (!has_capability('mod/lesson:manage', $context)) {
-                lesson_set_message(get_string('lessonnotready', 'lesson', $course->teacher)); // a nice message to the student
+                lesson_set_message(get_string('lessonnotready2', 'lesson')); // a nice message to the student
             } else {
                 if (!$DB->count_records('lesson_pages', array('lessonid'=>$lesson->id))) {
                     redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id"); // no pages - redirect to add pages
Index: mod/lesson/report.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/lesson/report.php,v
retrieving revision 1.47
diff -u -r1.47 report.php
--- mod/lesson/report.php	12 Jun 2008 11:52:15 -0000	1.47
+++ mod/lesson/report.php	11 Nov 2008 09:04:11 -0000
@@ -188,7 +188,7 @@
         $table         = new stdClass;
 
         // set up the table object
-        $table->head = array(get_string('studentname', 'lesson', $course->student), get_string('attempts', 'lesson'), get_string('highscore', 'lesson'));
+        $table->head = array(get_string('name'), get_string('attempts', 'lesson'), get_string('highscore', 'lesson'));
         $table->align = array("center", "left", "left");
         $table->wrap = array("nowrap", "nowrap", "nowrap");
         $table->width = "90%";
@@ -863,7 +863,7 @@
                 
                 $gradeinfo = lesson_grade($lesson, $try, $user->id);
                 
-                $table->data[] = array($course->student.':', print_user_picture($user->id, $course->id, $user->picture, 0, true).fullname($user, true));
+                $table->data[] = array(get_string('name').':', print_user_picture($user->id, $course->id, $user->picture, 0, true).fullname($user, true));
                 $table->data[] = array(get_string("timetaken", "lesson").":", format_time($timetotake));
                 $table->data[] = array(get_string("completed", "lesson").":", userdate($completed));
                 $table->data[] = array(get_string('rawgrade', 'lesson').':', $gradeinfo->earned.'/'.$gradeinfo->total);
Index: mod/lesson/tabs.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/lesson/tabs.php,v
retrieving revision 1.16
diff -u -r1.16 tabs.php
--- mod/lesson/tabs.php	13 Jun 2008 05:12:50 -0000	1.16
+++ mod/lesson/tabs.php	11 Nov 2008 09:04:11 -0000
@@ -28,13 +28,11 @@
     $tabs = $row = $inactive = $activated = array();
 
 /// user attempt count for reports link hover (completed attempts - much faster)
-    $counts           = new stdClass;
-    $counts->attempts = $DB->count_records('lesson_grades', array('lessonid'=>$lesson->id));
-    $counts->student  = $course->student;
+    $attemptscount = $DB->count_records('lesson_grades', array('lessonid'=>$lesson->id));
     
     $row[] = new tabobject('view', "$CFG->wwwroot/mod/lesson/view.php?id=$cm->id", get_string('preview', 'lesson'), get_string('previewlesson', 'lesson', format_string($lesson->name)));
     $row[] = new tabobject('edit', "$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id", get_string('edit', 'lesson'), get_string('edit', 'moodle', format_string($lesson->name)));
-    $row[] = new tabobject('reports', "$CFG->wwwroot/mod/lesson/report.php?id=$cm->id", get_string('reports', 'lesson'), get_string('viewreports', 'lesson', $counts));
+    $row[] = new tabobject('reports', "$CFG->wwwroot/mod/lesson/report.php?id=$cm->id", get_string('reports', 'lesson'), get_string('viewreports2', 'lesson', $attemptscount));
     if (has_capability('mod/lesson:edit', $context)) {
         $row[] = new tabobject('essay', "$CFG->wwwroot/mod/lesson/essay.php?id=$cm->id", get_string('manualgrading', 'lesson'));
     }
Index: mod/lesson/locallib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/lesson/locallib.php,v
retrieving revision 1.78
diff -u -r1.78 locallib.php
--- mod/lesson/locallib.php	13 Jun 2008 05:12:50 -0000	1.78
+++ mod/lesson/locallib.php	11 Nov 2008 09:04:10 -0000
@@ -1614,7 +1614,7 @@
     
     // catch teachers
     if (has_capability('mod/lesson:manage', $context)) {
-        notify(get_string('progressbarteacherwarning', 'lesson', $course->teachers));
+        notify(get_string('progressbarteacherwarning2', 'lesson'));
         return false;
     }
     if (!isset($USER->modattempts[$lesson->id])) {
Index: lib/weblib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/weblib.php,v
retrieving revision 1.1168
diff -u -r1.1168 weblib.php
--- lib/weblib.php	5 Nov 2008 08:17:32 -0000	1.1168
+++ lib/weblib.php	11 Nov 2008 09:04:04 -0000
@@ -4662,7 +4662,7 @@
     $output .= '<td class="content">';
     $output .= '<div class="username">'.fullname($user, has_capability('moodle/site:viewfullnames', $context)).'</div>';
     $output .= '<div class="info">';
-    if (!empty($user->role) and ($user->role <> $course->teacher)) {
+    if (!empty($user->role)) {
         $output .= $string->role .': '. $user->role .'<br />';
     }
     if ($user->maildisplay == 1 or ($user->maildisplay == 2 and ($course->id != SITEID) and !isguest()) or
Index: lib/adminlib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/adminlib.php,v
retrieving revision 1.282
diff -u -r1.282 adminlib.php
--- lib/adminlib.php	31 Oct 2008 21:11:46 -0000	1.282
+++ lib/adminlib.php	11 Nov 2008 09:04:01 -0000
@@ -512,10 +512,6 @@
     $newsite->numsections = 0;
     $newsite->category = 0;
     $newsite->format = 'site';  // Only for this course
-    $newsite->teacher = get_string("defaultcourseteacher");
-    $newsite->teachers = get_string("defaultcourseteachers");
-    $newsite->student = get_string("defaultcoursestudent");
-    $newsite->students = get_string("defaultcoursestudents");
     $newsite->timemodified = time();
 
     if (!$newid = $DB->insert_record('course', $newsite)) {
Index: mod/quiz/report/overview/report.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/quiz/report/overview/report.php,v
retrieving revision 1.160
diff -u -r1.160 report.php
--- mod/quiz/report/overview/report.php	23 Sep 2008 07:18:16 -0000	1.160
+++ mod/quiz/report/overview/report.php	11 Nov 2008 09:04:12 -0000
@@ -283,7 +283,7 @@
                     if ($currentgroup){
                         $a= new object();
                         $a->groupname = groups_get_group_name($currentgroup);
-                        $a->coursestudents = $COURSE->students;
+                        $a->coursestudents = get_string('participants');
                         $a->countregradeneeded = $countregradeneeded;
                         $regradealldrydolabel = get_string('regradealldrydogroup', 'quiz_overview', $a);
                         $regradealldrylabel = get_string('regradealldrygroup', 'quiz_overview', $a);
Index: mod/quiz/report/overview/overviewgraph.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/quiz/report/overview/overviewgraph.php,v
retrieving revision 1.8
diff -u -r1.8 overviewgraph.php
--- mod/quiz/report/overview/overviewgraph.php	15 Aug 2008 09:59:55 -0000	1.8
+++ mod/quiz/report/overview/overviewgraph.php	11 Nov 2008 09:04:12 -0000
@@ -31,7 +31,7 @@
 
 $line = new graph(800,600);
 $line->parameter['title']   = '';
-$line->parameter['y_label_left'] = $course->students;
+$line->parameter['y_label_left'] = get_string('participants');
 $line->parameter['x_label'] = get_string('grade');
 $line->parameter['y_label_angle'] = 90;
 $line->parameter['x_label_angle'] = 0;
Index: mod/quiz/report/overview/overviewsettings_form.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/quiz/report/overview/overviewsettings_form.php,v
retrieving revision 1.9
diff -u -r1.9 overviewsettings_form.php
--- mod/quiz/report/overview/overviewsettings_form.php	12 Sep 2008 08:33:40 -0000	1.9
+++ mod/quiz/report/overview/overviewsettings_form.php	11 Nov 2008 09:04:12 -0000
@@ -9,10 +9,10 @@
         $mform->addElement('header', 'preferencespage', get_string('preferencespage', 'quiz_overview'));
 
         if (!$this->_customdata['currentgroup']){
-            $studentsstring = "'".$COURSE->students."'";
+            $studentsstring = get_string('participants');
         } else {
             $a = new object();
-            $a->coursestudent = $COURSE->students;
+            $a->coursestudent = get_string('participants');
             $a->groupname = groups_get_group_name($this->_customdata['currentgroup']);
             if (20 < strlen($a->groupname)){
               $studentsstring = get_string('studentingrouplong', 'quiz_overview', $a);
Index: backup/restorelib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/backup/restorelib.php,v
retrieving revision 1.352
diff -u -r1.352 restorelib.php
--- backup/restorelib.php	6 Nov 2008 12:27:15 -0000	1.352
+++ backup/restorelib.php	11 Nov 2008 09:03:54 -0000
@@ -708,10 +708,6 @@
             $course->format = $course_header->course_format;
             $course->showgrades = $course_header->course_showgrades;
             $course->newsitems = $course_header->course_newsitems;
-            $course->teacher = $course_header->course_teacher;
-            $course->teachers = $course_header->course_teachers;
-            $course->student = $course_header->course_student;
-            $course->students = $course_header->course_students;
             $course->guest = $course_header->course_guest;
             $course->startdate = $course_header->course_startdate;
             $course->startdate += $restore->course_startdateoffset;
@@ -5156,18 +5152,6 @@
                         case "NEWSITEMS":
                             $this->info->course_newsitems = $this->getContents();
                             break;
-                        case "TEACHER":
-                            $this->info->course_teacher = $this->getContents();
-                            break;
-                        case "TEACHERS":
-                            $this->info->course_teachers = $this->getContents();
-                            break;
-                        case "STUDENT":
-                            $this->info->course_student = $this->getContents();
-                            break;
-                        case "STUDENTS":
-                            $this->info->course_students = $this->getContents();
-                            break;
                         case "GUEST":
                             $this->info->course_guest = $this->getContents();
                             break;
Index: backup/backuplib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/backup/backuplib.php,v
retrieving revision 1.221
diff -u -r1.221 backuplib.php
--- backup/backuplib.php	6 Nov 2008 07:34:01 -0000	1.221
+++ backup/backuplib.php	11 Nov 2008 09:03:48 -0000
@@ -680,10 +680,6 @@
             fwrite ($bf,full_tag("FORMAT",3,false,$course->format));
             fwrite ($bf,full_tag("SHOWGRADES",3,false,$course->showgrades));
             fwrite ($bf,full_tag("NEWSITEMS",3,false,$course->newsitems));
-            fwrite ($bf,full_tag("TEACHER",3,false,$course->teacher));
-            fwrite ($bf,full_tag("TEACHERS",3,false,$course->teachers));
-            fwrite ($bf,full_tag("STUDENT",3,false,$course->student));
-            fwrite ($bf,full_tag("STUDENTS",3,false,$course->students));
             fwrite ($bf,full_tag("GUEST",3,false,$course->guest));
             fwrite ($bf,full_tag("STARTDATE",3,false,$course->startdate));
             fwrite ($bf,full_tag("NUMSECTIONS",3,false,$course->numsections));
Index: enrol/paypal/return.php
===================================================================
RCS file: /cvsroot/moodle/moodle/enrol/paypal/return.php,v
retrieving revision 1.6
diff -u -r1.6 return.php
--- enrol/paypal/return.php	2 Jun 2008 21:02:53 -0000	1.6
+++ enrol/paypal/return.php	11 Nov 2008 09:03:56 -0000
@@ -30,7 +30,7 @@
 
     } else {   /// Somehow they aren't enrolled yet!  :-(
         print_header();
-        notice(get_string('paymentsorry', '', $course), $destination);
+        notice(get_string('paymentsorry', '', get_string('defaultcourseteacher')), $destination);
     }
 
 ?>
Index: course/format/weeks/format.php
===================================================================
RCS file: /cvsroot/moodle/moodle/course/format/weeks/format.php,v
retrieving revision 1.84
diff -u -r1.84 format.php
--- course/format/weeks/format.php	9 Jun 2008 16:53:58 -0000	1.84
+++ course/format/weeks/format.php	11 Nov 2008 09:03:55 -0000
@@ -49,9 +49,8 @@
     $editing         = $PAGE->user_is_editing();
 
     if ($editing) {
-        $strstudents = moodle_strtolower($course->students);
-        $strweekhide = get_string('weekhide', '', $strstudents);
-        $strweekshow = get_string('weekshow', '', $strstudents);
+        $strweekhide = get_string('hideweek');
+        $strweekshow = get_string('showweek');
         $strmoveup   = get_string('moveup');
         $strmovedown = get_string('movedown');
     }
Index: enrol/manual/enrol.php
===================================================================
RCS file: /cvsroot/moodle/moodle/enrol/manual/enrol.php,v
retrieving revision 1.40
diff -u -r1.40 enrol.php
--- enrol/manual/enrol.php	24 Sep 2008 18:47:40 -0000	1.40
+++ enrol/manual/enrol.php	11 Nov 2008 09:03:56 -0000
@@ -442,7 +442,7 @@
         if (!empty($teacher)) {
             $teachername = "<a href=\"../user/view.php?id=$teacher->id&course=".SITEID."\">".fullname($teacher)."</a>.";
         } else {
-            $teachername = strtolower( get_string('defaultcourseteacher') ); //get_string('yourteacher', '', $course->teacher);
+            $teachername = strtolower( get_string('defaultcourseteacher') );
         }
 
         // guest user has a slightly different message
Index: mod/resource/type/file/resource.class.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/resource/type/file/resource.class.php,v
retrieving revision 1.88
diff -u -r1.88 resource.class.php
--- mod/resource/type/file/resource.class.php	4 Nov 2008 05:19:01 -0000	1.88
+++ mod/resource/type/file/resource.class.php	11 Nov 2008 09:04:13 -0000
@@ -46,14 +46,6 @@
                                            'value'   => $this->course->summary),
                 'courseformat'    => array('langstr' => get_string('format'),
                                            'value'   => $this->course->format),
-                'courseteacher'   => array('langstr' => get_string('wordforteacher'),
-                                           'value'   => $this->course->teacher),
-                'courseteachers'  => array('langstr' => get_string('wordforteachers'),
-                                           'value'   => $this->course->teachers),
-                'coursestudent'   => array('langstr' => get_string('wordforstudent'),
-                                           'value'   => $this->course->student),
-                'coursestudents'  => array('langstr' => get_string('wordforstudents'),
-                                           'value'   => $this->course->students),
 
                 'label4'          => array('langstr' => "",
                                            'value'   =>'/optgroup'),
Index: enrol/imsenterprise/enrol.php
===================================================================
RCS file: /cvsroot/moodle/moodle/enrol/imsenterprise/enrol.php,v
retrieving revision 1.23
diff -u -r1.23 enrol.php
--- enrol/imsenterprise/enrol.php	5 Aug 2008 14:21:39 -0000	1.23
+++ enrol/imsenterprise/enrol.php	11 Nov 2008 09:03:56 -0000
@@ -508,17 +508,6 @@
                 $course->visible = 0;
                 // Insert default names for teachers/students, from the current language
                 $site = get_site();
-                if (current_language() == $CFG->lang) {
-                    $course->teacher  = $site->teacher;
-                    $course->teachers = $site->teachers;
-                    $course->student  = $site->student;
-                    $course->students = $site->students;
-                } else {
-                    $course->teacher = get_string("defaultcourseteacher");
-                    $course->teachers = get_string("defaultcourseteachers");
-                    $course->student = get_string("defaultcoursestudent");
-                    $course->students = get_string("defaultcoursestudents");
-                }
 
                 // Handle course categorisation (taken from the group.org.orgunit field if present)
                 if(strlen($group->category)>0){
Index: admin/cliupgrade.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/cliupgrade.php,v
retrieving revision 1.27
diff -u -r1.27 cliupgrade.php
--- admin/cliupgrade.php	29 Oct 2008 09:24:45 -0000	1.27
+++ admin/cliupgrade.php	11 Nov 2008 09:03:44 -0000
@@ -1132,10 +1132,6 @@
         $newsite->numsections = 0;
         $newsite->category = 0;
         $newsite->format = 'site';  // Only for this course
-        $newsite->teacher = get_string("defaultcourseteacher");
-        $newsite->teachers = get_string("defaultcourseteachers");
-        $newsite->student = get_string("defaultcoursestudent");
-        $newsite->students = get_string("defaultcoursestudents");
         $newsite->timemodified = time();
 
         if ($newid = $DB->insert_record('course', $newsite)) {
Index: mod/assignment/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/assignment/lib.php,v
retrieving revision 1.370
diff -u -r1.370 lib.php
--- mod/assignment/lib.php	11 Oct 2008 17:33:21 -0000	1.370
+++ mod/assignment/lib.php	11 Nov 2008 09:04:08 -0000
@@ -243,7 +243,7 @@
         }
 
     /// Print the feedback
-        print_heading(get_string('feedbackfromteacher', 'assignment', $this->course->teacher)); // TODO: fix teacher string
+        print_heading(get_string('feedbackfromteacher', 'assignment', fullname($teacher)));
 
         echo '<table cellspacing="0" class="feedback">';
 
@@ -1089,8 +1089,8 @@
                               get_string('fullname'),
                               get_string('grade'),
                               get_string('comment', 'assignment'),
-                              get_string('lastmodified').' ('.$course->student.')',
-                              get_string('lastmodified').' ('.$course->teacher.')',
+                              get_string('lastmodified').' ('.get_string('submission', 'assignment').')',
+                              get_string('lastmodified').' ('.get_string('grade').')',
                               get_string('status'),
                               get_string('finalgrade', 'grades'));
         if ($uses_outcomes) {
Index: mod/glossary/mod_form.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/glossary/mod_form.php,v
retrieving revision 1.26
diff -u -r1.26 mod_form.php
--- mod/glossary/mod_form.php	25 Sep 2008 10:04:41 -0000	1.26
+++ mod/glossary/mod_form.php	11 Nov 2008 09:04:09 -0000
@@ -127,7 +127,7 @@
         $mform->addElement('checkbox', 'userating', get_string('allowratings', 'glossary') , get_string('ratingsuse', 'glossary'));
 
         $options=array();
-        $options[2] = get_string('ratingonlyteachers', 'glossary', moodle_strtolower($COURSE->teachers));
+        $options[2] = get_string('ratingonlywithpermissions', 'glossary');
         $options[1] = get_string('ratingeveryone', 'glossary');
         $mform->addElement('select', 'assessed', get_string('users'), $options);
         $mform->disabledIf('assessed', 'userating');
Index: mod/survey/graph.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/survey/graph.php,v
retrieving revision 1.35
diff -u -r1.35 graph.php
--- mod/survey/graph.php	15 Jun 2008 09:14:55 -0000	1.35
+++ mod/survey/graph.php	11 Nov 2008 09:04:13 -0000
@@ -18,6 +18,12 @@
         print_error('coursemisconf');
     }
 
+    if ($sid) {
+        if (!$user = $DB->get_record("user", array("id"=>$sid))) {
+            print_error('invaliduserid');
+        }
+    }
+
     require_login($course->id, false, $cm);
 
     $groupmode = groups_get_activity_groupmode($cm);   // Groups are being used
@@ -49,11 +55,11 @@
 
     $stractual = get_string("actual", "survey");
     $stractualclass = get_string("actualclass", "survey");
-    $stractualstudent = get_string("actualstudent", "survey", $course->student);
+    $stractualstudent = get_string("actualstudent", "survey", fullname($user));
 
     $strpreferred = get_string("preferred", "survey");
     $strpreferredclass = get_string("preferredclass", "survey");
-    $strpreferredstudent = get_string("preferredstudent", "survey", $course->student);
+    $strpreferredstudent = get_string("preferredstudent", "survey", fullname($user));
 
     $virtualscales = false; //set default value for case clauses
 
Index: mod/survey/report.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/survey/report.php,v
retrieving revision 1.60
diff -u -r1.60 report.php
--- mod/survey/report.php	15 Jun 2008 09:14:56 -0000	1.60
+++ mod/survey/report.php	11 Nov 2008 09:04:13 -0000
@@ -97,7 +97,7 @@
         echo "<a href=\"report.php?action=summary&amp;id=$id\">$strsummary</a>";
         echo "&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"report.php?action=scales&amp;id=$id\">$strscales</a>";
         echo "&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"report.php?action=questions&amp;id=$id\">$strquestions</a>";
-        echo "&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"report.php?action=students&amp;id=$id\">$course->students</a>";
+        echo "&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"report.php?action=students&amp;id=$id\">".get_string('users')."</a>";
         if (has_capability('mod/survey:download', $context)) {
             echo "&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"report.php?action=download&amp;id=$id\">$strdownload</a>";
         }
@@ -106,7 +106,7 @@
         }
     } else {
         echo "<a href=\"report.php?action=questions&amp;id=$id\">$strquestions</a>";
-        echo "&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"report.php?action=students&amp;id=$id\">$course->students</a>";
+        echo "&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"report.php?action=students&amp;id=$id\">".get_string('users')."</a>";
         if (has_capability('mod/survey:download', $context)) {
             echo "&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"report.php?action=download&amp;id=$id\">$strdownload</a>";
         }
@@ -309,7 +309,7 @@
 
       case "students":
 
-         print_heading(get_string("analysisof", "survey", "$course->students"));
+         print_heading(get_string("analysisof", "survey", get_string('users')));
 
          if (! $results = survey_get_responses($survey->id, $currentgroup, $groupingid) ) {
              notify(get_string("nobodyyet","survey"));
Index: course/pending.php
===================================================================
RCS file: /cvsroot/moodle/moodle/course/pending.php,v
retrieving revision 1.21
diff -u -r1.21 pending.php
--- course/pending.php	2 Aug 2008 00:04:29 -0000	1.21
+++ course/pending.php	11 Nov 2008 09:03:55 -0000
@@ -27,10 +27,6 @@
             unset($course->id);
             $teacherid = $course->requester;
             unset($course->requester);
-            $course->teacher = get_string("defaultcourseteacher");
-            $course->teachers = get_string("defaultcourseteachers");
-            $course->student = get_string("defaultcoursestudent");
-            $course->students = get_string("defaultcoursestudents");
             if (!empty($CFG->restrictmodulesfor) && $CFG->restrictmodulesfor != 'none' && !empty($CFG->restrictbydefault)) {
                 $course->restrictmodules = 1;
             }
@@ -52,8 +48,7 @@
                 $user = $DB->get_record('user', array('id'=>$teacherid));
                 $a->name = $course->fullname;
                 $a->url = $CFG->wwwroot.'/course/view.php?id='.$courseid;
-                $a->teacher = $course->teacher;
-                
+
                 $eventdata = new object();
                 $eventdata->modulename        = 'moodle';
                 $eventdata->userfrom          = $USER;
Index: version.php
===================================================================
RCS file: /cvsroot/moodle/moodle/version.php,v
retrieving revision 1.873
diff -u -r1.873 version.php
--- version.php	10 Nov 2008 01:51:56 -0000	1.873
+++ version.php	11 Nov 2008 09:03:42 -0000
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2008110603;  // YYYYMMDD   = date of the last version bump
+    $version = 2008111200;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20081110)';  // Human-friendly version name
Index: mod/resource/type/repository/resource.class.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/resource/type/repository/resource.class.php,v
retrieving revision 1.24
diff -u -r1.24 resource.class.php
--- mod/resource/type/repository/resource.class.php	26 Mar 2008 02:58:16 -0000	1.24
+++ mod/resource/type/repository/resource.class.php	11 Nov 2008 09:04:13 -0000
@@ -52,14 +52,6 @@
                                        'value'   => $this->course->summary),
             'courseformat'    => array('langstr' => get_string('format'),
                                        'value'   => $this->course->format),
-            'courseteacher'   => array('langstr' => get_string('wordforteacher'),
-                                       'value'   => $this->course->teacher),
-            'courseteachers'  => array('langstr' => get_string('wordforteachers'),
-                                       'value'   => $this->course->teachers),
-            'coursestudent'   => array('langstr' => get_string('wordforstudent'),
-                                       'value'   => $this->course->student),
-            'coursestudents'  => array('langstr' => get_string('wordforstudents'),
-                                       'value'   => $this->course->students),
 
             'label4'          => array('langstr' => "",
                                        'value'   =>'/optgroup'),
Index: user/messageselect.php
===================================================================
RCS file: /cvsroot/moodle/moodle/user/messageselect.php,v
retrieving revision 1.26
diff -u -r1.26 messageselect.php
--- user/messageselect.php	24 Sep 2008 21:03:36 -0000	1.26
+++ user/messageselect.php	11 Nov 2008 09:04:13 -0000
@@ -5,9 +5,9 @@
 
     $id = required_param('id',PARAM_INT);
     $messagebody = optional_param('messagebody','',PARAM_CLEANHTML);
-    $send = optional_param('send','',PARAM_RAW);   // Content is actually treated as boolean
-    $preview = optional_param('preview','',PARAM_RAW);   // Content is actually treated as boolean
-    $edit = optional_param('edit','',PARAM_RAW);   // Content is actually treated as boolean
+    $send = optional_param('send','',PARAM_BOOL);
+    $preview = optional_param('preview','',PARAM_BOOL);
+    $edit = optional_param('edit','',PARAM_BOOL);
     $returnto = optional_param('returnto','',PARAM_LOCALURL);
     $format = optional_param('format',FORMAT_MOODLE,PARAM_INT);
     $deluser = optional_param('deluser',0,PARAM_INT);
@@ -48,7 +48,6 @@
             if (!array_key_exists($m[2],$SESSION->emailto[$id])) {
                 if ($user = $DB->get_record_select('user', "id = ?", array($m[2]), 'id,firstname,lastname,idnumber,email,emailstop,mailformat,lastaccess')) {
                     $SESSION->emailto[$id][$m[2]] = $user;
-                    $SESSION->emailto[$id][$m[2]]->teacher = ($m[1] == 'teacher');
                     $count++;
                 }
             }
@@ -100,12 +99,8 @@
                 echo "\n</form>";
             } else if (!empty($send)) {
                 $good = 1;
-                $teachers = array();
                 foreach ($SESSION->emailto[$id] as $user) {
                     $good = $good && message_post_message($USER,$user,$messagebody,$format,'direct');
-                    if ($user->teacher) {
-                        $teachers[] = $user->id;
-                    }
                 }
                 if (!empty($good)) {
                     print_heading(get_string('messagedselectedusers'));
Index: user/message.html
===================================================================
RCS file: /cvsroot/moodle/moodle/user/message.html,v
retrieving revision 1.8
diff -u -r1.8 message.html
--- user/message.html	7 May 2008 03:08:45 -0000	1.8
+++ user/message.html	11 Nov 2008 09:04:13 -0000
@@ -52,14 +52,8 @@
 <table align="center"><tr><th colspan="4" scope="row"><?php print_string('currentlyselectedusers'); ?></th></tr>
 <?php
     if (count($SESSION->emailto[$id])) {
-        if (!$course->teacher) {
-            $course->teacher = get_string('defaultcourseteacher');
-        }
         foreach ($SESSION->emailto[$id] as $user) {
             echo '<tr><td>'.fullname($user,true).'</td><td>'.$user->email.'</td><td>';
-            if ($user->teacher) {
-                echo '<img src="'.$CFG->pixpath.'/t/user.gif" alt="'.$course->teacher.'" title="'.$course->teacher.'"/>';
-            }
             if ($user->emailstop) {
                 $error = get_string('emaildisable');
             } elseif (empty($user->email)) {
Index: lib/db/upgrade.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/db/upgrade.php,v
retrieving revision 1.247
diff -u -r1.247 upgrade.php
--- lib/db/upgrade.php	8 Nov 2008 14:24:53 -0000	1.247
+++ lib/db/upgrade.php	11 Nov 2008 09:04:07 -0000
@@ -992,6 +992,38 @@
         upgrade_main_savepoint($result, 2008110603);
     }
 
+    /// Drop the deprecated teacher, teachers, student and students columns from the course table.
+    if ($result && $oldversion < 2008111200) {
+        $table = new xmldb_table('course');
+
+    /// Conditionally launch drop field teacher
+        $field = new xmldb_field('teacher');
+        if ($dbman->field_exists($table, $field)) {
+            $dbman->drop_field($table, $field);
+        }
+
+    /// Conditionally launch drop field teacher
+        $field = new xmldb_field('teachers');
+        if ($dbman->field_exists($table, $field)) {
+            $dbman->drop_field($table, $field);
+        }
+
+    /// Conditionally launch drop field teacher
+        $field = new xmldb_field('student');
+        if ($dbman->field_exists($table, $field)) {
+            $dbman->drop_field($table, $field);
+        }
+
+    /// Conditionally launch drop field teacher
+        $field = new xmldb_field('students');
+        if ($dbman->field_exists($table, $field)) {
+            $dbman->drop_field($table, $field);
+        }
+
+    /// Main savepoint reached
+        upgrade_main_savepoint($result, 2008111200);
+    }
+
     return $result;
 }
 
Index: lib/db/install.xml
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/db/install.xml,v
retrieving revision 1.173
diff -u -r1.173 install.xml
--- lib/db/install.xml	6 Nov 2008 07:34:02 -0000	1.173
+++ lib/db/install.xml	11 Nov 2008 09:04:06 -0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="lib/db" VERSION="20081022" COMMENT="XMLDB file for core Moodle tables"
+<XMLDB PATH="lib/db" VERSION="20081111" COMMENT="XMLDB file for core Moodle tables"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
 >
@@ -40,12 +40,8 @@
         <FIELD NAME="format" TYPE="char" LENGTH="10" NOTNULL="true" DEFAULT="topics" SEQUENCE="false" ENUM="false" PREVIOUS="summary" NEXT="showgrades"/>
         <FIELD NAME="showgrades" TYPE="int" LENGTH="2" NOTNULL="true" UNSIGNED="true" DEFAULT="1" SEQUENCE="false" ENUM="false" PREVIOUS="format" NEXT="modinfo"/>
         <FIELD NAME="modinfo" TYPE="text" LENGTH="big" NOTNULL="false" SEQUENCE="false" ENUM="false" PREVIOUS="showgrades" NEXT="newsitems"/>
-        <FIELD NAME="newsitems" TYPE="int" LENGTH="5" NOTNULL="true" UNSIGNED="true" DEFAULT="1" SEQUENCE="false" ENUM="false" PREVIOUS="modinfo" NEXT="teacher"/>
-        <FIELD NAME="teacher" TYPE="char" LENGTH="100" NOTNULL="true" DEFAULT="Teacher" SEQUENCE="false" ENUM="false" PREVIOUS="newsitems" NEXT="teachers"/>
-        <FIELD NAME="teachers" TYPE="char" LENGTH="100" NOTNULL="true" DEFAULT="Teachers" SEQUENCE="false" ENUM="false" PREVIOUS="teacher" NEXT="student"/>
-        <FIELD NAME="student" TYPE="char" LENGTH="100" NOTNULL="true" DEFAULT="Student" SEQUENCE="false" ENUM="false" PREVIOUS="teachers" NEXT="students"/>
-        <FIELD NAME="students" TYPE="char" LENGTH="100" NOTNULL="true" DEFAULT="Students" SEQUENCE="false" ENUM="false" PREVIOUS="student" NEXT="guest"/>
-        <FIELD NAME="guest" TYPE="int" LENGTH="2" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="students" NEXT="startdate"/>
+        <FIELD NAME="newsitems" TYPE="int" LENGTH="5" NOTNULL="true" UNSIGNED="true" DEFAULT="1" SEQUENCE="false" ENUM="false" PREVIOUS="modinfo" NEXT="guest"/>
+        <FIELD NAME="guest" TYPE="int" LENGTH="2" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="newsitems" NEXT="startdate"/>
         <FIELD NAME="startdate" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="guest" NEXT="enrolperiod"/>
         <FIELD NAME="enrolperiod" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="startdate" NEXT="numsections"/>
         <FIELD NAME="numsections" TYPE="int" LENGTH="5" NOTNULL="true" UNSIGNED="true" DEFAULT="1" SEQUENCE="false" ENUM="false" PREVIOUS="enrolperiod" NEXT="marker"/>
Index: enrol/ldap/enrol.php
===================================================================
RCS file: /cvsroot/moodle/moodle/enrol/ldap/enrol.php,v
retrieving revision 1.28
diff -u -r1.28 enrol.php
--- enrol/ldap/enrol.php	16 Jun 2008 14:25:54 -0000	1.28
+++ enrol/ldap/enrol.php	11 Nov 2008 09:03:56 -0000
@@ -557,10 +557,6 @@
     } else {
         // set defaults
         $course = new object();
-        $course->student  = get_string('defaultcoursestudent');
-        $course->students = get_string('defaultcoursestudents');
-        $course->teacher  = get_string('defaultcourseteacher');
-        $course->teachers = get_string('defaultcourseteachers');
         $course->format = 'topics';
     }
 
Index: enrol/database/enrol.php
===================================================================
RCS file: /cvsroot/moodle/moodle/enrol/database/enrol.php,v
retrieving revision 1.53
diff -u -r1.53 enrol.php
--- enrol/database/enrol.php	27 Aug 2008 07:27:13 -0000	1.53
+++ enrol/database/enrol.php	11 Nov 2008 09:03:55 -0000
@@ -575,10 +575,6 @@
                           'showgrades'     => 1,
                           'groupmode'      => 0,
                           'groupmodeforce' => 0,
-                          'student'  => $site->student,
-                          'students' => $site->students,
-                          'teacher'  => $site->teacher,
-                          'teachers' => $site->teachers,
                           );
     }
     // overlay template
Index: mod/assignment/type/upload/assignment.class.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/assignment/type/upload/assignment.class.php,v
retrieving revision 1.65
diff -u -r1.65 assignment.class.php
--- mod/assignment/type/upload/assignment.class.php	11 Oct 2008 17:33:21 -0000	1.65
+++ mod/assignment/type/upload/assignment.class.php	11 Nov 2008 09:04:09 -0000
@@ -82,7 +82,7 @@
 
         if (empty($submission->timemarked)) {   /// Nothing to show, so print nothing
             if ($this->count_responsefiles($USER->id)) {
-                print_heading(get_string('responsefiles', 'assignment', $this->course->teacher), '', 3);
+                print_heading(get_string('responsefiles', 'assignment'), '', 3);
                 $responsefiles = $this->print_responsefiles($USER->id, true);
                 print_simple_box($responsefiles, 'center');
             }
Index: blocks/quiz_results/block_quiz_results.php
===================================================================
RCS file: /cvsroot/moodle/moodle/blocks/quiz_results/block_quiz_results.php,v
retrieving revision 1.32
diff -u -r1.32 block_quiz_results.php
--- blocks/quiz_results/block_quiz_results.php	6 Nov 2008 06:13:09 -0000	1.32
+++ blocks/quiz_results/block_quiz_results.php	11 Nov 2008 09:03:55 -0000
@@ -330,10 +330,10 @@
                 foreach($best as $userid => $gradeid) {
                     switch($nameformat) {
                         case B_QUIZRESULTS_NAME_FORMAT_ID:
-                            $thisname = $course->student.' '.intval($users[$userid]->idnumber);
+                            $thisname = get_string('user').' '.intval($users[$userid]->idnumber);
                         break;
                         case B_QUIZRESULTS_NAME_FORMAT_ANON:
-                            $thisname = $course->student;
+                            $thisname = get_string('user');
                         break;
                         default:
                         case B_QUIZRESULTS_NAME_FORMAT_FULL:
@@ -371,10 +371,10 @@
                 foreach($worst as $userid => $gradeid) {
                     switch($nameformat) {
                         case B_QUIZRESULTS_NAME_FORMAT_ID:
-                            $thisname = $course->student.' '.intval($users[$userid]->idnumber);
+                            $thisname = get_string('user').' '.intval($users[$userid]->idnumber);
                         break;
                         case B_QUIZRESULTS_NAME_FORMAT_ANON:
-                            $thisname = $course->student;
+                            $thisname = get_string('user');
                         break;
                         default:
                         case B_QUIZRESULTS_NAME_FORMAT_FULL:
Index: mod/wiki/index.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/wiki/index.php,v
retrieving revision 1.21
diff -u -r1.21 index.php
--- mod/wiki/index.php	15 Jun 2008 10:47:14 -0000	1.21
+++ mod/wiki/index.php	11 Nov 2008 09:04:13 -0000
@@ -74,11 +74,11 @@
         switch ($wiki->wtype) {
 
         case 'teacher':
-            $wtype = $site->teacher;
+            $wtype = get_string('defaultcoursestudent');
             break;
 
         case 'student':
-            $wtype = $site->student;
+            $wtype = get_string('defaultcoursestudent');
             break;
 
         case 'group':
Index: course/format/topics/format.php
===================================================================
RCS file: /cvsroot/moodle/moodle/course/format/topics/format.php,v
retrieving revision 1.91
diff -u -r1.91 format.php
--- course/format/topics/format.php	9 Jun 2008 16:54:06 -0000	1.91
+++ course/format/topics/format.php	11 Nov 2008 09:03:55 -0000
@@ -58,9 +58,8 @@
     $editing         = $PAGE->user_is_editing();
 
     if ($editing) {
-        $strstudents = moodle_strtolower($course->students);
-        $strtopichide = get_string('topichide', '', $strstudents);
-        $strtopicshow = get_string('topicshow', '', $strstudents);
+        $strtopichide = get_string('hidetopic');
+        $strtopicshow = get_string('showtopic');
 	$strmarkthistopic = get_string('markthistopic');
 	$strmarkedthistopic = get_string('markedthistopic');
         $strmoveup   = get_string('moveup');
Index: mod/quiz/report/responses/responsessettings_form.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/quiz/report/responses/responsessettings_form.php,v
retrieving revision 1.4
diff -u -r1.4 responsessettings_form.php
--- mod/quiz/report/responses/responsessettings_form.php	24 Sep 2008 10:55:55 -0000	1.4
+++ mod/quiz/report/responses/responsessettings_form.php	11 Nov 2008 09:04:12 -0000
@@ -9,10 +9,10 @@
         $mform->addElement('header', 'preferencespage', get_string('preferencespage', 'quiz_overview'));
 
         if (!$this->_customdata['currentgroup']){
-            $studentsstring = "'".$COURSE->students."'";
+            $studentsstring = get_string('participants');
         } else {
             $a = new object();
-            $a->coursestudent = $COURSE->students;
+            $a->coursestudent = get_string('participants');
             $a->groupname = groups_get_group_name($this->_customdata['currentgroup']);
             if (20 < strlen($a->groupname)){
                 $studentsstring = get_string('studentingrouplong', 'quiz_overview', $a);