From: coolbit <coolbit>
Date: Wed, 28 May 2003 14:21:10 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=f001154b33f22abd557678d03c8349dcb29c64cf;p=moodle.git

*** empty log message ***
---

diff --git a/lang/zh_cn/help/textformat.html b/lang/zh_cn/help/textformat.html
index 4aaa9c4049..3e4563791e 100644
--- a/lang/zh_cn/help/textformat.html
+++ b/lang/zh_cn/help/textformat.html
@@ -1,66 +1,52 @@
-<P ALIGN=CENTER><B>Formatting text</B></P>
+<P ALIGN=CENTER><B>¸ñʽ»¯Îı¾</B></P>
 
-<P>When writing text in Moodle there are several formats you can choose
-   to produce your text, depending on your expertise and the type of browser
-   you are using.
+<P>ÔÚMoodleÉÏдÎı¾£¬Äã¿ÉÒÔ¸ù¾Ý×Ô¼ºµÄ¼¼ÊõˮƽÓëä¯ÀÀÆ÷ÀàÐÍÑ¡Ôñ¼¸ÖÖ²»Í¬µÄÎı¾¸ñʽ¡£
 
-<P><B>Usually you can just leave this setting to the default value and things 
-      should work as you expect</B>.
+<P><B>ͨ³£Äã¿ÉÒÔ²ÉÓÃĬÈÏÖµ£¬ÕâÍùÍù¾Í¿ÉÒÔ´ïµ½ÄãËùÆÚÍûµÄЧ¹û¡£</B>.
 
-<P><B>1. Moodle auto-format</B></P>
+<P><B>1. Moodle×Ô¶¯¸ñʽ</B></P>
 
 <UL>
-<P>This format is best for when you are using normal web forms for entry
-   (instead of the Richtext HTML editor).  Just type text normally, as if you
-   were sending an email.
-
-<P>When you save your text, Moodle will do a number of things to automatically
-   format your text for you.  
-<P>For example, URLs such as 
-   <A HREF="http://yahoo.com/">http://yahoo.com</A> or even 
-   <A HREF="http://www.yahoo.com/">www.yahoo.com</A> will be turned into links.
-<P>Your line breaks will be retained, and blank lines will start new paragraphs.
-<P>Smiley characters such as :-) will automatically become their graphical equivalents.
-<P>You can even embed HTML code if you want to and it will be retained.
-<P ALIGN=RIGHT><? helpbutton("text", get_string("helptext")) ?> More info about Moodle auto-formatting.</P>
+	<P>ÕâÖÖ¸ñʽ×îÊʺÏÓÃÆÕͨµÄÍøÒ³ÊäÈë±íµ¥(²»Óø»Îı¾HTML±à¼­Æ÷)¡£Ö»ÐèÊäÈëÎı¾£¬Ç¡ÈçÄãÔÚдһ·âemail¡£
+
+	<P>µ±Äã±£´æÎı¾Ê±£¬Moodle»á×Ô¶¯ÎªÄãµÄÎı¾×÷һЩ¸ñʽ»¯¡£  
+<P>ÀýÈ磬ÍøÖ·Èç 
+   <A HREF="http://yahoo.com/">http://yahoo.com</A> »òÕß 
+   <A HREF="http://www.yahoo.com/">www.yahoo.com</A> ½«×Ô¶¯±ä³ÉÁ´½Ó¡£
+<P>ÄãµÄ»»Ðн«»á±£³Ö£¬¿ÕÐн«ÁíÆðÒ»¶Î¡£
+<P>±íÇé×Ö·ûÈç :-) ½«×Ô¶¯±ä³ÉÏàÓ¦µÄ±íÇéͼ±ê¡£
+<P>ÉõÖÁÄã¿ÉÒÔǶÈëHTML´úÂ룬¶øËüÒ²»á±»±£Áô¡£
+<P ALIGN=RIGHT><? helpbutton("text", get_string("helptext")) ?>¸ü¶à¹ØÓÚMoodle×Ô¶¯¸ñʽ»¯µÄÐÅÏ¢¡£</P>
 </UL>
 
 
-<P><B>2. HTML format</B></P>
+<P><B>2. HTML¸ñʽ</B></P>
 
 <UL>
-<P>This format assumes the text is pure HTML.  If you are using the 
-   HTML editor to edit text then this is the default format - all 
-   the commands in the toolbar are producing HTML for you.
+	<P>ÕâÖÖ¸ñʽ½«ÊÓÎı¾Îª´¿HTML¡£Èç¹ûÄãÓÃHTML±à¼­Æ÷±à¼­Îı¾£¬ÄÇôÕâ¾ÍÊÇĬÈϵĸñʽËùÓй¤¾ßÀ¸ÖеÄÃüÁΪÄãÉú³ÉHTML´úÂë¡£
 
-<P>Even if you are not using the Richtext HTML editor, you can use HTML code 
-   in your text and it should come out exactly as you intended.
+	<P>Èç¹ûÄã²»Óø»Îı¾HTML±à¼­Æ÷£¬¶øÖ±½ÓÔÚÎı¾ÖÐʹÓÃHTML´úÂ룬ÄÇôËüÒ²»áÈçÄãËùÔ¸¡£
 
-<P>Unlike the Moodle auto-format, no automatic formatting is performed.
-<P ALIGN=RIGHT><? helpbutton("html", get_string("helphtml")) ?> More info about HTML</P>
-<P ALIGN=RIGHT><? helpbutton("richtext", get_string("helprichtext")) ?> More info about the Richtext HTML editor</P>
+	<P>ÓëMoodle×Ô¶¯¸ñʽ²»Í¬£¬Õâ²»»áÓÐ×Ô¶¯¸ñʽ»¯µÄ¹ý³Ì¡£
+<P ALIGN=RIGHT><? helpbutton("html", get_string("helphtml")) ?>¸ü¶à¹ØÓÚHTMLµÄÐÅÏ¢</P>
+<P ALIGN=RIGHT><? helpbutton("richtext", get_string("helprichtext")) ?>¸ü¶à¹ØÓÚ¸»Îı¾HTML±à¼­Æ÷µÄÐÅÏ¢</P>
 </UL>
 
 
-<P><B>3. Plain text format</B></P>
+<P><B>3. ´¿Îı¾¸ñʽ</B></P>
 
 <UL>
-<P>This format is useful when you need to include lots of code 
-   or HTML that you want to be displayed exactly as you wrote it.
+	<P>µ±ÄãµÄÎı¾ÖÐÓÐÐí¶àÌØÊâ´úÂë»òHTML´úÂ룬ÄãÐèÒªÈÃËüÃÇÔ­·â²»¶¯µØÏÔʾ³öÀ´£¬ÓÃÕâÖÖ¸ñʽ¾Í±È½ÏÊʺϡ£
 
-<P>It still translates smilies and new lines, but otherwise your 
-   text isn't touched.
+<P>ÕâÖÖ¸ñʽҲ»áת»»±íÇé×Ö·û¼°»»Ðзû£¬µ«ÆäËüÎı¾Ô­·â²»¶¯¡£
 </UL>
 
 
-<P><B>4. Wiki text format</B></P>
+<P><B>4. WikiÎı¾¸ñʽ</B></P>
 <UL>
-<P>This format uses a special way of typing text known as the 
-   Wiki format.
-<P>This format allows you to type text in a way that still looks
-   very readable, but can also be automatically converted into 
-   HTML text with headings, lists and other complex formatting.
+<P>ÓÃÒ»ÖÖÌØÊâµÄWiki¸ñʽ¡£
+<P>ÕâÖÖ¸ñʽ¿ÉÒÔÈÃÄãÒԿɶÁÐÔºÜÇ¿µÄ·½Ê½ÊäÈëÎı¾£¬È»ºó×Ô¶¯×ª»»³ÉHTML±êÌâ¡¢ÁÐ±í¼°ÆäËü¸´ÔÓ¸ñʽ¡£
 
-<P ALIGN=RIGHT><? helpbutton("wiki", get_string("helpwiki")) ?> More info about Wiki</P>
+<P ALIGN=RIGHT><? helpbutton("wiki", get_string("helpwiki")) ?>¸ü¶à¹ØÓÚWikiµÄÐÅÏ¢</P>
 </UL>
 
diff --git a/lang/zh_cn/help/wiki.html b/lang/zh_cn/help/wiki.html
index d0adf82f6d..d978756b1f 100644
--- a/lang/zh_cn/help/wiki.html
+++ b/lang/zh_cn/help/wiki.html
@@ -25,7 +25,7 @@ Wiki
 
 <h3>Áбí¸ñʽ</h3>
 
-<p>Ö»ÒªÔÚÁбíµÄÿһÐÐÇ°Ãæ¼ÓÉÏÒ»¸öÌض¨µÄ×Ö·ûºÍ¿Õ¸ñ£¬¾Í¿ÉÒÔ¹¹Ôì³ö¼òµ¥µÄÁбí¸ñʽ¡£ÁбíÒÔ¿ÕÐнáÊø¡£Ä¿Ç°ÁÐ±í»¹²»ÄÜ»ìºÏ»òǶÌס£µ«Îı¾¸ñʽÀàÐÍ¿ÉÒÔËæÒⶨÒåÒÔ»ñµÃÏëÒªµÄЧ¹û¡£Áбí¸ñʽ×Ö·ûÈçÏ£º</p>
+<p>Ö»ÒªÔÚÁбíµÄÿһÐÐÇ°Ãæ¼ÓÉÏÒ»¸öÌض¨µÄ×Ö·ûºÍ¿Õ¸ñ£¬¾Í¿ÉÒÔ¹¹Ôì³ö¼òµ¥µÄÁбí¸ñʽ¡£ÁбíÒÔ¿ÕÐнáÊø¡£¿ÉÒÔ×ÔÓɵØǶÌײ»Í¬ÀàÐ͵ÄÁÐ±í¡£µ«Îı¾¸ñʽÀàÐÍ¿ÉÒÔËæÒⶨÒåÒÔ»ñµÃÏëÒªµÄЧ¹û¡£Áбí¸ñʽ×Ö·ûÈçÏ£º</p>
 
 <table>
 	<tr><th>×Ö·û</th><th>ÁбíÏîÄ¿ÀàÐÍ</th></tr>
@@ -34,8 +34,23 @@ Wiki
   <tr><td>:</td><td>¶¨ÒåÁÐ±í£¬¶¨Òå</td></tr>
   <tr><td>;</td><td>¶¨ÒåÁÐ±í£¬Îı¾</td></tr>
 </table>  
-
-<h3>ǶÌ׸ñʽInline formatting</h3>
+<p>ǶÌ×Áбí¾ÙÀý£º</p>
+<p><pre>
+  * µÚÒ»µã
+  * µÚ¶þµã
+  ## ǶÌ×µÚÒ»ÐÐ
+  ## ǶÌ×µÚ¶þÐÐ
+  * µÚÈýµã
+</pre></p>
+<p>ÏÔʾЧ¹û£º
+<ul><li>µÚÒ»µã</li>
+  <li>µÚ¶þµã</li>
+  <ol><li>ǶÌ×ÐÐ 1</li>
+    <li>ǶÌ×ÐÐ 2</li></ol>
+  <li>µÚÈýµã
+</ul></p>
+
+<h3>ǶÌ׸ñʽ</h3>
 
 <p>ǶÌ׸ñʽ¿ÉÒÔÈÃÒ»ÐÐÖеÄij²¿·Ö±ê¼Ç³ÉÌض¨µÄ·ç¸ñ¡£Ìض¨×Ö·û¿ÉÒÔ³öÏÖÓÚÒ»ÐÐÖеÄÈκεط½£¬µ«×¢Òâ²»ÄÜ¿çÐС£·ûºÅÈçÏÂ</p>
 <table>
@@ -68,6 +83,14 @@ Wiki
 
 <p>ModuleName:nn(˵Ã÷ÎÄ×Ö)</p>
 <p>ÀýÈ磺 <em>resource:36(ÎÒµÄÐÂÍøÒ³)</em>   <em>forum:10(ÌøÖÁÂÛ̳)</em></p>
+
+<h3>MoodleͼƬÁ´½Ó</h3>
+
+<p>¿ÉÒÔÔÚwikiÍøÒ³ÖÐǶÈëͼƬ¡£ÄãµÃÉÏÔØͼƬ£¬²¢×¢ÒâËüÔÚÉÏÔØÇøÖеÄ·¾¶¡£Óï·¨ÈçÏ£ºInline graphics can be placed on wiki pages. You need to upload the graphic and note its path within the file upload area. The syntax is:</p>
+
+<p>/<em>..Îļþ·¾¶..</em>(alt text)</p>
+
+<p>ÀýÈ磬/mypics/graphic.jpg(Staff picture)</p>
 
 <h3>×Ô¶¯ÖØиñʽ»¯</h3>