diff --git a/lang/zh_cn/auth.php b/lang/zh_cn/auth.php
index e8a69f04c63..36357d26826 100755
--- a/lang/zh_cn/auth.php
+++ b/lang/zh_cn/auth.php
@@ -1,5 +1,5 @@
 <?PHP // $Id$ 
-      // auth.php - created with Moodle 1.0.9 development (2003042801)
+      // auth.php - created with Moodle 1.0.9 Beta 1 + (2003052000)
 
 
 $string['auth_dbdescription'] = "该方法使用一个外部数据库来检验用户名和密码是否有效。如果是一个新帐号，该帐号其它字段的信息将一起复制到本系统中。";
@@ -29,11 +29,16 @@ $string['auth_ldap_search_sub'] = "
 $string['auth_ldap_update_userinfo'] = "从LDAP向本系统更新用户信息（姓名、地址……）要查看映射信息，请看/auth/ldap/attr_mappings.php";
 $string['auth_ldap_user_attribute'] = "用于命名/搜索用户的属性。通常为‘cn’。";
 $string['auth_ldapdescription'] = "该方法利用一个外部的LDAP服务器进行身份验证。
+
                                   如果用户名和密码是有效的，本系统据此在数据库中创建一个新用户。 
+
                                   该模块可以从LDAP中读取用户属性，并把指定的字段预先填入本系统数据库。 
+
                                   此后的登录只需检验用户名和密码。";
 $string['auth_ldapextrafields'] = "这些字段是可选的。你可以在此指定这些<B>LDAP字段</B>复制到本系统的数据库中。 <P>如果你不选，将使用本系统默认值。<P>无论以上何种情况，用户在登录之后都可以修改这些字段。";
 $string['auth_ldaptitle'] = "使用一个LDAP服务器";
+$string['auth_manualdescription'] = "该方法不允许用户以任何方式创建帐号。所有帐号只能由管理员手工创建。";
+$string['auth_manualtitle'] = "只允许手工添加帐号";
 $string['auth_nntpdescription'] = "该方法使用一个NNTP服务器来检验用户名和密码是否有效。";
 $string['auth_nntphost'] = "NNTP服务器地址。用IP地址，不要用域名。";
 $string['auth_nntpport'] = "服务器端口（通常是119）";
@@ -45,6 +50,9 @@ $string['auth_pop3host'] = "POP3
 $string['auth_pop3port'] = "服务器端口（通常是110）";
 $string['auth_pop3title'] = "使用一个POP3服务器";
 $string['auth_pop3type'] = "服务器类型。如果你的POP3服务器使用安全验证，请选择pop3cert。";
+$string['auth_user_create'] = "激活用户创建功能";
+$string['auth_user_creation'] = "新的(匿名)用户可以在外部身份验证源中创建新用户帐号，并通过email确认。如果你激活了这个功能，请记住同时也为用户创建功能设置一下模块特定选项";
+$string['auth_usernameexists'] = "选中的用户名已经存在。请选择一个新的。";
 $string['authenticationoptions'] = "身份验证选项";
 $string['authinstructions'] = "你在这里可以给你的用户提供使用说明，让他们知道该用哪个用户名和密码。你在这里输入的文本将出现在登录页面。如果留空不填，登录页面将不会出现使用说明。";
 $string['changepassword'] = "更改密码地址（URL）";
@@ -52,6 +60,8 @@ $string['changepasswordhelp'] = "
 $string['chooseauthmethod'] = "选择一个身份验证方法：";
 $string['guestloginbutton'] = "访客登录按钮";
 $string['instructions'] = "使用说明";
+$string['md5'] = "MD5加密";
+$string['plaintext'] = "纯文本";
 $string['showguestlogin'] = "你可以在登录页面显示或隐藏访客登录按钮。";
 
 ?>
diff --git a/lang/zh_cn/help/textformat.html b/lang/zh_cn/help/textformat.html
index e01d9612a6e..4aaa9c4049d 100644
--- a/lang/zh_cn/help/textformat.html
+++ b/lang/zh_cn/help/textformat.html
@@ -1,11 +1,11 @@
 <P ALIGN=CENTER><B>Formatting text</B></P>
 
-<P>When writing text in Moodle there are currently two formats you can choose
+<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><B>Usually you can just leave this setting alone and things should
-   work as you expect</B>.
+<P><B>Usually you can just leave this setting to the default value and things 
+      should work as you expect</B>.
 
 <P><B>1. Moodle auto-format</B></P>
 
@@ -25,6 +25,7 @@
 <P ALIGN=RIGHT><? helpbutton("text", get_string("helptext")) ?> More info about Moodle auto-formatting.</P>
 </UL>
 
+
 <P><B>2. HTML format</B></P>
 
 <UL>
@@ -39,3 +40,27 @@
 <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>
 </UL>
+
+
+<P><B>3. Plain text format</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>It still translates smilies and new lines, but otherwise your 
+   text isn't touched.
+</UL>
+
+
+<P><B>4. Wiki text format</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 ALIGN=RIGHT><? helpbutton("wiki", get_string("helpwiki")) ?> More info about Wiki</P>
+</UL>
+
diff --git a/lang/zh_cn/moodle.php b/lang/zh_cn/moodle.php
index e63f5b41140..e92c055a888 100755
--- a/lang/zh_cn/moodle.php
+++ b/lang/zh_cn/moodle.php
@@ -247,7 +247,7 @@ $string['emailconfirmsent'] = "   <P>一
 $string['emaildisplay'] = "Email显示";
 $string['emaildisplaycourse'] = "只允许参加同一课程的其他成员看见我的email地址";
 $string['emaildisplayno'] = "不让任何人看见我的真实email地址";
-$string['emaildisplayyes'] = "允许任何人看见我的起初email地址";
+$string['emaildisplayyes'] = "允许任何人看见我的email地址";
 $string['emailexists'] = "这个email地址已经注册过了。";
 $string['emailformat'] = "Email格式";
 $string['emailmustbereal'] = "注意：你的email地址必须是真实的";
@@ -743,7 +743,7 @@ $string['newuser'] = "
 $string['newusers'] = "新用户";
 $string['no'] = "不";
 $string['nocoursesyet'] = "此类中无课程";
-$string['noexistingadmins'] = "没有管理员,这是个严重的错误,你应该不会看到这条信息。";
+$string['noexistingadmins'] = "没有管理员,这是个严重的错误,你不应该看到这条信息。";
 $string['noexistingcreators'] = "没有创建者";
 $string['noexistingteachers'] = "没有教师";
 $string['nofilesselected'] = "没有文件被选中用来恢复";
diff --git a/lang/zh_cn/workshop.php b/lang/zh_cn/workshop.php
index 76157bceb3b..7240a4a239a 100644
--- a/lang/zh_cn/workshop.php
+++ b/lang/zh_cn/workshop.php
@@ -1,138 +1,195 @@
 <?PHP // $Id$ 
+      // workshop.php - created with Moodle 1.0.9 Beta 1 + (2003052000)
 
-$string['accumulative'] = "Accumulative";
-$string['action'] = "Action";
-$string['afterdeadline'] = "After Deadline: \$a";
-$string['allgradeshaveamaximumof'] = "All Grades have a Maximum of: \$a";
-$string['allowresubmit'] = "Allow Resubmissions";
-$string['alreadyinphase'] = "Already in Phase \$a";
-$string['amendassessmentelements'] = "Amend Assessment Elements";
-$string['assess'] = "Assess";
-$string['assessmentgrade'] = "Assessment Grade: \$a";
-$string['assessmentsby'] = "Assessments by \$a";
-$string['assessments'] = "Assessments";
-$string['assessmentsareok'] = "Assessments are OK";
-$string['assessmentsdone'] = "Assessments Done";
-$string['assessthissubmission'] = "Assess this submission";
-$string['assessmentofthissubmission'] = "Assessment of this submission";
-$string['assignmentnotinthecorrectphase'] = "Assignment not in the Correct Phase";
-$string['awaitinggradingbyteacher'] = "Awaiting Grading by \$a";
-$string['beforedeadline'] = "Before Deadline: \$a";
-$string['calculationoffinalgrades'] = "Calculation of Final Grades";
-$string['closeassignment'] = "Close Assignment";
-$string['comment'] = "Comment";
-$string['criteria'] = "Criteria";
-$string['deadline'] = "Deadline";
-$string['deadlineis'] = "The Deadline is \$a";
-$string['description'] = "Description";
-$string['detailsofassessment'] = "Details of Assessment";
-$string['displayoffinalgrades'] = "Display of Final Grades";
-$string['dontshowgrades'] = "Don't Show Grades";
-$string['edit'] = "Edit";
-$string['editingassessmentelements'] = "Editing Assessment Elements";
-$string['element'] = "Element";
-$string['elementweight'] = "Element Weight";
-$string['errorbanded'] = "Error Banded";
-$string['feedbackgoeshere'] = "Feedback goes here";
-$string['generalcomment'] = "General comment";
-$string['grade'] = "Grade";
-$string['gradeassessment'] = "Grade Assessment";
-$string['graded'] = "Graded";
-$string['gradedbyteacher'] = "Graded by \$a";
-$string['gradeforassessments'] = "Grade for Assessments";
-$string['gradeforbias'] = "Grade for Bias";
-$string['gradeforreliability'] = "Grade for Reliability";
-$string['gradeforstudentsassessment'] = "Grade for Student's Assessment";
-$string['gradeofsubmission'] = "Grade of Submission: \$a";
-$string['gradingstrategy'] = "Grading Strategy";
-$string['includeteachersgrade'] = "Include Teacher's Grade";
-$string['listofallsubmissions'] = "List of all Submissions";
-$string['managingassignment'] = "Managing Assignment";
-$string['maximumsize'] = "Maximum Size";
-$string['modulename'] = "Workshop";
-$string['modulenameplural'] = "Workshops";
-$string['movedtophase'] = "Moved to Phase \$a";
-$string['moveonto'] = "Move on to";
-$string['noassessmentsdone'] = "No Assessments Done";
-$string['nosubmissionsavailableforassessment'] = "No Submissions available for assessment";
-$string['notavailable'] = "Not Available";
-$string['noteonassessmentelements'] = 
-	"Note that grading is broken down into a number of 'Assessment Elements'.<BR>
-	This makes the grading easier and more consistent. As teacher you must add these <BR>
-	Elements before making the assignment available to students. This is done by<BR>
-	clicking on the assignment in the course, if no elements are present you will be asked<BR>
-	to add them. You can change the number of elements using the Edit Assignment screen,<BR>
-	the elements themselves can be amended from the &quot;Managing Assessment&quot; screen. ";
-$string['notitlegiven'] = "No Title Given";
-$string['notgraded'] = "Not Graded";
-$string['numberofassessments'] = "Number of Assessments";
-$string['numberofassessmentelements'] = "Number of Comments, Assessment Elements, Grade Bands or Criteria Statments";
-$string['numberofassessmentsofstudentsubmissions'] = "Number of Assessments of Student Submissions";
-$string['numberofassessmentsofteachersexamples'] = "Number of Assessments of Examples from Teacher";
-$string['openassignment'] = "Open Assignment";
-$string['optionforpeergrade'] = "Option for Peer Grade";
-$string['overallgrade'] = "Overall Grade";
-$string['overallpeergrade'] = "Overall Peer Grade: \$a";
-$string['overallteachergrade'] = "Overall Teacher Grade: \$a";
+
+$string['accumulative'] = "累积的";
+$string['action'] = "动作";
+$string['addacomment'] = "添加一个评论";
+$string['afterdeadline'] = "晚于最后期限： \$a";
+$string['agreetothisassessment'] = "同意这个评价";
+$string['allgradeshaveamaximumof'] = "得分最高不大于： \$a";
+$string['allowresubmit'] = "允许重交";
+$string['alreadyinphase'] = "已经在阶段 \$a";
+$string['amendassessmentelements'] = "修改评价要素";
+$string['assess'] = "评价";
+$string['assessedon'] = "对 \$a 评价";
+$string['assessment'] = "评价";
+$string['assessmentby'] = "由 \$a 评价";
+$string['assessmentgrade'] = "评价得分： \$a";
+$string['assessmentnotyetagreed'] = "评价还未允许";
+$string['assessmentofthissubmission'] = "关于这份提交的评价";
+$string['assessments'] = "评价";
+$string['assessmentsareok'] = "评价不错";
+$string['assessmentsby'] = "由 \$a 评价";
+$string['assessmentsdone'] = "评价完成";
+$string['assessmentsmustbeagreed'] = "须经允许才能做出评价";
+$string['assessmentwasagreedon'] = "允许对 \$a 进行评价";
+$string['assessor'] = "评价者";
+$string['assessthissubmission'] = "评价这份提交";
+$string['assignmentnotinthecorrectphase'] = "布置作业不在正确的阶段中";
+$string['authorofsubmission'] = "提交作业的作者";
+$string['awaitinggradingbyteacher'] = "等待由 \$a 评分";
+$string['beforedeadline'] = "早于最后期限： \$a";
+$string['calculationoffinalgrades'] = "最后得分总计";
+$string['closeassignment'] = "结束作业";
+$string['comment'] = "评论";
+$string['commentby'] = "评论来自";
+$string['criteria'] = "标准";
+$string['deadline'] = "最后期限";
+$string['deadlineis'] = "最后期限为 \$a";
+$string['delete'] = "删除";
+$string['description'] = "描述";
+$string['detailsofassessment'] = "评价的具体内容";
+$string['disagreewiththisassessment'] = "不同意这个评价";
+$string['displayoffinalgrades'] = "显示最后得分";
+$string['dontshowgrades'] = "不显示得分";
+$string['edit'] = "编辑";
+$string['editacomment'] = "编辑一份评论";
+$string['editingassessmentelements'] = "编辑评价要素";
+$string['element'] = "要素";
+$string['elementweight'] = "要素权重";
+$string['errorbanded'] = "误差范围";
+$string['feedbackgoeshere'] = "反馈到这里";
+$string['generalcomment'] = "一般性评论";
+$string['grade'] = "评分";
+$string['gradeassessment'] = "对评价评分";
+$string['graded'] = "已评分";
+$string['gradedbyteacher'] = "由 \$a 评分";
+$string['gradeforassessments'] = "对评价评分";
+$string['gradeforbias'] = "对偏见评分";
+$string['gradeforreliability'] = "对可靠性评分";
+$string['gradeforstudentsassessment'] = "对学生的评价评分";
+$string['gradeofsubmission'] = "提交的得分： \$a";
+$string['gradingstrategy'] = "评分策略";
+$string['hidegradesbeforeagreement'] = "允许评分之前先隐藏";
+$string['includeteachersgrade'] = "包含教师的评分";
+$string['listassessments'] = "列出评价";
+$string['listofallsubmissions'] = "全部提交列表";
+$string['managingassignment'] = "管理课外作业";
+$string['maximumsize'] = "大小限制";
+$string['modulename'] = "专题讨论";
+$string['modulenameplural'] = "专题讨论";
+$string['movedtophase'] = "移至阶段 \$a";
+$string['moveonto'] = "前进到";
+$string['noassessmentsdone'] = "尚无完成的评价";
+$string['nosubmissionsavailableforassessment'] = "尚无可评价的提交";
+$string['notavailable'] = "没有";
+$string['noteonassessmentelements'] = "注意，得分可分解为一些“评价要素”。.<BR>
+
+
+
+
+
+
+
+	这使评分变得容易且保持一致性。 <BR>
+
+
+
+
+
+
+
+	作为教师你须在布置好作业之前添加这些要素。<BR>
+
+
+
+
+
+
+
+	点击课程中的布置作业，如果没有指定过要素，你就会看到提示要求添加要素。<BR>
+
+
+
+
+
+
+
+	你可以使用编辑课外作业页面来改变要素的数量。<BR>
+
+
+
+
+
+
+
+	具体要素本身在“管理课外作业”页面中修改。";
+$string['notgraded'] = "尚未评分";
+$string['notitlegiven'] = "尚未命名";
+$string['numberofassessmentelements'] = "评论的数目、评价要素、得分范围或标准声明";
+$string['numberofassessments'] = "评价的数目";
+$string['numberofassessmentsofstudentsubmissions'] = "对学生所交作业的评价数目";
+$string['numberofassessmentsofteachersexamples'] = "对教师样例的评价数目";
+$string['on'] = "在 \$a";
+$string['openassignment'] = "打开作业布置";
+$string['optionforpeergrade'] = "同学评分选项";
+$string['overallgrade'] = "全部得分";
+$string['overallpeergrade'] = "全部同学评分： \$a";
+$string['overallteachergrade'] = "全部教师评分： \$a";
 $string['ownwork'] = "Own Work";
-$string['phase'] = "Phase";
-$string['phase1'] = "Set Up Assignment";
-$string['phase2'] = "\$a Submissions and Assessments";
-$string['phase3'] = "Calculation of Final Grades";
-$string['phase4'] = "Show Final Grades";
-$string['pleaseassesstheseexamplesfromtheteacher'] = "Please assess these Examples from the \$a";
-$string['pleaseassessthesestudentsubmissions'] = "Please assess these \$a Submissions";
-$string['returntosubmissionpage'] = "Return to Submission Page";
-$string['savemyassessment'] = "Save my Assessment";
-$string['savedok'] = "Saved OK";
-$string['savemygrading'] = "Save my Grading";
-$string['scaleyes'] = "2 point Yes/No scale";
-$string['scalepresent'] = "2 point Present/Absent scale";
-$string['scalecorrect'] = "2 point Correct/Incorrect scale";
-$string['scalegood3'] = "3 point Good/Poor scale";
-$string['scaleexcellent4'] = "4 point Excellent/Very Poor scale";
-$string['scaleexcellent5'] = "5 point Excellent/Very Poor scale";
-$string['scaleexcellent7'] = "7 point Excellent/Very Poor scale";
-$string['scale10'] = "Score out of 10";
-$string['scale20'] = "Score out of 20";
-$string['scale100'] = "Score out of 100";
-$string['selfassessment'] = "Self Assessment";
-$string['showgrades'] = "Show Grades";
-$string['specimenassessmentform'] = "Specimen Assessment Form";
-$string['studentsassessment'] = "Student's Assessment";
-$string['studentgrades'] = "\$a Grades";
-$string['studentsubmissionsforassessment'] = "\$a Student Submissions for Assessment";
-$string['studentsubmissions'] = "\$a Submissions";
-$string['submitassignment'] = "Submit Assignment";
-$string['submitexampleassignment'] = "Submit Example Assignment";
-$string['submitted'] = "Submitted";
-$string['submissions'] = "Submissions";
-$string['returnto'] = "Return to";
-$string['teachersassessment'] = "Teacher's Assessment";
-$string['teacherscomment'] = "Teacher's Comment";
-$string['teachersgrade'] = "Teacher's Grade";
-$string['teachersubmissionsforassessment'] = "\$a Teacher Submissions for Assessment";
-$string['thegradeis'] = "The Grade is \$a";
-$string['theseasessmentsaregradedbytheteacher'] = "These Assessments are graded by the \$a";
-$string['timeassessed'] = "Time Assessed";
-$string['title'] = "Title";
-$string['typeofscale'] = "Type of Scale";
-$string['ungradedassessmentsofstudentsubmissions'] = "\$a Ungraded Assessments of Student Submissions";
-$string['ungradedassessmentsofteachersubmissions'] = "\$a Ungraded Assessments of Teacher Submissions";
-$string['view'] = "View";
-$string['viewassessmentofteacher'] = "View Assessment of \$a";
-$string['viewotherassessments'] = "View other Assessments";
-$string['warningonamendingelements'] = "WARNING: There are submitted assessments. <BR>Do NOT change the number
- of elements, the scale types or the element weights.";
-$string['weightederrorcount'] = "Weighted Error Count: \$a";
-$string['weightforbias'] = "Weight for Bias";
-$string['weightforgradingofassessments'] = "Weight for Grading of Assessments";
-$string['weightforpeerassessments'] = "Weight for Peer Assessments";
-$string['weightforreliability'] = "Weight for Reliability";
-$string['weightforteachersassessment'] = "Weight for Teacher's Assessment";
-$string['weights'] = "Weights";
-$string['weightsusedforfinalgrade'] = "Weights used for Final Grade";
-$string['weightsusedforsubmissions'] = "Weights used for Submissions";
-$string['yourassessments'] = "Your Assessments";
+$string['phase'] = "阶段";
+$string['phase1'] = "布置作业";
+$string['phase2'] = "\$a 提交和评价";
+$string['phase3'] = "最后得分总计";
+$string['phase4'] = "显示最后得分";
+$string['pleaseassesstheseexamplesfromtheteacher'] = "请评价这些来自 \$a 的例样";
+$string['pleaseassessthesestudentsubmissions'] = "请评价这些 \$a 提交的作业";
+$string['reassess'] = "重新评价";
+$string['reply'] = "答复";
+$string['returnto'] = "返回到";
+$string['returntosubmissionpage'] = "返回到提交页面";
+$string['savedok'] = "保存好了";
+$string['savemyassessment'] = "保存我的评价";
+$string['savemycomment'] = "保存我的评论";
+$string['savemygrading'] = "保存我的评分";
+$string['scale10'] = "分数超出 10";
+$string['scale100'] = "分数超出 100";
+$string['scale20'] = "分数超出 20";
+$string['scalecorrect'] = "2 点正确/错误量表";
+$string['scaleexcellent4'] = "4 点极好/极差量表";
+$string['scaleexcellent5'] = "5 点极好/极差量表";
+$string['scaleexcellent7'] = "7 点极好/极差量表";
+$string['scalegood3'] = "3 点好/差量表";
+$string['scalepresent'] = "2 点有/无量表";
+$string['scaleyes'] = "2 点是/非量表";
+$string['selfassessment'] = "自我评价";
+$string['showgrades'] = "显示得分";
+$string['specimenassessmentform'] = "样本评价表单";
+$string['studentgrades'] = "\$a 评分";
+$string['studentsassessment'] = "学生的评价";
+$string['studentsubmissions'] = "\$a 提交";
+$string['studentsubmissionsforassessment'] = "\$a 学生提交的评价意见";
+$string['submissions'] = "提交";
+$string['submitassignment'] = "提交布置的作业";
+$string['submitexampleassignment'] = "提交作业例样";
+$string['submitted'] = "提交";
+$string['submittedby'] = "提交来自";
+$string['teachersassessment'] = "教师的评价";
+$string['teacherscomment'] = "教师的评论";
+$string['teachersgrade'] = "教师的评分";
+$string['teachersubmissionsforassessment'] = "\$a 教师提交的评价意见";
+$string['thegradeis'] = "得分为 \$a";
+$string['theseasessmentsaregradedbytheteacher'] = "这些评价由 \$a 评分";
+$string['timeassessed'] = "评价时间";
+$string['title'] = "标题";
+$string['typeofscale'] = "量表类型";
+$string['ungradedassessmentsofstudentsubmissions'] = "\$a 更新对学生提交所作的评价";
+$string['ungradedassessmentsofteachersubmissions'] = "\$a 更新对教师提交所作的评价";
+$string['view'] = "查看";
+$string['viewassessmentofteacher'] = "查看 \$a 的评价";
+$string['viewotherassessments'] = "查看其它评价";
+$string['warningonamendingelements'] = "<b>警告</b>：已经有提交的评价。 <BR>请<b><big>不要</big></b>改变要素的数目、量表的类型或要素的权重。";
+$string['weightederrorcount'] = "加权的错误数： \$a";
+$string['weightforbias'] = "偏见权重";
+$string['weightforgradingofassessments'] = "评价的得分权重";
+$string['weightforpeerassessments'] = "同学评价的权重";
+$string['weightforreliability'] = "可靠性的权重";
+$string['weightforteachersassessment'] = "教师评价的权重";
+$string['weights'] = "权重";
+$string['weightsusedforfinalgrade'] = "用于最后得分的权重";
+$string['weightsusedforsubmissions'] = "用于提交物的权重";
+$string['yourassessments'] = "你的评价";
+$string['yourfeedbackgoeshere'] = "你的反馈到这里来";
 
 ?>