Polished and translated some. Math....

diff --git a/lang/ja/help/quiz/calculated.html b/lang/ja/help/quiz/calculated.html
new file mode 100644 (file)
index 0000000..c4de562
--- /dev/null
+++ b/lang/ja/help/quiz/calculated.html
@@ -0,0 +1,70 @@
+<p align="center"><b>·×»»ÌäÂê</b></p>
+·×»»ÌäÂê¤Ç¤Ï¡¢¾®¥Æ¥¹¥È¼Â»Ü»þ¤ËÃͤÈÃÖ¤­´¹¤¨¤é¤ì¤ë¥ï¥¤¥ë¥É¥«¡¼¥É¤ò»ÈÍѤ·¤¿¿ôÃÍÌäÂê¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
+
+<br/>²¼µ­¤Ï¥á¥¤¥ó¤ÎÊÔ½¸¥Ú¡¼¥¸¤ò½Ì¤á¤¿ÆþÎÏ¥µ¥ó¥×¥ë¤Ç¤¹:<br/>
+
+<table><tbody>
+<tr valign="top">
+    <td align="right"><p><b>ÌäÂê:</b></p>
+    </td>
+    <td>
+        <textarea id="questiontext" name="questiontext" rows="5" cols="40" wrap="virtual">{a} + {b} ¤ÎÅú¤¨¤Ï?</textarea>
+</td>
+</tr>
+<tr valign="top">
+    <td align="right"><p><b>ɽ¼¨¥¤¥á¡¼¥¸:</b></p></td>
+    <td>
+    <select name="image"><option value="" selected="selected">None</option><option value="grevture.gif">grevture.gif</option></select>
+    </td>
+</tr>
+
+<tr valign="top">
+<td align="right"><p><b>Àµ²ò¤Î¸ø¼°:</b></p></td>
+    <td>
+    <input align="left" type="text" id="formula0" name="answer[]" size="20" value="{a} + {b}">&nbsp;&nbsp;
+    <input type="hidden" name="fraction[]" value="1.0">
+    </td>
+</tr>
+<tr valign="top">
+    <td align="right"><p><b>µöÍÆÈÏ°Ï:</b></p></td>
+    <td>
+    <input align="left" type="text" id="tolerance0&quot;" name="tolerance[]" size="15" value="0.01">&plusmn
+    </td>
+</tr>
+<tr valign="top">
+<td align="right"><p><b>µöÍÆ¥¿¥¤¥×:</b></p></td>
+    <td>
+    <select name="tolerancetype[]"><option value="1" selected="selected">ÁêÂÐŪ</option><option value="2">̾ÌÜŪ</option><option value="3">´ö²¿³ØŪ</option></select>
+    </td>
+</tr>
+<tr valign="top">
+<td align="right"><p><b>Í­¸ú¿ô»ú:</b></p></td>
+    <td>
+    <select name="correctanswerlength[]"><option value="1">1</option><option value="2" selected="selected">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select>
+    </td>
+</tr>
+</tbody></table>
+
+<br/>
+¤³¤ÎÌäÂê¤Ë¤Ï¡¢¥Æ¥­¥¹¥ÈÆþÎÏÍóµÚ¤Ó¡ÖÀµ²ò¤Î¸ø¼°¡×{a} ¤È {b} ¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤é¤ÎÊÑ¿ôµÚ¤Ó¤½¤Î¾¤Î{name}¤Ï¡¢¾®¥Æ¥¹¥È¼Â»Ü»þ¤ËÃͤÈÃÖ´¹¤µ¤ì¤ë¥ï¥¤¥ë¥É¥«¡¼¥É¤È¤·¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£
+¤Þ¤¿¡¢¥Ç¡¼¥¿Á÷¿®»þ¤Ë¡ÖÀµ²ò¤Î¸ø¼°¡×¤ò»ÈÍѤ·¤ÆÀµ²ò¤¬·×»»¤µ¤ì¤Þ¤¹¡£¡ÖÀµ²ò¤Î¸ø¼°¡×¤Ï¡¢¥ï¥¤¥ë¥É¥«¡¼¥É¤¬ÃͤÈÃÖ´¹¤µ¤ì¤¿¸å¤Ë·×»»¤µ¤ì¤ë¿ô¼°¤Ç¤¹¡£
+¥ï¥¤¥ë¥É¥«¡¼¥É¤ÎÃͤϡ¢¸å¤Î¥Ú¡¼¥¸¤Ë¤¢¤ë·×»»ÌäÂê¤Î¡ÖÊÔ½¸¥¦¥£¥¶¡¼¥É¡×¤ÇÀßÄê¤Þ¤¿¤ÏÀ¸À®¤µ¤ì¤Þ¤¹ ...
+<br/>The example formula uses the operator +. Other accepted operators are -*/ and % where % is the modulo operator. It is also possible to use some PHP-style mathematical function. Among these there are 24 single-argument function:<br/><b>
+abs, acos, acosh, asin, asinh, atan, atanh, ceil, cos, cosh, deg2rad, exp, expm1, floor, log, log10, log1p, rad2deg, round, sin, sinh, sprt, tan, tanh
+</b><br/>and two two-argument functions<br/><b>
+atan2, pow
+</b><br/>and the functions <b>min</b> and <b>max</b> that can take two or more arguments. It is also possible to use the function <b>pi</b> that takes no arguments but do not forget the use the parentheses - the correct usage is <b>pi()</b>. Similary the other function must have their argument(s) within parentheses. Possible usage is for example <b>sin({a}) + cos({b}) * 2</b>. It should not be any problem to wrap functions within eachother like <b>cos(deg2rad({a} + 90))</b> etc.
+<br/>More details on how to use these PHP-style functions can be found in the <a target="phpmathdoc" href="http://www.php.net/manual/en/ref.math.php">documentation at the PHP web site</a>
+<br/><br/>
+As for numerical questions it is possible to allow a margin within which all responses are accepted as correct. The "Tolerance" field is used for this. However, there are three different types of tolerances. These are <b>Relative, Nominal and Geometric</b>. If we say that the correct answer at quiz time is calculated to 200 and the tolerance is set to 0.5 then the different tolerance types work like this:
+<br/><br/><b>Relative:</b> A tolerance interval is calculated by multiplying the correct answer with 0.5, ie in this case we get 100 so for this tolerance the correct response must be between 100 and 300.  (200 \8e± 100)<br/>
+This is useful if the magnitude of the correct answer can differ greatly between different wildcard values.
+<br/><br/><b>Nominal:</b>  This is the simpliest tolerance type but not very powerful. The correct response must be between 199.5 and 200.5 (200 &plusmn 0.5)<br/>
+This tolerance type can be useful if the differences between different correct answers are small.
+<br/><br/><b>Geometric:</b> The upper limit of the tolerance interval is calculated as 200 + 0.5*200 and is the same as for the relative case. The lower limit is calculated as 200/(1 + 0.5). The correct response must then be between 133.33 and 300.<br/>
+This is useful for complex calculation that must have great tolerances where relative tolerances of 1 or more would be used for the upper limit but clearly not acceptable for the lower limit as it would make zero a correct answer for all cases.
+<br/><br/>
+The field <b>Significant Figures</b> does only relate to how the correct answer should be presented in the review or the reports. Examples: If it is set to 3 then the correct answer 13.333 would be presented as 13.3; 1236 would be presented as 1240; 23 would be presented as 23.0 etc.
+<br/><br/>
+The feedback field and the optional unit fields work just like they do for numerical questions.
+<br/>
\ No newline at end of file

diff --git a/lang/ja/quiz.php b/lang/ja/quiz.php
index 13468cf43bae58712994ed8ce9eabd50e0da9020..1ac97fc36291da8cdbb2ddf77ba6b14d3c0fb757 100644 (file)
--- a/lang/ja/quiz.php
+++ b/lang/ja/quiz.php
@@ -3,7 +3,7 @@
 
 
 $string['acceptederror'] = '¥¨¥é¡¼ÈÏ°Ï';
-$string['addingquestions'] = '¤³¤³¤Ç¤Ï¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤Î¼ÁÌä¤ò´ÉÍý¤·¤Þ¤¹¡£¼ÁÌä¤ÏÀ°Íý¤·¤ä¤¹¤¤¤è¤¦¤Ë¥«¥Æ¥´¥êËè¤ËÊݸ¤µ¤ì¤Þ¤¹¡£¼ÁÌä¤Ï¥³¡¼¥¹Æâ¤ÎÁ´¤Æ¤Î¾®¥Æ¥¹¥È¤ËÍøÍѤǤ­¤Þ¤¹¡£¡Ö¸ø³«¡×¤òÁª¤ó¤À¾ì¹ç¤Ï¾¤Î¥³¡¼¥¹¤Ç¤âÍøÍѤǤ­¤Þ¤¹¡£<br /><br />¥«¥Æ¥´¥ê¤òÁªÂò¤Þ¤¿¤ÏºîÀ®¤·¤¿¸å¤Ë¡¢ÌäÂê¤òºîÀ®¡¦ÊÔ½¸¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î¥Ú¡¼¥¸¤ÎÈ¿ÂЦ¤Ë¤¢¤ë¾®¥Æ¥¹¥È¤Ë¤É¤Î¼ÁÌä¤Ç¤âÄɲ乤뤳¤È¤¬¤Ç¤­¤Þ¤¹¡£';
+$string['addingquestions'] = '¤³¤³¤Ç¤Ï¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤Î¼ÁÌä¤ò´ÉÍý¤·¤Þ¤¹¡£¼ÁÌä¤ÏÀ°Íý¤·¤ä¤¹¤¤¤è¤¦¤Ë¥«¥Æ¥´¥êËè¤ËÊݸ¤µ¤ì¤Þ¤¹¡£¼ÁÌä¤Ï¥³¡¼¥¹Æâ¤ÎÁ´¤Æ¤Î¾®¥Æ¥¹¥È¤ËÍøÍѤǤ­¤Þ¤¹¡£¡Ö¸ø³«¡×¤òÁªÂò¤·¤¿¾ì¹ç¤Ï¾¤Î¥³¡¼¥¹¤Ç¤âÍøÍѤǤ­¤Þ¤¹¡£<br /><br />¥«¥Æ¥´¥ê¤òÁªÂò¤Þ¤¿¤ÏºîÀ®¤·¤¿¸å¤Ë¡¢ÌäÂê¤òºîÀ®¡¦ÊÔ½¸¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î¥Ú¡¼¥¸¤Ë¤¢¤ë¾®¥Æ¥¹¥È¤Ë¡¢¤³¤ì¤é¤Î¼ÁÌä¤ÎÃ椫¤é¡¢¤É¤ì¤Ç¤âÄɲ乤뤳¤È¤¬¤Ç¤­¤Þ¤¹¡£';
 $string['addquestions'] = 'ÌäÂê¤òÄɲÃ';
 $string['addquestionstoquiz'] = '¸½ºß¤Î¾®¥Æ¥¹¥È¤ËÌäÂê¤òÄɲÃ';
 $string['addselectedtoquiz'] = 'ÁªÂò¤·¤¿¤â¤Î¤ò¾®¥Æ¥¹¥È¤ËÄɲÃ';
@@ -62,7 +62,7 @@ $string['custom'] = '
 $string['datasetdefinitions'] = '¥«¥Æ¥´¥ê $a ¤ÎºÆÍøÍѲÄǽ¤Ê¥Ç¡¼¥¿¥»¥Ã¥ÈÄêµÁ';
 $string['datasetnumber'] = 'No.';
 $string['daysavailable'] = 'ÆüÍøÍѲÄǽ';
-$string['decimals'] = '¾¯¿ôÂè $a °Ì';
+$string['decimals'] = '¾®¿ôÂè $a °Ì';
 $string['default'] = '¥Ç¥Õ¥©¥ë¥È';
 $string['defaultgrade'] = 'ɾÄê¤Î½é´üÃÍ';
 $string['defaultinfo'] = 'ÌäÂê¤Îɸ½à¥«¥Æ¥´¥ê';
@@ -98,6 +98,7 @@ $string['fileformat'] = '
 $string['filloutoneanswer'] = '1¤Ä°Ê¾å¤Î¹Í¤¨¤é¤ì¤ëÅú¤¨¤òÆþÎϤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¶õÇò¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£';
 $string['filloutthreequestions'] = '¾¯¤Ê¤¯¤È¤â3¤Ä¤ÎÌäÂê¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¶õÇò¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£';
 $string['fillouttwochoices'] = '2¤Ä°Ê¾å¤ÎÁªÂò¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¶õÇò¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£';
+$string['forceregeneration'] = '¥Ç¡¼¥¿¤òºÆÀ¸À®';
 $string['fractionsaddwrong'] = '¤¢¤Ê¤¿¤¬ÁªÂò¤·¤¿¥×¥é¥¹É¾ÅÀ¤Î¹ç·×¤¬100%%¤Ë㤷¤Æ¤¤¤Þ¤»¤ó¡£<br />¸½ºß¹ç·× $a%%¡¡¤Ç¤¹¡£<br />Ìá¤Ã¤ÆÌäÂê¤ò½¤Àµ¤·¤Þ¤¹¤«?';
 $string['fractionsnomax'] = '¤³¤ÎÌäÂê¤ÇËþÅÀ¤ò¼è¤ë¤¿¤á¤Ë¡¢<br />Åú¤¨¤Î°ì¤Ä¤Ï 100%%¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ <br />Ìá¤Ã¤ÆÌäÂê¤ò½¤Àµ¤·¤Þ¤¹¤«?';
 $string['functiontakesatleasttwo'] = '´Ø¿ô $a ¤Ï¾¯¤Ê¤¯¤È¤â2¤Ä¤Î°ú¿ô¤ò»ý¤ÄɬÍפ¬¤¢¤ê¤Þ¤¹¡£';
@@ -105,7 +106,7 @@ $string['functiontakesnoargs'] = '
 $string['functiontakesonearg'] = '´Ø¿ô $a ¤Ï¸·Ì©¤Ë1¤Ä¤Î°ú¿ô¤ò»ý¤ÄɬÍפ¬¤¢¤ê¤Þ¤¹¡£';
 $string['functiontakesoneortwoargs'] = '´Ø¿ô $a ¤Ï1¤Ä¤Þ¤¿¤Ï2¤Ä¤Î°ú¿ô¤ò»ý¤ÄɬÍפ¬¤¢¤ê¤Þ¤¹¡£';
 $string['functiontakestwoargs'] = '´Ø¿ô $a ¤Ï¸·Ì©¤Ë2¤Ä¤Î°ú¿ô¤ò»ý¤ÄɬÍפ¬¤¢¤ê¤Þ¤¹¡£';
-$string['generatevalue'] = '²¼µ­¤ÎÈϰϤǿ·¤·¤¤ÃͤòÀ¸À®¤¹¤ë';
+$string['generatevalue'] = '²¼µ­¤ÎÈϰϤǿ·¤·¤¤ÃͤòÀ¸À®';
 $string['geometric'] = '´ö²¿³ØŪ';
 $string['gift'] = 'GIFT¥Õ¥©¡¼¥Þ¥Ã¥È';
 $string['gradeaverage'] = 'Ê¿¶ÑɾÅÀ';
@@ -120,6 +121,7 @@ $string['introduction'] = '
 $string['itemanal'] = '¥¢¥¤¥Æ¥à²òÅúʬÀÏ';
 $string['link'] = '¥ê¥ó¥¯';
 $string['listitems'] = '¾®¥Æ¥¹¥È¤Î¥¢¥¤¥Æ¥à°ìÍ÷';
+$string['loguniform'] = '¿ô»ú¡¢Âпô°ìÍÍʬÉÛ¤è¤ê';
 $string['marks'] = 'ÆÀÅÀ';
 $string['match'] = 'ÁȤ߹ç¤ï¤»ÌäÂê';
 $string['matchanswer'] = 'Åú¤¨¤òÁȹç¤ï¤»¤ë';
@@ -139,7 +141,7 @@ $string['multiplier'] = '
 $string['name'] = '̾¾Î';
 $string['noanswers'] = 'Åú¤¨¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!';
 $string['noattempts'] = '¤³¤Î¾®¥Æ¥¹¥È¤Ï²òÅú¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£';
-$string['nominal'] = '̾ÌÜŪ';
+$string['nominal'] = 'Àµµ¬';
 $string['nomoreattempts'] = '²òÅú²ó¿ô¤¬½ªÎ»¤·¤Þ¤·¤¿¡£';
 $string['noquestions'] = 'ÌäÂ꤬Äɲ䵤ì¤Æ¤¤¤Þ¤»¤ó¡£';
 $string['noresponse'] = 'ÊÖÅú̵¤·';
@@ -197,7 +199,7 @@ $string['reportsimplestat'] = 'ñ
 $string['requirepassword'] = '¥Ñ¥¹¥ï¡¼¥É';
 $string['requirepasswordmessage'] = '¾®¥Æ¥¹¥È¤ò¹Ô¤¦¤¿¤á¤Ë¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£';
 $string['requiresubnet'] = '¥Í¥Ã¥È¥ï¡¼¥¯¥¢¥É¥ì¥¹';
-$string['reuseifpossible'] = 'ºï½ü¤µ¤ì¤¿¤â¤Î¤òºÆÍøÍѤ¹¤ë';
+$string['reuseifpossible'] = 'ºï½ü¥Ç¡¼¥¿¤òºÆÍøÍÑ';
 $string['review'] = '¥ì¥Ó¥å¡¼';
 $string['save'] = 'Êݸ';
 $string['savegrades'] = 'ɾÅÀ¤òÊݸ';
@@ -214,6 +216,7 @@ $string['showfeedback'] = '
 $string['shuffleanswers'] = 'Åú¤¨¤òº®¤¼¤ë';
 $string['shufflequestions'] = 'ÌäÂê¤òº®¤¼¤ë';
 $string['subneterror'] = '¿½¤·Ìõ¤´¤¶¤¤¤Þ¤»¤ó¡¢¤³¤Î¾®¥Æ¥¹¥È¤ÏÆÃÄê¤Î¾ì½ê¤«¤é¤Î¤ß¥¢¥¯¥»¥¹²Äǽ¤Ç¤¹¡£¤¢¤Ê¤¿¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Ï¤³¤Î¾®¥Æ¥¹¥È¤òÍøÍѤǤ­¤ë¥³¥ó¥Ô¥å¡¼¥¿¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£';
+$string['substitutedby'] = '¤¬¼¡¤ÎÃͤÈÃÖ´¹¤µ¤ì¤Þ¤¹:';
 $string['thischarset'] = 'EUC-JP';
 $string['thisdirection'] = 'ltr';
 $string['thislanguage'] = 'Japanese';
@@ -230,6 +233,7 @@ $string['toomanyrandom'] = '
 $string['true'] = '¡û';
 $string['truefalse'] = '¡û/¡ßÌäÂê';
 $string['type'] = '¥¿¥¤¥×';
+$string['uniform'] = '¾®¿ô¡¢°ìÍÍʬÉÛ¤è¤ê';
 $string['unit'] = 'ʪÍýÄê¿ô';
 $string['unknowntype'] = '$a ¹ÔÌܤÎÌäÂ꥿¥¤¥×¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£ÌäÂê¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£';
 $string['unsupportedformulafunction'] = '´Ø¿ô $a ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£';