Skip to content
Browse files

Merge remote-tracking branch 'jamie/wip_version_1_1_fixes_round3_mdl_…

…2_1' into wip_version_1_1_fixes_round3_mdl_2_2

Conflicts:
	lang/en/qtype_varnumericset.php
  • Loading branch information...
2 parents 96638d1 + 88a166c commit fe328f952b8f29152070d2f5e60ac19e64d6e400 @jamiepratt jamiepratt committed Jun 23, 2012
Showing with 10 additions and 2 deletions.
  1. +10 −2 lang/en/qtype_varnumericset.php
View
12 lang/en/qtype_varnumericset.php
@@ -62,7 +62,7 @@
$string['notenoughanswers'] = 'This type of question requires at least {$a} answers';
$string['notolerancehere'] = 'You cannot enter a tolerance for this match anything answer';
$string['notvalidnumber'] = 'You have not entered a number in a recognised format.';
-$string['notvalidnumberprepostfound'] = 'You seem to have entered something besides the numerical answer. You should not include a unit in your answer.';
+$string['notvalidnumberprepostfound'] = 'Please enter a valid number and nothing else.';
$string['options'] = 'Options';
$string['pleaseenterananswer'] = 'Please enter an answer.';
$string['pluginname'] = 'Variable numeric set';
@@ -75,7 +75,7 @@
$string['pluginnameadding'] = 'Adding a Variable numeric set question';
$string['pluginnameediting'] = 'Editing a Variable numeric set question';
$string['pluginnamesummary'] = 'Allows a numeric response, question can have several \'variants\', expressions are pre evaluated for each question variant';
-$string['preandpostfixesignored'] = 'Only the numerical part of your answer was graded. You should not have entered any units and any you entered have been ignored.';
+$string['preandpostfixesignored'] = 'Only the numerical part of your answer was graded.';
$string['questiontext'] = 'Question text and embedded variables';
$string['questiontext_help'] = 'You can embed variable names and expressions in question text, general feedback, answer feedback and hints
@@ -103,6 +103,14 @@
Or for a \'Calculated variable\' enter a variable name and assign it a value from an expression e.g. \'b = a^4\' (where \'a\' is a previously defined variable).
If you leave this field blank then any values below will just be ignored.';
+$string['varnumericset'] = 'Variable numeric set';
+$string['varnumericset_help'] = 'In response to a question the respondent types a number.
+
+Numbers used in the question and used to calculate the answer are chosen from predefined sets which can be precalculated from mathematical expressions.
+
+All expressions are calculated at the time of question creation and values from random functions are the same for all users. For a question without variants, with expressions calculated on the fly and with random values different for each user see the \'variable numeric\' question type.';
+$string['varnumericset_link'] = 'question/type/varnumericset';
+$string['varnumericsetsummary'] = 'Allows a numeric response, question can have several \'variants\', expressions are pre evaluated for each question variant';
$string['vartypecalculated'] = 'Calculated variable';
$string['vartypepredefined'] = 'Predefined variable';
$string['youmustprovideavalueforatleastonevariant'] = 'You must provide a value here.';

0 comments on commit fe328f9

Please sign in to comment.
Something went wrong with that request. Please try again.