diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 3eccd994f4..a1a1e823dc 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -11,19 +11,24 @@
  */
 global $config;
 
-$lang->action->common     = 'Log';
-$lang->action->product    = $lang->productCommon;
-$lang->action->project    = 'Project';
-$lang->action->execution  = $lang->executionCommon;
-$lang->action->objectType = 'Object Type';
-$lang->action->objectID   = 'ID';
-$lang->action->objectName = 'Object Name';
-$lang->action->actor      = 'User';
-$lang->action->action     = 'Action';
-$lang->action->actionID   = 'Action ID';
-$lang->action->date       = 'Date';
-$lang->action->extra      = 'Extra';
-$lang->action->system     = 'System';
+$lang->action->common      = 'Log';
+$lang->action->id          = 'ID';
+$lang->action->product     = $lang->productCommon;
+$lang->action->project     = 'Project';
+$lang->action->execution   = $lang->executionCommon;
+$lang->action->objectType  = 'Object Type';
+$lang->action->objectID    = 'ID';
+$lang->action->objectName  = 'Object Name';
+$lang->action->actor       = 'User';
+$lang->action->action      = 'Action';
+$lang->action->actionID    = 'Action ID';
+$lang->action->date        = 'Date';
+$lang->action->extra       = 'Extra';
+$lang->action->system      = 'System';
+$lang->action->url         = 'URL';
+$lang->action->contentType = 'Content Type';
+$lang->action->data        = 'Data';
+$lang->action->result      = 'Result';
 
 $lang->action->trash       = 'Recycle';
 $lang->action->undelete    = 'Restore';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 37a184818e..eada01b40c 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -11,19 +11,24 @@
  */
 global $config;
 
-$lang->action->common     = '系统日志';
-$lang->action->product    = $lang->productCommon;
-$lang->action->project    = '项目';
-$lang->action->execution  = $lang->executionCommon;
-$lang->action->objectType = '对象类型';
-$lang->action->objectID   = '对象ID';
-$lang->action->objectName = '对象名称';
-$lang->action->actor      = '操作者';
-$lang->action->action     = '动作';
-$lang->action->actionID   = '记录ID';
-$lang->action->date       = '日期';
-$lang->action->extra      = '附加值';
-$lang->action->system     = '系统';
+$lang->action->common      = '系统日志';
+$lang->action->id          = '编号';
+$lang->action->product     = $lang->productCommon;
+$lang->action->project     = '项目';
+$lang->action->execution   = $lang->executionCommon;
+$lang->action->objectType  = '对象类型';
+$lang->action->objectID    = '对象ID';
+$lang->action->objectName  = '对象名称';
+$lang->action->actor       = '操作者';
+$lang->action->action      = '动作';
+$lang->action->actionID    = '记录ID';
+$lang->action->date        = '日期';
+$lang->action->extra       = '附加值';
+$lang->action->system      = '系统';
+$lang->action->url         = '网址';
+$lang->action->contentType = '内容类型';
+$lang->action->data        = '数据';
+$lang->action->result      = '结果';
 
 $lang->action->trash       = '回收站';
 $lang->action->undelete    = '还原';
diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index ac3e8e0f6d..49b5678f4c 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -76,10 +76,6 @@ $lang->block->selectProduct       = 'Product selection';
 $lang->block->of                  = ' von ';
 $lang->block->remain              = 'Left';
 
-$lang->block->params = new stdclass();
-$lang->block->params->name  = 'Name';
-$lang->block->params->value = 'Wert';
-
 $lang->block->createBlock        = 'InfoBlock erstellen';
 $lang->block->editBlock          = 'Bearbeiten';
 $lang->block->ordersSaved        = 'Sortierung gespeichert.';
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 94c0c643e7..44689051f1 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -12,6 +12,8 @@
 global $config;
 $lang->block = new stdclass();
 $lang->block->common     = 'Block';
+$lang->block->id         = 'ID';
+$lang->block->params     = 'Params';
 $lang->block->name       = 'Name';
 $lang->block->style      = 'Style';
 $lang->block->grid       = 'Position';
@@ -76,10 +78,6 @@ $lang->block->selectProduct       = 'Product selection';
 $lang->block->of                  = ' of ';
 $lang->block->remain              = 'Left';
 
-$lang->block->params = new stdclass();
-$lang->block->params->name  = 'Name';
-$lang->block->params->value = 'Value';
-
 $lang->block->createBlock        = 'Add Block';
 $lang->block->editBlock          = 'Edit Block';
 $lang->block->ordersSaved        = 'The order is saved.';
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index 74c3a19073..1b47a8ce94 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -76,10 +76,6 @@ $lang->block->selectProduct       = 'Product selection';
 $lang->block->of                  = ' di ';
 $lang->block->remain              = 'Left';
 
-$lang->block->params = new stdclass();
-$lang->block->params->name  = 'Nom';
-$lang->block->params->value = 'Valeur';
-
 $lang->block->createBlock        = 'Ajouter Bloc';
 $lang->block->editBlock          = 'Editer Bloc';
 $lang->block->ordersSaved        = 'L´ordre a été sauvegardé.';
diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php
index 9d90a89d26..37202953eb 100644
--- a/module/block/lang/vi.php
+++ b/module/block/lang/vi.php
@@ -76,10 +76,6 @@ $lang->block->selectProduct       = 'Product selection';
 $lang->block->of                  = ' thực ';
 $lang->block->remain              = 'Left';
 
-$lang->block->params = new stdclass();
-$lang->block->params->name  = 'Tên';
-$lang->block->params->value = 'Giá trị';
-
 $lang->block->createBlock        = 'Thêm Block';
 $lang->block->editBlock          = 'Sửa Block';
 $lang->block->ordersSaved        = 'Thứ tự đã được lưu';
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 232bdf7348..dbd8e2ed9f 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -12,6 +12,8 @@
 global $config;
 $lang->block = new stdclass();
 $lang->block->common     = '区块';
+$lang->block->id         = '编号';
+$lang->block->params     = '参数';
 $lang->block->name       = '区块名称';
 $lang->block->style      = '外观';
 $lang->block->grid       = '位置';
@@ -76,10 +78,6 @@ $lang->block->selectProduct       = '选择产品';
 $lang->block->of                  = '的';
 $lang->block->remain              = '剩余工时';
 
-$lang->block->params = new stdclass();
-$lang->block->params->name  = '参数名称';
-$lang->block->params->value = '参数值';
-
 $lang->block->createBlock        = '添加区块';
 $lang->block->editBlock          = '编辑区块';
 $lang->block->ordersSaved        = '排序已保存';
diff --git a/module/company/lang/en.php b/module/company/lang/en.php
index b8b23f5fed..d054a3f82d 100644
--- a/module/company/lang/en.php
+++ b/module/company/lang/en.php
@@ -18,6 +18,7 @@ $lang->company->browse   = "User List";
 $lang->company->dynamic  = "Dynamics";
 $lang->company->orgView  = 'View';
 
+$lang->company->id       = 'ID';
 $lang->company->name     = 'Company Name';
 $lang->company->phone    = 'Phone';
 $lang->company->fax      = 'Fax';
@@ -27,6 +28,7 @@ $lang->company->website  = 'Website';
 $lang->company->backyard = 'Intranet';
 $lang->company->guest    = 'Guest Login';
 $lang->company->admins   = 'Administrator';
+$lang->company->deleted  = 'Deleted';
 
 $lang->company->product   = $lang->productCommon;
 $lang->company->project   = 'Project';
diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php
index 75e63a4bb1..83ad80071b 100644
--- a/module/company/lang/zh-cn.php
+++ b/module/company/lang/zh-cn.php
@@ -18,6 +18,7 @@ $lang->company->browse   = "用户列表";
 $lang->company->dynamic  = "组织动态";
 $lang->company->orgView  = '组织视图';
 
+$lang->company->id       = '编号';
 $lang->company->name     = '公司名称';
 $lang->company->phone    = '联系电话';
 $lang->company->fax      = '传真';
@@ -27,6 +28,7 @@ $lang->company->website  = '官网';
 $lang->company->backyard = '内网';
 $lang->company->guest    = '匿名登录';
 $lang->company->admins   = '管理员';
+$lang->company->deleted  = '已删除';
 
 $lang->company->product   = $lang->productCommon;
 $lang->company->project   = '项目';
diff --git a/module/compile/lang/en.php b/module/compile/lang/en.php
index be4fc2ac57..29518d7211 100644
--- a/module/compile/lang/en.php
+++ b/module/compile/lang/en.php
@@ -3,13 +3,23 @@ $lang->compile->common = 'Compile';
 $lang->compile->browse = 'History';
 $lang->compile->logs   = 'Log';
 
-$lang->compile->id        = 'ID';
-$lang->compile->name      = 'Name';
-$lang->compile->buildType = 'Engine';
-$lang->compile->status    = 'Status';
-$lang->compile->time      = 'Time';
-$lang->compile->result    = 'Result';
-$lang->compile->refresh   = 'Refresh';
+$lang->compile->id          = 'ID';
+$lang->compile->name        = 'Name';
+$lang->compile->buildType   = 'Engine';
+$lang->compile->status      = 'Status';
+$lang->compile->time        = 'Time';
+$lang->compile->result      = 'Result';
+$lang->compile->refresh     = 'Refresh';
+$lang->compile->job         = 'Job';
+$lang->compile->queue       = 'Queue';
+$lang->compile->atTime      = 'Execution Time';
+$lang->compile->testtask    = 'Testtask';
+$lang->compile->tag         = 'Tag';
+$lang->compile->times       = 'Times';
+$lang->compile->createdBy   = 'Created By';
+$lang->compile->createdDate = 'Created Date';
+$lang->compile->updateDate  = 'Update Date';
+$lang->compile->deleted     = 'Deleted';
 
 $lang->compile->statusList['success']     = 'Done';
 $lang->compile->statusList['failure']     = 'Failed';
diff --git a/module/compile/lang/zh-cn.php b/module/compile/lang/zh-cn.php
index c4bb5800ad..a8d16ef69a 100644
--- a/module/compile/lang/zh-cn.php
+++ b/module/compile/lang/zh-cn.php
@@ -3,13 +3,23 @@ $lang->compile->common = '构建';
 $lang->compile->browse = '构建历史';
 $lang->compile->logs   = '构建日志';
 
-$lang->compile->id        = 'ID';
-$lang->compile->name      = '构建名称';
-$lang->compile->buildType = '构建引擎';
-$lang->compile->status    = '构建状态';
-$lang->compile->time      = '构建时间';
-$lang->compile->result    = '构建结果';
-$lang->compile->refresh   = '刷新';
+$lang->compile->id          = 'ID';
+$lang->compile->name        = '构建名称';
+$lang->compile->buildType   = '构建引擎';
+$lang->compile->status      = '构建状态';
+$lang->compile->time        = '构建时间';
+$lang->compile->result      = '构建结果';
+$lang->compile->refresh     = '刷新';
+$lang->compile->job         = '构建任务';
+$lang->compile->queue       = '队列';
+$lang->compile->atTime      = '执行时间';
+$lang->compile->testtask    = '测试单';
+$lang->compile->tag         = '标签';
+$lang->compile->times       = '次数';
+$lang->compile->createdBy   = '由谁创建';
+$lang->compile->createdDate = '创建日期';
+$lang->compile->updateDate  = '编辑日期';
+$lang->compile->deleted     = '已删除';
 
 $lang->compile->statusList['success']     = '成功';
 $lang->compile->statusList['failure']     = '失败';
diff --git a/module/cron/lang/en.php b/module/cron/lang/en.php
index 0c7bcbe171..77712ef146 100644
--- a/module/cron/lang/en.php
+++ b/module/cron/lang/en.php
@@ -1,5 +1,7 @@
 <?php
 $lang->cron->common       = 'Cron';
+$lang->cron->id           = 'ID';
+$lang->cron->buildin      = 'Build In';
 $lang->cron->index        = 'Cron Home';
 $lang->cron->list         = 'Task';
 $lang->cron->create       = 'Add';
diff --git a/module/cron/lang/zh-cn.php b/module/cron/lang/zh-cn.php
index c7919b7a71..b407a22114 100644
--- a/module/cron/lang/zh-cn.php
+++ b/module/cron/lang/zh-cn.php
@@ -1,5 +1,7 @@
 <?php
 $lang->cron->common       = '定时任务';
+$lang->cron->id           = '编号';
+$lang->cron->buildin      = '内置';
 $lang->cron->index        = '首页';
 $lang->cron->list         = '任务列表';
 $lang->cron->create       = '添加';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 562bde2fd0..a13260bc9c 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -2,6 +2,7 @@
 global $config;
 
 $lang->custom->common               = 'Custom';
+$lang->custom->ID                   = 'ID';
 $lang->custom->index                = 'Home';
 $lang->custom->set                  = 'Customize';
 $lang->custom->restore              = 'Reset';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 4e41e05db9..a2aea410d8 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -2,6 +2,7 @@
 global $config;
 
 $lang->custom->common               = '自定义';
+$lang->custom->id                   = '编号';
 $lang->custom->index                = '首页';
 $lang->custom->set                  = '自定义配置';
 $lang->custom->restore              = '恢复默认';
diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php
index 793a3e878e..a0e7a707a3 100644
--- a/module/dept/lang/en.php
+++ b/module/dept/lang/en.php
@@ -10,6 +10,9 @@
  * @link        http://www.zentao.net
  */
 $lang->dept->common      = 'Department';
+$lang->dept->id          = 'ID';
+$lang->dept->path        = 'Path';
+$lang->dept->position    = 'Position';
 $lang->dept->manageChild = "Child Department";
 $lang->dept->edit        = "Edit Department";
 $lang->dept->delete      = "Delete Department";
diff --git a/module/dept/lang/zh-cn.php b/module/dept/lang/zh-cn.php
index 4e710b3df3..3073c19e25 100644
--- a/module/dept/lang/zh-cn.php
+++ b/module/dept/lang/zh-cn.php
@@ -10,6 +10,9 @@
  * @link        http://www.zentao.net
  */
 $lang->dept->common      = '部门结构';
+$lang->dept->id          = '编号';
+$lang->dept->path        = '路径';
+$lang->dept->position    = '职位';
 $lang->dept->manageChild = "下级部门";
 $lang->dept->edit        = "编辑部门";
 $lang->dept->delete      = "删除部门";
diff --git a/module/dev/config.php b/module/dev/config.php
index 21520f3856..dea5424e27 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -104,6 +104,7 @@ $config->dev->tableMap['doclib']         = 'doc';
 $config->dev->tableMap['grouppriv']      = 'group';
 $config->dev->tableMap['usercontact']    = 'user-contacts';
 $config->dev->tableMap['usergroup']      = 'user';
+$config->dev->tableMap['userview']       = 'user';
 $config->dev->tableMap['userquery']      = 'search';
 $config->dev->tableMap['usertpl']        = 'user-tpl';
 $config->dev->tableMap['history']        = 'action-history';
@@ -114,7 +115,10 @@ $config->dev->tableMap['suitecase']      = 'testcase';
 $config->dev->tableMap['repofiles']      = 'repo';
 $config->dev->tableMap['repohistory']    = 'repo';
 $config->dev->tableMap['repobranch']     = 'repo';
+$config->dev->tableMap['log']            = 'action';
 $config->dev->tableMap['searchindex']    = 'search';
+$config->dev->tableMap['searchdict']     = 'search';
+$config->dev->tableMap['testtask']       = 'testreport';
 
 $config->dev->postParams['story']['create']['product']       = 'int';
 $config->dev->postParams['story']['create']['title']         = 'string';
diff --git a/module/dev/model.php b/module/dev/model.php
index e953d61897..70220ae941 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -39,11 +39,12 @@ class devModel extends model
     {
         $module      = substr($table, strpos($table, '_') + 1);
         $aliasModule = $subLang = '';
+        $this->app->loadLang($module);
         try
         {
             if(isset($this->config->dev->tableMap[$module])) $aliasModule = $this->config->dev->tableMap[$module];
             if(strpos($aliasModule, '-') !== false) list($aliasModule, $subLang) = explode('-', $aliasModule);
-            if(empty($aliasModule) and strpos($module, 'im_') === false) $this->app->loadLang($aliasModule ? $aliasModule : $module);
+            if(!empty($aliasModule) and strpos($module, 'im_') === false) $this->app->loadLang($aliasModule);
         }
         catch(PDOException $e)
         {
@@ -69,7 +70,7 @@ 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((empty($field['name']) or !is_string($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;
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index fff3f5d5a4..b282541b4b 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -53,6 +53,12 @@ $lang->doc->searchResult = 'Search Result';
 $lang->doc->mailto       = 'Mailto';
 $lang->doc->noModule     = 'No document in this lib, please create it';
 $lang->doc->noChapter    = 'No chapters or articles in this book. Please add chapters and articles.';
+$lang->doc->views        = 'Views';
+$lang->doc->draft        = 'Draft';
+$lang->doc->collector    = 'Collector';
+$lang->doc->main         = 'Main Document Library';
+$lang->doc->order        = 'Order';
+$lang->doc->doc          = 'Document';
 
 $lang->doc->moduleDoc     = 'By Module';
 $lang->doc->searchDoc     = 'Search';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 7bc3bb78c2..cda43d8ffc 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -53,6 +53,12 @@ $lang->doc->searchResult = '搜索结果';
 $lang->doc->mailto       = '抄送给';
 $lang->doc->noModule     = '文档库下没有目录和文档，请维护目录或者创建文档';
 $lang->doc->noChapter    = '手册下没有章节和文章，请维护手册';
+$lang->doc->views        = '浏览次数';
+$lang->doc->draft        = '草稿';
+$lang->doc->collector    = '收藏者';
+$lang->doc->main         = '文档主库';
+$lang->doc->order        = '排序';
+$lang->doc->doc          = '文档';
 
 $lang->doc->moduleDoc     = '按模块浏览';
 $lang->doc->searchDoc     = '搜索';
diff --git a/module/entry/lang/en.php b/module/entry/lang/en.php
index 20eab19a62..bb2d95049f 100644
--- a/module/entry/lang/en.php
+++ b/module/entry/lang/en.php
@@ -26,6 +26,9 @@ $lang->entry->editedby    = 'EditedBy';
 $lang->entry->editedDate  = 'EditedDate';
 $lang->entry->date        = 'Requesting Time';
 $lang->entry->url         = 'Requesting URL';
+$lang->entry->calledTime  = 'Called Time';
+$lang->entry->editedBy    = 'Edited By';
+$lang->entry->deleted     = 'Deleted';
 
 $lang->entry->confirmDelete = 'Do you want to delete this entry?';
 $lang->entry->help          = 'Help';
diff --git a/module/entry/lang/zh-cn.php b/module/entry/lang/zh-cn.php
index de4b94ebda..ad31b6e210 100644
--- a/module/entry/lang/zh-cn.php
+++ b/module/entry/lang/zh-cn.php
@@ -26,6 +26,9 @@ $lang->entry->editedby    = '最后编辑';
 $lang->entry->editedDate  = '编辑时间';
 $lang->entry->date        = '请求时间';
 $lang->entry->url         = '请求地址';
+$lang->entry->calledTime  = '调用时间';
+$lang->entry->editedBy    = '由谁编辑';
+$lang->entry->deleted     = '已删除';
 
 $lang->entry->confirmDelete = '您确认要删除该应用吗？';
 $lang->entry->help          = '使用说明';
diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php
index dc72128b44..f71276b187 100644
--- a/module/extension/lang/en.php
+++ b/module/extension/lang/en.php
@@ -10,6 +10,7 @@
  * @link        http://www.zentao.net
  */
 $lang->extension->common           = 'Extension';
+$lang->extension->id               = 'ID';
 $lang->extension->browse           = 'Extensions';
 $lang->extension->install          = 'Install Extension';
 $lang->extension->installAuto      = 'Auto Installation';
diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php
index 164c06497d..483c43346f 100644
--- a/module/extension/lang/zh-cn.php
+++ b/module/extension/lang/zh-cn.php
@@ -10,6 +10,7 @@
  * @link        http://www.zentao.net
  */
 $lang->extension->common           = '插件管理';
+$lang->extension->id               = '编号';
 $lang->extension->browse           = '浏览插件';
 $lang->extension->install          = '安装插件';
 $lang->extension->installAuto      = '自动安装';
diff --git a/module/file/lang/en.php b/module/file/lang/en.php
index 0ad4e896ff..d48da55706 100644
--- a/module/file/lang/en.php
+++ b/module/file/lang/en.php
@@ -11,6 +11,10 @@
  */
 $lang->file = new stdclass();
 $lang->file->common        = 'File';
+$lang->file->id            = 'ID';
+$lang->file->objectType    = 'Object Type';
+$lang->file->objectID      = 'Object ID';
+$lang->file->deleted       = 'Deleted';
 $lang->file->uploadImages  = 'Batch Upload Images';
 $lang->file->download      = 'Download Files';
 $lang->file->uploadDate    = 'Uploaded';
diff --git a/module/file/lang/zh-cn.php b/module/file/lang/zh-cn.php
index 366b670688..31112ac912 100644
--- a/module/file/lang/zh-cn.php
+++ b/module/file/lang/zh-cn.php
@@ -11,6 +11,10 @@
  */
 $lang->file = new stdclass();
 $lang->file->common        = '附件';
+$lang->file->id            = '编号';
+$lang->file->objectType    = '对象类型';
+$lang->file->objectID      = '对象ID';
+$lang->file->deleted       = '已删除';
 $lang->file->uploadImages  = '多图上传';
 $lang->file->download      = '下载附件';
 $lang->file->uploadDate    = '上传时间：';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index 042d097e76..fa19545744 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -34,6 +34,8 @@ $lang->group->dynamic            = 'Access Dynamics';
 $lang->group->noticeVisit        = 'Blank means no access limit.';
 $lang->group->noneProgram        = "No Program";
 $lang->group->noneProduct        = "No {$lang->productCommon}";
+$lang->group->project            = 'Project';
+$lang->group->group              = 'Group';
 
 global $config;
 if($config->systemMode == 'new') $lang->group->noneProject = 'No Project';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index a4f88bdbed..d4ff79136a 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -34,6 +34,8 @@ $lang->group->dynamic            = '可查看动态';
 $lang->group->noticeVisit        = '空代表没有访问限制';
 $lang->group->noneProgram        = "暂时没有项目集";
 $lang->group->noneProduct        = "暂时没有{$lang->productCommon}";
+$lang->group->project            = '项目';
+$lang->group->group              = '分组';
 
 global $config;
 if($config->systemMode == 'new') $lang->group->noneProject = '暂时没有项目';
diff --git a/module/job/lang/en.php b/module/job/lang/en.php
index 8ed24b504a..17c4b011a6 100644
--- a/module/job/lang/en.php
+++ b/module/job/lang/en.php
@@ -38,6 +38,12 @@ $lang->job->customParam = 'Custom build parameters';
 $lang->job->paramName   = 'Name';
 $lang->job->paramValue  = 'Value';
 $lang->job->custom      = 'Custom';
+$lang->job->createdBy   = 'Created By';
+$lang->job->createdDate = 'Created Date';
+$lang->job->editedBy    = 'Edited By';
+$lang->job->editedDate  = 'Edited Date';
+$lang->job->lastTag     = 'Last Tag';
+$lang->job->deleted     = 'Deleted';
 
 $lang->job->lblBasic = 'Basic Info';
 
diff --git a/module/job/lang/zh-cn.php b/module/job/lang/zh-cn.php
index d95c034f77..efcca21100 100644
--- a/module/job/lang/zh-cn.php
+++ b/module/job/lang/zh-cn.php
@@ -38,6 +38,12 @@ $lang->job->customParam = '自定义构建参数';
 $lang->job->paramName   = '名称';
 $lang->job->paramValue  = '值';
 $lang->job->custom      = '自定义';
+$lang->job->createdBy   = '由谁创建';
+$lang->job->createdDate = '创建日期';
+$lang->job->editedBy    = '由谁编辑';
+$lang->job->editedDate  = '编辑日期';
+$lang->job->lastTag     = '最后标签';
+$lang->job->deleted     = '已删除';
 
 $lang->job->lblBasic = '基本信息';
 
diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php
index dfd6d50b88..da7c51712f 100644
--- a/module/repo/lang/en.php
+++ b/module/repo/lang/en.php
@@ -19,6 +19,10 @@ $lang->repo->deleteBug       = 'Delete Bug';
 $lang->repo->addComment      = 'Add Comment';
 $lang->repo->editComment     = 'Edit Comment';
 $lang->repo->deleteComment   = 'Delete Comment';
+$lang->repo->encrypt         = 'Encrypt';
+$lang->repo->repo            = 'Repository';
+$lang->repo->parent          = 'Parent File';
+$lang->repo->branch          = 'Branch';
 
 $lang->repo->browseAction    = 'Browse Repo';
 $lang->repo->createAction    = 'Create Repo';
diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php
index 31a702cf54..76ae2272b8 100644
--- a/module/repo/lang/zh-cn.php
+++ b/module/repo/lang/zh-cn.php
@@ -19,6 +19,10 @@ $lang->repo->deleteBug       = '删除评审';
 $lang->repo->addComment      = '添加备注';
 $lang->repo->editComment     = '编辑备注';
 $lang->repo->deleteComment   = '删除备注';
+$lang->repo->encrypt         = '加密方式';
+$lang->repo->repo            = '代码库';
+$lang->repo->parent          = '父文件夹';
+$lang->repo->branch          = '分支';
 
 $lang->repo->browseAction    = '浏览版本库';
 $lang->repo->createAction    = '创建版本库';
diff --git a/module/search/lang/en.php b/module/search/lang/en.php
index 0ee2b29838..14e0710118 100644
--- a/module/search/lang/en.php
+++ b/module/search/lang/en.php
@@ -10,6 +10,10 @@
  * @link        http://www.zentao.net
  */
 $lang->search->common        = 'Search';
+$lang->search->id            = 'ID';
+$lang->search->editedDate    = 'Edited Date';
+$lang->search->key           = 'Key';
+$lang->search->value         = 'Value';
 $lang->search->reset         = 'Reset';
 $lang->search->saveQuery     = 'Save Query';
 $lang->search->myQuery       = 'My Query';
diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php
index 180076618f..5ec2f1b0ca 100644
--- a/module/search/lang/zh-cn.php
+++ b/module/search/lang/zh-cn.php
@@ -10,6 +10,10 @@
  * @link        http://www.zentao.net
  */
 $lang->search->common        = '搜索';
+$lang->search->id            = '编号';
+$lang->search->editedDate    = '编辑时间';
+$lang->search->key           = '键';
+$lang->search->value         = '值';
 $lang->search->reset         = '重置';
 $lang->search->saveQuery     = '保存查询';
 $lang->search->myQuery       = '我的查询';
diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php
index b2168ca7e7..14dcbc879e 100644
--- a/module/testreport/lang/en.php
+++ b/module/testreport/lang/en.php
@@ -1,5 +1,6 @@
 <?php
 $lang->testreport->common       = 'Testing Report';
+$lang->testreport->id           = 'ID';
 $lang->testreport->browse       = 'Testing Reports';
 $lang->testreport->create       = 'Create Report';
 $lang->testreport->edit         = 'Edit Report';
diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php
index 9f2cfad8ea..6e609e0107 100644
--- a/module/testreport/lang/zh-cn.php
+++ b/module/testreport/lang/zh-cn.php
@@ -1,5 +1,6 @@
 <?php
 $lang->testreport->common       = '测试报告';
+$lang->testreport->id           = '编号';
 $lang->testreport->browse       = '报告列表';
 $lang->testreport->create       = '创建报告';
 $lang->testreport->edit         = '编辑报告';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index d0353b173d..b664c40091 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -47,6 +47,12 @@ $lang->testtask->all              = "All " . $lang->productCommon . "s";
 $lang->testtask->allTasks         = 'All Requests';
 $lang->testtask->collapseAll      = 'Collapse';
 $lang->testtask->expandAll        = 'Expand';
+$lang->testtask->auto             = 'Test Automation Tasks';
+$lang->testtask->task             = 'Test Task';
+$lang->testtask->run              = 'Test Run ID';
+$lang->testtask->job              = 'Job';
+$lang->testtask->compile          = 'Compile';
+$lang->testtask->duration         = 'Duration';
 
 $lang->testtask->viewAction     = "View Request";
 $lang->testtask->casesAction    = 'View Case';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 81e431816c..055299fde0 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -47,6 +47,12 @@ $lang->testtask->all              = "全部" . $lang->productCommon;
 $lang->testtask->allTasks         = '所有测试';
 $lang->testtask->collapseAll      = '全部折叠';
 $lang->testtask->expandAll        = '全部展开';
+$lang->testtask->auto             = '自动化';
+$lang->testtask->task             = '测试单';
+$lang->testtask->run              = '执行编号';
+$lang->testtask->job              = '构建任务';
+$lang->testtask->compile          = '构建';
+$lang->testtask->duration         = '持续时间';
 
 $lang->testtask->viewAction     = "测试单概况";
 $lang->testtask->casesAction    = '查看用例';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index a69c3f2f51..615a392c1b 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -57,6 +57,21 @@ $lang->user->cropAvatar       = 'Crop Avatar';
 $lang->user->cropAvatarTip    = 'Drag and drop the box to crop the image.';
 $lang->user->cropImageTip     = 'The image is too small. The recommended image size is at least 48x48. The current image size is %s';
 $lang->user->captcha          = 'Captcha';
+$lang->user->avatar           = 'Avatar';
+$lang->user->birthday         = 'Birthday';
+$lang->user->nature           = 'Nature';
+$lang->user->analysis         = 'Analysis';
+$lang->user->strategy         = 'Strategy';
+$lang->user->fails            = 'number of failures';
+$lang->user->locked           = 'Lock Time';
+$lang->user->scoreLevel       = 'Score Level';
+$lang->user->clientStatus     = 'Client Status';
+$lang->user->clientLang       = 'Client Language';
+$lang->user->programs         = 'Program';
+$lang->user->products         = $lang->productCommon;
+$lang->user->projects         = 'Project';
+$lang->user->sprints          = $lang->execution->common;
+$lang->user->identity         = 'Identity';
 
 $lang->user->legendBasic        = 'Basic Information';
 $lang->user->legendContribution = 'Contribution';
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index 80c40eb083..2c4e33c843 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -57,6 +57,21 @@ $lang->user->cropAvatar       = '剪切头像';
 $lang->user->cropAvatarTip    = '拖拽选框来选择头像剪切范围';
 $lang->user->cropImageTip     = '所使用的头像图片过小，建议图片大小至少为 48x48，当前图片大小为 %s';
 $lang->user->captcha          = '验证码';
+$lang->user->avatar           = '用户头像';
+$lang->user->birthday         = '生日';
+$lang->user->nature           = '性格特征';
+$lang->user->analysis         = '影响分析';
+$lang->user->strategy         = '应对策略';
+$lang->user->fails            = '失败次数';
+$lang->user->locked           = '锁住日期';
+$lang->user->scoreLevel       = '积分等级';
+$lang->user->clientStatus     = '登录状态';
+$lang->user->clientLang       = '客户端语言';
+$lang->user->programs         = '项目集';
+$lang->user->products         = $lang->productCommon;
+$lang->user->projects         = '项目';
+$lang->user->sprints          = $lang->execution->common;
+$lang->user->identity         = '身份';
 
 $lang->user->legendBasic        = '基本资料';
 $lang->user->legendContribution = '个人贡献';
diff --git a/module/webhook/lang/en.php b/module/webhook/lang/en.php
index 4feed17a3b..4f86f4403c 100644
--- a/module/webhook/lang/en.php
+++ b/module/webhook/lang/en.php
@@ -36,6 +36,11 @@ $lang->webhook->editedDate  = 'EditedDate';
 $lang->webhook->date        = 'Sent';
 $lang->webhook->data        = 'Data';
 $lang->webhook->result      = 'Result';
+$lang->webhook->products    = $lang->productCommon;
+$lang->webhook->executions  = $lang->execution->common;
+$lang->webhook->actions     = 'Log';
+$lang->webhook->editedBy    = 'Edited By';
+$lang->webhook->deleted     = 'Deleted';
 
 $lang->webhook->typeList['']            = '';
 $lang->webhook->typeList['dinggroup']   = 'Dingding Robot';
diff --git a/module/webhook/lang/zh-cn.php b/module/webhook/lang/zh-cn.php
index 986e3e66dc..b79ad11ec7 100644
--- a/module/webhook/lang/zh-cn.php
+++ b/module/webhook/lang/zh-cn.php
@@ -36,6 +36,11 @@ $lang->webhook->editedDate  = '编辑时间';
 $lang->webhook->date        = '发送时间';
 $lang->webhook->data        = '数据';
 $lang->webhook->result      = '结果';
+$lang->webhook->products    = $lang->productCommon;
+$lang->webhook->executions  = $lang->execution->common;
+$lang->webhook->actions     = '系统日志';
+$lang->webhook->editedBy    = '由谁编辑';
+$lang->webhook->deleted     = '已删除';
 
 $lang->webhook->typeList['']            = '';
 $lang->webhook->typeList['dinggroup']   = '钉钉群通知机器人';