stack-cvs

[Simon H. <sim...@us...>]

Update of /cvsroot/stack/stack-dev/lang/en
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25193/lang/en

Modified Files:
      Tag: item_state_separation
	stack.php 
Log Message:
Brought back up to date with big HEAD merge.

Index: stack.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lang/en/stack.php,v
retrieving revision 1.139.2.7.2.1
retrieving revision 1.139.2.7.2.2
diff -C2 -d -r1.139.2.7.2.1 -r1.139.2.7.2.2
*** stack.php	7 Dec 2009 14:41:23 -0000	1.139.2.7.2.1
--- stack.php	9 Nov 2010 16:51:39 -0000	1.139.2.7.2.2
***************
*** 20,24 ****
  $string['WorkedSolution']      = 'Worked solution';
  $string['NoSolution']          = '[No solution available]';
! $string['YourAttemptsWere']    = 'Your attempts at this question were as follows.';
  $string['Answer']              = 'Answer';
  $string['NoAttemptsAtQ']       = 'You have made no attempts at this question.';
--- 20,25 ----
  $string['WorkedSolution']      = 'Worked solution';
  $string['NoSolution']          = '[No solution available]';
! $string['YourAttemptsWere']    = 'Your attempts at this question were as follows';
! $string['stack_show/hide_feedback'] = 'show/hide feedback';
  $string['Answer']              = 'Answer';
  $string['NoAttemptsAtQ']       = 'You have made no attempts at this question.';
***************
*** 46,50 ****
  $string['stackQuestion_questionName']           = 'Name';
  
! $string['stackQuestion_questionKeywords']       = 'Keywords';
  $string['stackQuestion_questionBody']           = 'Body';
  $string['stackQuestion_questionUserLastEdited'] = 'User';
--- 47,53 ----
  $string['stackQuestion_questionName']           = 'Name';
  
! $string['stackQuestion_questionKeywordFilter']  = 'Keyword filter';
! $string['stackQuestion_questionKeywordReset']   = '[reset]';
! $string['stackQuestion_questionKeywordInvertFilter']   = 'Invert keywords';
  $string['stackQuestion_questionBody']           = 'Body';
  $string['stackQuestion_questionUserLastEdited'] = 'User';
***************
*** 64,74 ****
  $string['stackQuestion_questionRights']          = 'Rights statement';
  
  $string['stackQuestion_questionValid']          = 'Valid';
  $string['stackQuestion_questionStatus']          = 'Status';
  $string['stackQuestion_questionDescription']    = 'Description';
! $string['stackQuestion_questionDateLastEdited'] = 'Last edited on';
  $string['stackQuestion_questionPublished'] = 'Privacy';
  $string['stackQuestion_questionRelevance'] = 'Relevance';
! $string['stackQuestion_questionNoDeployed'] = "# dep'd";
  
  // Used in the question bank order select form to indicate no selection.
--- 67,79 ----
  $string['stackQuestion_questionRights']          = 'Rights statement';
  
+ $string['stackQuestion_questionHeader']          = '<b>Name</b> (version): Description <small>keywords</small>';
  $string['stackQuestion_questionValid']          = 'Valid';
  $string['stackQuestion_questionStatus']          = 'Status';
  $string['stackQuestion_questionDescription']    = 'Description';
! $string['stackQuestion_questionDateLastEdited'] = 'Last edited';
  $string['stackQuestion_questionPublished'] = 'Privacy';
  $string['stackQuestion_questionRelevance'] = 'Relevance';
! $string['stackQuestion_questionNoDeployed'] = "<abbr title='number deployed'>#</abbr>";
! $string['stackQuestion_questionActions'] = "Actions";
  
  // Used in the question bank order select form to indicate no selection.
***************
*** 121,124 ****
--- 126,130 ----
  $string['stackOptions_FeedBackGenericPCorrect']      = 'Feedback: partially correct';
  $string['stackOptions_FeedBackGenericPCorrect_def']  = "<span class='partially'>Your answer is partially correct.</span>";
+ $string['stackOptions_OptWorkedSol']       = 'Worked solution on demand';
  $string['stackOptions_QuizMode']           = 'Quiz mode';
  $string['stackOptions_SubjectMode']        = 'Allow access to';
***************
*** 269,272 ****
--- 275,279 ----
  
  $string['AT_NOTIMPLEMENTED']        = 'This answer test has not been implemented.';
+ $string['TEST_FAILED']              = 'The answer test failed to execute correctly: please altert your teacher.';
  
  $string['ATAlgEquiv_SA_not_expression'] = 'Your answer should be an expression, not an equation, inequality, list, set or matrix. ';
***************
*** 325,331 ****
  
  $string['ATCompSquare_true']            = '';
! $string['ATCompSquare_wrong']           = '';
  $string['ATCompSquare_not_AlgEquiv']    = 'Your answer appears to be in the correct form, but is not equivalent to the correct answer.';
! $string['ATCompSquare_wrong_no_summands']     = 'The completed square is of the form \( a(\cdots\cdots)^2 + b\) where \(a\) and \(b\) do not depend on your variable.  More than one of your summands appears to depend on the variable in your answer.';
  
  
--- 332,338 ----
  
  $string['ATCompSquare_true']            = '';
! $string['ATCompSquare_false']           = '';
  $string['ATCompSquare_not_AlgEquiv']    = 'Your answer appears to be in the correct form, but is not equivalent to the correct answer.';
! $string['ATCompSquare_false_no_summands']     = 'The completed square is of the form \( a(\cdots\cdots)^2 + b\) where \(a\) and \(b\) do not depend on your variable.  More than one of your summands appears to depend on the variable in your answer.';
  
  
***************
*** 367,375 ****
  $string['FE_index_main']         = 'main menu';
  $string['FE_index_Hints']        = 'Hints';
! $string['FE_index_search']       = 'Search Questions';
  $string['FE_peak_memory']        = 'Peak memory usage: ';
  $string['FE_publicCopied']       = 'Public question copied';
  $string['FE_publicCopy']         = 'You may now ';
! $string['FE_publicCopy2']        =  'modify your personal copy';
  $string['FE_publicCopy3']        = 'of the question.';
  $string['FE_confirmDelete']      = 'Confirm Delete';
--- 374,383 ----
  $string['FE_index_main']         = 'main menu';
  $string['FE_index_Hints']        = 'Hints';
! $string['FE_index_search']       = 'Search';
! $string['FE_index_question(s)']       = 'question(s)';
  $string['FE_peak_memory']        = 'Peak memory usage: ';
  $string['FE_publicCopied']       = 'Public question copied';
  $string['FE_publicCopy']         = 'You may now ';
! $string['FE_publicCopy2']        = 'modify your personal copy';
  $string['FE_publicCopy3']        = 'of the question.';
  $string['FE_confirmDelete']      = 'Confirm Delete';
***************
*** 379,383 ****
  $string['FE_noCancel']           = 'No, Cancel';
  $string['FE_testQuestion']       = 'Test Question';
! $string['FE_deployQuestion']     = 'Deploy Question';
  $string['FE_question']           = 'Question:';
  
--- 387,391 ----
  $string['FE_noCancel']           = 'No, Cancel';
  $string['FE_testQuestion']       = 'Test Question';
! $string['FE_deployVersion']      = 'Deploy Version';
  $string['FE_question']           = 'Question:';
  
***************
*** 385,398 ****
  $string['FE_deployQuestion_attemptingDeploy']   = 'Attempting to deploy {$a} instances.';
  $string['FE_deployQuestion_deployedInstances'] 	= 'Deployed {$a} new instances.';
! $string['FE_deployQuestion_dropping']    		= 'Dropping version ';
  $string['FE_deployQuestion_auto']  		 		= 'Automatically deployed single question instance';
! $string['FE_deployQuestion_singletonDeployed']	= 'Singleton question deployed (\'Drop\' will re-deploy).';
! $string['FE_deployQuestion_versions']    		= ' instances currently cached.';
! $string['FE_deployQuestion_version']     		= '1 instance currently cached.';
! $string['FE_deployQuestion_newversions'] 		= 'new random instances.';
  $string['FE_deployQuestion_noi']         		= 'No instances added yet.';
  $string['FE_deployQuestion_norand']      		= 'There are no random instances of this question, and hence no need to deploy more than one version.';
! $string['FE_deployQuestion_instancesOfQuestion']= 'Instances of question ';
  $string['FE_deployQuestion_primedResponses']	= 'Primed responses';
  
  $string['FE_validate'] = '{$a[0]} of {$a[1]} questions validated.';
--- 393,417 ----
  $string['FE_deployQuestion_attemptingDeploy']   = 'Attempting to deploy {$a} instances.';
  $string['FE_deployQuestion_deployedInstances'] 	= 'Deployed {$a} new instances.';
! $string['FE_deployQuestion_instancesOfQuestion']= 'Instances of question {$a}';
! $string['FE_deployQuestion_droppedInstance']    = 'Dropped instance.';
  $string['FE_deployQuestion_auto']  		 		= 'Automatically deployed single question instance';
! $string['FE_deployQuestion_singletonDeployed']	= 'Singleton question deployed (\'Undeploy\' will trigger redeploy).';
! $string['FE_deployQuestion_xInstances'] 		= '{$a} instances ';
! $string['FE_deployQuestion_instanceDeployed']   = '1 instance deployed.';
! $string['FE_deployQuestion_newRandomInstances']	= 'new random instances';
  $string['FE_deployQuestion_noi']         		= 'No instances added yet.';
  $string['FE_deployQuestion_norand']      		= 'There are no random instances of this question, and hence no need to deploy more than one version.';
! $string['FE_deployQuestion_instancesOfVersion']= 'Instances of question version';
! $string['FE_deployQuestion_autoprime'] 			= 'automatically prime';
  $string['FE_deployQuestion_primedResponses']	= 'Primed responses';
+ $string['FE_deployQuestion_ofVersionXdeployed']	= 'of version {$a} deployed.';
+ $string['FE_deployQuestion_newerVersion']		= 'There is a newer version of this question available: <strong>version {$a}</strong>.  To redeploy with this you will first need to undeploy the instances below.  Students will continue to be able to answer those instances if they have already started.';
+ $string['FE_deployQuestion_dropInstance']		= 'Dropped an instance ({$a}).';
+ $string['FE_deployQuestion_undeployAll']		= 'Undeploy all';
+ $string['FE_deployQuestion_confirmUndeployAll']	= 'Are you sure want to drop all deployed instances of this question version?';
+ $string['FE_deployQuestion_oldVersionDeployed']	= 'An older version of this question has been deployed.  Before you can deploy instances of this latest version you will need to undeploy all instances of the older version below.  Students already using this version will be able to continue.';
+ $string['FE_deployQuestion_newerVersionCannotDeploy'] = 'There is now a newer version of this question.  This means you cannot deploy any more instances from the older version.';
+ $string['FE_deployQuestion_undeployOldVersion']	= 'To deploy instances of the latest version you will need to undeploy all instances of this version.  ';
+ $string['FE_deployQuestion_primedResponsesBlurb'] = 'Pregenerated from the question tests, they can include correct answers as well as common mistakes.  The cache can be primed to include their straightforward submission to save the work at quiz time.';
  
  $string['FE_validate'] = '{$a[0]} of {$a[1]} questions validated.';
***************
*** 484,487 ****
--- 503,507 ----
  $string['stackQuestion_PR_AddAPR']       = 'Add a Potential Response';
  $string['stackQuestion_PR_requirements']       = 'This Potential Response Tree will become active when the student has answered:';
+ $string['PR_ERROR']                      = 'Please alert your teacher that the marking algorithm has failed to work because of the following problems:';
  
  $string['stackCas_invalidCommand']          = 'CAS commands not valid';
***************
*** 500,503 ****
--- 520,524 ----
  $string['stackCas_apostrophe']              = 'Apostrophes are not permitted in responses: ';
  $string['stackCas_finalChar']               = '\'{$a[0]}\' is an invalid final character in {$a[1]}';
+ $string['stackCas_qmchar']                  = 'This answer contains a question mark, which is forbidden.';
  
  //Authoring questions
***************
*** 515,518 ****
--- 536,540 ----
  
  //buttons
+ $string['stackAuthor_qid'] = 'Question ID:';
  $string['stackAuthor_button_update'] = 'Update';
  $string['stackAuthor_button_addPRT'] = '+';
***************
*** 532,545 ****
  $string['stackAuthor_button_exportAsXml'] = 'Export as XML';
  $string['chat_button'] = 'chat';
  
  //author editor text
  $string['stackAuthor_title'] = 'Author Question';
! $string['stackAuthor_qid'] = 'Question ID:';
  $string['stackAuthor_name'] = 'Name:';
  $string['stackAuthor_description'] = 'Description:';
  $string['stackAuthor_keywords'] = 'Keywords:';
  $string['stackAuthor_qvariables'] = 'Question Variables:';
! $string['stackAuthor_stem'] = 'Question Stem:';
! $string['stackAuthor_stemInfo'] = '#ans# denotes student answers<br /> @castext@ for castext<br />&lt;html&gt;&lt;/html&gt; for html <br />$\latex$ for latex';
  $string['stackAuthor_workedSolution'] = 'Worked Solution: ';
  $string['stackAuthor_qnote'] = 'Question Note:';
--- 554,571 ----
  $string['stackAuthor_button_exportAsXml'] = 'Export as XML';
  $string['chat_button'] = 'chat';
+ $string['stackQuiz_button_submit'] = 'Submit';
+ $string['stackQuiz_button_finishQuiz'] = 'Finish quiz';
  
  //author editor text
+ $string['stackAuthor_onlineGuide'] = 'Online Guide';
  $string['stackAuthor_title'] = 'Author Question';
! $string['stackAuthor_editingQuestion'] = 'Editing Question: ';
! $string['stackAuthor_stem'] = 'Stem';
  $string['stackAuthor_name'] = 'Name:';
  $string['stackAuthor_description'] = 'Description:';
  $string['stackAuthor_keywords'] = 'Keywords:';
  $string['stackAuthor_qvariables'] = 'Question Variables:';
! $string['stackAuthor_questionStem'] = 'Question Stem:';
! $string['stackAuthor_stemInfo'] = '#ans# denotes student answers<br /> @castext@ for castext<br />&lt;html&gt;&lt;/html&gt; for html <br />latex';
  $string['stackAuthor_workedSolution'] = 'Worked Solution: ';
  $string['stackAuthor_qnote'] = 'Question Note:';
***************
*** 566,569 ****
--- 592,597 ----
  $string['stackAuthor_LowestTerms'] = 'Require lowest terms';
  $string['stackAuthor_sameType'] = 'Check Students answer\'s type';
+ $string['stackAuthor_studentVerify'] = 'Student must verify';
+ $string['stackAuthor_hideFeedback'] = 'Hide feedback';
  $string['stackAuthor_inputTypeOpt'] = 'Input Type Options';
  $string['stackAuthor_noInputTypeOpt'] = 'No options';
***************
*** 572,576 ****
  
  
! $string['stackAuthor_metadata'] = 'Meta data';
  $string['stackAuthor_qstatus'] = 'Question Status:';
  $string['stackAuthor_lang'] = 'Language:';
--- 600,604 ----
  
  
! $string['stackAuthor_metadata'] = 'Metadata';
  $string['stackAuthor_qstatus'] = 'Question Status:';
  $string['stackAuthor_lang'] = 'Language:';
***************
*** 594,600 ****
  $string['stackAuthor_feedbackIncorrect'] = 'Feedback Incorrect:';
  $string['stackAuthor_output'] = 'Output';
  $string['stackAuthor_multSign'] = 'Multiplication Sign:';
  $string['stackAuthor_surd'] = 'Surd for Square Root:';
! $string['stackAuthor_ComplexNo'] = 'sqrt(-1) = i (true) or j (false):';
  
  $string['stackAuthor_empty_qstem'] = 'Please fill in the question stem.';
--- 622,629 ----
  $string['stackAuthor_feedbackIncorrect'] = 'Feedback Incorrect:';
  $string['stackAuthor_output'] = 'Output';
+ $string['stackAuthor_OptWorkedSol'] = 'Worked solution on demand';
  $string['stackAuthor_multSign'] = 'Multiplication Sign:';
  $string['stackAuthor_surd'] = 'Surd for Square Root:';
! $string['stackAuthor_ComplexNo'] = 'Meaning and display of sqrt(-1):';
  
  $string['stackAuthor_empty_qstem'] = 'Please fill in the question stem.';
***************
*** 603,606 ****
--- 632,636 ----
  $string['stackAuthor_invalid_workedSolution'] = 'Worked Solution is invalid:';
  $string['stackAuthor_invalid_questionNote'] = 'Question Note is invalid:';
+ $string['stackAuthor_empty_questionNote'] = 'The Question Note cannot be empty when rand() appears in the question variables.  Used to distinguish between different versions of the question.';
  $string['stackAuthor_PRTAlreadyExists'] = 'A potential response tree already exists with the name';
  $string['stackAuthor_teachersNote'] = 'Teachers Notes:';
***************
*** 614,628 ****
  
  //moodle additions to author interface
! $string['stackAuthor_moodleExport'] = 'Moodle Options';
! $string['stackAuthor_addedMoodle'] = 'Added to Moodle';
  $string['stackAuthor_moodleAddSucessful'] = 'Question added to Moodle successfully.';
! $string['stackAuthor_moodleAddFailed'] = 'Failed to add question to Moodle.';
! $string['stackAuthor_moodleEngIdFail'] = 'Engine ID missing, could not add to Moodle.';
  $string['stackAuthor_moodleUpdateFail'] = 'Failed to update Moodle';
! $string['stackAuthor_moodleQBFail'] = 'Could not update this question in Moodle\'s question bank.';
! $string['stackAuthor_moodleSave1st'] = 'The question must be saved before it can be added to Moodle\'s question bank.';
! $string['stackAuthor_inMoodle'] = 'This question is already in Moodle\'s question bank. Saving the question in STACK will automatically update Moodle.';
! $string['stackAuthor_moodleSelectCat'] = 'You may add this question to one of Moodle\'s question banks. Select the required category.';
! $string['stackAuthor_category'] = 'Category:';
  
  $string['stackMoodle_passkeyInvalid'] =  'Invalid passkey for this server.';
--- 644,660 ----
  
  //moodle additions to author interface
! $string['stackAuthor_moodleExport'] 	= 'Moodle Options';
! $string['stackAuthor_addToMoodle'] 		= 'Add to Moodle';
! $string['stackAuthor_addedMoodle'] 		= 'Added to Moodle';
  $string['stackAuthor_moodleAddSucessful'] = 'Question added to Moodle successfully.';
! $string['stackAuthor_moodleAddFailed'] 	= 'Failed to add question to Moodle.';
! $string['stackAuthor_moodleEngIdFail'] 	= 'Engine ID missing, could not add to Moodle.';
  $string['stackAuthor_moodleUpdateFail'] = 'Failed to update Moodle';
! $string['stackAuthor_moodleQBFail'] 	= 'Could not update this question in Moodle\'s question bank.';
! $string['stackAuthor_moodleSave1st'] 	= 'The question must be saved before it can be added to Moodle\'s question bank.';
! $string['stackAuthor_inMoodle'] 		= 'This question is already in Moodle\'s question bank. Saving the question in STACK will automatically update Moodle.';
! $string['stackAuthor_moodleSelectCat'] 	= 'You may add this question to one of Moodle\'s question banks. Select the required category.';
! $string['stackAuthor_category'] 		= 'Category:';
! $string['stackAuthor_savedVersions'] 	= 'Saved versions';
  
  $string['stackMoodle_passkeyInvalid'] =  'Invalid passkey for this server.';
***************
*** 692,695 ****
--- 724,728 ----
  $string['Illegal_floats'] = 'Your answer contains floating point numbers, that 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['DivisionZero']   = 'Your answer results in a division by zero, eg 1/0, which makes no mathematical sense.';
+ $string['CommaError']     = 'Your answer contains commas which are not part of a list, set or matrix.  <ul><li>If you meant to type in a list, please use <tt>{$a[0]}</tt>,</li><li>If you meant to type in a set, please use <tt>{$a[1]}</tt>.</li></ul>';
  
  //question display strings
***************
*** 709,713 ****
  $string['stackQuestionDisplay_workedSolutionDenied']   = 'You have changed one or more of your answers, because of this the worked solution will not be displayed.';
  $string['stackQuestionDisplay_assessmentItem']         = 'Assessment Item';
! $string['stackQuestionDisplay_resubmit']               = 'Your responses have been accepted and validated. Please review you responses and re-submit to fully evaluate your answers.';
  $string['stackQuestionDisplay_PRTunevaluated']         = 'Please continue to work.  Feedback will be provided here in due course.';
  $string['stackQuestionDisplay_nomarks']                = 'Thank you.  There are no marks available.';
--- 742,746 ----
  $string['stackQuestionDisplay_workedSolutionDenied']   = 'You have changed one or more of your answers, because of this the worked solution will not be displayed.';
  $string['stackQuestionDisplay_assessmentItem']         = 'Assessment Item';
! $string['stackQuestionDisplay_resubmit']               = 'Your responses have been accepted and validated. Please review your responses and re-submit to fully evaluate your answers.';
  $string['stackQuestionDisplay_PRTunevaluated']         = 'Please continue to work.  Feedback will be provided here in due course.';
  $string['stackQuestionDisplay_nomarks']                = 'Thank you.  There are no marks available.';
***************
*** 745,749 ****
  $string['stackIcon_success']    = 'correct.png';
  $string['stackIcon_success_alt']    = 'Success';
! 
  
  //Authoring errors
--- 778,785 ----
  $string['stackIcon_success']    = 'correct.png';
  $string['stackIcon_success_alt']    = 'Success';
! $string['stackIcon_edit']			= 'Edit';
! $string['stackIcon_try']			= 'Try';
! $string['stackIcon_deploy']			= 'Deploy';
! $string['stackIcon_xml']			= 'XML';
  
  //Authoring errors
***************
*** 879,882 ****
--- 915,919 ----
  $string['stackInstall_password']  = 'Password';
  $string['stackInstall_password2']  = 'Re-enter Password';
+ $string['stackInstall_yourMoodleUsername']  = 'Your Moodle Username';
  $string['stackInstall_email']  = 'Email Address (Optional)';
  $string['stackInstall_smtp']  = 'SMTP Server <br />(Required for sending emails)';
***************
*** 884,888 ****
  
  //p5.php
! $string['stackInstall_configWriteFailed']  = 'Could not write config.php file. Please copy &amp; paste the configuration below into a file named config.php in the directory {$a} then click continue.';
  $string['stackInstall_configWriteSucceed']  = 'Configuration file has been written. Ready to test the CAS.';
  
--- 921,925 ----
  
  //p5.php
! $string['stackInstall_configWriteFailed']  = 'Could not write <tt>config.php</tt> file. Please copy &amp; paste the configuration below into a file named <tt>config.php</tt> in the directory <tt>{$a}</tt> then click continue.';
  $string['stackInstall_configWriteSucceed']  = 'Configuration file has been written. Ready to test the CAS.';
  
***************
*** 965,968 ****
--- 1002,1008 ----
  $string['stackHealth_dirtest'] = 'Testing writable directories';
  $string['stackHealth_noProblems'] = 'No problems found.';
+ $string['stackInstall_securityHeader']  = 'Security checks';
+ $string['stackHealth_securityPass'] = 'No security issues found.';
+ $string['stackHealth_securityFail'] = 'The following security issues below were found.';
  
  $string['stackInstall_confHeader']  = 'Checking config.php';
***************
*** 971,980 ****
  $string['stackInstall_confBackupExposed']  = 'You have a <tt>config.php~</tt> backup file which may publicly expose sensitive settings';
  
! $string['stackInstall_failopenconfig']  = 'Could not open config.php';
! $string['stackInstall_retryconfig']  = 'Click the back button to retry creating config.php';
  
  
  $string['stackInstall_testsuite_title']  = 'A test suite for STACK Answer tests';
! $string['stackInstall_testsuite_intro']  = 'This page allows you to test that the STACK answer tests are functioning correctly.  Note that only answer tests can be checked through the web interface.  Other Maxima commands need to be checked from the command line: see unittests.mac.';
  $string['stackInstall_testsuite_choose']  = 'Please choose an answer test.';
  $string['stackInstall_testsuite_pass']  = 'All tests passed!';
--- 1011,1021 ----
  $string['stackInstall_confBackupExposed']  = 'You have a <tt>config.php~</tt> backup file which may publicly expose sensitive settings';
  
! $string['stackInstall_securityPublicConfig'] = 'Your configuration settings are public as config.php~.  You should remove this file.';
  
+ $string['stackInstall_failopenconfig']  = 'Could not open <tt>config.php</tt>';
+ $string['stackInstall_retryconfig']  = 'Click the back button to retry creating config.php';
  
  $string['stackInstall_testsuite_title']  = 'A test suite for STACK Answer tests';
! $string['stackInstall_testsuite_intro']  = 'This page allows you to test that the STACK answer tests are functioning correctly.  Note that only answer tests can be checked through the web interface.  Other Maxima commands need to be checked from the command line: see unittests.mac.<br />Documentation for the answer tests is available on the <a href=\"http://stack.bham.ac.uk/wiki/index.php/Answer_tests\">wiki</a>.';
  $string['stackInstall_testsuite_choose']  = 'Please choose an answer test.';
  $string['stackInstall_testsuite_pass']  = 'All tests passed!';
***************
*** 1082,1085 ****
--- 1123,1127 ----
  $string['stackInputType_list'] = 'List';
  $string['stackInputType_Textarea'] = 'Text area';
+ $string['stackInputType_slider'] = 'Slider';
  
  //Options editor
***************
*** 1118,1122 ****
  $string['stackOption_Feedback_S']     = 'Score only (no text)';
  $string['stackOption_Feedback_none']  = 'No feedback';
! $string['stackOption_Feedback_none_feedback']  = 'Thank you.  There is no specific feedback associated with this question.';
  
  
--- 1160,1164 ----
  $string['stackOption_Feedback_S']     = 'Score only (no text)';
  $string['stackOption_Feedback_none']  = 'No feedback';
! $string['stackOption_Feedback_none_feedback']  = 'Thank you.  Your answer has been accepted.';
  
  
***************
*** 1125,1130 ****
  $string['stackMoodle_questionNotDeployed'] = 'This question currently has no instances deployed.';
  
  
! //Reporting strings
  $string['stackReport_allAttempts'] = 'All Attempts';
  $string['stackReport_lastAttempt'] = 'Last Attempt';
--- 1167,1227 ----
  $string['stackMoodle_questionNotDeployed'] = 'This question currently has no instances deployed.';
  
+ // Deployment strings
+ $string['stackDeploy_button_update'] = 'Update'; // MUST match qtype_opaque
+ $string['FE_deployQuestion_moveTo'] = 'Move to';
  
! // Reporting Strings
! 
! // New strings
! $string['stackReport_questions'] = 'Questions';
! $string['stackReport_students'] = 'Students';
! $string['stackReport_last100AttemptsScores'] = 'The scores of the last 100 attempts';
! $string['stackReport_attemptsGraph'] = 'Attempts graph';
! $string['stackReport_attemptsTable'] = 'Attempts table';
! $string['stackReport_potentialResponseTrees'] = 'Potential Response Trees';
! $string['stackReport_attemptsHistory'] = 'History of attempts';
! $string['stackReport_workedSolution'] = 'Worked Solution';
! 
! // Reporting strings for javascript
! $string['stackReport_js_attemptInfoString'] = 'Student #[student] tried question #[question] on [date] and scored [score]';
! $string['stackReport_js_prtName'] = 'PRT Name';
! $string['stackReport_js_answerNote'] = 'Answer Note';
! $string['stackReport_js_score'] = 'Score';
! $string['stackReport_js_totalAttempts'] = 'Total Attempts';
! $string['stackReport_js_percentage'] = 'Percentage';
! $string['stackReport_js_tooltipHint'] = 'Move your mouse over a point on the graph to see more information about the attempt.';
! $string['stackReport_js_questions'] = 'Questions';
! $string['stackReport_js_questionsAttemptedBy'] = 'Questions which [name] attempted';
! $string['stackReport_js_students'] = 'Students';
! $string['stackReport_js_studentsWhoAttempted'] = 'Students who attempted question #[question]';
! $string['stackReport_js_loading'] = 'Loading';
! $string['stackReport_js_questionNotes'] = 'Question Notes';
! $string['stackReport_js_noAttempts'] = 'No Attempts';
! $string['stackReport_js_noPRTs'] = 'This question has no potential response trees.';
! $string['stackReport_js_questionAttempts'] = 'Attempts over time for question #[id]';
! $string['stackReport_js_questionGraph'] = 'Graph of scores obtained on question #[id]';
! $string['stackReport_js_studentAttempts'] = 'Attempts over time for student #[id]';
! $string['stackReport_js_studentGraph'] = 'Graph of scores obtained by [name]';
! $string['stackReport_js_tryQuestion'] = 'Try the question';
! $string['stackReport_js_errorRetrieving'] = 'There was an error retrieving this data';
! $string['stackReport_js_noWorkedSolution'] = 'There is no worked solution';
! $string['stackReport_js_tryQuestionInInterface'] = 'Try this question in the test question interface';
! $string['stackReport_js_dataAboutAttempt'] = 'Data about student [studentID]\'s attempts at question [questionID]'; // note backslash escapes apostrophe
! 
! // Reporting strings for datatables
! $string['stackReport_js_dataTable_loading'] = 'Loading';
! $string['stackReport_js_dataTable_first'] = 'First';
! $string['stackReport_js_dataTable_last'] = 'Last';
! $string['stackReport_js_dataTable_next'] = 'Next';
! $string['stackReport_js_dataTable_previous'] = 'Previous';
! $string['stackReport_js_dataTable_tableInfo'] = 'Showing _START_ to _END_ of _TOTAL_ entries';
! $string['stackReport_js_dataTable_tableInfoEmpty'] = 'Showing 0 to 0 of 0 entries';
! $string['stackReport_js_dataTable_tableInfoFiltered'] = '(filtered from _MAX_ total entries)';
! $string['stackReport_js_dataTable_processing'] = 'Procssing';
! $string['stackReport_js_dataTable_search'] = 'Search';
! $string['stackReport_js_dataTable_zeroRecords'] = 'No matching records found';
! 
! // Older strings from an reporting, may be no long needed
! $string['stackReport_questions'] = 'Questions';
  $string['stackReport_allAttempts'] = 'All Attempts';
  $string['stackReport_lastAttempt'] = 'Last Attempt';
***************
*** 1162,1166 ****
  $string['stackReport_rawmark'] = 'Raw Mark';
  $string['stackReport_modmark'] = 'Mod Mark';
! $string['stackReport_ansNote'] = 'Answer Note';
  $string['stackReport_errors'] = 'Errors';
  $string['stackReport_noMarks'] = 'No marks for this attempt.';
--- 1259,1263 ----
  $string['stackReport_rawmark'] = 'Raw Mark';
  $string['stackReport_modmark'] = 'Mod Mark';
! $string['stackReport_answerNote'] = 'Answer Note';
  $string['stackReport_errors'] = 'Errors';
  $string['stackReport_noMarks'] = 'No marks for this attempt.';
***************
*** 1169,1172 ****
--- 1266,1270 ----
  $string['stackReport_attempts'] = 'Attempts';
  $string['stackReport_question'] = 'Question';
+ $string['stackReport_questions'] = 'Questions';
  $string['stackReport_numAttempts'] = 'No Attempts';
  $string['stackReport_part'] = 'Part';
***************
*** 1179,1183 ****
  $string['stackReport_IEfeedback'] = 'Invalid: full feedback as ALT-text to icon.';
  $string['stackReport_feedback'] = 'Full feedback as ALT-text to icon.';
- $string['stackReport_'] = '';
  
  //Question search strings
--- 1277,1280 ----
***************
*** 1211,1215 ****
  $string['stackUpdate_complete'] = 'Update completed successfully.';
  $string['stackUpdate_problems'] = 'There were problems during the update.';
! $string['stackUpdate_configWriteFailed'] = 'Stack could not automatically update your configuration file. Please copy and paste the text below into your config.php file, overwriting any previous information.';
  $string['stackUpdate_backedup'] = 'You can find a backup of your database, before any updates were installed in {$a}.';
  
--- 1308,1312 ----
  $string['stackUpdate_complete'] = 'Update completed successfully.';
  $string['stackUpdate_problems'] = 'There were problems during the update.';
! $string['stackUpdate_configWriteFailed'] = 'Stack could not automatically update your configuration file. Please copy and paste the text below into your <tt>config.php</tt> file, overwriting any previous information.';
  $string['stackUpdate_backedup'] = 'You can find a backup of your database, before any updates were installed in {$a}.';