*** empty log message ***

diff --git a/lang/zh_cn/forum.php b/lang/zh_cn/forum.php
index dde904b0c40981b4fdbe02037b91e690e3ad8273..ca0c8976e4cd60b83e6834679e06afe0972dccea 100755 (executable)
--- a/lang/zh_cn/forum.php
+++ b/lang/zh_cn/forum.php
@@ -22,6 +22,7 @@ $string['discussion'] = "
 $string['discussionmoved'] = "¸ÃÌÖÂÛÒѱ»ÒƵ½ \$a ";
 $string['discussions'] = "»°Ìâ";
 $string['discussionsstartedby'] = "ÓÉ \$a ·¢ÆðµÄ»°Ìâ";
+$string['discussionsstartedbyrecent'] = "×î½üÓÉ \$a ·¢ÆðµÄ»°Ìâ";
 $string['discussthistopic'] = "ÌÖÂÛÕâ¸ö»°Ìâ";
 $string['eachuserforum'] = "ÿ¸öÈË·¢±íÒ»¸ö»°Ìâ";
 $string['edit'] = "±à¼­";

diff --git a/lang/zh_cn/help/quiz/questiontypes.html b/lang/zh_cn/help/quiz/questiontypes.html
index dff0f4b4a1e2c190fddf15acb5ceae4a3940600e..8d0220e8bf52dbe16aacf47f3443eca4d7a08123 100644 (file)
--- a/lang/zh_cn/help/quiz/questiontypes.html
+++ b/lang/zh_cn/help/quiz/questiontypes.html
@@ -1,4 +1,4 @@
-<P ALIGN=CENTER><B>´´½¨ÐµÄÎÊÌâ</B></P>
+<P ALIGN=CENTER><B>´´½¨ÐÂÌâÄ¿</B></P>
 
 <P>´´½¨ÐµÄÎÊÌâʱ£¬Äã¿ÉÒ԰Ѹ÷ÖÖÀàÐ͵ÄÌâÄ¿¼Óµ½ÈçÏÂÏàÓ¦µÄÀàÐÍÖÐÈ¥£º</P>
 

diff --git a/lang/zh_cn/help/quiz/shortanswer.html b/lang/zh_cn/help/quiz/shortanswer.html
index 41c4c119c3014cd5b0eccdf49e57e5cbca5d31bc..33f56188445434685b3edb670c5f1b20dbe80f64 100644 (file)
--- a/lang/zh_cn/help/quiz/shortanswer.html
+++ b/lang/zh_cn/help/quiz/shortanswer.html
@@ -1,4 +1,4 @@
-<P ALIGN=CENTER><B>¼ò´ðÌâ</B></P>
+<P ALIGN=CENTER><B>Ìî¿ÕÌâ</B></P>
 
 <P>»Ø´ðÕâÑùµÄÌâÄ¿£¨ÓпÉÄÜÌâÄ¿Öл¹°üº¬ÓÐͼƬ£©£¬´ðÌâÕßÖ»ÒªÊäÈëÒ»¸ö×Ö»òÒ»¸ö´Ê»òÒ»¸ö¶Ì¾ä¡£
 

diff --git a/lang/zh_cn/help/richtext.html b/lang/zh_cn/help/richtext.html
index 334d406053da05d14e3ca79a58d8ce6be024d79b..89f562b993b7fa31a2bb76ba7726ace7a6b8647e 100644 (file)
--- a/lang/zh_cn/help/richtext.html
+++ b/lang/zh_cn/help/richtext.html
@@ -1,6 +1,6 @@
 <P ALIGN=CENTER><B>¹ØÓÚ¸»Îı¾¸ñʽHTML±à¼­Æ÷</B></P>
 
-<P>Availability: <B>
+<P>¿ÉÓò»¿ÉÓ㺠<B>
 <? if (!$CFG->htmleditor) {
        print_string("htmleditordisabledadmin");
    } else if (!$USER->htmleditor) {
@@ -15,7 +15,7 @@
 
 <P>¸»Îı¾¸ñʽHTML±à¼­Æ÷ÊÇǶÈëÔÚÄãµÄÍøÒ³ä¯ÀÀÆ÷ÖеÄÎÄ×Ö´¦ÀíÆ÷£¬ÄÜÈÃÄãÒÔÖ±¹ÛµÄ·½Ê½±à¼­Îı¾£¬²¢×Ô¶¯²úÉúÕýÈ·µÄHTML´úÂë¡£
 
-<P>¶ÔÎı¾ÅŰ棬Õâ¸ö±à¼­Æ÷ÌṩÁËÒ»ÒýÆð¶îÍâµÄÌØÐÔ£¬Äã¿ÉÄÜ»á¾õµÃÓÐÓá£
+<P>¶ÔÎı¾ÅŰ棬Õâ¸ö±à¼­Æ÷ÌṩÁËÒ»Щ¶îÍâµÄÌØÐÔ£¬Äã¿ÉÄÜ»á¾õµÃÓÐÓá£
 
 <P><B>´Ó±ðµÄÓ¦ÓóÌÐòÖÐÕ³ÌùÎı¾</B></P>
 <UL>
@@ -29,7 +29,7 @@
 
 <P><B>²åÈë±í¸ñ<img border="0" hspace="10" src="lib/rte/images/icon_ins_table.gif"></B></P>
 <UL>
-<P>Ҫ¹æÔòÄãµÄÎı¾µÄ°æÃ棬¿ÉÒÔÓù¤¾ßÀ¸Öеġ°²åÈë±í¸ñ¡±°´Å¥¡£  
+<P>ҪÈÃÄãµÄÎı¾°æÃæ¹æÔò£¬¿ÉÒÔÓù¤¾ßÀ¸Öеġ°²åÈë±í¸ñ¡±°´Å¥¡£  
 </UL>
 
 <P><B>²åÈëÁ´½Ó<img border="0" hspace="10" src="lib/rte/images/icon_ins_link.gif"></B></P>

diff --git a/lang/zh_cn/index.html b/lang/zh_cn/index.html
new file mode 100644 (file)
index 0000000..36eb43a
--- /dev/null
+++ b/lang/zh_cn/index.html
@@ -0,0 +1,99 @@
+
+<p><b>°ïÖúÎĵµË÷Òý</b></p>
+
+<p>¹ÜÀí</p>
+<ul>
+  <li><a href="help.php?file=langedit.html">±à¼­ÓïÑÔ</a> 
+</ul>
+
+<p>ÉèÖÿγÌ</p>
+<ul>
+  <li><a href="help.php?file=mods.html">»î¶¯Ä£¿é</a> 
+  <li><a href="help.php?file=coursecategory.html">¿Î³ÌÀà±ð</a> 
+  <li><a href="help.php?file=courseformats.html">¿Î³Ì¸ñʽ</a> 
+  <li><a href="help.php?file=coursefullname.html">¿Î³ÌÈ«³Æ</a> 
+  <li><a href="help.php?file=coursenewsitems.html">¿Î³ÌÐÂÎÅÌõÄ¿</a> 
+  <li><a href="help.php?file=coursenumsections.html">¿Î³ÌµÄÐÇÆÚ/Ö÷ÌâÊýÄ¿</a> 
+  <li><a href="help.php?file=courseshortname.html">¿Î³Ì¼ò³Æ</a> 
+  <li><a href="help.php?file=coursestartdate.html">¿Î³Ì¿ªÊ¼ÈÕÆÚ</a> 
+  <li><a href="help.php?file=enrolmentkey.html">Ñ¡¿ÎÃÜÔ¿</a> 
+  <li><a href="help.php?file=guestaccess.html">·Ã¿Í²Î¹Û</a> 
+  <li><a href="help.php?file=courserecent.html">×îж¯Ì¬</a> 
+  <li><a href="help.php?file=summaries.html">Ö÷Ìâ/ÐÇÆÚ¸ÅÒª</a> 
+  <li><a href="help.php?file=teachers.html">¹ØÓÚ½Ìʦ</a> 
+  <li><a href="help.php?file=picture.html">ÉÏÔØͼƬ</a> 
+</ul>
+
+<p>ÔĶÁÓë±àд</p>
+<ul>
+       <li><a href="help.php?file=questions.html">ÈçºÎÌáÎÊÌâ</a> 
+  <li><a href="help.php?file=reading.html">ÔĶÁ</a> 
+  <li><a href="help.php?file=writing.html">±àд</a> 
+  <li><a href="help.php?file=textformat.html">Îı¾¸ñʽ»¯</a> 
+  <li><a href="help.php?file=html.html">±àдHTML¸ñʽ</a> 
+  <li><a href="help.php?file=text.html">±àдÎı¾¸ñʽ</a> 
+  <li><a href="help.php?file=wiki.html">±àдWiki¸ñʽ</a> 
+  <li><a href="help.php?file=richtext.html">ʹÓø»Îı¾HTML±à¼­Æ÷</a> 
+  <li><a href="help.php?file=emoticons.html">ʹÓñíÇéͼ±ê</a> 
+</ul>
+
+<p>×÷Òµ</p>
+<ul>
+  <li><a href="help.php?module=assignment&file=assignmenttype.html">×÷ÒµÀàÐÍ</a> 
+  <li><a href="help.php?module=assignment&file=resubmit.html">ÖØÐÂÌá½»</a> 
+</ul>
+
+<p>Ñ¡Ôñ</p>
+<ul>
+  <li><a href="help.php?module=choice&file=options.html">Ñ¡Ïî</a>
+</ul>
+
+<p>ÌÖÂÛÇø</p>
+<ul>
+  <li><a href="help.php?module=forum&file=allowdiscussions.html">ÔÊÐí·¢ÆðÌÖÂÛ</a>
+  <li><a href="help.php?module=forum&file=attachment.html">¸½¼þ</a>
+  <li><a href="help.php?module=forum&file=forumtype.html">ÂÛ̳ÀàÐÍ</a>
+  <li><a href="help.php?module=forum&file=ratings.html">ÆÀ·Ö</a>
+  <li><a href="help.php?module=forum&file=subscription.html">¶©ÔÄ</a>
+</ul>
+       
+
+<p>²âÑé</p>
+<ul>
+  <li><a href="help.php?module=quiz&file=review.html">²âÑé¹Ø±ÕºóÔÊÐí»Ø¹Ë</a>
+  <li><a href="help.php?module=quiz&file=attempts.html">ÊÔ´ð</a>
+  <li><a href="help.php?module=quiz&file=categories.html">Àà±ð</a>
+  <li><a href="help.php?module=quiz&file=correctanswers.html">ÏÔʾÕýÈ·´ð°¸</a>
+  <li><a href="help.php?module=quiz&file=createmultiple.html">´´½¨¶à¸öÌâÄ¿</a>
+  <li><a href="help.php?module=quiz&file=grademethod.html">ÆÀ·Ö°ì·¨</a>
+  <li><a href="help.php?module=quiz&file=import.html">µ¼ÈëÌâÄ¿</a>
+  <li><a href="help.php?module=quiz&file=match.html">Æ¥ÅäÌâ</a>
+  <li><a href="help.php?module=quiz&file=maxgrade.html">×î¸ß·ÖÖµ</a>
+  <li><a href="help.php?module=quiz&file=multichoice.html">¶àÑ¡Ìâ</a>
+  <li><a href="help.php?module=quiz&file=timeopen.html">¿ª·ÅºÍ¹Ø±Õ²âÑé</a>
+  <li><a href="help.php?module=quiz&file=feedback.html">ÌâÄ¿·´À¡</a>
+  <li><a href="help.php?module=quiz&file=questiontypes.html">ÌâÐÍ¡ª¡ª´´½¨ÐµÄÌâÄ¿</a>
+  <li><a href="help.php?module=quiz&file=random.html">Ëæ»úÌâ</a>
+  <li><a href="help.php?module=quiz&file=randomsamatch.html">Ëæ»úÌî¿ÕÆ¥ÅäÌâ</a>
+  <li><a href="help.php?module=quiz&file=shortanswer.html">Ìî¿ÕÌâ</a>
+  <li><a href="help.php?module=quiz&file=shuffleanswers.html">Ëæ»úÅÅÁдð°¸</a>
+  <li><a href="help.php?module=quiz&file=shufflequestions.html">Ëæ»úÅÅÁÐÌâÄ¿</a>
+  <li><a href="help.php?module=quiz&file=truefalse.html">ÊÇ·ÇÌâ</a>
+</ul>
+
+<p>×ÊÔ´Ä£¿é</p>
+<ul>
+  <li><a href="help.php?module=resource&file=resourcetype.html">×ÊÔ´ÀàÐÍ</a>
+  <li><a href="help.php?module=resource&file=summary.html">ÔĶÁ¸ÅÒª</a>
+  <li><a href="help.php?module=resource&file=program.html">³ÌÐò×ÊÔ´</a>
+</ul>
+
+<p>ÎʾíÄ£¿é</p>
+<ul>
+  <li><a href="help.php?file=surveys.html">¿ÉÓõÄÎʾí</a> 
+</ul>
+
+<p>רÌâÌÖÂÛÄ£¿é</p>
+<ul>
+  <li>¼´½«À´ÁÙ¡­¡­
+</ul>

diff --git a/lang/zh_cn/moodle.php b/lang/zh_cn/moodle.php
index f6fb8c5819de1e65b6c3b2979ef3e2c5205aead2..a281633adf64f0c9143ede3e36bfa8bd4cc1ac03 100755 (executable)
--- a/lang/zh_cn/moodle.php
+++ b/lang/zh_cn/moodle.php
@@ -158,27 +158,27 @@ $string['editthisactivity'] = "
 $string['edituser'] = "±à¼­Óû§ÕʺÅ";
 $string['email'] = "EmailµØÖ·";
 $string['emailconfirm'] = "È·ÈÏÄãµÄÕʺÅ";
-$string['emailconfirmation'] = " \$a->lastname  £º\r
-\r
-ÄãºÃ£¡\r
-\r
-¸Õ²ÅÄãÓÃÄãµÄµç×ÓÓÊÏäµØÖ·ÔÚ¡® \$a->sitename ¡¯ÉÏÉêÇëÁËÒ»¸öÐÂÕʺš£\r
-\r
-Èç¹ûҪȷÈÏÄãµÄÐÂÕʺţ¬Çëµã»÷ÒÔÏÂÁ´½Ó£º\r
-\r
-  \$a->link\r
-\r
-ÔÚ¶àÊýµÄÓʼþÈí¼þÖУ¬Õâ¸öµØÖ·Ó¦¸ÃÏÔʾΪÀ¶É«µÄÁ´½Ó¡£Èç¹û²»ÊÇÕâÑù£¬Ç뽫ÒÔÉϵØÖ·¸´ÖÆÕ³Ìùµ½ÍøÒ³ä¯ÀÀÆ÷£¨±ÈÈçIE»ònetscapeµÈ£©µÄµØÖ·À¸£¬´ò¿ªÕâ¸öÍøÒ³¡£\r
-ÖÂ\r
-\r
-¾´Àñ£¡\r
-\r
-¡® \$a->sitename ¡¯¹ÜÀíÔ±\r
-\r
+$string['emailconfirmation'] = " \$a->lastname  £º
+
+ÄãºÃ£¡
+
+¸Õ²ÅÄãÓÃÄãµÄµç×ÓÓÊÏäµØÖ·ÔÚ¡® \$a->sitename ¡¯ÉÏÉêÇëÁËÒ»¸öÐÂÕʺš£
+
+Èç¹ûҪȷÈÏÄãµÄÐÂÕʺţ¬Çëµã»÷ÒÔÏÂÁ´½Ó£º
+
+  \$a->link
+
+ÔÚ¶àÊýµÄÓʼþÈí¼þÖУ¬Õâ¸öµØÖ·Ó¦¸ÃÏÔʾΪÀ¶É«µÄÁ´½Ó¡£Èç¹û²»ÊÇÕâÑù£¬Ç뽫ÒÔÉϵØÖ·¸´ÖÆÕ³Ìùµ½ÍøÒ³ä¯ÀÀÆ÷£¨±ÈÈçIE»ònetscapeµÈ£©µÄµØÖ·À¸£¬´ò¿ªÕâ¸öÍøÒ³¡£
+ÖÂ
+
+¾´Àñ£¡
+
+¡® \$a->sitename ¡¯¹ÜÀíÔ±
+
 \$a->admin";
 $string['emailconfirmationsubject'] = "\$a £ºÕʺÅÈ·ÈÏ";
-$string['emailconfirmsent'] = "   <P>Ò»·âemailÒѾ­·¢Ë͵½ÄãµÄµØÖ· <B> \$a </B>¡£\r
-   <P>Õâ·âÓʼþ¼òҪ˵Ã÷ÁËÄãÈçºÎÍê³É×¢²á¡£\r
+$string['emailconfirmsent'] = "   <P>Ò»·âemailÒѾ­·¢Ë͵½ÄãµÄµØÖ· <B> \$a </B>¡£
+   <P>Õâ·âÓʼþ¼òҪ˵Ã÷ÁËÄãÈçºÎÍê³É×¢²á¡£
    <P>Èç¹ûÄ㻹Óöµ½Ê²Ã´À§ÄÑ£¬ÇëºÍÍøÕ¾¹ÜÀíÔ±ÁªÏµ¡£";
 $string['emaildisplay'] = "EmailÏÔʾ";
 $string['emaildisplaycourse'] = "Ö»ÔÊÐí²Î¼Óͬһ¿Î³ÌµÄÆäËû³ÉÔ±¿´¼ûÎÒµÄemailµØÖ·";
@@ -187,38 +187,38 @@ $string['emaildisplayyes'] = "
 $string['emailexists'] = "Õâ¸öemailµØÖ·ÒѾ­×¢²á¹ýÁË¡£";
 $string['emailformat'] = "Email¸ñʽ";
 $string['emailmustbereal'] = "×¢Ò⣺ÄãµÄemailµØÖ·±ØÐëÊÇÕæʵµÄ";
-$string['emailpasswordconfirmation'] = "\$a->lastname £º\r
-\r
-ÄãºÃ£¡\r
-\r
-ÓÐÈË£¨Ò»°ãÇé¿öÏÂÊÇÄã×Ô¼º£©ÎªÄãÔÚ¡® \$a->sitename ¡¯ÉϵÄÕʺÅÉêÇëÁËеÄÃÜÂë¡£\r
-\r
-Èç¹ûÄãҪȷÈÏÉêÇ룬²¢Ï£Íûͨ¹ýemail»ñÈ¡ÐÂÃÜÂ룬Çëµã»÷ÒÔÏÂÁ´½Ó£º\r
-\r
-    \$a->link\r
-\r
-ÔÚ¶àÊýÓʼþÈí¼þ£¨Èçoutlook£©ÖиÃÁ´½ÓÓ¦¸ÃÏÔÏÖΪÀ¶É«µÄÁ´½Ó£¬ÄãÖ»Ðèµã»÷Ëü¡£Èç¹ûËü²»ÄÜÕý³£¹¤×÷£¬ÄÇôÇëÄ㸴ÖƸõØÖ·£¬È»ºóÕ³Ìùµ½ÍøÒ³ä¯ÀÀÆ÷µÄµØÖ·À¸ÖУ¬°´»Ø³µ¼ü£¬¾Í¿ÉÒÔµ½´ï¡£\r
-\r
-Èç¹ûÄãÐèÒª°ïÖú£¬ÇëÁªÏµÍøÕ¾¹ÜÀíÔ± \$a->admin ¡£\r
+$string['emailpasswordconfirmation'] = "\$a->lastname £º
+
+ÄãºÃ£¡
+
+ÓÐÈË£¨Ò»°ãÇé¿öÏÂÊÇÄã×Ô¼º£©ÎªÄãÔÚ¡® \$a->sitename ¡¯ÉϵÄÕʺÅÉêÇëÁËеÄÃÜÂë¡£
+
+Èç¹ûÄãҪȷÈÏÉêÇ룬²¢Ï£Íûͨ¹ýemail»ñÈ¡ÐÂÃÜÂ룬Çëµã»÷ÒÔÏÂÁ´½Ó£º
+
+    \$a->link
+
+ÔÚ¶àÊýÓʼþÈí¼þ£¨Èçoutlook£©ÖиÃÁ´½ÓÓ¦¸ÃÏÔÏÖΪÀ¶É«µÄÁ´½Ó£¬ÄãÖ»Ðèµã»÷Ëü¡£Èç¹ûËü²»ÄÜÕý³£¹¤×÷£¬ÄÇôÇëÄ㸴ÖƸõØÖ·£¬È»ºóÕ³Ìùµ½ÍøÒ³ä¯ÀÀÆ÷µÄµØÖ·À¸ÖУ¬°´»Ø³µ¼ü£¬¾Í¿ÉÒÔµ½´ï¡£
+
+Èç¹ûÄãÐèÒª°ïÖú£¬ÇëÁªÏµÍøÕ¾¹ÜÀíÔ± \$a->admin ¡£
 ";
 $string['emailpasswordconfirmationsubject'] = "\$a £ºÈ·Èϸü¸ÄÃÜÂë";
-$string['emailpasswordconfirmsent'] = "Ò»·âemailÒѾ­·¢Ë͵½ÄãµÄÓÊÏä<b>\$a</b>¡£\r
-\r
-<p>ÆäÖÐÓйØÓÚÈçºÎÈ·Èϲ¢Íê³É±¾´ÎÃÜÂë¸ü¸ÄµÄ¼òµ¥ËµÃ÷¡£\r
+$string['emailpasswordconfirmsent'] = "Ò»·âemailÒѾ­·¢Ë͵½ÄãµÄÓÊÏä<b>\$a</b>¡£
+
+<p>ÆäÖÐÓйØÓÚÈçºÎÈ·Èϲ¢Íê³É±¾´ÎÃÜÂë¸ü¸ÄµÄ¼òµ¥ËµÃ÷¡£
 Èç¹ûÄ㻹ÊÇÓÐÀ§ÄÑ£¬ÇëÁªÏµÍøÕ¾¹ÜÀíÔ±¡£";
-$string['emailpasswordsent'] = "ллÄã¶Ô¸ü¸ÄÃÜÂë×öÁËÈ·ÈÏ¡£\r
-\r
-<p>ÄãµÄÐÂÃÜÂëÒѾ­Í¨¹ýemail·¢Ë͵½ÄãµÄÓÊÏ䣺<b>\$a->email</b>\r
-\r
+$string['emailpasswordsent'] = "ллÄã¶Ô¸ü¸ÄÃÜÂë×öÁËÈ·ÈÏ¡£
+
+<p>ÄãµÄÐÂÃÜÂëÒѾ­Í¨¹ýemail·¢Ë͵½ÄãµÄÓÊÏ䣺<b>\$a->email</b>
+
 <P>Õâ¸öÐÂÃÜÂëÊÇ×Ô¶¯Éú³ÉµÄ¡ª¡ªÄã×îºÃµ½<a href=\$a->link>ÕâÀï</a>¸Ä³ÉÄã×Ô¼ºÈÝÒ׼ǵÄÃÜÂë¡£";
 $string['enrolmentkey'] = "Ñ¡¿ÎÃÜÔ¿";
-$string['enrolmentkeyfrom'] = "¸Ã¿Î³ÌÐèÒª¡®Ñ¡¿ÎÃÜÔ¿¡¯¡ª¡ª<BR>\r
-\r
+$string['enrolmentkeyfrom'] = "¸Ã¿Î³ÌÐèÒª¡®Ñ¡¿ÎÃÜÔ¿¡¯¡ª¡ª<BR>
+
 Ò»¸ö´Ó \$a »ñµÃµÄÒ»´ÎÐÔÃÜÂë";
-$string['enrolmentkeyhint'] = "Õâ¸öÑ¡¿ÎÃÜÔ¿²»ÕýÈ·£¬ÇëÔÙÊÔÒ»´Î<BR>\r
+$string['enrolmentkeyhint'] = "Õâ¸öÑ¡¿ÎÃÜÔ¿²»ÕýÈ·£¬ÇëÔÙÊÔÒ»´Î<BR>
 £¨Ìáʾ£ºÒÔ'\$a'¿ªÍ·£©";
 $string['entercourse'] = "µã»÷½øÈë¸Ã¿Î³Ì";
-$string['enteremailaddress'] = "ÊäÈëÄãµÄemailµØÖ·ÒÔÖØÉèÃÜÂ룬\r
+$string['enteremailaddress'] = "ÊäÈëÄãµÄemailµØÖ·ÒÔÖØÉèÃÜÂ룬
 ÐÂÃÜÂ뽫Ë͵½ÄãµÄÐÅÏäÖС£";
 $string['error'] = "´íÎó";
 $string['errortoomanylogins'] = "±§Ç¸£¬ÄãÒѳ¬¹ýÔÊÐíµÄ×î´óµÇ¼³¢ÊÔ´ÎÊý¡£ÇëÖØÆôÄãµÄä¯ÀÀÆ÷¡£";
@@ -254,12 +254,12 @@ $string['gd1'] = "GD 1.x
 $string['gd2'] = "GD 2.xÒѾ­°²×°";
 $string['gdneed'] = "Òª¿´µ½¸Ãͼ±ØÐë°²×°GD";
 $string['gdnot'] = "GDûÓа²×°";
-$string['gpl'] = "°æȨËùÓÐ £¨C£© 2001-2002  Martin Dougiamas  £¨http://dougiamas.com£©\r
-\r
-¸ÃϵͳÊÇ×ÔÓÉÈí¼þ£»Äã¿ÉÒÔ°´ÕÕ×ÔÓÉÈí¼þ»ù½ð»áËù¹«²¼µÄGNUͨÓù«¹²Ðí¿ÉÖ¤£¨GPL£©½øÐÐÐ޸ĻòÖØз¢²¼£»Ðí¿ÉÖ¤¿ÉÒÔÊǵÚ2°æ»ò¸üеİ汾¡£\r
-\r
-·¢²¼¸ÃÈí¼þÊÇÏ£ÍûËüÓÐÓÃÓÐÒ棬µ«²»ÌṩÈκÎÐÎʽµÄµ£±££¬²»ÂÛÊÇÃ÷È·µÄ»¹ÊÇÒþº¬µÄ£¬°üÀ¨µ«²»ÏÞÓÚ¿ÉÏúÊÛºÍÊʺÏÌض¨ÓÃ;µÄÒþº¬±£Ö¤¡£Ïê¼ûGNUͨÓù«¹²Ðí¿ÉÖ¤£º\r
-\r
+$string['gpl'] = "°æȨËùÓÐ £¨C£© 2001-2002  Martin Dougiamas  £¨http://dougiamas.com£©
+
+¸ÃϵͳÊÇ×ÔÓÉÈí¼þ£»Äã¿ÉÒÔ°´ÕÕ×ÔÓÉÈí¼þ»ù½ð»áËù¹«²¼µÄGNUͨÓù«¹²Ðí¿ÉÖ¤£¨GPL£©½øÐÐÐ޸ĻòÖØз¢²¼£»Ðí¿ÉÖ¤¿ÉÒÔÊǵÚ2°æ»ò¸üеİ汾¡£
+
+·¢²¼¸ÃÈí¼þÊÇÏ£ÍûËüÓÐÓÃÓÐÒ棬µ«²»ÌṩÈκÎÐÎʽµÄµ£±££¬²»ÂÛÊÇÃ÷È·µÄ»¹ÊÇÒþº¬µÄ£¬°üÀ¨µ«²»ÏÞÓÚ¿ÉÏúÊÛºÍÊʺÏÌض¨ÓÃ;µÄÒþº¬±£Ö¤¡£Ïê¼ûGNUͨÓù«¹²Ðí¿ÉÖ¤£º
+
 http://www.gnu.org/copyleft/gpl.html";
 $string['grade'] = "³É¼¨";
 $string['grades'] = "³É¼¨";
@@ -330,24 +330,24 @@ $string['login'] = "
 $string['loginas'] = "µÇ¼Ϊ";
 $string['loginguest'] = "×÷Ϊ·Ã¿ÍµÇ¼";
 $string['loginsite'] = "µÇ¼¸ÃÕ¾";
-$string['loginsteps'] = "àË£¬ÄãºÃ£¡ÎªÁËÍêÈ«·ÃÎÊËùÓпγ̣¬Äã±ØÐ뻨һÁ½·ÖÖÓʱ¼äÉêÇëÒ»¸öÐÂÕʺš£¸÷¸ö¿Î³Ì¿ÉÄÜ»¹ÐèÒªÒ»¸öÒ»´ÎÐԵġ°Ñ¡¿ÎÃÜÔ¿¡±£¬ÓùýÒ»´ÎÒÔºó¾Í²»ÔÙÐèÒª¡£Çë°´ÒÔϲ½Öè½øÐУº\r
-\r
-   <OL size=2>\r
-\r
-   <LI>Ìîд<A HREF= \$a >×¢²áÐÂÕʺÅ</A>ÉϵĹØÓÚ¸öÈËÇé¿öµÄ±íµ¥¡£\r
-\r
-   <LI>Ò»·âemail»áÂíÉÏ·¢Ë͵½ÄãµÄÐÅÏäÖС£\r
-\r
-   <LI>ÔĶÁÕâ·âemail£¬µã»÷ÐÅÖаüº¬µÄÍøÒ³Á´½Ó¡£\r
-\r
-   <LI>ÄãµÄÕʺŻáÂíÉϵõ½È·ÈÏ£¬¶øÄãÒ²½«µÇ¼µ½±¾Õ¾ÖС£\r
-\r
-   <LI>È»ºó£¬Ñ¡ÔñÄãÏëÑ¡Ð޵Ŀγ̡£\r
-\r
-   <LI>Èç¹ûϵͳÌáʾҪ¡°Ñ¡¿ÎÃÜÔ¿¡±£¬ÇëÓÃÄãµÄÀÏʦÌṩ¸øÄãµÄÃÜÔ¿¡£ÕâÑù²ÅÄÜ×¢²áµ½¸Ã¿Î³ÌÖС£\r
-\r
-   <LI>ÕâʱÄã¿ÉÒÔÍêÈ«·ÃÎʿγ̡£´Ó´ËºóÄãÖ»ÐèÊäÈëÄã¸öÈ˵ÄÓû§ÃûºÍÃÜÂ루ÔÚ±¾Ò³ÃæµÄ±íµ¥ÖУ©ÒԵǼ²¢½øÈëÈÎÒ»¸öÄãÒÑ×¢²áµÄ¿Î³Ì¡£\r
-\r
+$string['loginsteps'] = "àË£¬ÄãºÃ£¡ÎªÁËÍêÈ«·ÃÎÊËùÓпγ̣¬Äã±ØÐ뻨һÁ½·ÖÖÓʱ¼äÉêÇëÒ»¸öÐÂÕʺš£¸÷¸ö¿Î³Ì¿ÉÄÜ»¹ÐèÒªÒ»¸öÒ»´ÎÐԵġ°Ñ¡¿ÎÃÜÔ¿¡±£¬ÓùýÒ»´ÎÒÔºó¾Í²»ÔÙÐèÒª¡£Çë°´ÒÔϲ½Öè½øÐУº
+
+   <OL size=2>
+
+   <LI>Ìîд<A HREF= \$a >×¢²áÐÂÕʺÅ</A>ÉϵĹØÓÚ¸öÈËÇé¿öµÄ±íµ¥¡£
+
+   <LI>Ò»·âemail»áÂíÉÏ·¢Ë͵½ÄãµÄÐÅÏäÖС£
+
+   <LI>ÔĶÁÕâ·âemail£¬µã»÷ÐÅÖаüº¬µÄÍøÒ³Á´½Ó¡£
+
+   <LI>ÄãµÄÕʺŻáÂíÉϵõ½È·ÈÏ£¬¶øÄãÒ²½«µÇ¼µ½±¾Õ¾ÖС£
+
+   <LI>È»ºó£¬Ñ¡ÔñÄãÏëÑ¡Ð޵Ŀγ̡£
+
+   <LI>Èç¹ûϵͳÌáʾҪ¡°Ñ¡¿ÎÃÜÔ¿¡±£¬ÇëÓÃÄãµÄÀÏʦÌṩ¸øÄãµÄÃÜÔ¿¡£ÕâÑù²ÅÄÜ×¢²áµ½¸Ã¿Î³ÌÖС£
+
+   <LI>ÕâʱÄã¿ÉÒÔÍêÈ«·ÃÎʿγ̡£´Ó´ËºóÄãÖ»ÐèÊäÈëÄã¸öÈ˵ÄÓû§ÃûºÍÃÜÂ루ÔÚ±¾Ò³ÃæµÄ±íµ¥ÖУ©ÒԵǼ²¢½øÈëÈÎÒ»¸öÄãÒÑ×¢²áµÄ¿Î³Ì¡£
+
    </OL>";
 $string['loginstepsnone'] = "àË£¡<P>ΪÁËÍêÈ«·ÃÎʿγÌÄã±ØÐëÉêÇëÒ»¸öÐÂÕʺš£<P>ÄãËùÐèÒª×öµÄÊÇ´´½¨Ò»¸öÓû§ÃûºÍÃÜÂ룬²¢ÔÚ±¾Ò³ÃæÖÐʹÓá£<P>Èç¹û±ðÈËÒѾ­ÉêÇëÁËÏàͬµÄÓû§Ãû£¬Ö»ºÃÇëÄãίÇüÒ»ÏÂÓñðµÄÓû§ÃûÖØÊÔ¡£";
 $string['loginto'] = "µÇ¼µ½ \$a";
@@ -390,7 +390,7 @@ $string['missingurl'] = "ȱ
 $string['missingusername'] = "Óû§ÃûûÌî";
 $string['modified'] = "ÐÞ¸Äʱ¼ä";
 $string['moduledeleteconfirm'] = "Ä㽫ҪÍêȫɾ³ýÄ£¿é¡° \$a ¡±¡£Õ⽫Íêȫɾ³ýÊý¾Ý¿âÖÐÓë¸Ã»î¶¯Ä£¿éÓйصÄËùÓÐ×ÊÁÏ¡£ÄãÈ·¶¨Òª¼ÌÐøÏÂÈ¥Âð£¿";
-$string['moduledeletefiles'] = "ËùÓÐÓëÄ£¿é¡°  \$a->module ¡±ÓйصÄ×ÊÁÏÒѾ­´ÓÊý¾Ý¿âÖÐɾ³ý¡£Òª³¹µ×ɾ³ý£¨·Àֹģ¿é×Ô¼ºÓÖÖØа²×°£©£¬Ä㻹ÐëÔÚÄãµÄ·þÎñÆ÷ÉÏɾ³ýÒÔÏÂĿ¼£º\r
+$string['moduledeletefiles'] = "ËùÓÐÓëÄ£¿é¡°  \$a->module ¡±ÓйصÄ×ÊÁÏÒѾ­´ÓÊý¾Ý¿âÖÐɾ³ý¡£Òª³¹µ×ɾ³ý£¨·Àֹģ¿é×Ô¼ºÓÖÖØа²×°£©£¬Ä㻹ÐëÔÚÄãµÄ·þÎñÆ÷ÉÏɾ³ýÒÔÏÂĿ¼£º
 \$a->directory";
 $string['modulesetup'] = "°²×°Ä£¿é±í";
 $string['modulesuccess'] = "\$a ±íÒѾ­ÕýÈ·°²×°";
@@ -413,18 +413,18 @@ $string['new'] = "
 $string['newaccount'] = "ÐÂÕʺÅ";
 $string['newcourse'] = "пγÌ";
 $string['newpassword'] = "ÐÂÃÜÂë";
-$string['newpasswordtext'] = "\$a->lastname £º\r
-ÄãºÃ£¡ \r
-ÄãÔÚ¡® \$a->sitename ¡¯ÉϵÄÕʺÅÃÜÂëÒѱ»ÖØÉ裬ÕâÊÇÄãеÄÁÙʱÃÜÂë¡£\r
-ÏÖÔÚÄãµÄµÇ¼ÐÅÏ¢ÊÇ£º\r
- Óû§Ãû£º \$a->username\r
- ÃÜÂ룺 \$a->newpassword\r
-Çëµ½ÕâÀï¸ü¸ÄÄãµÄÃÜÂ룺\r
-   \$a->link\r
-ÔÚ¶àÊýµÄÓʼþÈí¼þÖУ¬Õâ¸öµØÖ·Ó¦¸ÃÏÔʾΪÀ¶É«µÄÁ´½Ó¡£Èç¹û²»ÊÇÕâÑù£¬Ç뽫ÒÔÉϵØÖ·¸´ÖÆÕ³Ìùµ½ÍøÒ³ä¯ÀÀÆ÷£¨±ÈÈçIE»ònetscapeµÈ£©µÄµØÖ·À¸£¬´ò¿ªÕâ¸öÍøÒ³¡£\r
-ÖÂ\r
-¾´Àñ£¡\r
-¡® \$a->sitename ¡¯¹ÜÀíÔ±\r
+$string['newpasswordtext'] = "\$a->lastname £º
+ÄãºÃ£¡ 
+ÄãÔÚ¡® \$a->sitename ¡¯ÉϵÄÕʺÅÃÜÂëÒѱ»ÖØÉ裬ÕâÊÇÄãеÄÁÙʱÃÜÂë¡£
+ÏÖÔÚÄãµÄµÇ¼ÐÅÏ¢ÊÇ£º
+ Óû§Ãû£º \$a->username
+ ÃÜÂ룺 \$a->newpassword
+Çëµ½ÕâÀï¸ü¸ÄÄãµÄÃÜÂ룺
+   \$a->link
+ÔÚ¶àÊýµÄÓʼþÈí¼þÖУ¬Õâ¸öµØÖ·Ó¦¸ÃÏÔʾΪÀ¶É«µÄÁ´½Ó¡£Èç¹û²»ÊÇÕâÑù£¬Ç뽫ÒÔÉϵØÖ·¸´ÖÆÕ³Ìùµ½ÍøÒ³ä¯ÀÀÆ÷£¨±ÈÈçIE»ònetscapeµÈ£©µÄµØÖ·À¸£¬´ò¿ªÕâ¸öÍøÒ³¡£
+ÖÂ
+¾´Àñ£¡
+¡® \$a->sitename ¡¯¹ÜÀíÔ±
 \$a->signoff";
 $string['newpicture'] = "ÐÂÕÕƬ";
 $string['newsitem'] = "ÐÂÎÅÌõÄ¿";
@@ -460,7 +460,7 @@ $string['numberweeks'] = "
 $string['numdays'] = "\$a Ìì";
 $string['numhours'] = "\$a Сʱ";
 $string['numminutes'] = "\$a ·ÖÖÓ";
-$string['numviews'] = "\$a ÈË´ÎÔĶÁ";
+$string['numviews'] = "ÔĶÁ \$a ´Î";
 $string['numweeks'] = "\$a ÐÇÆÚ";
 $string['numwords'] = "\$a ×Ö´Ê";
 $string['numyears'] = "\$a Äê";
@@ -476,12 +476,12 @@ $string['passwordconfirmchange'] = "ȷ
 $string['passwordrecovery'] = "Êǵģ¬°ïÎҵǼ°É";
 $string['passwordsdiffer'] = "ÕâЩÃÜÂë²»¶Ô";
 $string['passwordsent'] = "ÃÜÂëÒѱ»·¢ËÍ";
-$string['passwordsenttext'] = "   <P>Ò»·âemailÒѾ­Ë͵½ÄãµÄÓÊÏä \$a->email¡£\r
-\r
-   <P><B>Çë²éÊÕÄãµÄemailÒÔ»ñÈ¡ÃÜÂë¡£</B>\r
-\r
-   <P>Õâ¸öÐÂÃÜÂëÊÇ×Ô¶¯Éú³ÉµÄ£¬ËùÒÔÄã¿ÉÄÜÐèÒªµã»÷\r
-\r
+$string['passwordsenttext'] = "   <P>Ò»·âemailÒѾ­Ë͵½ÄãµÄÓÊÏä \$a->email¡£
+
+   <P><B>Çë²éÊÕÄãµÄemailÒÔ»ñÈ¡ÃÜÂë¡£</B>
+
+   <P>Õâ¸öÐÂÃÜÂëÊÇ×Ô¶¯Éú³ÉµÄ£¬ËùÒÔÄã¿ÉÄÜÐèÒªµã»÷
+
    <A HREF= \$a->link >ÕâÀï</A>¸Ä³ÉÄã×Ô¼ºÈÝÒ׼ǵÄÃÜÂë¡£";
 $string['people'] = "ÈËÎï";
 $string['personalprofile'] = "¸öÈË×ÊÁÏ";
@@ -626,10 +626,10 @@ $string['weekhide'] = "
 $string['weeklyoutline'] = "ÿÖܸÅÒª";
 $string['weekshow'] = "ÏÔʾÕâ¸öÐÇÆÚÓÚ \$a";
 $string['welcometocourse'] = "»¶Ó­½øÈë \$a ¿Î³Ì";
-$string['welcometocoursetext'] = "»¶Ó­ÄãÀ´ \$a->coursename£¡\r
-\r
-ÄãÊ×ÏÈÒª×öµÄÒ»¼þÊÂÇéÊDZ༭ÄãµÄ¸öÈË×ÊÁÏ£¬ÒÔ±ãÎÒÃǸüºÃµØÁ˽âÄ㣺\r
-\r
+$string['welcometocoursetext'] = "»¶Ó­ÄãÀ´ \$a->coursename£¡
+
+ÄãÊ×ÏÈÒª×öµÄÒ»¼þÊÂÇéÊDZ༭ÄãµÄ¸öÈË×ÊÁÏ£¬ÒÔ±ãÎÒÃǸüºÃµØÁ˽âÄ㣺
+
   \$a->profileurl";
 $string['withchosenfiles'] = "Ñ¡ÖеÄÎļþ»òÎļþ¼ÐÓÃÓÚ";
 $string['withoutuserdata'] = "²»ÓÃÓû§×ÊÁÏ";

diff --git a/lang/zh_cn/quiz.php b/lang/zh_cn/quiz.php
index 2cf1d847d4c11934dbebd63b8aea2a7772493c1d..be93b67cf4c789434b51ae84d458438f7e9d5d20 100755 (executable)
--- a/lang/zh_cn/quiz.php
+++ b/lang/zh_cn/quiz.php
@@ -21,7 +21,7 @@ $string['attempts'] = "
 $string['attemptsallowed'] = "ÔÊÐí¶à´Î³¢ÊÔ";
 $string['attemptsunlimited'] = "²»ÏÞ³¢ÊÔ´ÎÊý";
 $string['backtoquiz'] = "»Øµ½²âÑé±à¼­";
-$string['bestgrade'] = "×î¼Ñ³É¼¨";
+$string['bestgrade'] = "³É¼¨";
 $string['blackboard'] = "ºÚ°åÈí¼þ";
 $string['caseno'] = "²»,×Öĸ´óСдÎÞËùν";
 $string['casesensitive'] = "Çø·Ö´óСд×Öĸ";
@@ -45,12 +45,12 @@ $string['defaultinfo'] = "
 $string['deletequestioncheck'] = "ÄãÕæµÄÈ·¶¨ÒªÉ¾³ý¡° \$a ¡±Âð£¿";
 $string['editcategories'] = "±à¼­Àà±ð";
 $string['editingmatch'] = "±à¼­Æ¥ÅäÌâ";
-$string['editingmultichoice'] = "±à¼­¶àÑ¡Ìâ";
+$string['editingmultichoice'] = "±à¼­Ñ¡ÔñÌâ";
 $string['editingquestion'] = "±à¼­ÌâÄ¿";
 $string['editingquiz'] = "±à¼­²âÑé";
 $string['editingrandom'] = "±à¼­Ëæ»úÌâ";
-$string['editingrandomsamatch'] = "±à¼­Ëæ»ú¼ò´ðÆ¥ÅäÌâ";
-$string['editingshortanswer'] = "±à¼­¼ò´ðÌâ";
+$string['editingrandomsamatch'] = "±à¼­Ëæ»úÌî¿ÕÆ¥ÅäÌâ";
+$string['editingshortanswer'] = "±à¼­Ìî¿ÕÌâ";
 $string['editingtruefalse'] = "±à¼­ÊÇ·ÇÌâ";
 $string['false'] = "´í";
 $string['feedback'] = "·´À¡";
@@ -58,15 +58,15 @@ $string['fileformat'] = "
 $string['filloutoneanswer'] = "ÄãÖÁÉÙ±ØÐëÌîдһ¸ö´ð°¸¡£´ð°¸Áô¿ÕµÄ½«²»¿ÉÓá£";
 $string['filloutthreequestions'] = "Äã±ØÐëÖÁÉÙÌîдÈý¸öÎÊÌâ¡£Áô¿Õ²»ÌîµÄÎÊÌ⽫×÷·Ï¡£";
 $string['fillouttwochoices'] = "ÄãÖÁÉÙ±ØÐëÌîдһ¸öÑ¡ÏѡÏîÁô¿ÕµÄ½«×÷·Ï¡£";
-$string['fractionsaddwrong'] = "ÄãÑ¡µÄµÃ·Ö×ܺͲ»µÈÓÚ 100%%
-
-<BR>¶øÊǵÈÓÚ \$a%%
-
+$string['fractionsaddwrong'] = "ÄãÑ¡µÄµÃ·Ö×ܺͲ»µÈÓÚ 100%%\r
+\r
+<BR>¶øÊǵÈÓÚ \$a%%\r
+\r
 <BR>ÄãÏë»ØÈ¥ÐÞ¸ÄÂð?";
-$string['fractionsnomax'] = "´ð°¸µÃ·ÖÓ¦¸ÃÓÐ 100%%£¬
-
-<BR>ÕâÑùÕâ¸öÌâÄ¿²ÅÓпÉÄܵÃÂú·Ö¡£
-
+$string['fractionsnomax'] = "´ð°¸µÃ·ÖÓ¦¸ÃÓÐ 100%%£¬\r
+\r
+<BR>ÕâÑùÕâ¸öÌâÄ¿²ÅÓпÉÄܵÃÂú·Ö¡£\r
+\r
 <BR>ÄãÏë»ØÈ¥ÐÞ¸ÄÂð£¿";
 $string['gradeaverage'] = "ƽ¾ù·Ö";
 $string['gradehighest'] = "×î¸ß·Ö";
@@ -84,7 +84,7 @@ $string['missingquestiontext'] = "ȱ
 $string['missingword'] = "ȱÉÙÎÄ×Ö¸ñʽ";
 $string['modulename'] = "²âÑé";
 $string['modulenameplural'] = "²âÑé";
-$string['multichoice'] = "¶àÑ¡Ìâ";
+$string['multichoice'] = "Ñ¡ÔñÌâ";
 $string['noanswers'] = "ÄãûÓÐÑ¡´ð°¸£¡";
 $string['noattempts'] = "Õâ¸ö²âÑ黹ûÈËÊÔ´ð";
 $string['nomoreattempts'] = "²»ÔÊÐíÔÙÊÔÁË";
@@ -101,12 +101,13 @@ $string['questions'] = "
 $string['quizavailable'] = "²âÑéÉúЧÈÕÆÚ£º \$a";
 $string['quizclose'] = "¹Ø±Õ²âÑé";
 $string['quizclosed'] = "¸Ã²âÑéÒÑÓÚ \$a ¹Ø±Õ";
+$string['quizcloses'] = "²âÑé¹Ø±Õ";
 $string['quiznotavailable'] = "²âÑéÓÐЧÆÚ½ØÖ¹£º \$a";
 $string['quizopen'] = "¿ª·Å²âÑé";
 $string['random'] = "Ëæ»úÌâ";
 $string['randomcreate'] = "´´½¨Ëæ»úÌâ";
-$string['randomsamatch'] = "Ëæ»ú¼ò´ðÆ¥ÅäÌâ";
-$string['randomsamatchcreate'] = "´´½¨Ëæ»ú¼ò´ðÆ¥ÅäÌâ";
+$string['randomsamatch'] = "Ëæ»úÌî¿ÕÆ¥ÅäÌâ";
+$string['randomsamatchcreate'] = "´´½¨Ëæ»úÌî¿ÕÆ¥ÅäÌâ";
 $string['randomsamatchintro'] = "¶ÔÒÔÏÂÿµÀÌ⣬´Ó²Ëµ¥ÖÐÑ¡ÔñÆ¥ÅäµÄ´ð°¸";
 $string['randomsamatchnumber'] = "´ýÑ¡ÌâÄ¿Êý";
 $string['readytosend'] = "ÄãÕýÔÚ·¢ËÍÕû·ÝÊÔ¾íÈ¥ÆÀ·Ö¡£ÄãÈ·¶¨Òª¼ÌÐøÂð£¿";
@@ -123,7 +124,7 @@ $string['score'] = "ԭʼ
 $string['select'] = "Ñ¡Ôñ";
 $string['selectall'] = "Ñ¡ÔñÈ«²¿";
 $string['selectcategoryabove'] = "ÔÚÉÏÃæÑ¡Ò»¸öÀà±ð";
-$string['shortanswer'] = "¼ò´ðÌâ";
+$string['shortanswer'] = "Ìî¿ÕÌâ";
 $string['show'] = "ÏÔʾ";
 $string['showcorrectanswer'] = "ÔÚ·´À¡ÐÅÏ¢ÖÐÏÔʾÕýÈ·´ð°¸Âð£¿";
 $string['showfeedback'] = "»Ø´ðÖ®ºóÏÔʾ·´À¡ÐÅÏ¢Âð£¿";