Merged ppichet changes to quiz files from 1.8

diff --git a/lang/en_utf8/qtype_calculated.php b/lang/en_utf8/qtype_calculated.php
index 43dd4de68852db6b6e1a2ddd456017acaddf574b..05d790dff072cebb26bb4630ace83f0559780a01 100644 (file)
--- a/lang/en_utf8/qtype_calculated.php
+++ b/lang/en_utf8/qtype_calculated.php
@@ -1,15 +1,24 @@
 <?php
-$string['correctanswershows'] = 'Correct answer shows';
-$string['correctanswershowsformat'] = 'Format';
-$string['tolerance'] = 'Tolerance &plusmn;';
 $string['addmoreanswerblanks'] = 'Add another answer blank.';
 $string['addmoreunitblanks'] = 'Blanks for $a More Units';
 $string['answerhdr'] = 'Answer';
 $string['atleastoneanswer'] = 'You need to provide at least one answer.';
+$string['correctanswershows'] = 'Correct answer shows';
+$string['correctanswershowsformat'] = 'Format';
+$string['existingcategory1'] = 'will use an already existing shared dataset';
+$string['keptcategory1'] = 'will use the same existing shared dataset as before';
+$string['keptlocal1'] = 'will use the same existing private dataset as before';
+$string['makecopynextpage'] = 'Next Page (new question)';
+$string['mandatoryhdr']='Mandatory wild cards present in answers';
 $string['mustbenumeric'] = 'You must enter a number here.';
 $string['mustnotbenumeric'] = 'This can\'t be a number.';
-$string['youmustenteramultiplierhere'] = 'You must enter a multiplier here.';
-$string['nextpage'] = 'Next Page';
+$string['newcategory1'] = 'will use a new shared dataset';
+$string['newlocal1'] = 'will use a new private dataset';
 $string['nextitemtoadd'] = 'Next \'Item to Add\'';
-$string['makecopynextpage'] = 'Next Page (new question)';
+$string['nextpage'] = 'Next Page';
+$string['nodataset'] = 'nothing - it is not a wild card';
+$string['possiblehdr']='Possible wild cards present only in the question text';
+$string['tolerance'] = 'Tolerance &plusmn;';
+$string['usedinquestion']='Used in Question';
+$string['youmustenteramultiplierhere'] = 'You must enter a multiplier here.';
 ?>
\ No newline at end of file

diff --git a/lang/en_utf8/qtype_datasetdependent.php b/lang/en_utf8/qtype_datasetdependent.php
index f743468b3bc6a86a79781606e7da10e158861e9b..d72287adcb9ba91a88af497f8882a480dd175213 100644 (file)
--- a/lang/en_utf8/qtype_datasetdependent.php
+++ b/lang/en_utf8/qtype_datasetdependent.php
@@ -1,19 +1,43 @@
 <?php
-$string['itemno'] = 'Item $a';
-$string['param'] = 'Param {<strong>$a</strong>}';
 $string['additem'] = 'Add Item';
+$string['atleastonerealdataset']='There should be at least one real dataset in question text';
+$string['atleastonewildcard']='There should be at least one wild card in answer formula or question text';
+$string['calcdistribution'] = 'Distribution';
+$string['calclength'] = 'Decimal Places';
+$string['calcmax'] = 'Maximum';
+$string['calcmin'] = 'Minimum';
+$string['dataitemdefined']='with $a numerical values already defined is available';
+$string['datasetrole']= ' The wild cards <strong>{x..}</strong> will be substituted by a numerical value from their dataset';
 $string['deletelastitem'] = 'Delete Last Item';
+$string['existingcategory1'] = 'a literal from an already existing set of literals that are also used by other questions in this category';
+$string['existingcategory2'] = 'a file from an already existing set of files that are also used by other questions in this category';
+$string['existingcategory3'] = 'a link from an already existing set of links that are also used by other questions in this category';
+$string['forceregeneration'] = 'force regeneration';
+$string['getnextnow'] = 'Get New \'Item to Add\' Now';
+$string['itemno'] = 'Item $a';
+$string['itemscount']='Items<br/>Count';
 $string['itemtoadd'] = 'Item To Add';
-$string['calclength'] = 'Decimal Places';
-$string['calcdistribution'] = 'Distribution';
-$string['uniform'] = 'Uniform';
+$string['keptcategory1'] = 'a literal from the same category reusable set of literals as before';
+$string['keptcategory2'] = 'a file from the same category reusable set of files as before';
+$string['keptcategory3'] = 'a link from the same category reusable set of links as before';
+$string['keptlocal1'] = 'a literal from the same question private set of literals as before';
+$string['keptlocal2'] = 'a file from the same question private set of files as before';
+$string['keptlocal3'] = 'a link from the same question private set of links as before';
 $string['loguniform'] = 'Loguniform';
-$string['calcmin'] = 'Minimum';
-$string['calcmax'] = 'Maximum';
 $string['minmax'] = 'Range of Values';
+$string['newcategory1'] = 'a literal from a new set of literals that may also be used by other questions in this category';
+$string['newcategory2'] = 'a file from a new set of files that may also be used by other questions in this category';
+$string['newcategory3'] = 'a link from a new set of links that may also be used by other questions in this category';
+$string['newlocal1'] = 'a literal from a new set of literals that will only be used by this question';
+$string['newlocal2'] = 'a file  from a new set of files that will only be used by this question';
+$string['newlocal3'] = 'a link from a new set of links that will only be used by this question';
+$string['nodataset'] = 'nothing - it is not a wild card';
+$string['param'] = 'Param {<strong>$a</strong>}';
 $string['replacewithrandom'] = 'Replace with a random value';
-$string['getnextnow'] = 'Get New \'Item to Add\' Now';
-$string['forceregeneration'] = 'force regeneration';
 $string['reuseifpossible'] = 'reuse previous value if available';
+$string['sharedwildcard']='Shared wild card';
+$string['sharedwildcards']='Shared wild cards';
+$string['uniform'] = 'Uniform';
+$string['updatedatasetparam'] = 'Update the datasets parameters';
 $string['youmustaddatleastoneitem'] = 'You must add at least one dataset item before you can save this question.';
 ?>
\ No newline at end of file

diff --git a/lang/en_utf8/quiz.php b/lang/en_utf8/quiz.php
index 1f8429c05b6b66d84aafb1933bec9d103b15f4e3..fa85db76b174dc7870e79a66d60d9d514d20416c 100644 (file)
--- a/lang/en_utf8/quiz.php
+++ b/lang/en_utf8/quiz.php
@@ -174,9 +174,6 @@ $string['event7'] = 'Submit';
 $string['event8'] = 'Close';
 $string['event9'] = 'Manual Grade';
 $string['examview'] = 'Examview';
-$string['existingcategory1'] = 'a literal from an already existing set of literals that are also used by other questions in this category';
-$string['existingcategory2'] = 'a file from an already existing set of files that are also used by other questions in this category';
-$string['existingcategory3'] = 'a link from an already existing set of links that are also used by other questions in this category';
 $string['export'] = 'Export';
 $string['exporterror'] = 'An error occurred during export processing';
 $string['exportfilename'] = 'quiz';
@@ -256,12 +253,6 @@ $string['itemdefinition'] = 'Definition';
 $string['itemsource'] = 'Item Source';
 $string['itemsourceformat'] = 'Item Source Format';
 $string['itemtypes'] = 'Remote Question Types';
-$string['keptcategory1'] = 'a literal from the same category reusable set of literals as before';
-$string['keptcategory2'] = 'a file from the same category reusable set of files as before';
-$string['keptcategory3'] = 'a link from the same category reusable set of links as before';
-$string['keptlocal1'] = 'a literal from the same question private set of literals as before';
-$string['keptlocal2'] = 'a file from the same question private set of files as before';
-$string['keptlocal3'] = 'a link from the same question private set of links as before';
 $string['lastanswer'] = 'Your last answer was';
 $string['learnwise'] = 'Learnwise format';
 $string['link'] = 'Link';
@@ -301,12 +292,6 @@ $string['multipleanswers'] = 'Choose at least one answer.';
 $string['multiplier'] = 'Multiplier';
 $string['name'] = 'Name';
 $string['newattemptfail'] = 'Error: Could not start a new attempt at the quiz';
-$string['newcategory1'] = 'a literal from a new set of literals that may also be used by other questions in this category';
-$string['newcategory2'] = 'a file from a new set of files that may also be used by other questions in this category';
-$string['newcategory3'] = 'a link from a new set of links that may also be used by other questions in this category';
-$string['newlocal1'] = 'a literal from a new set of literals that will only be used by this question';
-$string['newlocal2'] = 'a file  from a new set of files that will only be used by this question';
-$string['newlocal3'] = 'a link from a new set of links that will only be used by this question';
 $string['noanswers'] = 'No answers were selected!';
 $string['noattempts'] = 'No attempts have been made on this quiz';
 $string['noattemptstoshow'] = 'There are no attempts to show';