From 23922ac9179ceba04869ab7127965c0972e90b63 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 10 Jul 2019 12:15:19 +0800
Subject: [PATCH]  * finish task #5993.

---
 framework/router.class.php             |   9 +-
 module/admin/lang/en.php               |   1 +
 module/admin/lang/zh-cn.php            |   1 +
 module/backup/lang/en.php              |   6 +-
 module/branch/lang/en.php              |   2 +-
 module/branch/lang/zh-cn.php           |   2 +-
 module/bug/lang/en.php                 |  12 ++-
 module/bug/lang/zh-cn.php              |   9 ++
 module/build/lang/en.php               |   2 +-
 module/company/lang/en.php             |   2 +-
 module/cron/lang/en.php                |  20 ++--
 module/cron/lang/zh-cn.php             |  20 ++--
 module/cron/view/create.html.php       |   2 +-
 module/dept/lang/en.php                |   8 +-
 module/doc/lang/en.php                 |   5 +-
 module/doc/lang/zh-cn.php              |   3 +-
 module/extension/lang/en.php           |  36 ++++---
 module/extension/lang/zh-cn.php        |  34 ++++---
 module/file/lang/en.php                |   2 +-
 module/group/lang/resource.php         | 131 ++++++++++++-------------
 module/mail/lang/en.php                |   6 +-
 module/mail/lang/zh-cn.php             |   4 +
 module/product/lang/en.php             |  43 ++++----
 module/product/lang/zh-cn.php          |  41 ++++----
 module/productplan/lang/en.php         |   2 +-
 module/project/lang/en.php             |  16 ++-
 module/project/lang/zh-cn.php          |  12 +++
 module/release/lang/en.php             |   4 +-
 module/report/lang/en.php              |   4 +-
 module/report/lang/zh-cn.php           |   2 +-
 module/search/lang/en.php              |   2 +-
 module/search/lang/zh-cn.php           |   2 +-
 module/story/lang/en.php               |  77 ++++++++-------
 module/story/lang/zh-cn.php            |   1 +
 module/task/lang/en.php                |  10 +-
 module/task/lang/zh-cn.php             |  10 +-
 module/testcase/lang/en.php            |   9 +-
 module/testcase/lang/zh-cn.php         |   7 +-
 module/testreport/lang/en.php          |  17 ++--
 module/testreport/lang/zh-cn.php       |  17 ++--
 module/testsuite/lang/en.php           |  12 ++-
 module/testsuite/lang/zh-cn.php        |   2 +
 module/testsuite/view/library.html.php |   2 +-
 module/testsuite/view/libview.html.php |   2 +-
 module/testtask/lang/en.php            |  12 ++-
 module/testtask/lang/zh-cn.php         |   8 +-
 module/todo/lang/en.php                |  18 ++--
 module/todo/lang/zh-cn.php             |  10 +-
 module/translate/lang/en.php           |   5 +-
 module/translate/lang/zh-cn.php        |   3 +-
 module/tree/lang/en.php                |   8 +-
 module/tree/lang/zh-cn.php             |   4 +-
 module/user/lang/en.php                |  82 ++++++++--------
 53 files changed, 442 insertions(+), 319 deletions(-)

diff --git a/framework/router.class.php b/framework/router.class.php
index b45829ea7c..eaf72e96b1 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -47,9 +47,12 @@ class router extends baseRouter
      */
     public function setClientLang($lang = '')
     {
-        $langs = $this->dbh->query('SELECT value FROM' . TABLE_CONFIG . "WHERE `owner`='system' AND `module`='common' AND `section`='global' AND `key`='langs'")->fetch();
-        $langs = empty($langs) ? array() : json_decode($langs->value, true);
-        foreach($langs as $langKey => $langData) $this->config->langs[$langKey] = $langData['name'];
+        if($this->dbh)
+        {
+            $langs = $this->dbh->query('SELECT value FROM' . TABLE_CONFIG . "WHERE `owner`='system' AND `module`='common' AND `section`='global' AND `key`='langs'")->fetch();
+            $langs = empty($langs) ? array() : json_decode($langs->value, true);
+            foreach($langs as $langKey => $langData) $this->config->langs[$langKey] = $langData['name'];
+        }
         return parent::setClientLang($lang);
     }
 
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index db747ddf00..0e05bcb64a 100644
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -13,6 +13,7 @@ $lang->admin->common        = 'Admin';
 $lang->admin->index         = 'Admin Home';
 $lang->admin->checkDB       = 'Check Database';
 $lang->admin->sso           = 'Zdoo';
+$lang->admin->ssoAction     = 'Link Zdoo';
 $lang->admin->safeIndex     = 'Security';
 $lang->admin->checkWeak     = 'Check Weak Password';
 $lang->admin->certifyMobile = 'Verify your cellphone';
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index 8f1bb46a58..d5765300d1 100644
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -13,6 +13,7 @@ $lang->admin->common        = '后台管理';
 $lang->admin->index         = '后台管理首页';
 $lang->admin->checkDB       = '检查数据库';
 $lang->admin->sso           = '然之集成';
+$lang->admin->ssoAction     = '然之集成';
 $lang->admin->safeIndex     = '安全';
 $lang->admin->checkWeak     = '弱口令检查';
 $lang->admin->certifyMobile = '认证手机';
diff --git a/module/backup/lang/en.php b/module/backup/lang/en.php
index d3bc95fea2..0e181605d3 100644
--- a/module/backup/lang/en.php
+++ b/module/backup/lang/en.php
@@ -1,9 +1,9 @@
 <?php
 $lang->backup->common      = 'Backup';
-$lang->backup->index       = 'Home';
+$lang->backup->index       = 'Backup Home';
 $lang->backup->history     = 'History';
-$lang->backup->delete      = 'Delete';
-$lang->backup->backup      = 'BackUp';
+$lang->backup->delete      = 'Delete Backup';
+$lang->backup->backup      = 'Backup';
 $lang->backup->restore     = 'Restore';
 $lang->backup->change      = 'Edit Expiration';
 $lang->backup->changeAB    = 'Edit';
diff --git a/module/branch/lang/en.php b/module/branch/lang/en.php
index eb3443e2bc..28c10e3862 100644
--- a/module/branch/lang/en.php
+++ b/module/branch/lang/en.php
@@ -1,7 +1,7 @@
 <?php
 $lang->branch->common = 'Branch';
 $lang->branch->manage = 'Manage Branch';
-$lang->branch->sort   = 'Order';
+$lang->branch->sort   = 'Rank Branch';
 $lang->branch->delete = 'Delete Branch';
 $lang->branch->add    = 'Add';
 
diff --git a/module/branch/lang/zh-cn.php b/module/branch/lang/zh-cn.php
index 2de28a09d4..3051ad8c11 100644
--- a/module/branch/lang/zh-cn.php
+++ b/module/branch/lang/zh-cn.php
@@ -1,7 +1,7 @@
 <?php
 $lang->branch->common = '分支';
 $lang->branch->manage = '分支管理';
-$lang->branch->sort   = '排序';
+$lang->branch->sort   = '分支排序';
 $lang->branch->delete = '分支删除';
 $lang->branch->add    = '添加';
 
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index b076d65b42..6a32ecc44f 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -74,10 +74,11 @@ $lang->bug->toCase           = 'To Case';
 $lang->bug->colorTag         = 'Color';
 
 /* 方法列表。*/
-$lang->bug->index              = 'Home';
+$lang->bug->index              = 'Bug Home';
 $lang->bug->create             = 'Report Bug';
 $lang->bug->batchCreate        = 'Batch Report';
 $lang->bug->confirmBug         = 'Confirm';
+$lang->bug->confirmAction      = 'Confirm Bug';
 $lang->bug->batchConfirm       = 'Batch Confirm';
 $lang->bug->edit               = 'Edit Bug';
 $lang->bug->batchEdit          = 'Batch Edit';
@@ -85,17 +86,24 @@ $lang->bug->batchChangeModule  = 'Batch Edit Module';
 $lang->bug->batchChangeBranch  = 'Batch Edit Branch';
 $lang->bug->batchClose         = 'Batch Close';
 $lang->bug->assignTo           = 'Assign';
+$lang->bug->assignAction       = 'Assign Bug';
 $lang->bug->batchAssignTo      = 'Batch Assign';
 $lang->bug->browse             = 'Bug List';
 $lang->bug->view               = 'Bug Detail';
-$lang->bug->resolve            = 'Resolve Bug';
+$lang->bug->resolve            = 'Resolve';
+$lang->bug->resolveAction      = 'Resolve Bug';
 $lang->bug->batchResolve       = 'Batch Resolve';
 $lang->bug->close              = 'Close';
+$lang->bug->closeAction        = 'Close Bug';
 $lang->bug->activate           = 'Activate';
+$lang->bug->activateAction     = 'Activate Bug';
 $lang->bug->batchActivate      = 'Batch Activate';
 $lang->bug->reportChart        = 'Report';
+$lang->bug->reportAction       = 'Bug Report';
 $lang->bug->export             = 'Export Data';
+$lang->bug->exportAction       = 'Export Bug';
 $lang->bug->delete             = 'Delete';
+$lang->bug->deleteAction       = 'Delete Bug';
 $lang->bug->deleted            = 'Deleted';
 $lang->bug->confirmStoryChange = 'Confirm Story Change';
 $lang->bug->copy               = 'Copy';
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 1149bafb6c..9b9521a6fb 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -39,6 +39,7 @@ $lang->bug->toTask           = '转任务';
 $lang->bug->toStory          = '转需求';
 $lang->bug->mailto           = '抄送给';
 $lang->bug->openedBy         = '由谁创建';
+$lang->bug->openedByAB       = '创建者';
 $lang->bug->openedDate       = '创建日期';
 $lang->bug->openedDateAB     = '创建日期';
 $lang->bug->openedBuild      = '影响版本';
@@ -77,6 +78,7 @@ $lang->bug->index              = '首页';
 $lang->bug->create             = '提Bug';
 $lang->bug->batchCreate        = '批量提Bug';
 $lang->bug->confirmBug         = '确认';
+$lang->bug->confirmAction      = '确认Bug';
 $lang->bug->batchConfirm       = '批量确认';
 $lang->bug->edit               = '编辑';
 $lang->bug->batchEdit          = '批量编辑';
@@ -84,17 +86,24 @@ $lang->bug->batchChangeModule  = '批量修改模块';
 $lang->bug->batchChangeBranch  = '批量修改分支';
 $lang->bug->batchClose         = '批量关闭';
 $lang->bug->assignTo           = '指派';
+$lang->bug->assignAction       = '指派Bug';
 $lang->bug->batchAssignTo      = '批量指派';
 $lang->bug->browse             = 'Bug列表';
 $lang->bug->view               = 'Bug详情';
 $lang->bug->resolve            = '解决';
+$lang->bug->resolveAction      = '解决Bug';
 $lang->bug->batchResolve       = '批量解决';
 $lang->bug->close              = '关闭';
+$lang->bug->closeAction        = '关闭Bug';
 $lang->bug->activate           = '激活';
+$lang->bug->activateAction     = '激活Bug';
 $lang->bug->batchActivate      = '批量激活';
 $lang->bug->reportChart        = '报表统计';
+$lang->bug->reportAction       = 'Bug报表统计';
 $lang->bug->export             = '导出数据';
+$lang->bug->exportAction       = '导出Bug';
 $lang->bug->delete             = '删除';
+$lang->bug->deleteAction       = '删除Bug';
 $lang->bug->deleted            = '已删除';
 $lang->bug->confirmStoryChange = '确认需求变动';
 $lang->bug->copy               = '复制Bug';
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index d2529c8dec..083938f73c 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -16,7 +16,7 @@ $lang->build->linkStory        = "Link Story";
 $lang->build->linkBug          = "Link Bug";
 $lang->build->delete           = "Delete Build";
 $lang->build->deleted          = "Deleted";
-$lang->build->view             = "Detail";
+$lang->build->view             = "Build Detail";
 $lang->build->batchUnlink      = 'Batch Unlink';
 $lang->build->batchUnlinkStory = 'Batch Unlink Stories';
 $lang->build->batchUnlinkBug   = 'Batch Unlink Bugs';
diff --git a/module/company/lang/en.php b/module/company/lang/en.php
index 8e62a5315f..69d87eb5cc 100644
--- a/module/company/lang/en.php
+++ b/module/company/lang/en.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 $lang->company->common   = 'Company';
-$lang->company->index    = "Home";
+$lang->company->index    = "Company Home";
 $lang->company->edit     = "Edit Company";
 $lang->company->view     = "Company Information";
 $lang->company->browse   = "User List";
diff --git a/module/cron/lang/en.php b/module/cron/lang/en.php
index 65ec9601ed..752cd1be57 100644
--- a/module/cron/lang/en.php
+++ b/module/cron/lang/en.php
@@ -1,13 +1,15 @@
 <?php
-$lang->cron->common      = 'Cron';
-$lang->cron->index       = 'Home';
-$lang->cron->list        = 'Task';
-$lang->cron->create      = 'Add';
-$lang->cron->edit        = 'Edit';
-$lang->cron->delete      = 'Delete';
-$lang->cron->toggle      = 'Activate/Deactivate';
-$lang->cron->turnon      = 'On/Off';
-$lang->cron->openProcess = 'Restart';
+$lang->cron->common       = 'Cron';
+$lang->cron->index        = 'Cron Home';
+$lang->cron->list         = 'Task';
+$lang->cron->create       = 'Add';
+$lang->cron->createAction = 'Add Cron';
+$lang->cron->edit         = 'Edit Cron';
+$lang->cron->delete       = 'Delete Cron';
+$lang->cron->toggle       = 'Activate/Deactivate';
+$lang->cron->turnon       = 'On/Off';
+$lang->cron->openProcess  = 'Restart';
+$lang->cron->restart      = 'Restart Cron';
 
 $lang->cron->m        = 'Minute';
 $lang->cron->h        = 'Hour';
diff --git a/module/cron/lang/zh-cn.php b/module/cron/lang/zh-cn.php
index a769b15faf..fc09b80e08 100644
--- a/module/cron/lang/zh-cn.php
+++ b/module/cron/lang/zh-cn.php
@@ -1,13 +1,15 @@
 <?php
-$lang->cron->common      = '计划任务';
-$lang->cron->index       = '首页';
-$lang->cron->list        = '任务列表';
-$lang->cron->create      = '添加';
-$lang->cron->edit        = '编辑';
-$lang->cron->delete      = '删除';
-$lang->cron->toggle      = '激活/禁用';
-$lang->cron->turnon      = '打开/关闭';
-$lang->cron->openProcess = '重启';
+$lang->cron->common       = '计划任务';
+$lang->cron->index        = '首页';
+$lang->cron->list         = '任务列表';
+$lang->cron->create       = '添加';
+$lang->cron->createAction = '添加任务';
+$lang->cron->edit         = '编辑任务';
+$lang->cron->delete       = '删除任务';
+$lang->cron->toggle       = '激活/禁用';
+$lang->cron->turnon       = '打开/关闭';
+$lang->cron->openProcess  = '重启';
+$lang->cron->restart      = '重启计划任务';
 
 $lang->cron->m        = '分';
 $lang->cron->h        = '小时';
diff --git a/module/cron/view/create.html.php b/module/cron/view/create.html.php
index 687ca7afba..758b2df01b 100644
--- a/module/cron/view/create.html.php
+++ b/module/cron/view/create.html.php
@@ -27,7 +27,7 @@
         <tr>
           <th><?php echo $lang->cron->m;?></th>
           <td><?php echo html::input('m', '', "class='form-control'")?></td>
-          <td><?php echo $lang->cron->notice->m;?></td><td></td>
+          <td colspan='2'><?php echo $lang->cron->notice->m;?></td>
         </tr>
         <tr>
           <th><?php echo $lang->cron->h;?></th>
diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php
index 8266b57b8e..902528e1c4 100644
--- a/module/dept/lang/en.php
+++ b/module/dept/lang/en.php
@@ -11,14 +11,14 @@
  */
 $lang->dept->common      = 'Department';
 $lang->dept->manageChild = "Child Department";
-$lang->dept->edit        = "Edit";
-$lang->dept->delete      = "Delete";
+$lang->dept->edit        = "Edit Department";
+$lang->dept->delete      = "Delete Department";
 $lang->dept->parent      = "Parent Dept";
 $lang->dept->manager     = "Manager";
 $lang->dept->name        = "Department Name";
-$lang->dept->browse      = "Manage";
+$lang->dept->browse      = "Manage Department";
 $lang->dept->manage      = "Manage Department";
-$lang->dept->updateOrder = "Order";
+$lang->dept->updateOrder = "Order Department";
 $lang->dept->add         = "Add Department";
 $lang->dept->dragAndSort = "Drag to order";
 
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index f93ab2a6bf..53427c2112 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -67,11 +67,12 @@ $lang->doc->myCollection   = 'My Favorites';
 $lang->doc->index            = 'Document Home';
 $lang->doc->create           = 'Create Document';
 $lang->doc->edit             = 'Edit Document';
-$lang->doc->delete           = 'Delete';
+$lang->doc->delete           = 'Delete Document';
 $lang->doc->browse           = 'Document List';
 $lang->doc->view             = 'Document Detail';
 $lang->doc->diff             = 'Diff';
-$lang->doc->sort             = 'Order';
+$lang->doc->diffAction       = 'Diff Document';
+$lang->doc->sort             = 'Order Document';
 $lang->doc->manageType       = 'Manage Category';
 $lang->doc->editType         = 'Edit';
 $lang->doc->deleteType       = 'Delete';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 9304bfbf11..79d5ffaa37 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -71,7 +71,8 @@ $lang->doc->delete           = '删除文档';
 $lang->doc->browse           = '文档列表';
 $lang->doc->view             = '文档详情';
 $lang->doc->diff             = '对比';
-$lang->doc->sort             = '排序';
+$lang->doc->diffAction       = '对比文档';
+$lang->doc->sort             = '文档排序';
 $lang->doc->manageType       = '维护分类';
 $lang->doc->editType         = '编辑分类';
 $lang->doc->deleteType       = '删除分类';
diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php
index e545fd8cde..ae7cf230b6 100644
--- a/module/extension/lang/en.php
+++ b/module/extension/lang/en.php
@@ -9,23 +9,27 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
-$lang->extension->common        = 'Extension';
-$lang->extension->browse        = 'Extensions';
-$lang->extension->install       = 'Install';
-$lang->extension->installAuto   = 'Auto Installation';
-$lang->extension->installForce  = 'Force Installation';
-$lang->extension->uninstall     = 'Uninstall';
-$lang->extension->activate      = 'Activate';
-$lang->extension->deactivate    = 'Deactivate';
-$lang->extension->obtain        = 'Get Extension';
-$lang->extension->view          = 'Detail';
-$lang->extension->downloadAB    = 'Download';
-$lang->extension->upload        = 'Local Installation';
-$lang->extension->erase         = 'Erase';
-$lang->extension->upgrade       = 'Upgrade Extension';
-$lang->extension->agreeLicense  = 'I agree to the license.';
+$lang->extension->common           = 'Extension';
+$lang->extension->browse           = 'Extensions';
+$lang->extension->install          = 'Install Extension';
+$lang->extension->installAuto      = 'Auto Installation';
+$lang->extension->installForce     = 'Force Installation';
+$lang->extension->uninstall        = 'Uninstall';
+$lang->extension->uninstallAction  = 'Uninstall Extension';
+$lang->extension->activate         = 'Activate';
+$lang->extension->activateAction   = 'Activate Extension';
+$lang->extension->deactivate       = 'Deactivate';
+$lang->extension->deactivateAction = 'Deactivate Extension';
+$lang->extension->obtain           = 'Get Extension';
+$lang->extension->view             = 'Detail';
+$lang->extension->downloadAB       = 'Download';
+$lang->extension->upload           = 'Local Installation';
+$lang->extension->erase            = 'Erase';
+$lang->extension->eraseAction      = 'Erase Extension';
+$lang->extension->upgrade          = 'Upgrade Extension';
+$lang->extension->agreeLicense     = 'I agree to the license.';
 
-$lang->extension->structure   = 'Structure';
+$lang->extension->structure   = 'Extension Structure';
 $lang->extension->installed   = 'Installed';
 $lang->extension->deactivated = 'Deactivated';
 $lang->extension->available   = 'Downloaded';
diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php
index f6f37944e8..ce7f62468d 100644
--- a/module/extension/lang/zh-cn.php
+++ b/module/extension/lang/zh-cn.php
@@ -9,21 +9,25 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
-$lang->extension->common        = '插件管理';
-$lang->extension->browse        = '浏览插件';
-$lang->extension->install       = '安装插件';
-$lang->extension->installAuto   = '自动安装';
-$lang->extension->installForce  = '强制安装';
-$lang->extension->uninstall     = '卸载';
-$lang->extension->activate      = '激活';
-$lang->extension->deactivate    = '禁用';
-$lang->extension->obtain        = '获得插件';
-$lang->extension->view          = '详情';
-$lang->extension->downloadAB    = '下载';
-$lang->extension->upload        = '本地安装';
-$lang->extension->erase         = '清除';
-$lang->extension->upgrade       = '升级插件';
-$lang->extension->agreeLicense  = '我同意该授权';
+$lang->extension->common           = '插件管理';
+$lang->extension->browse           = '浏览插件';
+$lang->extension->install          = '安装插件';
+$lang->extension->installAuto      = '自动安装';
+$lang->extension->installForce     = '强制安装';
+$lang->extension->uninstall        = '卸载';
+$lang->extension->uninstallAction  = '卸载插件';
+$lang->extension->activate         = '激活';
+$lang->extension->activateAction   = '激活插件';
+$lang->extension->deactivate       = '禁用';
+$lang->extension->deactivateAction = '禁用插件';
+$lang->extension->obtain           = '获得插件';
+$lang->extension->view             = '详情';
+$lang->extension->downloadAB       = '下载';
+$lang->extension->upload           = '本地安装';
+$lang->extension->erase            = '清除';
+$lang->extension->eraseAction      = '清除插件';
+$lang->extension->upgrade          = '升级插件';
+$lang->extension->agreeLicense     = '我同意该授权';
 
 $lang->extension->structure   = '目录结构';
 $lang->extension->installed   = '已安装';
diff --git a/module/file/lang/en.php b/module/file/lang/en.php
index 1f1e7d5679..c3a893817e 100644
--- a/module/file/lang/en.php
+++ b/module/file/lang/en.php
@@ -14,7 +14,7 @@ $lang->file->common        = 'File';
 $lang->file->uploadImages  = 'Batch Upload Images';
 $lang->file->download      = 'Download Files';
 $lang->file->uploadDate    = 'Uploaded';
-$lang->file->edit          = 'Rename';
+$lang->file->edit          = 'File Rename';
 $lang->file->inputFileName = 'Enter File Name';
 $lang->file->delete        = 'Delete File';
 $lang->file->label         = 'Label:';
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 732650f512..08abfa0e6f 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -152,11 +152,11 @@ $lang->resource->product->roadmap     = 'roadmap';
 $lang->resource->product->doc         = 'doc';
 $lang->resource->product->dynamic     = 'dynamic';
 $lang->resource->product->project     = 'project';
-$lang->resource->product->close       = 'close';
-$lang->resource->product->updateOrder = 'updateOrder';
+$lang->resource->product->close       = 'closeAction';
+$lang->resource->product->updateOrder = 'orderAction';
 $lang->resource->product->all         = 'all';
 $lang->resource->product->build       = 'build';
-$lang->resource->product->export      = 'export';
+$lang->resource->product->export      = 'exportAction';
 
 $lang->product->methodOrder[0]  = 'index';
 $lang->product->methodOrder[5]  = 'browse';
@@ -192,21 +192,21 @@ $lang->resource->story->batchCreate = 'batchCreate';
 $lang->resource->story->edit        = 'edit';
 $lang->resource->story->linkStory   = 'linkStory';
 $lang->resource->story->batchEdit   = 'batchEdit';
-$lang->resource->story->export      = 'export';
-$lang->resource->story->delete      = 'delete';
+$lang->resource->story->export      = 'exportAction';
+$lang->resource->story->delete      = 'deleteAction';
 $lang->resource->story->view        = 'view';
 $lang->resource->story->change      = 'changeAction';
-$lang->resource->story->review      = 'lblReview';
+$lang->resource->story->review      = 'reviewAction';
 $lang->resource->story->batchReview = 'batchReview';
-$lang->resource->story->assignTo    = 'assignTo';
+$lang->resource->story->assignTo    = 'assignAction';
 $lang->resource->story->close       = 'closeAction';
 $lang->resource->story->batchClose  = 'batchClose';
-$lang->resource->story->activate    = 'lblActivate';
+$lang->resource->story->activate    = 'activateAction';
 $lang->resource->story->tasks       = 'tasks';
 $lang->resource->story->bugs        = 'bugs';
 $lang->resource->story->cases       = 'cases';
 $lang->resource->story->zeroCase    = 'zeroCase';
-$lang->resource->story->report      = 'reportChart';
+$lang->resource->story->report      = 'reportAction';
 $lang->resource->story->batchChangePlan   = 'batchChangePlan';
 $lang->resource->story->batchChangeBranch = 'batchChangeBranch';
 $lang->resource->story->batchChangeStage  = 'batchChangeStage';
@@ -304,11 +304,11 @@ $lang->resource->project->browse            = 'browse';
 $lang->resource->project->create            = 'create';
 $lang->resource->project->edit              = 'edit';
 $lang->resource->project->batchedit         = 'batchEdit';
-$lang->resource->project->start             = 'start';
-$lang->resource->project->activate          = 'activate';
-$lang->resource->project->putoff            = 'putoff';
-$lang->resource->project->suspend           = 'suspend';
-$lang->resource->project->close             = 'close';
+$lang->resource->project->start             = 'startAction';
+$lang->resource->project->activate          = 'activateAction';
+$lang->resource->project->putoff            = 'delayAction';
+$lang->resource->project->suspend           = 'suspendAction';
+$lang->resource->project->close             = 'closeAction';
 $lang->resource->project->delete            = 'delete';
 $lang->resource->project->task              = 'task';
 $lang->resource->project->grouptask         = 'groupTask';
@@ -317,13 +317,13 @@ $lang->resource->project->importplanstories = 'importPlanStories';
 $lang->resource->project->importBug         = 'importBug';
 $lang->resource->project->story             = 'story';
 $lang->resource->project->build             = 'build';
-$lang->resource->project->testtask          = 'testtask';
+$lang->resource->project->testtask          = 'testtaskAction';
 $lang->resource->project->bug               = 'bug';
 $lang->resource->project->burn              = 'burn';
-$lang->resource->project->computeBurn       = 'computeBurn';
+$lang->resource->project->computeBurn       = 'computeBurnAction';
 $lang->resource->project->fixFirst          = 'fixFirst';
 $lang->resource->project->burnData          = 'burnData';
-$lang->resource->project->team              = 'team';
+$lang->resource->project->team              = 'teamAction';
 $lang->resource->project->doc               = 'doc';
 $lang->resource->project->dynamic           = 'dynamic';
 $lang->resource->project->manageProducts    = 'manageProducts';
@@ -334,15 +334,15 @@ $lang->resource->project->linkStory         = 'linkStory';
 $lang->resource->project->unlinkStory       = 'unlinkStory';
 $lang->resource->project->batchUnlinkStory  = 'batchUnlinkStory';
 $lang->resource->project->updateOrder       = 'updateOrder';
-$lang->resource->project->kanban            = 'kanban';
-$lang->resource->project->printKanban       = 'printKanban';
-$lang->resource->project->tree              = 'tree';
+$lang->resource->project->kanban            = 'kanbanAction';
+$lang->resource->project->printKanban       = 'printKanbanAction';
+$lang->resource->project->tree              = 'treeAction';
 $lang->resource->project->treeTask          = 'treeOnlyTask';
 $lang->resource->project->treeStory         = 'treeOnlyStory';
 $lang->resource->project->all               = 'allProjects';
 $lang->resource->project->kanbanHideCols    = 'kanbanHideCols';
 $lang->resource->project->kanbanColsColor   = 'kanbanColsColor';
-$lang->resource->project->export            = 'export';
+$lang->resource->project->export            = 'exportAction';
 $lang->resource->project->storyKanban       = 'storyKanban';
 $lang->resource->project->storySort         = 'storySort';
 
@@ -383,12 +383,12 @@ $lang->project->methodOrder[165] = 'batchUnlinkStory';
 $lang->project->methodOrder[170] = 'updateOrder';
 $lang->project->methodOrder[175] = 'kanban';
 $lang->project->methodOrder[180] = 'printKanban';
-$lang->project->methodOrder[185] = 'tree';
-$lang->project->methodOrder[190] = 'tree';
+$lang->project->methodOrder[185] = 'kanbanHideCols';
+$lang->project->methodOrder[190] = 'kanbanColsColor';
 $lang->project->methodOrder[195] = 'tree';
-$lang->project->methodOrder[200] = 'all';
-$lang->project->methodOrder[205] = 'kanbanHideCols';
-$lang->project->methodOrder[210] = 'kanbanColsColor';
+$lang->project->methodOrder[200] = 'treeTask';
+$lang->project->methodOrder[205] = 'treeStory';
+$lang->project->methodOrder[210] = 'all';
 $lang->project->methodOrder[215] = 'export';
 $lang->project->methodOrder[220] = 'storyKanban';
 $lang->project->methodOrder[225] = 'storySort';
@@ -397,13 +397,13 @@ $lang->project->methodOrder[225] = 'storySort';
 $lang->resource->task = new stdclass();
 $lang->resource->task->create             = 'create';
 $lang->resource->task->edit               = 'edit';
-$lang->resource->task->assignTo           = 'assign';
-$lang->resource->task->start              = 'start';
-$lang->resource->task->pause              = 'pause';
-$lang->resource->task->restart            = 'restart';
+$lang->resource->task->assignTo           = 'assignAction';
+$lang->resource->task->start              = 'startAction';
+$lang->resource->task->pause              = 'pauseAction';
+$lang->resource->task->restart            = 'restartAction';
 $lang->resource->task->finish             = 'finishAction';
-$lang->resource->task->cancel             = 'cancel';
-$lang->resource->task->close              = 'close';
+$lang->resource->task->cancel             = 'cancelAction';
+$lang->resource->task->close              = 'closeAction';
 $lang->resource->task->batchCreate        = 'batchCreate';
 $lang->resource->task->batchEdit          = 'batchEdit';
 $lang->resource->task->batchClose         = 'batchClose';
@@ -411,9 +411,9 @@ $lang->resource->task->batchCancel        = 'batchCancel';
 $lang->resource->task->batchAssignTo      = 'batchAssignTo';
 $lang->resource->task->batchChangeModule  = 'batchChangeModule';
 $lang->resource->task->activate           = 'activateAction';
-$lang->resource->task->delete             = 'delete';
+$lang->resource->task->delete             = 'deleteAction';
 $lang->resource->task->view               = 'view';
-$lang->resource->task->export             = 'export';
+$lang->resource->task->export             = 'exportAction';
 $lang->resource->task->confirmStoryChange = 'confirmStoryChange';
 $lang->resource->task->recordEstimate     = 'recordEstimate';
 $lang->resource->task->editEstimate       = 'editEstimate';
@@ -480,24 +480,24 @@ $lang->resource->bug->index              = 'index';
 $lang->resource->bug->browse             = 'browse';
 $lang->resource->bug->create             = 'create';
 $lang->resource->bug->batchCreate        = 'batchCreate';
-$lang->resource->bug->confirmBug         = 'confirmBug';
+$lang->resource->bug->confirmBug         = 'confirmAction';
 $lang->resource->bug->batchConfirm       = 'batchConfirm';
 $lang->resource->bug->view               = 'view';
 $lang->resource->bug->edit               = 'edit';
 $lang->resource->bug->linkBugs           = 'linkBugs';
 $lang->resource->bug->batchEdit          = 'batchEdit';
 $lang->resource->bug->batchClose         = 'batchClose';
-$lang->resource->bug->assignTo           = 'assignTo';
+$lang->resource->bug->assignTo           = 'assignAction';
 $lang->resource->bug->batchAssignTo      = 'batchAssignTo';
-$lang->resource->bug->resolve            = 'resolve';
+$lang->resource->bug->resolve            = 'resolveAction';
 $lang->resource->bug->batchResolve       = 'batchResolve';
-$lang->resource->bug->activate           = 'activate';
+$lang->resource->bug->activate           = 'activateAction';
 $lang->resource->bug->batchActivate      = 'batchActivate';
-$lang->resource->bug->close              = 'close';
-$lang->resource->bug->report             = 'reportChart';
-$lang->resource->bug->export             = 'export';
+$lang->resource->bug->close              = 'closeAction';
+$lang->resource->bug->report             = 'reportAction';
+$lang->resource->bug->export             = 'exportAction';
 $lang->resource->bug->confirmStoryChange = 'confirmStoryChange';
-$lang->resource->bug->delete             = 'delete';
+$lang->resource->bug->delete             = 'deleteAction';
 $lang->resource->bug->batchChangeModule  = 'batchChangeModule';
 $lang->resource->bug->batchChangeBranch  = 'batchChangeBranch';
 
@@ -538,11 +538,11 @@ $lang->resource->testcase->view               = 'view';
 $lang->resource->testcase->edit               = 'edit';
 $lang->resource->testcase->linkCases          = 'linkCases';
 $lang->resource->testcase->batchEdit          = 'batchEdit';
-$lang->resource->testcase->delete             = 'delete';
+$lang->resource->testcase->delete             = 'deleteAction';
 $lang->resource->testcase->batchDelete        = 'batchDelete';
-$lang->resource->testcase->export             = 'export';
+$lang->resource->testcase->export             = 'exportAction';
 $lang->resource->testcase->exportTemplet      = 'exportTemplet';
-$lang->resource->testcase->import             = 'import';
+$lang->resource->testcase->import             = 'importAction';
 $lang->resource->testcase->showImport         = 'showImport';
 $lang->resource->testcase->confirmChange      = 'confirmChange';
 $lang->resource->testcase->confirmStoryChange = 'confirmStoryChange';
@@ -590,20 +590,19 @@ $lang->resource->testtask->view             = 'view';
 $lang->resource->testtask->cases            = 'cases';
 $lang->resource->testtask->groupCase        = 'groupCase';
 $lang->resource->testtask->edit             = 'edit';
-$lang->resource->testtask->start            = 'start';
-$lang->resource->testtask->close            = 'close';
+$lang->resource->testtask->start            = 'startAction';
+$lang->resource->testtask->close            = 'closeAction';
 $lang->resource->testtask->delete           = 'delete';
 $lang->resource->testtask->batchAssign      = 'batchAssign';
 $lang->resource->testtask->linkcase         = 'linkCase';
 $lang->resource->testtask->unlinkcase       = 'lblUnlinkCase';
 $lang->resource->testtask->batchUnlinkCases = 'batchUnlinkCases';
 $lang->resource->testtask->runcase          = 'lblRunCase';
-$lang->resource->testtask->results          = 'lblResults';
-$lang->resource->testtask->results          = 'lblResults';
+$lang->resource->testtask->results          = 'resultsAction';
 $lang->resource->testtask->batchRun         = 'batchRun';
-$lang->resource->testtask->activate         = 'activate';
-$lang->resource->testtask->block            = 'block';
-$lang->resource->testtask->report           = 'reportChart';
+$lang->resource->testtask->activate         = 'activateAction';
+$lang->resource->testtask->block            = 'blockAction';
+$lang->resource->testtask->report           = 'reportAction';
 
 $lang->testtask->methodOrder[0]  = 'index';
 $lang->testtask->methodOrder[5]  = 'create';
@@ -646,7 +645,7 @@ $lang->resource->testsuite->view             = 'view';
 $lang->resource->testsuite->edit             = 'edit';
 $lang->resource->testsuite->delete           = 'delete';
 $lang->resource->testsuite->linkCase         = 'linkCase';
-$lang->resource->testsuite->unlinkCase       = 'unlinkCase';
+$lang->resource->testsuite->unlinkCase       = 'unlinkCaseAction';
 $lang->resource->testsuite->batchUnlinkCases = 'batchUnlinkCases';
 
 $lang->testsuite->methodOrder[0]  = 'index';
@@ -667,7 +666,7 @@ $lang->resource->caselib->createCase       = 'createCase';
 $lang->resource->caselib->libView          = 'libView';
 $lang->resource->caselib->batchCreateCase  = 'batchCreateCase';
 $lang->resource->caselib->exportTemplet    = 'exportTemplet';
-$lang->resource->caselib->import           = 'import';
+$lang->resource->caselib->import           = 'importAction';
 $lang->resource->caselib->showImport       = 'showImport';
 
 $lang->caselib->methodOrder[0]  = 'library';
@@ -717,14 +716,14 @@ $lang->doc->methodOrder[65] = 'collect';
 /* mail. */
 $lang->resource->mail = new stdclass();
 $lang->resource->mail->index  = 'index';
-$lang->resource->mail->detect = 'detect';
+$lang->resource->mail->detect = 'detectAction';
 $lang->resource->mail->edit   = 'edit';
-$lang->resource->mail->save   = 'save';
+$lang->resource->mail->save   = 'saveAction';
 $lang->resource->mail->test   = 'test';
-$lang->resource->mail->reset  = 'reset';
+$lang->resource->mail->reset  = 'resetAction';
 $lang->resource->mail->browse = 'browse';
 $lang->resource->mail->delete = 'delete';
-$lang->resource->mail->resend = 'resend';
+$lang->resource->mail->resend = 'resendAction';
 $lang->resource->mail->batchDelete   = 'batchDelete';
 $lang->resource->mail->sendCloud     = 'sendCloud';
 $lang->resource->mail->sendcloudUser = 'sendcloudUser';
@@ -920,7 +919,7 @@ $lang->resource->admin->index     = 'index';
 $lang->resource->admin->checkDB   = 'checkDB';
 $lang->resource->admin->safe      = 'safeIndex';
 $lang->resource->admin->checkWeak = 'checkWeak';
-$lang->resource->admin->sso       = 'sso';
+$lang->resource->admin->sso       = 'ssoAction';
 
 $lang->admin->methodOrder[0]  = 'index';
 $lang->admin->methodOrder[5]  = 'checkDB';
@@ -934,11 +933,11 @@ $lang->resource->extension->browse     = 'browse';
 $lang->resource->extension->obtain     = 'obtain';
 $lang->resource->extension->structure  = 'structure';
 $lang->resource->extension->install    = 'install';
-$lang->resource->extension->uninstall  = 'uninstall';
-$lang->resource->extension->activate   = 'activate';
-$lang->resource->extension->deactivate = 'deactivate';
+$lang->resource->extension->uninstall  = 'uninstallAction';
+$lang->resource->extension->activate   = 'activateAction';
+$lang->resource->extension->deactivate = 'deactivateAction';
 $lang->resource->extension->upload     = 'upload';
-$lang->resource->extension->erase      = 'erase';
+$lang->resource->extension->erase      = 'eraseAction';
 $lang->resource->extension->upgrade    = 'upgrade';
 
 $lang->extension->methodOrder[5]  = 'browse';
@@ -1047,11 +1046,11 @@ $lang->backup->methodOrder[30] = 'rmPHPHeader';
 $lang->resource->cron = new stdclass();
 $lang->resource->cron->index   = 'index';
 $lang->resource->cron->turnon  = 'turnon';
-$lang->resource->cron->create  = 'create';
+$lang->resource->cron->create  = 'createAction';
 $lang->resource->cron->edit    = 'edit';
 $lang->resource->cron->toggle  = 'toggle';
 $lang->resource->cron->delete  = 'delete';
-$lang->resource->cron->openProcess = 'openProcess';
+$lang->resource->cron->openProcess = 'restart';
 
 $lang->cron->methodOrder[5]  = 'index';
 $lang->cron->methodOrder[10] = 'turnon';
@@ -1066,7 +1065,7 @@ $lang->resource->translate->index        = 'index';
 $lang->resource->translate->addLang      = 'addLang';
 $lang->resource->translate->chooseModule = 'chooseModule';
 $lang->resource->translate->module       = 'module';
-$lang->resource->translate->review       = 'review';
+$lang->resource->translate->review       = 'reviewAction';
 $lang->resource->translate->result       = 'result';
 $lang->resource->translate->batchPass    = 'batchPass';
 $lang->resource->translate->setting      = 'setting';
diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php
index 5b74bb4195..bbfa40c099 100755
--- a/module/mail/lang/en.php
+++ b/module/mail/lang/en.php
@@ -1,12 +1,16 @@
 <?php
 $lang->mail->common        = 'Email Settings';
-$lang->mail->index         = 'Home';
+$lang->mail->index         = 'Email Home';
 $lang->mail->detect        = 'Detect';
+$lang->mail->detectAction  = 'Detect By Email Address';
 $lang->mail->edit          = 'Edit Settings';
 $lang->mail->save          = 'Save';
+$lang->mail->saveAction    = 'Save Settings';
 $lang->mail->test          = 'Email Sending Test';
 $lang->mail->reset         = 'Reset';
+$lang->mail->resetAction   = 'Reset Settings';
 $lang->mail->resend        = 'Resend';
+$lang->mail->resendAction  = 'Resend Email';
 $lang->mail->browse        = 'Email List';
 $lang->mail->delete        = 'Delete Email';
 $lang->mail->ztCloud       = 'ZenTao CloudMail';
diff --git a/module/mail/lang/zh-cn.php b/module/mail/lang/zh-cn.php
index fe70acb5a3..5dbfa3dd91 100755
--- a/module/mail/lang/zh-cn.php
+++ b/module/mail/lang/zh-cn.php
@@ -2,11 +2,15 @@
 $lang->mail->common        = '发信配置';
 $lang->mail->index         = '首页';
 $lang->mail->detect        = '检测';
+$lang->mail->detectAction  = '通过邮箱地址检测';
 $lang->mail->edit          = '编辑配置';
 $lang->mail->save          = '保存';
+$lang->mail->saveAction    = '保存发信设置';
 $lang->mail->test          = '测试发信';
 $lang->mail->reset         = '重置';
+$lang->mail->resetAction   = '重置发信设置';
 $lang->mail->resend        = '重发';
+$lang->mail->resendAction  = '重发邮件';
 $lang->mail->browse        = '邮件列表';
 $lang->mail->delete        = '删除邮件';
 $lang->mail->ztCloud       = '禅道云发信';
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 7048a0d796..619ef41758 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -9,24 +9,27 @@
  * @version     $Id: en.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->product->common      = $lang->productCommon;
-$lang->product->index       = $lang->productCommon . ' Home';
-$lang->product->browse      = 'Story List';
-$lang->product->dynamic     = 'Dynamics';
-$lang->product->view        = 'Overview';
-$lang->product->edit        = "Edit {$lang->productCommon}";
-$lang->product->batchEdit   = 'Batch Edit';
-$lang->product->create      = "Create {$lang->productCommon}";
-$lang->product->delete      = "Delete {$lang->productCommon}";
-$lang->product->deleted     = 'Deleted';
-$lang->product->close       = 'Close';
-$lang->product->select      = "Select {$lang->productCommon}";
-$lang->product->mine        = 'My:';
-$lang->product->other       = 'Others:';
-$lang->product->closed      = 'Closed';
-$lang->product->updateOrder = 'Order';
-$lang->product->all         = "All {$lang->productCommon}s";
-$lang->product->export      = 'Export';
+$lang->product->common       = $lang->productCommon;
+$lang->product->index        = $lang->productCommon . ' Home';
+$lang->product->browse       = 'Story List';
+$lang->product->dynamic      = 'Dynamics';
+$lang->product->view         = "{$lang->productCommon} Detail";
+$lang->product->edit         = "Edit {$lang->productCommon}";
+$lang->product->batchEdit    = 'Batch Edit';
+$lang->product->create       = "Create {$lang->productCommon}";
+$lang->product->delete       = "Delete {$lang->productCommon}";
+$lang->product->deleted      = 'Deleted';
+$lang->product->close        = "Close";
+$lang->product->closeAction  = "Close {$lang->productCommon}";
+$lang->product->select       = "Select {$lang->productCommon}";
+$lang->product->mine         = 'My:';
+$lang->product->other        = 'Others:';
+$lang->product->closed       = 'Closed';
+$lang->product->updateOrder  = 'Order';
+$lang->product->orderAction  = "Order {$lang->productCommon}";
+$lang->product->all          = "All {$lang->productCommon}s";
+$lang->product->export       = 'Export';
+$lang->product->exportAction = "Export {$lang->productCommon}";
 
 $lang->product->basicInfo = 'Basic Info';
 $lang->product->otherInfo = 'Other Info';
@@ -38,8 +41,8 @@ $lang->product->bugs        = 'Linked Bug';
 $lang->product->projects    = "Linked {$lang->projectCommon}";
 $lang->product->cases       = 'Case';
 $lang->product->builds      = 'Build';
-$lang->product->roadmap     = 'Roadmap';
-$lang->product->doc         = 'Documents';
+$lang->product->roadmap     = "{$lang->productCommon} Roadmap";
+$lang->product->doc         = "{$lang->productCommon} Documents";
 $lang->product->project     = $lang->projectCommon . ' List';
 $lang->product->build       = 'Build List';
 $lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index b423e14eb0..2c251c54de 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -9,24 +9,27 @@
  * @version     $Id: zh-cn.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->product->common      = $lang->productCommon . '视图';
-$lang->product->index       = $lang->productCommon . '主页';
-$lang->product->browse      = '需求列表';
-$lang->product->dynamic     = '动态';
-$lang->product->view        = "{$lang->productCommon}概况";
-$lang->product->edit        = "编辑{$lang->productCommon}";
-$lang->product->batchEdit   = '批量编辑';
-$lang->product->create      = "添加{$lang->productCommon}";
-$lang->product->delete      = "删除{$lang->productCommon}";
-$lang->product->deleted     = '已删除';
-$lang->product->close       = '关闭';
-$lang->product->select      = "请选择{$lang->productCommon}";
-$lang->product->mine        = '我负责：';
-$lang->product->other       = '其他：';
-$lang->product->closed      = '已关闭';
-$lang->product->updateOrder = '排序';
-$lang->product->all         = "所有{$lang->productCommon}";
-$lang->product->export      = '导出数据';
+$lang->product->common       = $lang->productCommon . '视图';
+$lang->product->index        = $lang->productCommon . '主页';
+$lang->product->browse       = '需求列表';
+$lang->product->dynamic      = '产品动态';
+$lang->product->view         = "{$lang->productCommon}概况";
+$lang->product->edit         = "编辑{$lang->productCommon}";
+$lang->product->batchEdit    = '批量编辑';
+$lang->product->create       = "添加{$lang->productCommon}";
+$lang->product->delete       = "删除{$lang->productCommon}";
+$lang->product->deleted      = '已删除';
+$lang->product->close        = '关闭';
+$lang->product->closeAction  = "关闭{$lang->productCommon}";
+$lang->product->select       = "请选择{$lang->productCommon}";
+$lang->product->mine         = '我负责：';
+$lang->product->other        = '其他：';
+$lang->product->closed       = '已关闭';
+$lang->product->updateOrder  = '排序';
+$lang->product->orderAction  = "{$lang->productCommon}排序";
+$lang->product->all          = "所有{$lang->productCommon}";
+$lang->product->export       = '导出数据';
+$lang->product->exportAction = "导出{$lang->productCommon}";
 
 $lang->product->basicInfo = '基本信息';
 $lang->product->otherInfo = '其他信息';
@@ -38,7 +41,7 @@ $lang->product->bugs        = '相关Bug';
 $lang->product->projects    = "关联{$lang->projectCommon}数";
 $lang->product->cases       = '用例数';
 $lang->product->builds      = 'BUILD数';
-$lang->product->roadmap     = '路线图';
+$lang->product->roadmap     = "{$lang->productCommon}路线图";
 $lang->product->doc         = '文档列表';
 $lang->product->project     = $lang->projectCommon . '列表';
 $lang->product->build       = '版本列表';
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index 1b6c92e6ef..5d3acda127 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 $lang->productplan->common     = $lang->productCommon . ' Plan';
-$lang->productplan->browse     = "Plans";
+$lang->productplan->browse     = "Plan List";
 $lang->productplan->index      = "List";
 $lang->productplan->create     = "Create Plan";
 $lang->productplan->edit       = "Edit Plan";
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index e0431cc697..30470e7636 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -73,7 +73,7 @@ $lang->project->export   = 'Export';
 $lang->project->typeList['sprint']    = 'Sprint';
 $lang->project->typeList['waterfall'] = 'Waterfall';
 $lang->project->typeList['ops']       = 'OPS';
-    
+
 $lang->project->endList[7]   = '1 Week';
 $lang->project->endList[14]  = '2 Weeks';
 $lang->project->endList[31]  = '1 Month';
@@ -131,7 +131,19 @@ $lang->project->linkPlan          = 'Linked Plans';
 $lang->project->unlinkStoryTasks  = 'Unlink';
 $lang->project->linkedProducts    = "Linked {$lang->productCommon}s";
 $lang->project->unlinkedProducts  = "Unlinked {$lang->productCommon}s";
-$lang->project->view              = "Overview";
+$lang->project->view              = "{$lang->projectCommon} Detail";
+$lang->project->startAction       = "Start {$lang->projectCommon}";
+$lang->project->activateAction    = "Activate {$lang->projectCommon}";
+$lang->project->delayAction       = "Delay {$lang->projectCommon}";
+$lang->project->suspendAction     = "Suspend {$lang->projectCommon}";
+$lang->project->closeAction       = "Close {$lang->projectCommon}";
+$lang->project->testtaskAction    = "{$lang->projectCommon} Request";
+$lang->project->teamAction        = "{$lang->projectCommon} Members";
+$lang->project->kanbanAction      = "{$lang->projectCommon} Kanban";
+$lang->project->printKanbanAction = "Print Kanban";
+$lang->project->treeAction        = "{$lang->projectCommon} Tree View";
+$lang->project->exportAction      = "Export {$lang->projectCommon}";
+$lang->project->computeBurnAction = "Compute Burn";
 $lang->project->create            = "Create {$lang->projectCommon}";
 $lang->project->copy              = "Copy {$lang->projectCommon}";
 $lang->project->delete            = "Delete {$lang->projectCommon}";
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 9e41818c27..ea4e5997aa 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -132,6 +132,18 @@ $lang->project->unlinkStoryTasks  = '未关联需求任务';
 $lang->project->linkedProducts    = '已关联';
 $lang->project->unlinkedProducts  = '未关联';
 $lang->project->view              = "{$lang->projectCommon}概况";
+$lang->project->startAction       = "开始{$lang->projectCommon}";
+$lang->project->activateAction    = "计划{$lang->projectCommon}";
+$lang->project->delayAction       = "延期{$lang->projectCommon}";
+$lang->project->suspendAction     = "挂起{$lang->projectCommon}";
+$lang->project->closeAction       = "关闭{$lang->projectCommon}";
+$lang->project->testtaskAction    = "{$lang->projectCommon}测试单";
+$lang->project->teamAction        = "{$lang->projectCommon}团队";
+$lang->project->kanbanAction      = "{$lang->projectCommon}看板";
+$lang->project->printKanbanAction = "打印看板";
+$lang->project->treeAction        = "{$lang->projectCommon}树状图";
+$lang->project->exportAction      = "导出{$lang->projectCommon}";
+$lang->project->computeBurnAction = "计算燃尽图";
 $lang->project->create            = "添加{$lang->projectCommon}";
 $lang->project->copy              = "复制{$lang->projectCommon}";
 $lang->project->delete            = "删除{$lang->projectCommon}";
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index 6b467181d3..42bf12db10 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -16,8 +16,8 @@ $lang->release->linkStory        = "Link Story";
 $lang->release->linkBug          = "Link Bug";
 $lang->release->delete           = "Delete Release";
 $lang->release->deleted          = 'Deleted';
-$lang->release->view             = "Overview";
-$lang->release->browse           = "Releases";
+$lang->release->view             = "Release Detail";
+$lang->release->browse           = "Release List";
 $lang->release->changeStatus     = "Change Status";
 $lang->release->batchUnlink      = "Batch Unlink";
 $lang->release->batchUnlinkStory = "Batch Unlink Story";
diff --git a/module/report/lang/en.php b/module/report/lang/en.php
index 18465fcce6..ff32d0d92a 100644
--- a/module/report/lang/en.php
+++ b/module/report/lang/en.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 $lang->report->common     = 'Report';
-$lang->report->index      = 'Home';
+$lang->report->index      = 'Report Home';
 $lang->report->list       = 'Report';
 $lang->report->item       = 'Item';
 $lang->report->value      = 'Value';
@@ -84,7 +84,7 @@ $lang->report->closedProduct = 'Closed ' . $lang->productCommon . 's';
 $lang->report->overduePlan   = 'Expired Plans';
 
 /* daily reminder. */
-$lang->report->idAB  = 'ID';
+$lang->report->idAB         = 'ID';
 $lang->report->bugTitle     = 'Bug Name';
 $lang->report->taskName     = 'Task Name';
 $lang->report->todoName     = 'Todo Name';
diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php
index 470808c859..86b8a36858 100644
--- a/module/report/lang/zh-cn.php
+++ b/module/report/lang/zh-cn.php
@@ -98,5 +98,5 @@ $lang->report->mailTitle->task     = " 任务(%s),";
 $lang->report->mailTitle->todo     = " 待办(%s),";
 $lang->report->mailTitle->testTask = " 测试版本(%s),";
 
-$lang->report->proVersion = '<a href="https://api.zentao.net/goto.php?item=proversion&from=reportpage" target="_blank">更多精彩，尽在专业版！</a>';
+$lang->report->proVersion   = '<a href="https://api.zentao.net/goto.php?item=proversion&from=reportpage" target="_blank">更多精彩，尽在专业版！</a>';
 $lang->report->proVersionEn = '<a href="http://api.zentao.pm/goto.php?item=proversion&from=reportpage" target="_blank">Try ZenTao Pro for more!</a>';
diff --git a/module/search/lang/en.php b/module/search/lang/en.php
index 6cf01a39d5..45e90134bc 100644
--- a/module/search/lang/en.php
+++ b/module/search/lang/en.php
@@ -11,7 +11,7 @@
  */
 $lang->search->common        = 'Search';
 $lang->search->reset         = 'Reset';
-$lang->search->saveQuery     = 'Save';
+$lang->search->saveQuery     = 'Save Query';
 $lang->search->myQuery       = 'My Query';
 $lang->search->group1        = 'Group 1';
 $lang->search->group2        = 'Group 2';
diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php
index 27c3c76831..8cd135f104 100644
--- a/module/search/lang/zh-cn.php
+++ b/module/search/lang/zh-cn.php
@@ -11,7 +11,7 @@
  */
 $lang->search->common        = '搜索';
 $lang->search->reset         = '重置';
-$lang->search->saveQuery     = '保存';
+$lang->search->saveQuery     = '保存查询';
 $lang->search->myQuery       = '我的查询';
 $lang->search->group1        = '第一组';
 $lang->search->group2        = '第二组';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 27aad88283..d7cfebcae0 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -9,41 +9,48 @@
  * @version     $Id: en.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->story->create       = "Create Story";
-$lang->story->batchCreate  = "Batch Create";
-$lang->story->change       = "Change";
-$lang->story->changeAction = "Change Story";
-$lang->story->changed      = 'Change';
-$lang->story->assignTo     = 'Assign';
-$lang->story->review       = 'Review';
-$lang->story->needReview   = 'Need Review';
-$lang->story->batchReview  = 'Batch Review';
-$lang->story->edit         = "Edit Story";
-$lang->story->batchEdit    = "Batch Edit";
-$lang->story->subdivide    = 'Decompose';
-$lang->story->close        = 'Close';
-$lang->story->closeAction  = 'Close Story';
-$lang->story->batchClose   = 'Batch Close';
-$lang->story->activate     = 'Activate';
-$lang->story->delete       = "Delete";
-$lang->story->view         = "Story Detail";
-$lang->story->setting      = "Settings";
-$lang->story->tasks        = "Linked Tasks";
-$lang->story->bugs         = "Linked Bugs";
-$lang->story->cases        = "Linked Cases";
-$lang->story->taskCount    = 'Tasks';
-$lang->story->bugCount     = 'Bugs';
-$lang->story->caseCount    = 'Cases';
-$lang->story->taskCountAB  = 'T';
-$lang->story->bugCountAB   = 'B';
-$lang->story->caseCountAB  = 'C';
-$lang->story->linkStory    = 'Link Story';
-$lang->story->unlinkStory  = 'UnLinked';
-$lang->story->export       = "Export";
-$lang->story->zeroCase     = "Stories without cases";
-$lang->story->zeroTask     = "Only list stories without tasks";
-$lang->story->reportChart  = "Report";
-$lang->story->copyTitle    = "Copy Title";
+$lang->story->create          = "Create Story";
+$lang->story->batchCreate     = "Batch Create";
+$lang->story->change          = "Change";
+$lang->story->changeAction    = "Change Story";
+$lang->story->changed         = 'Change';
+$lang->story->assignTo        = 'Assign';
+$lang->story->assignAction    = 'Assign Story';
+$lang->story->review          = 'Review';
+$lang->story->reviewAction    = 'Review Story';
+$lang->story->needReview      = 'Need Review';
+$lang->story->batchReview     = 'Batch Review';
+$lang->story->edit            = "Edit Story";
+$lang->story->batchEdit       = "Batch Edit";
+$lang->story->subdivide       = 'Decompose';
+$lang->story->subdivideAction = 'Decompose Story';
+$lang->story->close           = 'Close';
+$lang->story->closeAction     = 'Close Story';
+$lang->story->batchClose      = 'Batch Close';
+$lang->story->activate        = 'Activate';
+$lang->story->activateAction  = 'Activate Story';
+$lang->story->delete          = "Delete";
+$lang->story->deleteAction    = "Delete Story";
+$lang->story->view            = "Story Detail";
+$lang->story->setting         = "Settings";
+$lang->story->tasks           = "Linked Tasks";
+$lang->story->bugs            = "Linked Bugs";
+$lang->story->cases           = "Linked Cases";
+$lang->story->taskCount       = 'Tasks';
+$lang->story->bugCount        = 'Bugs';
+$lang->story->caseCount       = 'Cases';
+$lang->story->taskCountAB     = 'T';
+$lang->story->bugCountAB      = 'B';
+$lang->story->caseCountAB     = 'C';
+$lang->story->linkStory       = 'Link Story';
+$lang->story->unlinkStory     = 'UnLinked';
+$lang->story->export          = "Export";
+$lang->story->exportAction    = "Export Story";
+$lang->story->zeroCase        = "Stories without cases";
+$lang->story->zeroTask        = "Only list stories without tasks";
+$lang->story->reportChart     = "Report";
+$lang->story->reportAction    = "Story Report";
+$lang->story->copyTitle       = "Copy Title";
 $lang->story->batchChangePlan   = "Batch Change Plans";
 $lang->story->batchChangeBranch = "Batch Change Branches";
 $lang->story->batchChangeStage  = "Batch Change Phases";
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index ae143d7e3e..1fb0b5188c 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -43,6 +43,7 @@ $lang->story->export       = "导出数据";
 $lang->story->zeroCase     = "零用例需求";
 $lang->story->zeroTask     = "只列零任务需求";
 $lang->story->reportChart  = "统计报表";
+$lang->story->reportAction = "统计报表";
 $lang->story->copyTitle    = "同需求名称";
 $lang->story->batchChangePlan   = "批量修改计划";
 $lang->story->batchChangeBranch = "批量修改分支";
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 5ac572644e..b4e62cb075 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -19,21 +19,28 @@ $lang->task->batchClose          = "Batch Close";
 $lang->task->batchCancel         = "Batch Cancel";
 $lang->task->edit                = "Edit Task";
 $lang->task->delete              = "Delete";
+$lang->task->deleteAction        = "Delete Task";
 $lang->task->deleted             = "Deleted";
 $lang->task->delayed             = 'Delayed';
-$lang->task->view                = "Overview";
+$lang->task->view                = "Task Detail";
 $lang->task->logEfforts          = "Effort";
 $lang->task->record              = "Estimates";
 $lang->task->start               = "Start";
+$lang->task->startAction         = "Start Task";
 $lang->task->restart             = "Continue";
+$lang->task->restartAction       = "Continue Task";
 $lang->task->finishAction        = "Finish Task";
 $lang->task->finish              = "Finish";
 $lang->task->pause               = "Pause";
+$lang->task->pauseAction         = "Pause Task";
 $lang->task->close               = "Close";
+$lang->task->closeAction         = "Close Task";
 $lang->task->cancel              = "Cancel";
+$lang->task->cancelAction        = "Cancel Task";
 $lang->task->activateAction      = "Activate Task";
 $lang->task->activate            = "Activate";
 $lang->task->export              = "Export";
+$lang->task->exportAction        = "Export Task";
 $lang->task->reportChart         = "Report Chart";
 $lang->task->fromBug             = 'From Bug';
 $lang->task->case                = 'Linked Case';
@@ -78,6 +85,7 @@ $lang->task->deadlineAB        = 'Deadline';
 $lang->task->status            = 'Status';
 $lang->task->desc              = 'Description';
 $lang->task->assign            = 'Assign';
+$lang->task->assignAction      = 'Assign Task';
 $lang->task->assignTo          = $lang->task->assign;
 $lang->task->batchAssignTo     = 'Batch Assign';
 $lang->task->assignedTo        = 'AssignTo';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index a5f4e61f59..48eead5a89 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -17,23 +17,30 @@ $lang->task->batchEdit           = "批量编辑";
 $lang->task->batchChangeModule   = "批量修改模块";
 $lang->task->batchClose          = "批量关闭";
 $lang->task->batchCancel         = "批量取消";
-$lang->task->edit                = "编辑";
+$lang->task->edit                = "编辑任务";
 $lang->task->delete              = "删除";
+$lang->task->deleteAction        = "删除任务";
 $lang->task->deleted             = "已删除";
 $lang->task->delayed             = '延期';
 $lang->task->view                = "查看任务";
 $lang->task->logEfforts          = "记录工时";
 $lang->task->record              = "工时";
 $lang->task->start               = "开始";
+$lang->task->startAction         = "开始任务";
 $lang->task->restart             = "继续";
+$lang->task->restartAction       = "继续任务";
 $lang->task->finishAction        = "完成任务";
 $lang->task->finish              = "完成";
 $lang->task->pause               = "暂停";
+$lang->task->pauseAction         = "暂停任务";
 $lang->task->close               = "关闭";
+$lang->task->closeAction         = "关闭任务";
 $lang->task->cancel              = "取消";
+$lang->task->cancelAction        = "取消任务";
 $lang->task->activateAction      = "激活任务";
 $lang->task->activate            = "激活";
 $lang->task->export              = "导出数据";
+$lang->task->exportAction        = "导出任务";
 $lang->task->reportChart         = "报表统计";
 $lang->task->fromBug             = '来源Bug';
 $lang->task->case                = '相关用例';
@@ -78,6 +85,7 @@ $lang->task->deadlineAB       = '截止';
 $lang->task->status           = '任务状态';
 $lang->task->desc             = '任务描述';
 $lang->task->assign           = '指派';
+$lang->task->assignAction     = '指派任务';
 $lang->task->assignTo         = $lang->task->assign;
 $lang->task->batchAssignTo    = '批量指派';
 $lang->task->assignedTo       = '指派给';
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 2207d13891..587398ccb3 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -76,11 +76,12 @@ $lang->testcase->stepExpect  = 'Expectation';
 $lang->testcase->stepVersion = 'Version';
 
 $lang->testcase->common                  = 'Case';
-$lang->testcase->index                   = "Home";
+$lang->testcase->index                   = "Case Home";
 $lang->testcase->create                  = "Add Case";
 $lang->testcase->batchCreate             = "Batch Add";
 $lang->testcase->delete                  = "Delete";
-$lang->testcase->view                    = "Overview";
+$lang->testcase->deleteAction            = "Delete Case";
+$lang->testcase->view                    = "Case Detail";
 $lang->testcase->review                  = "Need Review";
 $lang->testcase->reviewAB                = "Review";
 $lang->testcase->batchReview             = "Batch Review";
@@ -91,19 +92,21 @@ $lang->testcase->confirmLibcaseChange    = "Confirm CaseLib Change";
 $lang->testcase->ignoreLibcaseChange     = "Ignore CaseLib Change";
 $lang->testcase->batchChangeBranch       = "Batch Change Branch";
 $lang->testcase->groupByStories          = 'Group by Story';
-$lang->testcase->delete                  = "Delete";
 $lang->testcase->batchDelete             = "Batch Delete ";
 $lang->testcase->batchConfirmStoryChange = "Batch Confirm";
 $lang->testcase->batchCaseTypeChange     = "Batch Change Type";
 $lang->testcase->browse                  = "Case List";
 $lang->testcase->groupCase               = "View By Group";
 $lang->testcase->import                  = "Import";
+$lang->testcase->importAction            = "Import Case";
 $lang->testcase->importFile              = "Import CSV";
 $lang->testcase->importFromLib           = "Import From Library";
 $lang->testcase->showImport              = "Show Import";
 $lang->testcase->exportTemplet           = "Export Template";
 $lang->testcase->export                  = "Export Data";
+$lang->testcase->exportAction            = "Export Case";
 $lang->testcase->reportChart             = 'Report Chart';
+$lang->testcase->reportAction            = 'Case Report';
 $lang->testcase->confirmChange           = 'Confirm Case Change';
 $lang->testcase->confirmStoryChange      = 'Confirm Story Change';
 $lang->testcase->copy                    = 'Copy Case';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index ca78d46f8f..ff6279f8c3 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -79,7 +79,8 @@ $lang->testcase->common                  = '用例';
 $lang->testcase->index                   = "用例管理首页";
 $lang->testcase->create                  = "建用例";
 $lang->testcase->batchCreate             = "批量建用例";
-$lang->testcase->delete                  = "删除用例";
+$lang->testcase->delete                  = "删除";
+$lang->testcase->deleteAction            = "删除用例";
 $lang->testcase->view                    = "用例详情";
 $lang->testcase->review                  = "评审";
 $lang->testcase->reviewAB                = "评审";
@@ -91,19 +92,21 @@ $lang->testcase->confirmLibcaseChange    = "同步用例库用例修改";
 $lang->testcase->ignoreLibcaseChange     = "忽略用例库用例修改";
 $lang->testcase->batchChangeBranch       = "批量修改分支";
 $lang->testcase->groupByStories          = '需求分组';
-$lang->testcase->delete                  = "删除";
 $lang->testcase->batchDelete             = "批量删除 ";
 $lang->testcase->batchConfirmStoryChange = "批量确认变更";
 $lang->testcase->batchCaseTypeChange     = "批量修改类型";
 $lang->testcase->browse                  = "用例列表";
 $lang->testcase->groupCase               = "分组浏览用例";
 $lang->testcase->import                  = "导入";
+$lang->testcase->importAction            = "导入用例";
 $lang->testcase->importFile              = "导入CSV";
 $lang->testcase->importFromLib           = "从用例库中导入";
 $lang->testcase->showImport              = "显示导入内容";
 $lang->testcase->exportTemplet           = "导出模板";
 $lang->testcase->export                  = "导出数据";
+$lang->testcase->exportAction            = "导出用例";
 $lang->testcase->reportChart             = '报表统计';
+$lang->testcase->reportAction            = '用例报表统计';
 $lang->testcase->confirmChange           = '确认用例变动';
 $lang->testcase->confirmStoryChange      = '确认需求变动';
 $lang->testcase->copy                    = '复制用例';
diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php
index ec49a36b7c..7b01755d23 100644
--- a/module/testreport/lang/en.php
+++ b/module/testreport/lang/en.php
@@ -1,12 +1,13 @@
 <?php
-$lang->testreport->common   = 'Testing Report';
-$lang->testreport->browse   = 'Testing Reports';
-$lang->testreport->create   = 'Create Report';
-$lang->testreport->edit     = 'Edit Report';
-$lang->testreport->delete   = 'Delete';
-$lang->testreport->export   = 'Export';
-$lang->testreport->view     = 'Detail';
-$lang->testreport->recreate = 'ReCreate';
+$lang->testreport->common       = 'Testing Report';
+$lang->testreport->browse       = 'Testing Reports';
+$lang->testreport->create       = 'Create Report';
+$lang->testreport->edit         = 'Edit Report';
+$lang->testreport->delete       = 'Delete Report';
+$lang->testreport->export       = 'Export';
+$lang->testreport->exportAction = 'Export Report';
+$lang->testreport->view         = 'Report Detail';
+$lang->testreport->recreate     = 'ReCreate';
 
 $lang->testreport->title       = 'Title';
 $lang->testreport->bugTitle    = 'Bug';
diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php
index 68c3f7e7ec..165e8c41d9 100644
--- a/module/testreport/lang/zh-cn.php
+++ b/module/testreport/lang/zh-cn.php
@@ -1,12 +1,13 @@
 <?php
-$lang->testreport->common   = '测试报告';
-$lang->testreport->browse   = '报告列表';
-$lang->testreport->create   = '创建报告';
-$lang->testreport->edit     = '编辑报告';
-$lang->testreport->delete   = '删除报告';
-$lang->testreport->export   = '导出报告';
-$lang->testreport->view     = '报告详情';
-$lang->testreport->recreate = '重新生成报告';
+$lang->testreport->common       = '测试报告';
+$lang->testreport->browse       = '报告列表';
+$lang->testreport->create       = '创建报告';
+$lang->testreport->edit         = '编辑报告';
+$lang->testreport->delete       = '删除报告';
+$lang->testreport->export       = '导出';
+$lang->testreport->exportAction = '导出报告';
+$lang->testreport->view         = '报告详情';
+$lang->testreport->recreate     = '重新生成报告';
 
 $lang->testreport->title       = '标题';
 $lang->testreport->bugTitle    = 'Bug 标题';
diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php
index b3ef89d50f..45f4b52d86 100644
--- a/module/testsuite/lang/en.php
+++ b/module/testsuite/lang/en.php
@@ -9,20 +9,22 @@
  * @version     $Id: zh-cn.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->testsuite->index            = "Home";
+$lang->testsuite->index            = "Suite Home";
 $lang->testsuite->create           = "Create Suite";
-$lang->testsuite->delete           = "Delete";
-$lang->testsuite->view             = "Overview";
+$lang->testsuite->delete           = "Delete Suite";
+$lang->testsuite->view             = "Suite Detail";
 $lang->testsuite->edit             = "Edit Suite";
 $lang->testsuite->browse           = "Suite List";
 $lang->testsuite->linkCase         = "Link Case";
 $lang->testsuite->linkVersion      = "Version";
 $lang->testsuite->unlinkCase       = "Unlink";
+$lang->testsuite->unlinkCaseAction = "Unlink Cases";
 $lang->testsuite->batchUnlinkCases = "Batch Unlink Case";
 $lang->testsuite->deleted          = 'Deleted';
 $lang->testsuite->exportTemplet    = 'Export Template';
 $lang->testsuite->batchCreateCase  = 'Batch Create';
 $lang->testsuite->import           = 'Import';
+$lang->testsuite->importAction     = 'Import Cases';
 $lang->testsuite->showImport       = 'Imported Data';
 $lang->testsuite->successSaved     = 'Saved';
 
@@ -56,7 +58,7 @@ $lang->caselib->common = 'Case Library';
 $lang->caselib->all    = 'All Case Libraries';
 
 $lang->testsuite->createLib  = 'Create Library';
-$lang->testsuite->editLib    = 'Edit';
+$lang->testsuite->editLib    = 'Edit Library';
 $lang->testsuite->library    = 'View Cases in Library';
 $lang->testsuite->createCase = 'Create Case';
-$lang->testsuite->libView    = 'Overview';
+$lang->testsuite->libView    = 'Library Detail';
diff --git a/module/testsuite/lang/zh-cn.php b/module/testsuite/lang/zh-cn.php
index 9461070312..b5947934e7 100644
--- a/module/testsuite/lang/zh-cn.php
+++ b/module/testsuite/lang/zh-cn.php
@@ -18,11 +18,13 @@ $lang->testsuite->browse           = "套件列表";
 $lang->testsuite->linkCase         = "关联用例";
 $lang->testsuite->linkVersion      = "版本";
 $lang->testsuite->unlinkCase       = "移除";
+$lang->testsuite->unlinkCaseAction = "移除用例";
 $lang->testsuite->batchUnlinkCases = "批量移除用例";
 $lang->testsuite->deleted          = '已删除';
 $lang->testsuite->exportTemplet    = '导出模板';
 $lang->testsuite->batchCreateCase  = '批量创建用例';
 $lang->testsuite->import           = '导入';
+$lang->testsuite->importAction     = '导入用例';
 $lang->testsuite->showImport       = '显示导入数据';
 $lang->testsuite->successSaved     = '保存成功';
 
diff --git a/module/testsuite/view/library.html.php b/module/testsuite/view/library.html.php
index 9a1fecbf69..f95367ab09 100644
--- a/module/testsuite/view/library.html.php
+++ b/module/testsuite/view/library.html.php
@@ -47,7 +47,7 @@ js::set('flow',          $config->global->flow);
     if(common::hasPriv('testsuite', 'libView'))
     {
         $link = helper::createLink('testsuite', 'libView', "libID=$libID");
-        echo html::a($link, "<i class='icon icon-list-alt muted'> </i>" . $this->lang->testsuite->view, '', "class='btn btn-link'");
+        echo html::a($link, "<i class='icon icon-list-alt muted'> </i>" . $this->lang->testsuite->libView, '', "class='btn btn-link'");
     }
     ?>
   </div>
diff --git a/module/testsuite/view/libview.html.php b/module/testsuite/view/libview.html.php
index 0c6abe0387..9cf3b019be 100644
--- a/module/testsuite/view/libview.html.php
+++ b/module/testsuite/view/libview.html.php
@@ -14,7 +14,7 @@
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <?php $browseLink = $this->session->caseList ? $this->session->caseList : $this->createLink('testsuite', 'library', "libID=$lib->id");?>
-    <?php common::printBack($browseLink, 'btn btn-link');?>
+    <?php common::printBack($browseLink, 'btn btn-secondary');?>
     <div class='divider'></div>
     <div class='page-title'>
       <span class='label label-id'><?php echo $lib->id;?></span>
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index f2598075af..aa25b2234a 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -12,8 +12,9 @@
 $lang->testtask->index            = "Request Home";
 $lang->testtask->create           = "Submit Request";
 $lang->testtask->reportChart      = 'Report';
-$lang->testtask->delete           = "Delete";
-$lang->testtask->view             = "Overview";
+$lang->testtask->reportAction     = 'Case Report';
+$lang->testtask->delete           = "Delete Request";
+$lang->testtask->view             = "Request Detail";
 $lang->testtask->edit             = "Edit Request";
 $lang->testtask->browse           = "Test Request";
 $lang->testtask->linkCase         = "Link Case";
@@ -23,7 +24,8 @@ $lang->testtask->batchUnlinkCases = "Batch Unlink Case";
 $lang->testtask->batchAssign      = "Batch Assign";
 $lang->testtask->runCase          = "Run";
 $lang->testtask->batchRun         = "Batch Run";
-$lang->testtask->results          = "Case Result";
+$lang->testtask->results          = "Results";
+$lang->testtask->resultsAction    = "Case Result";
 $lang->testtask->createBug        = "Bug(+)";
 $lang->testtask->assign           = 'Assign';
 $lang->testtask->cases            = 'Case List';
@@ -31,10 +33,14 @@ $lang->testtask->groupCase        = "View By Group";
 $lang->testtask->pre              = 'Prev.';
 $lang->testtask->next             = 'Next';
 $lang->testtask->start            = "Start";
+$lang->testtask->startAction      = "Start Request";
 $lang->testtask->close            = "Close";
+$lang->testtask->closeAction      = "Close Request";
 $lang->testtask->wait             = "Waiting";
 $lang->testtask->block            = "Block";
+$lang->testtask->blockAction      = "Block Request";
 $lang->testtask->activate         = "Activate";
+$lang->testtask->activateAction   = "Activate Request";
 $lang->testtask->testing          = "Testing";
 $lang->testtask->blocked          = "Blocked";
 $lang->testtask->done             = "Tested";
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 0a998a89ef..1105a0e9d7 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -12,6 +12,7 @@
 $lang->testtask->index            = "版本首页";
 $lang->testtask->create           = "提交测试";
 $lang->testtask->reportChart      = '报表统计';
+$lang->testtask->reportAction     = '用例报表统计';
 $lang->testtask->delete           = "删除版本";
 $lang->testtask->view             = "概况";
 $lang->testtask->edit             = "编辑测试单";
@@ -24,6 +25,7 @@ $lang->testtask->batchAssign      = "批量指派";
 $lang->testtask->runCase          = "执行";
 $lang->testtask->batchRun         = "批量执行";
 $lang->testtask->results          = "结果";
+$lang->testtask->resultsAction    = "用例结果";
 $lang->testtask->createBug        = "提Bug";
 $lang->testtask->assign           = '指派';
 $lang->testtask->cases            = '用例';
@@ -31,10 +33,14 @@ $lang->testtask->groupCase        = "分组浏览用例";
 $lang->testtask->pre              = '上一个';
 $lang->testtask->next             = '下一个';
 $lang->testtask->start            = "开始";
+$lang->testtask->startAction      = "开始版本";
 $lang->testtask->close            = "关闭";
+$lang->testtask->closeAction      = "关闭版本";
 $lang->testtask->wait             = "待测版本";
 $lang->testtask->block            = "阻塞";
+$lang->testtask->blockAction      = "阻塞版本";
 $lang->testtask->activate         = "激活";
+$lang->testtask->activateAction   = "激活版本";
 $lang->testtask->testing          = "测试中版本";
 $lang->testtask->blocked          = "被阻塞版本";
 $lang->testtask->done             = "已测版本";
@@ -139,7 +145,7 @@ $lang->testtask->report = new stdclass();
 $lang->testtask->report->common = '报表';
 $lang->testtask->report->select = '请选择报表类型';
 $lang->testtask->report->create = '生成报表';
-    
+
 $lang->testtask->report->charts['testTaskPerRunResult'] = '按用例结果统计';
 $lang->testtask->report->charts['testTaskPerType']      = '按用例类型统计';
 $lang->testtask->report->charts['testTaskPerModule']    = '按用例模块统计';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 292479a5cc..80027de5a1 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -13,18 +13,18 @@ $lang->todo->common       = 'Todo';
 $lang->todo->index        = "Home";
 $lang->todo->create       = "Add Todo";
 $lang->todo->createCycle  = "Add Recurred Todo";
-$lang->todo->assignTo     = "Assign";
-$lang->todo->activate     = "Activate";
+$lang->todo->assignTo     = "Todo Assign";
+$lang->todo->activate     = "Activate Todo";
 $lang->todo->batchCreate  = "Batch Add ";
-$lang->todo->edit         = "Edit";
-$lang->todo->close        = "Close";
+$lang->todo->edit         = "Edit Todo";
+$lang->todo->close        = "Close Todo";
 $lang->todo->batchClose   = "Batch Close";
-$lang->todo->batchEdit    = "Batch Edit";
-$lang->todo->view         = "Overview";
-$lang->todo->finish       = "Finish";
+$lang->todo->batchEdit    = "Batch Edit Todo";
+$lang->todo->view         = "Todo Detail";
+$lang->todo->finish       = "Finish Todo";
 $lang->todo->batchFinish  = "Batch Finish";
-$lang->todo->export       = "Export";
-$lang->todo->delete       = "Delete";
+$lang->todo->export       = "Export Todo";
+$lang->todo->delete       = "Delete Todo";
 $lang->todo->import2Today = "Import to Today";
 $lang->todo->import       = "Import";
 $lang->todo->legendBasic  = "Basic Info";
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 76cd3f6095..b952b8074c 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -14,17 +14,17 @@ $lang->todo->index        = "待办一览";
 $lang->todo->create       = "添加待办";
 $lang->todo->createCycle  = "创建周期待办";
 $lang->todo->assignTo     = "指派给";
-$lang->todo->activate     = "激活";
+$lang->todo->activate     = "激活待办";
 $lang->todo->batchCreate  = "批量添加";
-$lang->todo->edit         = "编辑";
-$lang->todo->close        = "关闭";
+$lang->todo->edit         = "编辑待办";
+$lang->todo->close        = "关闭待办";
 $lang->todo->batchClose   = "批量关闭";
 $lang->todo->batchEdit    = "批量编辑";
 $lang->todo->view         = "待办详情";
 $lang->todo->finish       = "完成待办";
 $lang->todo->batchFinish  = "批量完成";
-$lang->todo->export       = "导出";
-$lang->todo->delete       = "删除";
+$lang->todo->export       = "导出待办";
+$lang->todo->delete       = "删除待办";
 $lang->todo->import2Today = "导入到今天";
 $lang->todo->import       = "导入";
 $lang->todo->legendBasic  = "基本信息";
diff --git a/module/translate/lang/en.php b/module/translate/lang/en.php
index 1b0ffb7ffd..76e90168be 100644
--- a/module/translate/lang/en.php
+++ b/module/translate/lang/en.php
@@ -11,9 +11,10 @@
 $lang->translate->common       = 'Translate';
 $lang->translate->index        = 'Home';
 $lang->translate->addLang      = 'Add Language';
-$lang->translate->module       = 'Module';
+$lang->translate->module       = 'Translate Module';
 $lang->translate->review       = 'Review';
-$lang->translate->result       = 'Result';
+$lang->translate->reviewAction = 'Review Translation';
+$lang->translate->result       = 'Save Review Result';
 $lang->translate->batchPass    = 'Batch Pass';
 $lang->translate->export       = 'Export Lang File';
 $lang->translate->setting      = 'Settings';
diff --git a/module/translate/lang/zh-cn.php b/module/translate/lang/zh-cn.php
index ac04041866..c2dad24b01 100644
--- a/module/translate/lang/zh-cn.php
+++ b/module/translate/lang/zh-cn.php
@@ -13,7 +13,8 @@ $lang->translate->index        = '首页';
 $lang->translate->addLang      = '新增语言';
 $lang->translate->module       = '翻译模块';
 $lang->translate->review       = '审校';
-$lang->translate->result       = '审校结果';
+$lang->translate->reviewAction = '审校翻译';
+$lang->translate->result       = '保存审校结果';
 $lang->translate->batchPass    = '批量通过';
 $lang->translate->export       = '导出新语言';
 $lang->translate->setting      = '设置';
diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php
index 7985aa9062..73d8217cf0 100644
--- a/module/tree/lang/en.php
+++ b/module/tree/lang/en.php
@@ -11,12 +11,12 @@
  */
 $lang->tree = new stdclass();
 $lang->tree->common             = 'Module';
-$lang->tree->edit               = 'Edit';
-$lang->tree->delete             = 'Delete';
+$lang->tree->edit               = 'Edit Module';
+$lang->tree->delete             = 'Delete Module';
 $lang->tree->browse             = 'Manage General Module';
 $lang->tree->browseTask         = 'Manage Task Module';
 $lang->tree->manage             = 'Manage Module';
-$lang->tree->fix                = 'Fix';
+$lang->tree->fix                = 'Fix Module';
 $lang->tree->manageProduct      = "Manage {$lang->productCommon} Modules";
 $lang->tree->manageProject      = "Manage {$lang->projectCommon} Modules";
 $lang->tree->manageLine         = 'Manage Product Line';
@@ -24,7 +24,7 @@ $lang->tree->manageBug          = 'Manage Bug';
 $lang->tree->manageCase         = 'Manage Case';
 $lang->tree->manageCaseLib      = 'Manage Library';
 $lang->tree->manageCustomDoc    = 'Manage Document Library';
-$lang->tree->updateOrder        = 'Order';
+$lang->tree->updateOrder        = 'Rank Module';
 $lang->tree->manageChild        = 'Manage Child Modules';
 $lang->tree->manageStoryChild   = 'Manage Child Modules';
 $lang->tree->manageLineChild    = 'Manage Product Line';
diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php
index 9f7eb69d9b..6276efd076 100644
--- a/module/tree/lang/zh-cn.php
+++ b/module/tree/lang/zh-cn.php
@@ -11,8 +11,8 @@
  */
 $lang->tree = new stdclass();
 $lang->tree->common             = '模块维护';
-$lang->tree->edit               = '编辑';
-$lang->tree->delete             = '删除';
+$lang->tree->edit               = '编辑模块';
+$lang->tree->delete             = '删除模块';
 $lang->tree->browse             = '通用模块维护';
 $lang->tree->browseTask         = '任务模块维护';
 $lang->tree->manage             = '维护模块';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 8bccf25541..6a597c2b0b 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -9,41 +9,41 @@
  * @version     $Id: en.php 5053 2013-07-06 08:17:37Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->user->common      = 'User';
-$lang->user->id          = 'ID';
-$lang->user->company     = 'Company';
-$lang->user->dept        = 'Department';
-$lang->user->account     = 'Account';
-$lang->user->password    = 'Password';
-$lang->user->password2   = 'Repeat Password';
-$lang->user->role        = 'Role';
-$lang->user->group       = 'Privilege Group';
-$lang->user->realname    = 'Name';
-$lang->user->nickname    = 'Nickname';
-$lang->user->commiter    = 'SVN/GIT Account';
-$lang->user->birthyear   = 'DOB';
-$lang->user->gender      = 'Gender';
-$lang->user->email       = 'Email';
-$lang->user->basicInfo   = 'Basic Info.';
-$lang->user->accountInfo = 'Account Info.';
-$lang->user->verify      = 'Verification';
-$lang->user->contactInfo = 'Contact';
-$lang->user->skype       = 'Skype';
-$lang->user->qq          = 'QQ';
-$lang->user->mobile      = 'Mobile';
-$lang->user->phone       = 'Phone';
-$lang->user->weixin      = 'WeChat';
-$lang->user->dingding    = 'DingDing';
-$lang->user->slack       = 'Slack';
-$lang->user->whatsapp    = 'WhatsApp';
-$lang->user->address     = 'Address';
-$lang->user->zipcode     = 'ZipCode';
-$lang->user->join        = 'Joined';
-$lang->user->visits      = 'Visits';
-$lang->user->ip          = 'Last IP';
-$lang->user->last        = 'Last Login';
-$lang->user->ranzhi      = 'Zdoo Account';
-$lang->user->ditto       = 'Ditto';
+$lang->user->common           = 'User';
+$lang->user->id               = 'ID';
+$lang->user->company          = 'Company';
+$lang->user->dept             = 'Department';
+$lang->user->account          = 'Account';
+$lang->user->password         = 'Password';
+$lang->user->password2        = 'Repeat Password';
+$lang->user->role             = 'Role';
+$lang->user->group            = 'Privilege Group';
+$lang->user->realname         = 'Name';
+$lang->user->nickname         = 'Nickname';
+$lang->user->commiter         = 'SVN/GIT Account';
+$lang->user->birthyear        = 'DOB';
+$lang->user->gender           = 'Gender';
+$lang->user->email            = 'Email';
+$lang->user->basicInfo        = 'Basic Info.';
+$lang->user->accountInfo      = 'Account Info.';
+$lang->user->verify           = 'Verification';
+$lang->user->contactInfo      = 'Contact';
+$lang->user->skype            = 'Skype';
+$lang->user->qq               = 'QQ';
+$lang->user->mobile           = 'Mobile';
+$lang->user->phone            = 'Phone';
+$lang->user->weixin           = 'WeChat';
+$lang->user->dingding         = 'DingDing';
+$lang->user->slack            = 'Slack';
+$lang->user->whatsapp         = 'WhatsApp';
+$lang->user->address          = 'Address';
+$lang->user->zipcode          = 'ZipCode';
+$lang->user->join             = 'Joined';
+$lang->user->visits           = 'Visits';
+$lang->user->ip               = 'Last IP';
+$lang->user->last             = 'Last Login';
+$lang->user->ranzhi           = 'Zdoo Account';
+$lang->user->ditto            = 'Ditto';
 $lang->user->originalPassword = 'Old Password';
 $lang->user->newPassword      = 'New Password';
 $lang->user->verifyPassword   = 'Password';
@@ -53,13 +53,13 @@ $lang->user->legendBasic        = 'Basic Information';
 $lang->user->legendContribution = 'Contribution';
 
 $lang->user->index         = "Home";
-$lang->user->view          = "Overview";
+$lang->user->view          = "User Detail";
 $lang->user->create        = "Add User";
 $lang->user->batchCreate   = "Batch Add";
 $lang->user->edit          = "Edit User";
 $lang->user->batchEdit     = "Batch Edit";
-$lang->user->unlock        = "Unlock";
-$lang->user->delete        = "Delete";
+$lang->user->unlock        = "Unlock User";
+$lang->user->delete        = "Delete User";
 $lang->user->unbind        = "Unbind from Zdoo";
 $lang->user->login         = "Login";
 $lang->user->mobileLogin   = "Mobile";
@@ -87,10 +87,10 @@ $lang->user->project     = $lang->projectCommon . 's';
 $lang->user->task        = 'Tasks';
 $lang->user->bug         = 'Bugs';
 $lang->user->test        = 'QA';
-$lang->user->testTask    = 'Test Request';
-$lang->user->testCase    = 'Test Case';
+$lang->user->testTask    = 'Requests';
+$lang->user->testCase    = 'Cases';
 $lang->user->schedule    = 'Schedule';
-$lang->user->todo        = 'Todo';
+$lang->user->todo        = 'Todos';
 $lang->user->story       = 'Stories';
 $lang->user->dynamic     = 'Dynamics';