diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index a5aa9f1920..385ca366c0 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -33,6 +33,13 @@ $lang->action->confirmHideAll = 'Do you want to hide all the records?';
 $lang->action->needEdit       = '%s you want to restore has already existed. Please edit it.';
 $lang->action->historyEdit    = 'The history editor cannot be empty.';
 
+$lang->action->history = new stdclass();
+$lang->action->history->action = 'Bound action';
+$lang->action->history->field  = 'Field';
+$lang->action->history->old    = 'Old value';
+$lang->action->history->new    = 'New value';
+$lang->action->history->diff   = 'Diff';
+
 $lang->action->dynamic = new stdclass();
 $lang->action->dynamic->today      = 'Today';
 $lang->action->dynamic->yesterday  = 'Yesterday';
@@ -168,6 +175,8 @@ $lang->action->label->suspended           = 'Suspended';
 $lang->action->label->login               = 'Login';
 $lang->action->label->logout              = "Logout";
 $lang->action->label->deleteestimate      = "Deleted Man-Hour";
+$lang->action->label->linked2build        = "Linked Build";
+$lang->action->label->linked2bug          = "Linked Bug";
 
 /* 用来生成相应对象的链接。*/
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 2a9707252b..eedcf955c6 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -33,6 +33,13 @@ $lang->action->confirmHideAll = '您确定要全部隐藏这些记录吗？';
 $lang->action->needEdit       = '要还原%s的名称或代号已经存在，请编辑更改。';
 $lang->action->historyEdit    = '历史记录编辑不能为空。';
 
+$lang->action->history = new stdclass();
+$lang->action->history->action = '关联日志';
+$lang->action->history->field  = '字段';
+$lang->action->history->old    = '旧值';
+$lang->action->history->new    = '新值';
+$lang->action->history->diff   = '不同';
+
 $lang->action->dynamic = new stdclass();
 $lang->action->dynamic->today      = '今天';
 $lang->action->dynamic->yesterday  = '昨天';
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 178f40a75a..db1ae32a0c 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -16,6 +16,14 @@ $lang->block->style  = 'Style';
 $lang->block->grid   = 'Grid';
 $lang->block->color  = 'Color';
 
+$lang->block->account  = 'Account';
+$lang->block->module   = 'Module';
+$lang->block->title    = 'Title';
+$lang->block->source   = 'Source module';
+$lang->block->block    = 'Source block';
+$lang->block->order    = 'Order';
+$lang->block->height   = 'Height';
+
 $lang->block->lblModule    = 'Module';
 $lang->block->lblBlock     = 'Widget';
 $lang->block->lblNum       = 'Number';
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 4c7a63691b..0bbfe758ae 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -16,6 +16,14 @@ $lang->block->style  = '外观';
 $lang->block->grid   = '宽度';
 $lang->block->color  = '颜色';
 
+$lang->block->account  = '所属用户';
+$lang->block->module   = '所属模块';
+$lang->block->title    = '区块名称';
+$lang->block->source   = '来源模块';
+$lang->block->block    = '来源区块';
+$lang->block->order    = '排序';
+$lang->block->height   = '高度';
+
 $lang->block->lblModule    = '模块';
 $lang->block->lblBlock     = '区块';
 $lang->block->lblNum       = '条数';
diff --git a/module/branch/lang/en.php b/module/branch/lang/en.php
index 2d6f428b19..4e3208250c 100644
--- a/module/branch/lang/en.php
+++ b/module/branch/lang/en.php
@@ -7,5 +7,10 @@ $lang->branch->delete = 'Delete Branch';
 $lang->branch->manageTitle = '%s Management';
 $lang->branch->all         = 'All';
 
+$lang->branch->id      = 'ID';
+$lang->branch->product = 'Product';
+$lang->branch->name    = 'Name';
+$lang->branch->order   = 'Order';
+
 $lang->branch->confirmDelete = 'Do you want to delete this @branch@?';
 $lang->branch->canNotDelete  = 'There is data in @branch@. It cannot be deleted.';
diff --git a/module/branch/lang/zh-cn.php b/module/branch/lang/zh-cn.php
index 3d327f9d12..3f8d2d374d 100644
--- a/module/branch/lang/zh-cn.php
+++ b/module/branch/lang/zh-cn.php
@@ -7,5 +7,10 @@ $lang->branch->delete = '分支删除';
 $lang->branch->manageTitle = '%s管理';
 $lang->branch->all         = '所有';
 
+$lang->branch->id      = '编号';
+$lang->branch->product = '所属产品';
+$lang->branch->name    = '名称';
+$lang->branch->order   = '排序';
+
 $lang->branch->confirmDelete = '是否删除该@branch@？';
 $lang->branch->canNotDelete  = '该@branch@下已经有数据，不能删除！';
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index 45ec2696d2..a8d85a2806 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -13,7 +13,6 @@ $lang->build->common       = "Build";
 $lang->build->create       = "Create";
 $lang->build->edit         = "Edit";
 $lang->build->linkStory    = "Link Story";
-$lang->build->linked2build = "Link build";
 $lang->build->linkBug      = "Link Bug";
 $lang->build->delete       = "Delete Build";
 $lang->build->deleted      = "Deleted";
@@ -30,6 +29,7 @@ $lang->build->basicInfo = 'Basic Info';
 
 $lang->build->id        = 'ID';
 $lang->build->product   = $lang->productCommon;
+$lang->build->branch    = 'Platform/Branch';
 $lang->build->project   = $lang->projectCommon;
 $lang->build->name      = 'Name';
 $lang->build->date      = 'Date';
@@ -39,6 +39,7 @@ $lang->build->filePath  = 'File Path';
 $lang->build->desc      = 'Description';
 $lang->build->files     = 'Upload Files';
 $lang->build->last      = 'Last Build';
+$lang->build->packageType        = 'Package Type';
 $lang->build->unlinkStory        = 'Unlink Story';
 $lang->build->unlinkBug          = 'Unlink Bug';
 $lang->build->stories            = 'Finished Story';
diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php
index 4f6709773d..bc941c457d 100644
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -29,6 +29,7 @@ $lang->build->basicInfo = '基本信息';
 
 $lang->build->id        = 'ID';
 $lang->build->product   = $lang->productCommon;
+$lang->build->branch    = '平台/分支';
 $lang->build->project   = '所属' . $lang->projectCommon;
 $lang->build->name      = '名称编号';
 $lang->build->date      = '打包日期';
@@ -38,6 +39,7 @@ $lang->build->filePath  = '下载地址';
 $lang->build->desc      = '描述';
 $lang->build->files     = '上传发行包';
 $lang->build->last      = '上个版本';
+$lang->build->packageType        = '包类型';
 $lang->build->unlinkStory        = '移除需求';
 $lang->build->unlinkBug          = '移除Bug';
 $lang->build->stories            = '完成的需求';
diff --git a/module/company/lang/en.php b/module/company/lang/en.php
index a0e5ff22e0..1f65792ae8 100644
--- a/module/company/lang/en.php
+++ b/module/company/lang/en.php
@@ -25,6 +25,7 @@ $lang->company->zipcode  = 'Zip Code';
 $lang->company->website  = 'Website';
 $lang->company->backyard = 'Intranet';
 $lang->company->guest    = 'Guest Login';
+$lang->company->admins   = 'Administrators';
 
 $lang->company->product = $lang->productCommon;
 $lang->company->project = $lang->projectCommon;
diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php
index f4ff7c9f64..1d4ece70f4 100644
--- a/module/company/lang/zh-cn.php
+++ b/module/company/lang/zh-cn.php
@@ -25,6 +25,7 @@ $lang->company->zipcode  = '邮政编码';
 $lang->company->website  = '官网';
 $lang->company->backyard = '内网';
 $lang->company->guest    = '匿名登录';
+$lang->company->admins   = '管理员';
 
 $lang->company->product = $lang->productCommon;
 $lang->company->project = $lang->projectCommon;
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index ef40bd2351..074df7838f 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -9,6 +9,10 @@ $lang->custom->flow      = 'Process';
 $lang->custom->working   = 'Working';
 $lang->custom->select    = 'Select Process';
 $lang->custom->branch    = 'Multi Branch';
+$lang->custom->owner     = 'Owner';
+$lang->custom->module    = 'Module';
+$lang->custom->section   = 'Section';
+$lang->custom->lang      = 'Language';
 
 $lang->custom->object['story']    = 'Story';
 $lang->custom->object['task']     = 'Task';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 79123328ba..de09fda4e7 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -9,6 +9,10 @@ $lang->custom->flow      = '流程';
 $lang->custom->working   = '工作方式';
 $lang->custom->select    = '请选择流程：';
 $lang->custom->branch    = '多分支';
+$lang->custom->owner     = '所有者';
+$lang->custom->module    = '模块';
+$lang->custom->section   = '附加部分';
+$lang->custom->lang      = '所属语言';
 
 $lang->custom->object['story']    = '需求';
 $lang->custom->object['task']     = '任务';
diff --git a/module/dev/config.php b/module/dev/config.php
index 990a9f022c..db376d358a 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -25,6 +25,7 @@ $config->dev->group['testreport']     = 'qa';
 $config->dev->group['testsuite']      = 'qa';
 $config->dev->group['testresult']     = 'qa';
 $config->dev->group['testrun']        = 'qa';
+$config->dev->group['suitecase']      = 'qa';
 $config->dev->group['doc']            = 'doc';
 $config->dev->group['doccontent']     = 'doc';
 $config->dev->group['doclib']         = 'doc';
@@ -48,3 +49,28 @@ $config->dev->group['mail']           = 'admin';
 $config->dev->group['backup']         = 'admin';
 $config->dev->group['cron']           = 'admin';
 $config->dev->group['dev']            = 'admin';
+
+$config->dev->tableMap['storyspec']      = 'story';
+$config->dev->tableMap['storystage']     = 'story';
+$config->dev->tableMap['burn']           = 'task';
+$config->dev->tableMap['projectproduct'] = 'project';
+$config->dev->tableMap['projectstory']   = 'story';
+$config->dev->tableMap['taskestimate']   = 'task';
+$config->dev->tableMap['team']           = 'project';
+$config->dev->tableMap['case']           = 'testcase';
+$config->dev->tableMap['casestep']       = 'testcase';
+$config->dev->tableMap['testresult']     = 'testtask';
+$config->dev->tableMap['testrun']        = 'testtask';
+$config->dev->tableMap['doccontent']     = 'doc';
+$config->dev->tableMap['doclib']         = 'doc';
+$config->dev->tableMap['grouppriv']      = 'group';
+$config->dev->tableMap['usercontact']    = 'user-contacts';
+$config->dev->tableMap['usergroup']      = 'user';
+$config->dev->tableMap['userquery']      = 'search';
+$config->dev->tableMap['usertpl']        = 'user-tpl';
+$config->dev->tableMap['history']        = 'action-history';
+$config->dev->tableMap['lang']           = 'custom';
+$config->dev->tableMap['config']         = 'custom';
+$config->dev->tableMap['mailqueue']      = 'mail';
+$config->dev->tableMap['module']         = 'tree';
+$config->dev->tableMap['suitecase']      = 'testcase';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index 75511c7722..f623d5613d 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -89,6 +89,7 @@ $lang->dev->tableList['branch']         = 'Branch';
 $lang->dev->tableList['doccontent']     = 'Doc Content';
 $lang->dev->tableList['storystage']     = 'Story Stage';
 $lang->dev->tableList['tutorial']       = 'Tutorial';
+$lang->dev->tableList['suitecase']      = 'Suite Case';
 
 $lang->dev->groupList['my']      = 'Dashboard';
 $lang->dev->groupList['product'] = $lang->productCommon;
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index 3649d63a02..b5fff62330 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -89,6 +89,7 @@ $lang->dev->tableList['branch']         = '平台/分支';
 $lang->dev->tableList['doccontent']     = '文档内容';
 $lang->dev->tableList['storystage']     = '需求阶段';
 $lang->dev->tableList['tutorial']       = '新手教程';
+$lang->dev->tableList['suitecase']      = '套件用例';
 
 $lang->dev->groupList['my']      = '我的地盘';
 $lang->dev->groupList['product'] = $lang->productCommon;
diff --git a/module/dev/model.php b/module/dev/model.php
index 3f4cec0c36..7bbdd1ab47 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -35,11 +35,13 @@ class devModel extends model
      */
     public function getFields($table)
     {
-        $module = substr($table, strpos($table, '_') + 1);
+        $module      = substr($table, strpos($table, '_') + 1);
+        $aliasModule = $subLang = '';
         try
         {
-            if($module == 'case') $module = 'testcase';
-            $this->app->loadLang($module);
+            if(isset($this->config->dev->tableMap[$module])) $aliasModule = $this->config->dev->tableMap[$module];
+            if(strpos($aliasModule, '-') !== false) list($aliasModule, $subLang) = explode('-', $aliasModule);
+            $this->app->loadLang($aliasModule ? $aliasModule : $module);
         }
         catch(PDOException $e)
         {
@@ -57,6 +59,7 @@ class devModel extends model
         {
             $this->sqlError($e);
         }
+
         foreach($rawFields as $rawField)
         {
             $firstPOS = strpos($rawField->type, '(');
@@ -64,6 +67,9 @@ class devModel extends model
             $type     = str_replace(array('big', 'small', 'medium', 'tiny'), '', $type);
             $field    = array();
             $field['name'] = isset($this->lang->$module->{$rawField->field}) ? $this->lang->$module->{$rawField->field} : '';
+            if(empty($field['name']) and $aliasModule) $field['name'] = isset($this->lang->$aliasModule->{$rawField->field}) ? $this->lang->$aliasModule->{$rawField->field} : '';
+            if($subLang) $field['name'] = isset($this->lang->$aliasModule->$subLang->{$rawField->field}) ? $this->lang->$aliasModule->$subLang->{$rawField->field} : $field['name'];
+            if(!is_string($field['name'])) $field['name'] = '';
             $field['null'] = $rawField->null;
 
             if($type == 'enum' or $type == 'set')
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index d23d5686bf..7058ef7f62 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -40,6 +40,9 @@ $lang->doc->filePath       = 'File Path';
 $lang->doc->extension      = 'Extension';
 $lang->doc->size           = 'Size';
 $lang->doc->download       = 'Download';
+$lang->doc->acl            = 'Right';
+$lang->doc->groups         = 'Groups';
+$lang->doc->users          = 'Users';
 
 $lang->doc->moduleDoc      = 'By Module';
 $lang->doc->searchDoc      = 'By Search';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 5a1c9c3ced..ce1c8c99d3 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -40,6 +40,9 @@ $lang->doc->filePath       = '地址';
 $lang->doc->extension      = '类型';
 $lang->doc->size           = '大小';
 $lang->doc->download       = '下载';
+$lang->doc->acl            = '权限';
+$lang->doc->groups         = '分组';
+$lang->doc->users          = '用户';
 
 $lang->doc->moduleDoc      = '按模块浏览';
 $lang->doc->searchDoc      = '搜索';
diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php
index f31993ef53..cfed75c605 100644
--- a/module/extension/lang/en.php
+++ b/module/extension/lang/en.php
@@ -30,8 +30,14 @@ $lang->extension->installed   = 'Installed';
 $lang->extension->deactivated = 'Deactivated';
 $lang->extension->available   = 'Downloaded';
 
+$lang->extension->name        = 'Extension Name';
+$lang->extension->code        = 'Code';
+$lang->extension->desc        = 'Describe';
+$lang->extension->type        = 'Type';
+$lang->extension->dirs        = 'Directories';
+$lang->extension->files       = 'Files';
+$lang->extension->status      = 'Status';
 $lang->extension->version     = 'Version';
-$lang->extension->compatible  = 'Compatible';
 $lang->extension->latest      = '<small>Latest:<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，need zentao <a href="http://api.zentao.net/goto.php?item=latest" target="_blank"><strong>%s</strong></small>';
 $lang->extension->author      = 'Author';
 $lang->extension->license     = 'License';
@@ -40,6 +46,8 @@ $lang->extension->downloads   = 'Downloads';
 $lang->extension->compatible  = 'Compatibility';
 $lang->extension->grade       = 'Score';
 $lang->extension->depends     = 'Dependent';
+$lang->extension->zentaoCompatible  = 'Compatible Version';
+$lang->extension->installedTime     = 'Installed Time';
 
 $lang->extension->publicList[0] = 'Manually';
 $lang->extension->publicList[1] = 'Auto';
diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php
index 5146c709d7..c345b4f8be 100644
--- a/module/extension/lang/zh-cn.php
+++ b/module/extension/lang/zh-cn.php
@@ -30,8 +30,14 @@ $lang->extension->installed   = '已安装';
 $lang->extension->deactivated = '被禁用';
 $lang->extension->available   = '已下载';
 
+$lang->extension->name        = '插件名称';
+$lang->extension->code        = '代号';
+$lang->extension->desc        = '描述';
+$lang->extension->type        = '类型';
+$lang->extension->dirs        = '安装目录';
+$lang->extension->files       = '安装文件';
+$lang->extension->status      = '状态';
 $lang->extension->version     = '版本';
-$lang->extension->compatible  = '适用版本';
 $lang->extension->latest      = '<small>最新版本<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，兼容禅道<a href="http://api.zentao.net/goto.php?item=latest" target="_blank" class="alert-link"><strong>%s</strong></a></small>';
 $lang->extension->author      = '作者';
 $lang->extension->license     = '授权';
@@ -40,6 +46,8 @@ $lang->extension->downloads   = '下载量';
 $lang->extension->compatible  = '兼容性';
 $lang->extension->grade       = '评分';
 $lang->extension->depends     = '依赖';
+$lang->extension->zentaoCompatible  = '适用版本';
+$lang->extension->installedTime     = '安装时间';
 
 $lang->extension->publicList[0] = '手工下载';
 $lang->extension->publicList[1] = '直接下载';
diff --git a/module/file/lang/en.php b/module/file/lang/en.php
index 583952493c..48ee394ecc 100644
--- a/module/file/lang/en.php
+++ b/module/file/lang/en.php
@@ -30,6 +30,15 @@ $lang->file->addFile       = 'Add File';
 $lang->file->beginUpload   = 'Start uploading';
 $lang->file->uploadSuccess = 'uploaded Successfully';
 
+$lang->file->pathname  = 'Path Name';
+$lang->file->title     = 'Title';
+$lang->file->extension = 'Extension';
+$lang->file->size      = 'Size';
+$lang->file->addedBy   = 'Added By';
+$lang->file->addedDate = 'Added Date';
+$lang->file->downloads = 'Downloads';
+$lang->file->extra     = 'Extra';
+
 $lang->file->dragFile         = 'Please drag here.';
 $lang->file->errorNotExists   = "<span class='red'>'%s' is not found.</span>";
 $lang->file->errorCanNotWrite = "<span class='red'>'%s' is not writable. Please change its permission. Enter sudo chmod -R 777 '%s'</span> in Linux.";
diff --git a/module/file/lang/zh-cn.php b/module/file/lang/zh-cn.php
index d94ad3b1db..b54a47c0f0 100644
--- a/module/file/lang/zh-cn.php
+++ b/module/file/lang/zh-cn.php
@@ -30,6 +30,15 @@ $lang->file->addFile       = '添加文件';
 $lang->file->beginUpload   = '开始上传';
 $lang->file->uploadSuccess = '上传成功';
 
+$lang->file->pathname  = '路径';
+$lang->file->title     = '标题';
+$lang->file->extension = '扩展名';
+$lang->file->size      = '大小';
+$lang->file->addedBy   = '由谁添加';
+$lang->file->addedDate = '添加时间';
+$lang->file->downloads = '下载次数';
+$lang->file->extra     = '备注';
+
 $lang->file->dragFile         = '请拖拽文件到此处';
 $lang->file->errorNotExists   = "<span class='red'>文件夹 '%s' 不存在</span>";
 $lang->file->errorCanNotWrite = "<span class='red'>文件夹 '%s' 不可写,请改变文件夹的权限。在linux中输入指令:sudo chmod -R 777 %s</span>";
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index c7e3308dcb..624ae0db92 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -32,6 +32,8 @@ $lang->group->noticeVisit        = 'N/A means access is not restricted.';
 $lang->group->id       = 'ID';
 $lang->group->name     = 'Name';
 $lang->group->desc     = 'Description';
+$lang->group->role     = 'Role';
+$lang->group->acl      = 'Right';
 $lang->group->users    = 'Users';
 $lang->group->module   = 'Module';
 $lang->group->method   = 'Method';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index cad53e028e..718df150d0 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -32,6 +32,8 @@ $lang->group->noticeVisit        = '空代表访问没有访问限制';
 $lang->group->id       = '编号';
 $lang->group->name     = '分组名称';
 $lang->group->desc     = '分组描述';
+$lang->group->role     = '角色';
+$lang->group->acl      = '权限';
 $lang->group->users    = '用户列表';
 $lang->group->module   = '模块';
 $lang->group->method   = '方法';
diff --git a/module/mail/control.php b/module/mail/control.php
index 29907e2042..93b1ffe344 100755
--- a/module/mail/control.php
+++ b/module/mail/control.php
@@ -265,7 +265,7 @@ class mail extends control
                 }
             }
 
-            $this->mail->send($this->post->to, $this->lang->mail->subject, $this->lang->mail->content, "", true);
+            $this->mail->send($this->post->to, $this->lang->mail->testSubject, $this->lang->mail->testContent, "", true);
             if($this->mail->isError())
             {
                 $this->view->error = $this->mail->getError();
diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php
index 06e0cbb305..f497605c91 100755
--- a/module/mail/lang/en.php
+++ b/module/mail/lang/en.php
@@ -42,7 +42,8 @@ $lang->mail->sync       = 'Synchronize';
 $lang->mail->remove     = 'Remove';
 
 $lang->mail->toList      = 'Addressee';
-$lang->mail->subjectName = 'Subject';
+$lang->mail->ccList      = 'Copy to';
+$lang->mail->subject     = 'Subject';
 $lang->mail->addedBy     = 'Sender';
 $lang->mail->addedDate   = 'Added Date';
 $lang->mail->sendTime    = 'Send Date';
@@ -74,8 +75,8 @@ $lang->mail->noticeResend   = 'Sent it again!';
 $lang->mail->inputFromEmail = 'Enter Email Address';
 $lang->mail->nextStep       = 'Next';
 $lang->mail->successSaved   = 'Configuration has been saved.';
-$lang->mail->subject        = 'Testing Email';
-$lang->mail->content        = 'Email configured!';
+$lang->mail->testSubject    = 'Testing Email';
+$lang->mail->testContent    = 'Email configured!';
 $lang->mail->successSended  = 'Sent!';
 $lang->mail->confirmDelete  = 'Do you want to delete it?';
 $lang->mail->sendmailTips   = 'Note: Email author will not receive this email.';
diff --git a/module/mail/lang/zh-cn.php b/module/mail/lang/zh-cn.php
index eac8e03c83..47ea0a204f 100755
--- a/module/mail/lang/zh-cn.php
+++ b/module/mail/lang/zh-cn.php
@@ -42,7 +42,8 @@ $lang->mail->sync       = '同步';
 $lang->mail->remove     = '移除';
 
 $lang->mail->toList      = '收信人';
-$lang->mail->subjectName = '主题';
+$lang->mail->ccList      = '抄送给';
+$lang->mail->subject     = '主题';
 $lang->mail->addedBy     = '发送者';
 $lang->mail->addedDate   = '创建时间';
 $lang->mail->sendTime    = '发送时间';
@@ -74,8 +75,8 @@ $lang->mail->noticeResend   = '已经重新发信！';
 $lang->mail->inputFromEmail = '请输入发信邮箱：';
 $lang->mail->nextStep       = '下一步';
 $lang->mail->successSaved   = '配置信息已经成功保存。';
-$lang->mail->subject        = '测试邮件';
-$lang->mail->content        = '邮箱设置成功';
+$lang->mail->testSubject    = '测试邮件';
+$lang->mail->testContent    = '邮箱设置成功';
 $lang->mail->successSended  = '成功发送！';
 $lang->mail->confirmDelete  = '是否删除邮件？';
 $lang->mail->sendmailTips   = '提示：系统不会为当前操作者发信。';
diff --git a/module/mail/view/browse.html.php b/module/mail/view/browse.html.php
index a5bbd048a4..bd05ea74a5 100644
--- a/module/mail/view/browse.html.php
+++ b/module/mail/view/browse.html.php
@@ -22,7 +22,7 @@
       <tr>
         <th class='w-id'>    <?php common::printOrderLink('id',        $orderBy, $vars, $lang->idAB);?></th>
         <th class='w-80px'>  <?php common::printOrderLink('toList',    $orderBy, $vars, $lang->mail->toList);?></th>
-        <th class='w-150px'> <?php common::printOrderLink('subject',   $orderBy, $vars, $lang->mail->subjectName);?></th>
+        <th class='w-150px'> <?php common::printOrderLink('subject',   $orderBy, $vars, $lang->mail->subject);?></th>
         <th class='w-80px'>  <?php common::printOrderLink('addedBy',   $orderBy, $vars, $lang->mail->addedBy);?></th>
         <th class='w-150px'> <?php common::printOrderLink('addedDate', $orderBy, $vars, $lang->mail->addedDate);?></th>
         <th class='w-150px'> <?php common::printOrderLink('sendTime',  $orderBy, $vars, $lang->mail->sendTime);?></th>
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index bab33a5916..846c1b5a45 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -39,6 +39,7 @@ $lang->productplan->confirmUnlinkBug   = "Do you want to unlink this Bug?";
 
 $lang->productplan->id      = 'ID';
 $lang->productplan->product = $lang->productCommon;
+$lang->productplan->branch  = 'Platform/Branch';
 $lang->productplan->title   = 'Title';
 $lang->productplan->desc    = 'Description';
 $lang->productplan->begin   = 'Begin';
diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php
index be461de55f..a78748b62e 100644
--- a/module/productplan/lang/zh-cn.php
+++ b/module/productplan/lang/zh-cn.php
@@ -39,6 +39,7 @@ $lang->productplan->confirmUnlinkBug   = "您确认移除该Bug吗？";
 
 $lang->productplan->id      = '编号';
 $lang->productplan->product = $lang->productCommon;
+$lang->productplan->branch  = '平台/分支';
 $lang->productplan->title   = '名称';
 $lang->productplan->desc    = '描述';
 $lang->productplan->begin   = '开始日期';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 0aec04f2e9..e4b0628afb 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -51,6 +51,7 @@ $lang->project->mine          = 'My Responsibility: ';
 $lang->project->other         = 'Other:';
 $lang->project->deleted       = 'Deleted';
 $lang->project->delayed       = 'Delayed';
+$lang->project->product       = $lang->project->products;
 
 $lang->project->start    = 'Start';
 $lang->project->activate = 'Activate';
@@ -197,6 +198,7 @@ $lang->project->confirmDelete         = "Do you want to delete {$lang->projectCo
 $lang->project->confirmUnlinkMember   = "Do you want to unlink this User from {$lang->projectCommon}?";
 $lang->project->confirmUnlinkStory    = "Do you want to unlink this Story from {$lang->projectCommon}?";
 $lang->project->errorNoLinkedProducts = "No linked {$lang->productCommon} found in {$lang->projectCommon}. You will be directed to {$lang->productCommon}linked page.";
+$lang->project->errorSameProducts     = "{$lang->projectCommon} cannot be associated with multiple identical {$lang->productCommon}。";
 $lang->project->accessDenied          = "Access to {$lang->projectCommon} denied!";
 $lang->project->tips                  = 'Note';
 $lang->project->afterInfo             = "{$lang->projectCommon} is created. Next you can ";
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index af7309cbbf..2ec73ee143 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -51,6 +51,7 @@ $lang->project->mine          = '我负责：';
 $lang->project->other         = '其他：';
 $lang->project->deleted       = '已删除';
 $lang->project->delayed       = '已延期';
+$lang->project->product       = $lang->project->products;
 
 $lang->project->start    = '开始';
 $lang->project->activate = '激活';
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index fc5a3293b1..71d06752f7 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -31,6 +31,7 @@ $lang->release->basicInfo = 'Basic Info';
 
 $lang->release->id                    = 'ID';
 $lang->release->product               = $lang->productCommon;
+$lang->release->branch                = 'Platform/Branch';
 $lang->release->build                 = 'Build';
 $lang->release->name                  = 'Name';
 $lang->release->date                  = 'Date';
@@ -41,6 +42,7 @@ $lang->release->unlinkStory           = 'Unlink Story';
 $lang->release->unlinkBug             = 'Unlink Bug';
 $lang->release->stories               = 'Finished Story';
 $lang->release->bugs                  = 'Solved Bug';
+$lang->release->leftBugs              = 'Remained Bug';
 $lang->release->generatedBugs         = 'Remained Bug';
 $lang->release->finishStories         = 'Finished %s Story';
 $lang->release->resolvedBugs          = 'Solved %s Bug';
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index 287a5a3777..72e9a6f63e 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -31,6 +31,7 @@ $lang->release->basicInfo = '基本信息';
 
 $lang->release->id                    = 'ID';
 $lang->release->product               = $lang->productCommon;
+$lang->release->branch                = '平台/分支';
 $lang->release->build                 = '版本';
 $lang->release->name                  = '发布名称';
 $lang->release->date                  = '发布日期';
@@ -41,6 +42,7 @@ $lang->release->unlinkStory           = '移除需求';
 $lang->release->unlinkBug             = '移除Bug';
 $lang->release->stories               = '完成的需求';
 $lang->release->bugs                  = '解决的Bug';
+$lang->release->leftBugs              = '遗留的Bug';
 $lang->release->generatedBugs         = '遗留的Bug';
 $lang->release->finishStories         = '本次共完成 %s 个需求';
 $lang->release->resolvedBugs          = '本次共解决 %s 个Bug';
diff --git a/module/search/lang/en.php b/module/search/lang/en.php
index 43cae3d159..4564626295 100644
--- a/module/search/lang/en.php
+++ b/module/search/lang/en.php
@@ -25,6 +25,13 @@ $lang->search->me            = 'Me';
 $lang->search->noQuery       = 'No query saved!';
 $lang->search->onMenuBar     = 'Show in Menu';
 
+$lang->search->account  = 'Account';
+$lang->search->module   = 'Module';
+$lang->search->title    = 'Title';
+$lang->search->form     = 'Form Field';
+$lang->search->sql      = 'SQL Condition';
+$lang->search->shortcut = $lang->search->onMenuBar;
+
 $lang->search->operators['=']          = '=';
 $lang->search->operators['!=']         = '!=';
 $lang->search->operators['>']          = '>';
diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php
index 6da06f6bfd..f0bce24da0 100644
--- a/module/search/lang/zh-cn.php
+++ b/module/search/lang/zh-cn.php
@@ -25,6 +25,13 @@ $lang->search->me            = '自己';
 $lang->search->noQuery       = '还没有保存查询！';
 $lang->search->onMenuBar     = '显示在菜单栏';
 
+$lang->search->account  = '用户名';
+$lang->search->module   = '模块';
+$lang->search->title    = '名称';
+$lang->search->form     = '表单字段';
+$lang->search->sql      = 'SQL条件';
+$lang->search->shortcut = $lang->search->onMenuBar;
+
 $lang->search->operators['=']          = '=';
 $lang->search->operators['!=']         = '!=';
 $lang->search->operators['>']          = '>';
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 029daa62e1..552719118b 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -45,6 +45,8 @@ $lang->testcase->lastRunDate      = 'Run Date';
 $lang->testcase->assignedTo       = 'Assigned To';
 $lang->testcase->colorTag         = 'Color Tag';
 $lang->testcase->lastRunResult    = 'Result';
+$lang->testcase->desc             = 'Step';
+$lang->testcase->expect           = 'Expect';
 $lang->testcase->allProduct       = "All {$lang->productCommon}";
 $lang->testcase->fromBug          = 'From Bug';
 $lang->testcase->toBug            = 'To Bug';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 4e8c47dc89..0c5ff186ab 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -45,6 +45,8 @@ $lang->testcase->lastRunDate      = '执行时间';
 $lang->testcase->assignedTo       = '指派给';
 $lang->testcase->colorTag         = '颜色标签';
 $lang->testcase->lastRunResult    = '结果';
+$lang->testcase->desc             = '步骤';
+$lang->testcase->expect           = '预期';
 $lang->testcase->allProduct       = "所有{$lang->productCommon}";
 $lang->testcase->fromBug          = '来源Bug';
 $lang->testcase->toBug            = '生成Bug';
diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php
index 4ebcb84472..778ce45e56 100644
--- a/module/testreport/lang/en.php
+++ b/module/testreport/lang/en.php
@@ -11,9 +11,12 @@ $lang->testreport->recreate = 'Re-Create';
 $lang->testreport->title       = 'Title';
 $lang->testreport->project     = 'Project';
 $lang->testreport->testtask    = 'Test Build';
+$lang->testreport->tasks       = $lang->testreport->testtask;
 $lang->testreport->startEnd    = 'Start and end';
 $lang->testreport->owner       = 'Owner';
-$lang->testreport->member      = 'Members';
+$lang->testreport->members     = 'Members';
+$lang->testreport->begin       = 'Begin';
+$lang->testreport->end         = 'End';
 $lang->testreport->stories     = 'Stories of Test';
 $lang->testreport->bugs        = 'Bugs';
 $lang->testreport->builds      = 'Build Info';
diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php
index 7597ddd23d..3609073879 100644
--- a/module/testreport/lang/zh-cn.php
+++ b/module/testreport/lang/zh-cn.php
@@ -11,9 +11,12 @@ $lang->testreport->recreate = '重新生成报告';
 $lang->testreport->title       = '标题';
 $lang->testreport->project     = '所属项目';
 $lang->testreport->testtask    = '测试版本';
+$lang->testreport->tasks       = $lang->testreport->testtask;
 $lang->testreport->startEnd    = '起止时间';
 $lang->testreport->owner       = '负责人';
-$lang->testreport->member      = '参与人员';
+$lang->testreport->members     = '参与人员';
+$lang->testreport->begin       = '开始时间';
+$lang->testreport->end         = '结束时间';
 $lang->testreport->stories     = '测试的需求';
 $lang->testreport->bugs        = '测试的Bug';
 $lang->testreport->builds      = '版本信息';
diff --git a/module/testreport/view/create.html.php b/module/testreport/view/create.html.php
index 09fc989768..2cdfd794f0 100644
--- a/module/testreport/view/create.html.php
+++ b/module/testreport/view/create.html.php
@@ -51,7 +51,7 @@
           </td>
         </tr>
         <tr>
-          <th><?php echo $lang->testreport->member?></th>
+          <th><?php echo $lang->testreport->members?></th>
           <td colspan='2'><?php echo html::select('members[]', $users, $members, "class='form-control chosen' multiple")?></td>
         </tr>
         <tr>
diff --git a/module/testreport/view/edit.html.php b/module/testreport/view/edit.html.php
index 66e0cc8de8..5a8f13445a 100644
--- a/module/testreport/view/edit.html.php
+++ b/module/testreport/view/edit.html.php
@@ -46,7 +46,7 @@
           </td>
         </tr>
         <tr>
-          <th><?php echo $lang->testreport->member?></th>
+          <th><?php echo $lang->testreport->members?></th>
           <td colspan='2'><?php echo html::select('members[]', $users, $report->members, "class='form-control chosen' multiple")?></td>
         </tr>
         <tr>
diff --git a/module/testreport/view/view.html.php b/module/testreport/view/view.html.php
index 399f42c535..28d1db3a18 100644
--- a/module/testreport/view/view.html.php
+++ b/module/testreport/view/view.html.php
@@ -71,7 +71,7 @@
             <td><?php echo zget($users, $report->owner);?></td>
           </tr>
           <tr>
-            <th><?php echo $lang->testreport->member?></th>
+            <th><?php echo $lang->testreport->members?></th>
             <td colspan='2'><?php foreach(explode(',', $report->members) as $member)echo zget($users, $member) . ' &nbsp; ';?></td>
           </tr>
           <tr>
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 289a08add0..7c5f2d630c 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -61,6 +61,13 @@ $lang->testtask->lastRunTime    = 'Time';
 $lang->testtask->lastRunResult  = 'Result';
 $lang->testtask->reportField    = 'Report';
 $lang->testtask->files          = 'Upload';
+$lang->testtask->case           = 'Case';
+$lang->testtask->version        = 'Version';
+$lang->testtask->caseResult     = 'Case Result';
+$lang->testtask->stepResults    = 'Step Results';
+$lang->testtask->lastRunner     = 'Last Runner';
+$lang->testtask->lastRunDate    = 'Last RunDate';
+$lang->testtask->date           = 'Date';
 
 $lang->testtask->legendDesc      = 'Desc';
 $lang->testtask->legendReport    = 'Report';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 9ad559d43e..a48b65fced 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -61,6 +61,13 @@ $lang->testtask->lastRunTime    = '执行时间';
 $lang->testtask->lastRunResult  = '结果';
 $lang->testtask->reportField    = '测试总结';
 $lang->testtask->files          = '上传附件';
+$lang->testtask->case           = '用例';
+$lang->testtask->version        = '版本';
+$lang->testtask->caseResult     = '测试结果';
+$lang->testtask->stepResults    = '步骤结果';
+$lang->testtask->lastRunner     = '最后执行人';
+$lang->testtask->lastRunDate    = '最后执行时间';
+$lang->testtask->date           = '测试时间';
 
 $lang->testtask->legendDesc      = '版本描述';
 $lang->testtask->legendReport    = '测试总结';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index a2d1fb6f61..23b29d927e 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -32,6 +32,7 @@ $lang->todo->end         = 'End';
 $lang->todo->beginAB     = 'Begin';
 $lang->todo->endAB       = 'End';
 $lang->todo->beginAndEnd = 'Time Frame';
+$lang->todo->idvalue     = 'Linded ID';
 $lang->todo->type        = 'Type';
 $lang->todo->pri         = 'Priority';
 $lang->todo->name        = 'Name';
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 7ef53a8e1e..3c49f4ca73 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -32,6 +32,7 @@ $lang->todo->end         = '结束';
 $lang->todo->beginAB     = '开始';
 $lang->todo->endAB       = '结束';
 $lang->todo->beginAndEnd = '起止时间';
+$lang->todo->idvalue     = '关联编号';
 $lang->todo->type        = '类型';
 $lang->todo->pri         = '优先级';
 $lang->todo->name        = '名称';
diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php
index 7fc99a02ed..922c6701c2 100644
--- a/module/tree/lang/en.php
+++ b/module/tree/lang/en.php
@@ -42,6 +42,10 @@ $lang->tree->successFixed  = 'Fixed.';
 $lang->tree->repeatName    = 'The name "%s" has existed!';
 
 $lang->tree->name       = 'Name';
+$lang->tree->root       = 'Root';
+$lang->tree->branch     = 'Platform/Branch';
+$lang->tree->path       = 'Path';
+$lang->tree->type       = 'Type';
 $lang->tree->parent     = 'Parent';
 $lang->tree->child      = 'Child';
 $lang->tree->owner      = 'Owner';
diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php
index 4ae7a63213..6fabd33685 100644
--- a/module/tree/lang/zh-cn.php
+++ b/module/tree/lang/zh-cn.php
@@ -42,6 +42,10 @@ $lang->tree->successFixed  = '成功修正数据！';
 $lang->tree->repeatName    = '模块名“%s”已经存在！';
 
 $lang->tree->name       = '模块名称';
+$lang->tree->root       = '所属根';
+$lang->tree->branch     = '平台/分支';
+$lang->tree->path       = '路径';
+$lang->tree->type       = '类型';
 $lang->tree->parent     = '上级模块';
 $lang->tree->child      = '子模块';
 $lang->tree->owner      = '负责人';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 0a7c24d953..b5fed36cdd 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -121,6 +121,12 @@ $lang->user->statusList['delete'] = 'Deleted';
 $lang->user->keepLogin['on']      = 'Keep login';
 $lang->user->loginWithDemoUser    = 'Login as Demo User:';
 
+$lang->user->tpl = new stdclass();
+$lang->user->tpl->type    = 'Type';
+$lang->user->tpl->title   = 'TPL Title';
+$lang->user->tpl->content = 'Content';
+$lang->user->tpl->public  = 'Public';
+
 $lang->user->placeholder = new stdclass();
 $lang->user->placeholder->account   = 'must be contain letters, underline, and numbers,at lease three characters';
 $lang->user->placeholder->password1 = 'must be at lease six characters';
@@ -146,6 +152,7 @@ $lang->user->error->originalPassword = "Old password is incorrect.";
 $lang->user->contacts = new stdclass();
 $lang->user->contacts->common   = 'Contact';
 $lang->user->contacts->listName = 'List Name';
+$lang->user->contacts->userList = 'User List';
 
 $lang->user->contacts->manage        = 'Manage';
 $lang->user->contacts->contactsList  = 'Contacts';
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index 4d219272ac..29107330fa 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -121,6 +121,12 @@ $lang->user->statusList['delete'] = '删除';
 $lang->user->keepLogin['on']      = '保持登录';
 $lang->user->loginWithDemoUser    = '使用demo帐号登录：';
 
+$lang->user->tpl = new stdclass();
+$lang->user->tpl->type    = '类型';
+$lang->user->tpl->title   = '模板名';
+$lang->user->tpl->content = '内容';
+$lang->user->tpl->public  = '是否公开';
+
 $lang->user->placeholder = new stdclass();
 $lang->user->placeholder->account   = '英文、数字和下划线的组合，三位以上';
 $lang->user->placeholder->password1 = '六位以上';
@@ -146,6 +152,7 @@ $lang->user->error->originalPassword = "原密码不正确";
 $lang->user->contacts = new stdclass();
 $lang->user->contacts->common   = '联系人';
 $lang->user->contacts->listName = '列表名称';
+$lang->user->contacts->userList = '用户列表';
 
 $lang->user->contacts->manage        = '维护列表';
 $lang->user->contacts->contactsList  = '已有列表';