diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index c857bcfdca..b398414bd4 100644
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -55,7 +55,7 @@ $lang->action->objectTypes['testtask']    = '测试任务';
 $lang->action->objectTypes['user']        = '用户';
 $lang->action->objectTypes['doc']         = '文档';
 $lang->action->objectTypes['doclib']      = '文档库';
-$lang->action->objectTypes['todo']        = 'TODO';
+$lang->action->objectTypes['todo']        = '待办';
 
 /* 用来描述操作历史记录。*/
 $lang->action->desc = new stdclass();
@@ -159,7 +159,7 @@ $lang->action->search->objectTypeList['testtask']    = '测试任务';
 $lang->action->search->objectTypeList['user']        = '用户'; 
 $lang->action->search->objectTypeList['doc']         = '文档';
 $lang->action->search->objectTypeList['doclib']      = '文档库';   
-$lang->action->search->objectTypeList['todo']        = 'TODO'; 
+$lang->action->search->objectTypeList['todo']        = '待办'; 
 $lang->action->search->objectTypeList['build']       = 'Build';  
 $lang->action->search->objectTypeList['release']     = '发布';    
 $lang->action->search->objectTypeList['productplan'] = '计划';        
diff --git a/module/editor/lang/zh-cn.php b/module/editor/lang/zh-cn.php
index a8d790dca9..0e52893a51 100644
--- a/module/editor/lang/zh-cn.php
+++ b/module/editor/lang/zh-cn.php
@@ -76,7 +76,7 @@ $lang->editor->modules['story']       = '需求';
 $lang->editor->modules['task']        = '任务';
 $lang->editor->modules['testcase']    = '用例管理';
 $lang->editor->modules['testtask']    = '测试任务';
-$lang->editor->modules['todo']        = 'TODO';
+$lang->editor->modules['todo']        = '待办';
 $lang->editor->modules['tree']        = '模块维护';
 $lang->editor->modules['upgrade']     = '升级';
 $lang->editor->modules['user']        = '用户';
diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php
index 10e573dc9f..86e400daec 100644
--- a/module/report/lang/zh-cn.php
+++ b/module/report/lang/zh-cn.php
@@ -76,12 +76,12 @@ $lang->report->unplanned     = '未计划';
 $lang->report->idAB     = 'ID';
 $lang->report->bugTitle = 'Bug标题';
 $lang->report->taskName = '任务名称';
-$lang->report->todoName = 'Todo名称';
+$lang->report->todoName = '待办名称';
 
 $lang->report->mailtitle        = new stdclass();
 $lang->report->mailtitle->begin = '提醒：您有';
 $lang->report->mailtitle->bug   = " Bugs(%s),";
 $lang->report->mailtitle->task  = " 任务(%s),";
-$lang->report->mailtitle->todo  = " Todos(%s),";
+$lang->report->mailtitle->todo  = " 待办(%s),";
 
 $lang->report->proVersion = '<a href="http://www.zentao.net/goto.php?item=proversion&from=reportpage" target="_blank">更多精彩，尽在专业版！</a>';
diff --git a/module/todo/control.php b/module/todo/control.php
index 58565ef308..70e46c7177 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -249,7 +249,7 @@ class todo extends control
         $this->loadModel('user')->setMenu($this->user->getPairs(), $todo->account);
         $this->lang->set('menugroup.todo', $from);
 
-        $this->view->title      = "TODO #$todo->id $todo->name";
+        $this->view->title      = "{$this->lang->todo->common} #$todo->id $todo->name";
         $this->view->position[] = $this->lang->todo->view;
         $this->view->todo       = $todo;
         $this->view->times      = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta);
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 1d0d8ad3bf..f0ba958551 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -9,19 +9,19 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
-$lang->todo->common       = 'TODO';
-$lang->todo->index        = "todo一览";
+$lang->todo->common       = '待办';
+$lang->todo->index        = "待办一览";
 $lang->todo->create       = "新增";
 $lang->todo->batchCreate  = "批量添加";
-$lang->todo->edit         = "更新TODO";
+$lang->todo->edit         = "更新待办";
 $lang->todo->batchEdit    = "批量编辑";
-$lang->todo->view         = "TODO详情";
+$lang->todo->view         = "待办详情";
 $lang->todo->viewAB       = "详情";
 $lang->todo->finish       = "完成";
 $lang->todo->batchFinish  = "批量完成";
 $lang->todo->export       = "导出";
-$lang->todo->delete       = "删除TODO";
-$lang->todo->browse       = "浏览TODO";
+$lang->todo->delete       = "删除待办";
+$lang->todo->browse       = "浏览待办";
 $lang->todo->import2Today = "导入到今天";
 $lang->todo->changeStatus = "更改";
 
@@ -59,7 +59,7 @@ $lang->todo->typeList['custom'] = '自定义';
 $lang->todo->typeList['bug']    = 'Bug';
 $lang->todo->typeList['task']   = '项目任务';
 
-$lang->todo->confirmDelete  = "您确定要删除这个todo吗？";
+$lang->todo->confirmDelete  = "您确定要删除这个待办吗？";
 $lang->todo->successMarked  = "成功切换状态！";
 $lang->todo->thisIsPrivate  = '这是一条私人事务。:)';
 $lang->todo->lblDisableDate = '暂时不设定时间';
diff --git a/module/todo/view/m.batchcreate.html.php b/module/todo/view/m.batchcreate.html.php
index 9ff4882fff..e9f16d245a 100755
--- a/module/todo/view/m.batchcreate.html.php
+++ b/module/todo/view/m.batchcreate.html.php
@@ -16,7 +16,7 @@
 <?php echo html::hidden("date", date('Y-m-d'));?>
 <?php for($i = 1; $i <= 5; $i++):?>
 <?php
-echo html::input("names[$i]", '', "placeholder='TODO{$lang->todo->name}'");
+echo html::input("names[$i]", '', "placeholder='{$lang->todo->common}{$lang->todo->name}'");
 echo html::hidden("types[$i]", 'custom');
 echo html::hidden("pris[$i]", 3);
 echo html::hidden("descs[$i]", '');
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index f736664e65..fd426b852e 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php if(!$todo->private or ($todo->private and $todo->account == $app->user->account)):?>
 <table class='table-1 a-left'> 
-  <caption>TODO  #<?php echo $todo->id . ' ' . $todo->name;?></caption>
+  <caption><?php echo $lang->todo->common . ' #' . $todo->id . ' ' . $todo->name;?></caption>
   <tr>
     <th class='rowhead'><?php echo $lang->todo->account;?></th>
     <td><?php echo $todo->account;?></td>