stack-cvs

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

Update of /cvsroot/stack/stack-1-0/lang/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26368/lang/en

Modified Files:
	stack.php 
Log Message:


Index: stack.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/lang/en/stack.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** stack.php	4 Sep 2005 19:24:57 -0000	1.26
--- stack.php	12 Sep 2005 08:07:47 -0000	1.27
***************
*** 54,58 ****
  // Stack page footer.
  $string['ThisSTACKVer']      = 'This is STACK version';
! $string['ThisPageTook']      = 'This page took approximatly';
  $string['seconds']           = 'seconds';
  $string['STACKlogo']         = 'STACK logo';
--- 54,58 ----
  // Stack page footer.
  $string['ThisSTACKVer']      = 'This is STACK version';
! $string['ThisPageTook']      = 'This page took approximately';
  $string['seconds']           = 'seconds';
  $string['STACKlogo']         = 'STACK logo';
***************
*** 143,147 ****
  $string['USR_Address']             = 'Address'; 
  $string['USR_Department']          = 'Department'; 
! $string['USR_Institution']         = 'Instituion'; 
  
  ////////////////////////////////////////
--- 143,147 ----
  $string['USR_Address']             = 'Address'; 
  $string['USR_Department']          = 'Department'; 
! $string['USR_Institution']         = 'Institution'; 
  
  ////////////////////////////////////////
***************
*** 177,181 ****
  $string['stackQuestion_questionFormat']          = 'Digital manifestation';
  $string['stackQuestion_questionLanguage']        = 'Language of content';
! $string['stackQuestion_questionLearningContext'] = 'Targetted to';
  $string['stackQuestion_questionDifficulty']      = 'Difficulty';
  $string['stackQuestion_questionCompetency']      = 'Competencies trained';
--- 177,181 ----
  $string['stackQuestion_questionFormat']          = 'Digital manifestation';
  $string['stackQuestion_questionLanguage']        = 'Language of content';
! $string['stackQuestion_questionLearningContext'] = 'Targeted to';
  $string['stackQuestion_questionDifficulty']      = 'Difficulty';
  $string['stackQuestion_questionCompetency']      = 'Competencies trained';
***************
*** 222,226 ****
  $string['stackQuiz_quizFormat']         = 'Digital manifestation';
  $string['stackQuiz_quizLanguage']       = 'Language of content';
! $string['stackQuiz_quizLearningContext']= 'Targetted to';
  $string['stackQuiz_quizDifficulty']     = 'Difficulty';
  $string['stackQuiz_quizCompetency']     = 'Competencies trained';
--- 222,226 ----
  $string['stackQuiz_quizFormat']         = 'Digital manifestation';
  $string['stackQuiz_quizLanguage']       = 'Language of content';
! $string['stackQuiz_quizLearningContext']= 'Targeted to';
  $string['stackQuiz_quizDifficulty']     = 'Difficulty';
  $string['stackQuiz_quizCompetency']     = 'Competencies trained';
***************
*** 240,244 ****
  $string['stackSubject_subjectFormat']         = 'Digital manifestation';
  $string['stackSubject_subjectLanguage']       = 'Language of content';
! $string['stackSubject_subjectLearningContext']= 'Targetted to';
  $string['stackSubject_subjectDifficulty']     = 'Difficulty';
  $string['stackSubject_subjectCompetency']     = 'Competencies trained';
--- 240,244 ----
  $string['stackSubject_subjectFormat']         = 'Digital manifestation';
  $string['stackSubject_subjectLanguage']       = 'Language of content';
! $string['stackSubject_subjectLearningContext']= 'Targeted to';
  $string['stackSubject_subjectDifficulty']     = 'Difficulty';
  $string['stackSubject_subjectCompetency']     = 'Competencies trained';
***************
*** 266,269 ****
--- 266,271 ----
  $string['stackOptions_SyntaxHint']        = 'Syntax Hint';
  $string['stackOptions_Display']           = 'Display';
+ $string['stackOptions_Complex no']        = 'Complex no';
+ $string['stackOptions_Floats']            = 'Forbid floats';
  $string['stackOptions_Language']          = 'Language';
  $string['stackOptions_QuVal']             = 'Question value';
***************
*** 350,353 ****
--- 352,356 ----
  
  $string['AT_NOTIMPLEMENTED']        = 'This answer test has not been implemented.';
+ $string['Illegal_floats']           = 'Your answer contains floating point numbers, which are not allowed in this question.  You need to type in numbers as fractions.  For example, you should type 1/3 not 0.3333, which is after all only an approximation to one third.';
  
  $string['ATAlgEquiv_SA_not_matrix']     = 'Your answer should be a matrix, but is not.';
***************
*** 375,382 ****
  $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.
! $string['ATFacForm_notalgequiv']    = 'Note that your answer is not algebarically equivalent to the correct answer.  You must have done something wrong. '; // needs a space at the end.
  
  $string['ATPartFrac_error_list']        = $string['ATFacForm_error_list'];
--- 378,384 ----
  $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_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.
! $string['ATFacForm_notalgequiv']    = 'Note that your answer is not algebraically equivalent to the correct answer.  You must have done something wrong. '; // needs a space at the end.
  
  $string['ATPartFrac_error_list']        = $string['ATFacForm_error_list'];
***************
*** 410,414 ****
  
  $string['FE_notadmin']     = 'Not permitted!';
! $string['FE_needadmin']    = 'You need to be logged in as the admin to edit quizzes, but seem to be user {$a}.';
  $string['FE_errors_exist'] = 'Errors exist!';
  $string['FE_errors_field'] = 'The field $a, gave the following error.';
--- 412,416 ----
  
  $string['FE_notadmin']     = 'Not permitted!';
! $string['FE_needadmin']    = 'You need to be logged in as the administrator, but seem to be user {$a}.';
  $string['FE_errors_exist'] = 'Errors exist!';
  $string['FE_errors_field'] = 'The field $a, gave the following error.';