diff --git a/lang/zh_cn_utf8/auth.php b/lang/zh_cn_utf8/auth.php
index 1f89c04e733..cafee1201c5 100644
--- a/lang/zh_cn_utf8/auth.php
+++ b/lang/zh_cn_utf8/auth.php
@@ -1,7 +1,9 @@
 <?PHP // $Id$ 
-      // auth.php - created with Moodle 1.5 UNSTABLE DEVELOPMENT (2005031000)
+      // auth.php - created with Moodle 1.5 UNSTABLE DEVELOPMENT (2005041900)
 
 
+$string['alternatelogin'] = '如果你在此输入一个URL，它将被用于本站的登录。这个页面上应当有一个表单，表单的action一项应设定为<strong>“{$a}”</strong>，并且返回的字段中应当有<strong>username</strong>和<strong>password</strong>。<br />小心宾不要输入错误的URL，否则你可能会被锁在站点之外。<br />要使用缺省的登录页面请为此设置保留空白。';
+$string['alternateloginurl'] = '换用其它登录链接';
 $string['auth_cas_baseuri'] = '服务器的URI<br />例如，如果CAS服务器位于 host.domaine.fr/CAS/ 那么<br />cas_baseuri = CAS/';
 $string['auth_cas_create_user'] = '如果你希望将CAS认证用户加入到Moodle数据库中，否则只有已经存在于Moodle数据库中的用户可以登录。';
 $string['auth_cas_enabled'] = '如果你希望使用CAS认证请开启此选项。';
@@ -58,7 +60,8 @@ $string['auth_ldap_graceattr_desc'] = '可选: 覆盖宽限登录属性';
 $string['auth_ldap_gracelogins_desc'] = '激活LDAP gracelogin支持。在密码过期后，在宽限登录为0前用户仍可以登录。激活这个选项后，当密码过期时将显示gracelogin信息。';
 $string['auth_ldap_host_url'] = '以URL形式指定LDAP主机，类似于：‘ldap://ldap.myorg.com/’或‘ldaps://ldap.myorg.com/’';
 $string['auth_ldap_login_settings'] = '登录设置';
-$string['auth_ldap_memberattribute'] = '指定从属于某个组的用户属性,一般是\'member\'';
+$string['auth_ldap_memberattribute'] = '可选的：指定从属于某个组的用户属性,一般是\'member\'';
+$string['auth_ldap_objectclass'] = '可选的：指定objectClass以外的属性在ldap_user_type中搜索用户。通常你不需修改这个选项。';
 $string['auth_ldap_opt_deref'] = '检查在搜索时如何处理别名。选择下列值之一: “否”(LDAP_DEREF_NEVER)或“是”(LDAP_DEREF_ALWAYS)。';
 $string['auth_ldap_passwdexpire_settings'] = 'LDAP密码过期设置。';
 $string['auth_ldap_search_sub'] = '如果你想从次级上下文中搜索用户，设值<> 0。';
@@ -96,7 +99,14 @@ $string['auth_pop3mailbox'] = '要连接的邮箱名称。(通常是INBOX)';
 $string['auth_pop3port'] = '服务器端口（通常是110）';
 $string['auth_pop3title'] = '使用一个POP3服务器';
 $string['auth_pop3type'] = '服务器类型。如果你的POP3服务器使用安全验证，请选择pop3cert。';
-$string['auth_shibbolethdescription'] = '使用这个方法可以链接到已有的Shibboleth服务器检查或创建帐号';
+$string['auth_shib_instructions'] = '如果您的学院支持Shibboleth，可以使用<a href=\"$a\">Shibboleth登录</a>来访问它。<br />否则请使用普通的登录表格。';
+$string['auth_shib_instructions_help'] = '应当在此为你的用户提供关于Shibboleth的解释。在登录屏幕上，将会显示这些提示。其中应当包含一个指向“<b>$a</b>”的链接，这样Shibboleth用户可以轻松等如。如果此项为空，缺省的指示信息将会被是用(并非为Shibboleth定制)。';
+$string['auth_shib_only'] = '只用Shibboleth';
+$string['auth_shib_only_description'] = '如果只是用Shibboleth认证方式，请设定此选项。';
+$string['auth_shib_settings'] = '在设定你的Moodle是用Shibboleth前，请仔细阅读<a href=\"../auth/shibboleth/README.txt\" target=\"_blank\">README</a>文件。';
+$string['auth_shibboleth_login'] = 'Shibboleth登录';
+$string['auth_shibboleth_manual_login'] = '手工登录';
+$string['auth_shibbolethdescription'] = '是用这个方法，用户的创建和验证是使用<a href=\"http://shibboleth.internet2.edu/\" target=\"_blank\">Shibboleth</a>进行的';
 $string['auth_shibbolethtitle'] = 'Shibboleth';
 $string['auth_updatelocal'] = '更新本地数据';
 $string['auth_updatelocal_expl'] = '<p><b>更新本地数据:</b> 如果开启，则用户每次登录或有用户同步时字段将会被更新。设定为本地更新的字段应当被锁住。</p>';
diff --git a/lang/zh_cn_utf8/choice.php b/lang/zh_cn_utf8/choice.php
index 50ba726a2cd..e63db3f0281 100644
--- a/lang/zh_cn_utf8/choice.php
+++ b/lang/zh_cn_utf8/choice.php
@@ -1,23 +1,33 @@
 <?PHP // $Id$ 
-      // choice.php - created with Moodle 1.2 development (2004021700)
+      // choice.php - created with Moodle 1.5 UNSTABLE DEVELOPMENT (2005031000)
 
 
+$string['allowupdate'] = '允许更新投票';
 $string['answered'] = '已答';
-$string['choice'] = '选择 $a';
-$string['choicename'] = '选择名称';
-$string['choicetext'] = '选择本文';
-$string['modulename'] = '选择';
-$string['modulenameplural'] = '选择';
+$string['choice'] = '投票{$a}';
+$string['choiceclose'] = '直到';
+$string['choicename'] = '投票名称';
+$string['choiceopen'] = '开启';
+$string['choicetext'] = '投票本文';
+$string['havetologin'] = '只有登录后才能提交您的选择';
+$string['modulename'] = '投票';
+$string['modulenameplural'] = '投票';
 $string['mustchooseone'] = '保存前必须先选择一个答案。保存失败。';
 $string['notanswered'] = '未答';
+$string['notopenyet'] = '对于起，此活动在{$a}之后才可用';
+$string['privacy'] = '结果公开/保密';
 $string['publish'] = '公布结果';
+$string['publishafteranswer'] = '在学生回答后向其显示结果';
+$string['publishafterclose'] = '只在投票结束后向学生显示结果';
+$string['publishalways'] = '总是将结果显示给学生';
 $string['publishanonymous'] = '匿名公布结果，不显示学生姓名';
 $string['publishnames'] = '完全公开结果，显示学生姓名及其选择';
 $string['publishnot'] = '不向学生公布结果';
-$string['responses'] = '应答';
-$string['responsesto'] = '应答 $a';
+$string['responses'] = '回答';
+$string['responsesto'] = '回答{$a}';
 $string['savemychoice'] = '保存我的选择';
 $string['showunanswered'] = '显示未被回答的问题的列';
-$string['viewallresponses'] = '查看 $a 应答';
+$string['timerestrict'] = '必须在此时间之间回答';
+$string['viewallresponses'] = '查看{$a}回复';
 
 ?>
diff --git a/lang/zh_cn_utf8/journal.php b/lang/zh_cn_utf8/journal.php
index 1a9561e7ab2..137149588af 100644
--- a/lang/zh_cn_utf8/journal.php
+++ b/lang/zh_cn_utf8/journal.php
@@ -1,5 +1,5 @@
 <?PHP // $Id$ 
-      // journal.php - created with Moodle 1.2 Beta (2004022400)
+      // journal.php - created with Moodle 1.5 UNSTABLE DEVELOPMENT (2005041900)
 
 
 $string['alwaysopen'] = '总是开放';
@@ -22,6 +22,7 @@ $string['journalquestion'] = '杂志问题';
 $string['journalrating1'] = '不满意';
 $string['journalrating2'] = '满意';
 $string['journalrating3'] = '出色';
+$string['mailsubject'] = '杂志反馈';
 $string['modulename'] = '杂志';
 $string['modulenameplural'] = '杂志';
 $string['newjournalentries'] = '新杂志登记';
diff --git a/lang/zh_cn_utf8/lesson.php b/lang/zh_cn_utf8/lesson.php
index 04333ab32be..28aaf767c4b 100644
--- a/lang/zh_cn_utf8/lesson.php
+++ b/lang/zh_cn_utf8/lesson.php
@@ -1,12 +1,18 @@
 <?PHP // $Id$ 
-      // lesson.php - created with Moodle 1.4.3 + (2004083132)
+      // lesson.php - created with Moodle 1.5 UNSTABLE DEVELOPMENT (2005042100)
 
 
-$string['actionaftercorrectanswer'] = '正确答案之后的动作';
+$string['accesscontrol'] = '访问控制';
+$string['actionaftercorrectanswer'] = '正确答案之后的行为';
 $string['addabranchtable'] = '添加分支';
 $string['addanendofbranch'] = '添加分支结束页';
 $string['addaquestionpage'] = '添加问题页';
 $string['addcluster'] = '添加簇';
+$string['addedabranchtable'] = '已经添加分支表';
+$string['addedanendofbranch'] = '已经添加分支表结束页';
+$string['addedaquestionpage'] = '已经添加问题页';
+$string['addedcluster'] = '已经添加簇';
+$string['addedendofcluster'] = '已经添加簇结束页';
 $string['addendofcluster'] = '添加簇结束页';
 $string['answer'] = '答案';
 $string['answeredcorrectly'] = '回答正确。';
@@ -21,36 +27,72 @@ $string['cancel'] = '取消';
 $string['canretake'] = '$a 允许重学';
 $string['casesensitive'] = '大小写敏感';
 $string['checkbranchtable'] = '检查此分支';
-$string['checknavigation'] = '检查课程导航';
+$string['checknavigation'] = '检查该课导航';
 $string['checkquestion'] = '检查此问题';
 $string['classstats'] = '班级统计';
 $string['clicktopost'] = '点击此处可以把您的成绩发送到最高分列表上。';
 $string['clusterjump'] = '在簇中的问题不可见';
 $string['clustertitle'] = '簇';
 $string['comments'] = '您的评价';
-$string['commentswithname'] = '{$a->lastname}{$a->firstname} 的评价';
+$string['commentswithname'] = '{$a->lastname}{$a->firstname}的评价';
 $string['completed'] = '完成';
 $string['confirmdeletionofthispage'] = '确认删除该页';
-$string['congratulations'] = 'Congratulations - end of lesson reached';
+$string['congratulations'] = '恭喜 － 这节课学习完毕';
 $string['continue'] = '继续';
+$string['continuetoanswer'] = '继续修改密码';
+$string['correctanswerjump'] = '正确回答跳转';
+$string['correctanswerscore'] = '正确回答成绩';
+$string['correctresponse'] = '正确响应';
+$string['customscoring'] = '定制分数';
 $string['deadline'] = '截止期限';
+$string['deleteattempts'] = '删除学生的学习记录(用户id)';
+$string['deletedpage'] = '删除此页';
+$string['deleting'] = '删除中';
 $string['deletingpage'] = '删除页面: $a';
 $string['description'] = '说明';
+$string['detailedstats'] = '详细统计';
+$string['didnotanswerquestion'] = '不回答此问题';
+$string['displayhighscores'] = '显示最高分';
+$string['displayinleftmenu'] = '在左侧目录显示?';
+$string['displayleftmenu'] = '显示左侧目录';
 $string['displayofgrade'] = '向学生显示等级';
-$string['endoflesson'] = 'End of lesson';
+$string['displayreview'] = '显示检查按钮';
+$string['displayscorewithoutessays'] = '你的分数是{$a->score}(满分$a->grade)。';
+$string['editlessonsettings'] = '修改这节课的设置';
+$string['editpagecontent'] = '修改页面内容';
+$string['email'] = '电子邮件';
+$string['emailsuccess'] = '电子邮件发送成功';
+$string['endofbranch'] = '分支结束';
+$string['endofclustertitle'] = '簇结束';
+$string['endoflesson'] = '课结束';
+$string['entername'] = '请输入昵称以显示在最高分列表中';
+$string['enterpassword'] = '请输入密码';
 $string['fileformat'] = '文件格式';
 $string['firstanswershould'] = '第一个答案应当跳转到\"正确\"页';
-$string['gradeis'] = 'Grade is $a';
+$string['flowcontrol'] = '流程控制';
+$string['general'] = '一般';
+$string['gobacktolesson'] = '返回课程';
+$string['grade'] = '成绩';
+$string['gradeessay'] = '为问答题打分';
+$string['gradeis'] = '成绩是{$a}';
+$string['gradeoptions'] = '分数选项';
 $string['handlingofretakes'] = '如何处理多个成绩';
+$string['havenotgradedyet'] = '尚未打分。';
 $string['here'] = ' ';
+$string['highscore'] = '最高分';
 $string['importquestions'] = '导入问题';
 $string['jump'] = '跳转';
+$string['lessondefault'] = '用此节课设置作为缺省值';
+$string['lessonformating'] = '该课格式';
+$string['lessonmenu'] = '课程目录';
+$string['maxhighscores'] = '显示的最高分数目';
 $string['maximumnumberofanswersbranches'] = '最多有几个答案/分支';
 $string['maximumnumberofattempts'] = '最多尝试几次';
 $string['maxtime'] = '时间限制(分钟)';
 $string['minimumnumberofquestions'] = '至少需要回答几个问题';
-$string['modulename'] = '课程';
-$string['modulenameplural'] = '课程';
+$string['modattempts'] = '允许检查';
+$string['modulename'] = '课';
+$string['modulenameplural'] = '课';
 $string['movepagehere'] = '移动页面到此';
 $string['moving'] = '移动页面: $a';
 $string['movingtonextpage'] = '移动到下一爷';
@@ -58,20 +100,27 @@ $string['multianswer'] = '多答案';
 $string['multipleanswer'] = '多个答案';
 $string['nextpage'] = '下一页';
 $string['noanswer'] = '未给出答案';
-$string['noattemptrecordsfound'] = 'No Attempt Records Found: No Grade given';
-$string['normal'] = '常规-按照课程路径';
+$string['normal'] = '常规-按照课路径';
 $string['numberofcorrectanswers'] = '正确答案数: $a';
 $string['numberofcorrectmatches'] = '正确匹配数: $a';
 $string['numberofpagestoshow'] = '显示多少页(卡片)';
 $string['numberofpagesviewed'] = '页面浏览数: $a';
-$string['outof'] = 'Out of $a';
+$string['ongoing'] = '开始即计分并显示';
+$string['other'] = '其它';
+$string['outoftime'] = '超时了';
 $string['page'] = '页面: $a';
 $string['pagecontents'] = '页面内容';
 $string['pagetitle'] = '页面标题';
+$string['password'] = '密码';
+$string['passwordprotectedlesson'] = '该课{$a}受密码保护。';
 $string['pleasecheckoneanswer'] = '请检查一个答案';
 $string['pleasecheckoneormoreanswers'] = '请检查一个或更多答案';
 $string['pleaseenteryouranswerinthebox'] = '请在框内填上答案';
 $string['pleasematchtheabovepairs'] = '请匹配以上内容';
+$string['postsuccess'] = '发表成功';
+$string['practice'] = '实践课';
+$string['previouspage'] = '前一页';
+$string['question'] = '问题';
 $string['questionoption'] = '问题选项';
 $string['questiontype'] = '问题类别';
 $string['redisplaypage'] = '重新显示此页';
@@ -84,38 +133,46 @@ $string['savepage'] = '保存页面';
 $string['showanunansweredpage'] = '显示一个未回答的页面';
 $string['showanunseenpage'] = '显示一个未浏览的页面';
 $string['singleanswer'] = '单个答案';
+$string['slideshow'] = '幻灯片';
+$string['slideshowbgcolor'] = '幻灯片背景';
+$string['slideshowheight'] = '幻灯片高度';
+$string['slideshowwidth'] = '幻灯片宽度';
+$string['startlesson'] = '开始该课';
 $string['submitname'] = '提交名称';
 $string['teachertimerwarning'] = '仅有学生可以使用计时器。要实验计时器请以学生身份登录。';
 $string['thatsthecorrectanswer'] = '这是正确答案';
 $string['thatsthewronganswer'] = '这是错误答案';
 $string['thefollowingpagesjumptothispage'] = '一下页面跳转到此页面';
 $string['thispage'] = '本页';
+$string['timed'] = '计时';
 $string['timeremaining'] = '剩余时间';
 $string['timetaken'] = '已用时间';
-$string['topscorestitle'] = '课程 {$a->name} 的 {$a->mahighscores} 个最高分。';
+$string['topscorestitle'] = '课{$a->name}的{$a->mahighscores}个最高分。';
 $string['treeview'] = '树视图';
 $string['unseenpageinbranch'] = '分支内未显示的问题';
+$string['updatedpage'] = '更新页面';
 $string['updatefailed'] = '更新失败';
 $string['updatesuccess'] = '更新成功';
 $string['useeditor'] = '使用编辑器';
 $string['usemaximum'] = '最高分';
 $string['usemean'] = '平均分';
-$string['usepassword'] = '此课程有密码';
+$string['usepassword'] = '此课有密码';
 $string['viewallpages'] = '查看所有页面';
 $string['viewgrades'] = '查看成绩';
 $string['viewhighscores'] = '查看最高分列表';
-$string['viewlessonstats'] = '查看课程统计';
+$string['viewlessonstats'] = '查看该课统计';
 $string['waitpostscore'] = '正在提交最高分，请稍候...';
 $string['welldone'] = '非常好!';
 $string['whatdofirst'] = '您希望先做什么?';
 $string['wronganswerjump'] = '错误答案跳转';
 $string['wronganswerscore'] = '错误答案成绩';
 $string['wrongresponse'] = '错误应答';
-$string['youhaveseen'] = '你已经浏览了该课程的多个页面.<br />想从最后浏览的页面开始吗?';
+$string['youhavereceived'] = '您已经获得了此问题{$a->outof}分中的{$a->score}分。';
+$string['youhaveseen'] = '你已经浏览了该课的多个页面.<br />想从最后浏览的页面开始吗?';
 $string['youmadehighscore'] = '您在';
 $string['youranswer'] = '你的答案';
 $string['yourcurrentgradeis'] = '您当前的分数是{$a}';
-$string['yourgradeisnow'] = '您在此课程中的分数以修改为{$a}';
+$string['yourgradeisnow'] = '您在此课中的分数以修改为{$a}';
 $string['yourresponse'] = '您的应答';
 
 ?>