[Stack-cvs] stack-1-0/scripts en.php,1.3,1.3.2.1

[Chris S. <san...@us...>]

Update of /cvsroot/stack/stack-1-0/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30583/scripts

Modified Files:
      Tag: frontend_dev
	en.php 
Log Message:


Index: en.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/en.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** en.php	12 Jun 2005 16:10:00 -0000	1.3
--- en.php	14 Jun 2005 11:36:06 -0000	1.3.2.1
***************
*** 30,33 ****
--- 30,34 ----
  $string['End']               = 'End';
  
+ // Stack page footer.
  $string['ThisSTACKVer']      = 'This is STACK version';
  $string['ThisPageTook']      = 'This page took approximatly';
***************
*** 39,47 ****
  $string['QValidquestionnotar'] = '$question variable does not exist!';
  $string['QValidMaximaName']    = 'is a Maxima function name.';
! $string['QInstCASError']       = 'CAS ERROR when instantiated!';
  $string['CASError']            = 'CAS ERROR!';
  $string['CASError_ans']        = 'The CAS did not process your answer.';
! $string['QMarkBailOut']        = 'WARNING! bailing out, since the following prn has been visited more than once:';
  
  $string['QTestTeacherInfo']    = 'Information for the teacher';
  $string['QTestQuestionNote']   = 'Question note';
--- 40,49 ----
  $string['QValidquestionnotar'] = '$question variable does not exist!';
  $string['QValidMaximaName']    = 'is a Maxima function name.';
! $string['QInstCASError']       = 'The CAS generated errors when creating a question version.';
  $string['CASError']            = 'CAS ERROR!';
  $string['CASError_ans']        = 'The CAS did not process your answer.';
! $string['QMarkBailOut']        = 'There is an error in the marking procedure, please contact your administrator.  (A potential response was visited more than once.)';
  
+ // Teacher's view to try questions.
  $string['QTestTeacherInfo']    = 'Information for the teacher';
  $string['QTestQuestionNote']   = 'Question note';
***************
*** 49,52 ****
--- 51,55 ----
  $string['QTestTeacherAns']     = "Teacher's answer";
  
+ // 
  $string['YourLastAns']         = 'Your last answer was interpreted as:';
  $string['YouHaveNotAns']       = 'Warning: you have not answered this.';
***************
*** 90,94 ****
  $string['NotSupported']        = 'The string <tt><font color=\'orange\'>{$a[\'key\']}</font></tt> is a legitimate CAS command, but does is not supported in this implementation of STACK.  There may be an alternative. If you are in doubt about this, please contact the administrator.';
  
! $string['EmptyCASString']      =  'You have an empty <tt>casstring</tt>, which is not permitted.';
  $string['ErrorCASString']      =  'The string <font color=\'orange\'><tt>@{$a[\'key\']}@</tt></font> generated the following error(s)';
  $string['OddAmpCASString']     = 'You have an odd number of @s, which is not permitted.';
--- 93,98 ----
  $string['NotSupported']        = 'The string <tt><font color=\'orange\'>{$a[\'key\']}</font></tt> is a legitimate CAS command, but does is not supported in this implementation of STACK.  There may be an alternative. If you are in doubt about this, please contact the administrator.';
  
! // Validating the CASText
! $string['EmptyCASString']      =  'You have included a CAS string which is empty.  This is not permitted.'; // This occurs when validating CASText For example, a user might type "Factor @ @."
  $string['ErrorCASString']      =  'The string <font color=\'orange\'><tt>@{$a[\'key\']}@</tt></font> generated the following error(s)';
  $string['OddAmpCASString']     = 'You have an odd number of @s, which is not permitted.';
***************
*** 123,127 ****
  $string['stackQuestion_questionStem']           = 'Question stem';
  $string['stackQuestion_questionAns']            = "Teacher's answer";
! $string['stackQuestion_questionAnsKey']         = "Student's answer key";
  $string['stackQuestion_questionAnsVarsRaw']     = 'Feedback variables';
  $string['stackQuestion_questionAnsVars']        = '(Internal) Feedback variables';
--- 127,131 ----
  $string['stackQuestion_questionStem']           = 'Question stem';
  $string['stackQuestion_questionAns']            = "Teacher's answer";
! $string['stackQuestion_questionAnsKey']         = "Student's answer key"; // The name of the variable to which the student's answer is assigned.
  $string['stackQuestion_questionAnsVarsRaw']     = 'Feedback variables';
  $string['stackQuestion_questionAnsVars']        = '(Internal) Feedback variables';
***************
*** 212,220 ****
  
  $string['FacForm_UnPick_morework']  = 'You could still do some more work on the term {$a[0]}. ';
! $string['FacForm_UnPick_intfac']    = 'You need to take out a common integer factor. ';
  
  $string['ATFacForm_error_list']     = 'The answer test failed.  Please contact your systems administrator';
  $string['ATFacForm_error_degreeSA'] = 'The CAS could not establish the algebraic degree of your answer.';
! $string['ATFacForm_error_float']    = 'You should not use any floating point numbers.  Please use only integers, fractions etc.';
  $string['ATFacForm_isfactored']     = 'Your answer is factored, well done. ';  // needs a space at the end.
  $string['ATFacForm_notfactored']    = 'Your answer is not factored. '; // needs a space at the end.
--- 216,224 ----
  
  $string['FacForm_UnPick_morework']  = 'You could still do some more work on the term {$a[0]}. ';
! $string['FacForm_UnPick_intfac']    = $string['irred_Q_commonint'];
  
  $string['ATFacForm_error_list']     = 'The answer test failed.  Please contact your systems administrator';
  $string['ATFacForm_error_degreeSA'] = 'The CAS could not establish the algebraic degree of your answer.';
! $string['ATFacForm_error_float']    = 'You should not use any floating point (decimal) numbers.  Please use only integers, fractions etc.';
  $string['ATFacForm_isfactored']     = 'Your answer is factored, well done. ';  // needs a space at the end.
  $string['ATFacForm_notfactored']    = 'Your answer is not factored. '; // needs a space at the end.