*** empty log message ***

diff --git a/lang/zh_cn/moodle.php b/lang/zh_cn/moodle.php
index 5949508c0fce0a41c14ca7166139f9be0f15feaf..d788d12cb097830fffcb9133bddab615ab93caa4 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>Ò»·âµç×ÓÓʼþÒѾ­·¢Ë͵½ÄãµÄµØÖ· <B> \$a </B>¡£\r
-   <P>Õâ·âÓʼþ¼òҪ˵Ã÷ÁËÄãÈçºÎÍê³É×¢²á¡£\r
+$string['emailconfirmsent'] = "   <P>Ò»·âµç×ÓÓʼþÒѾ­·¢Ë͵½ÄãµÄµØÖ· <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->firstname £º\r
-\r
-ÄãºÃ!\r
-\r
-ÓÐÈË(ºÜ¿ÉÄÜÊÇÄã×Ô¼º)ΪÄãÔÚ¡° \$a->sitename ¡±ÉϵÄÕʺÅÉêÇëÁËеÄÃÜÂë¡£\r
-\r
-Èç¹ûÄãҪȷÈÏÉêÇ룬²¢Ï£Íûͨ¹ýemail»ñÈ¡ÐÂÃÜÂ룬Çëµã»÷ÒÔÏÂÁ´½Ó£º\r
-\r
-    \$a->link\r
-\r
-ÔÚ¶àÊýÓʼþÈí¼þ(Èçoutlook)ÖиÃÁ´½ÓÓ¦¸ÃÏÔÏÖΪÀ¶É«µÄÁ´½Ó£¬ÄãÖ»Ðèµã»÷Ëü¡£Èç¹ûËü²»ÄÜÕý³£¹¤×÷£¬ÄÇôÇëÄ㸴ÖƸõØÖ·£¬È»ºóÕ³Ìùµ½ÍøÒ³ä¯ÀÀÆ÷µÄµØÖ·À¸ÖУ¬°´»Ø³µ¼ü£¬¾Í¿ÉÒÔµ½´ï¡£\r
-\r
-Èç¹ûÄãÐèÒª°ïÖú£¬ÇëÁªÏµ¹ÜÀíÔ± \$a->admin ¡£\r
+$string['emailpasswordconfirmation'] = "\$a->firstname £º
+
+ÄãºÃ!
+
+ÓÐÈË(ºÜ¿ÉÄÜÊÇÄã×Ô¼º)ΪÄãÔÚ¡° \$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,15 +254,15 @@ $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'] = "µÃ·Ö";
+$string['grade'] = "³É¼¨";
+$string['grades'] = "³É¼¨";
 $string['guestskey'] = "ÔÊÐíÓÐÃÜÔ¿µÄ·Ã¿Í½øÈë";
 $string['guestsno'] = "²»ÔÊÐí·Ã¿Í½øÈë";
 $string['guestsnotallowed'] = "±§Ç¸£¡ '\$a' ²»ÔÊÐí·Ã¿Í½øÈë¡£";
@@ -332,24 +332,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»áÂíÉÏ·¢Ë͵½ÄãµÄ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»áÂíÉÏ·¢Ë͵½ÄãµÄemailÐÅÏäÖС£
+
+   <LI>ÔĶÁÕâ·âemail£¬µã»÷ÐÅÖаüº¬µÄÍøÒ³Á´½Ó¡£
+
+   <LI>ÄãµÄÕʺŻáÂíÉϵõ½È·ÈÏ£¬¶øÄãÒ²½«µÇ¼µ½±¾Õ¾ÖС£
+
+   <LI>È»ºó£¬Ñ¡ÔñÄãÏëÑ¡Ð޵Ŀγ̡£
+
+   <LI>Èç¹ûϵͳÌáʾ¡°Ñ¡¿ÎÃÜÔ¿¡±£¬ÇëÓÃÄãµÄÀÏʦÌṩ¸øÄãµÄÃÜÔ¿¡£ÕâÑù²ÅÄÜ×¢²áµ½¸Ã¿Î³ÌÖС£
+
+   <LI>ÕâʱÄã¿ÉÒÔÍêÈ«·ÃÎʿγ̡£´Ó´ËºóÄãÖ»ÐèÊäÈëÄã¸öÈ˵ÄÓû§ÃûºÍÃÜÂ루ÔÚ±¾Ò³ÃæµÄ±íµ¥ÖУ©ÒԵǼ²¢½øÈëÈÎÒ»¸öÄãÒÑ×¢²áµÄ¿Î³Ì¡£
+
    </OL>";
 $string['loginstepsnone'] = "àË£¡<P>ΪÁËÍêÈ«·ÃÎʿγÌÄã±ØÐëÉêÇëÒ»¸öÐÂÕʺš£<P>ÄãËùÐèÒª×öµÄÊÇ´´½¨Ò»¸öÓû§ÃûºÍÃÜÂ룬²¢ÔÚ±¾Ò³ÃæÖÐʹÓá£<P>Èç¹û±ðÈËÒѾ­ÉêÇëÁËÏàͬµÄÓû§Ãû£¬Ö»ºÃÇëÄãίÇüÒ»ÏÂÓñðµÄÓû§ÃûÖØÊÔ¡£";
 $string['loginto'] = "µÇ¼µ½ \$a";
@@ -392,7 +392,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 ±íÒѾ­ÕýÈ·°²×°";
@@ -415,18 +415,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'] = "ÐÂÎÅÌõÄ¿";
@@ -478,12 +478,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'] = "¸öÈË×ÊÁÏ";
@@ -628,10 +628,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 88837b8879066f43c7b27aff3f6595d12ae1d6c3..2cf1d847d4c11934dbebd63b8aea2a7772493c1d 100755 (executable)
--- a/lang/zh_cn/quiz.php
+++ b/lang/zh_cn/quiz.php
@@ -17,11 +17,11 @@ $string['attempt'] = "
 $string['attemptfirst'] = "³õ´ð·Ö";
 $string['attemptlast'] = "×î½ü·Ö";
 $string['attemptquiznow'] = "ÏÖÔÚÊÔ´ð²âÑé";
-$string['attempts'] = "ÊÔ´ð";
+$string['attempts'] = "ÊÔ´ð³É¼¨";
 $string['attemptsallowed'] = "ÔÊÐí¶à´Î³¢ÊÔ";
 $string['attemptsunlimited'] = "²»ÏÞ³¢ÊÔ´ÎÊý";
 $string['backtoquiz'] = "»Øµ½²âÑé±à¼­";
-$string['bestgrade'] = "×î¸ß·ÖÖµ";
+$string['bestgrade'] = "×î¼Ñ³É¼¨";
 $string['blackboard'] = "ºÚ°åÈí¼þ";
 $string['caseno'] = "²»,×Öĸ´óСдÎÞËùν";
 $string['casesensitive'] = "Çø·Ö´óСд×Öĸ";
@@ -63,7 +63,7 @@ $string['fractionsaddwrong'] = "
 <BR>¶øÊǵÈÓÚ \$a%%
 
 <BR>ÄãÏë»ØÈ¥ÐÞ¸ÄÂð?";
-$string['fractionsnomax'] = "Ò»¸ö´ð°¸µÃ·ÖÓ¦¸ÃÓÐ 100%%£¬
+$string['fractionsnomax'] = "´ð°¸µÃ·ÖÓ¦¸ÃÓÐ 100%%£¬
 
 <BR>ÕâÑùÕâ¸öÌâÄ¿²ÅÓпÉÄܵÃÂú·Ö¡£
 
@@ -112,7 +112,7 @@ $string['randomsamatchnumber'] = "
 $string['readytosend'] = "ÄãÕýÔÚ·¢ËÍÕû·ÝÊÔ¾íÈ¥ÆÀ·Ö¡£ÄãÈ·¶¨Òª¼ÌÐøÂð£¿";
 $string['regrade'] = "¸øËùÓÐÊÔ´ðÖØÐÂÆÀ·Ö";
 $string['regradecomplete'] = "ËùÓÐÊÔ´ðÖØÐÂÆÀ·ÖÍê±Ï";
-$string['regradecount'] = " À´×Ô \$a->attempt µÃ·ÖµÄ \$a->changed ÒÑ×ö¸ü¸Ä";
+$string['regradecount'] = " \$a->attempt ´ÎÊÔ´ðµÃ·ÖÖÐµÄ \$a->changed ´Î¸ü¸ÄÍê³É";
 $string['rename'] = "ÖØÃüÃû";
 $string['report'] = "±¨¸æ";
 $string['save'] = "±£´æ";
@@ -130,7 +130,7 @@ $string['showfeedback'] = "
 $string['shuffleanswers'] = "Ëæ»úÅÅÁдð°¸";
 $string['shufflequestions'] = "Ëæ»úÅÅÁÐÌâÄ¿";
 $string['time'] = "ʱ¼ä";
-$string['timecompleted'] = "Íê³É";
+$string['timecompleted'] = "Íê³Éʱ¼ä";
 $string['timetaken'] = "ËùÓÃʱ¼ä";
 $string['toomanyrandom'] = "ËùÒªÇóµÄËæ»úÌâµÄÊýÁ¿´óÓÚ¸ÃÀà±ðÏÖÓÐÌâÁ¿";
 $string['true'] = "¶Ô";