diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 8c36eba6dd..8ad1096f4f 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -15,7 +15,7 @@ $lang->action->project    = $lang->projectCommon;
 $lang->action->objectType = 'Object';
 $lang->action->objectID   = 'ID';
 $lang->action->objectName = 'Name';
-$lang->action->actor      = 'Operated by';
+$lang->action->actor      = 'Done by';
 $lang->action->action     = 'Action';
 $lang->action->actionID   = 'Action ID';
 $lang->action->date       = 'Date';
@@ -24,9 +24,9 @@ $lang->action->trash       = 'Recycle';
 $lang->action->undelete    = 'Restore';
 $lang->action->hideOne     = 'Hide';
 $lang->action->hideAll     = 'Hide All';
-$lang->action->editComment = 'Edit Note';
+$lang->action->editComment = 'Edit';
 
-$lang->action->trashTips      = 'Note: The action of Delete in ZenTao is logic.';
+$lang->action->trashTips      = 'Note: Delete in ZenTao is logic.';
 $lang->action->textDiff       = 'Text Format';
 $lang->action->original       = 'Original Format';
 $lang->action->confirmHideAll = 'Do you want to hide all the records?';
@@ -34,7 +34,7 @@ $lang->action->needEdit       = '%s you want to restore has already existed. Ple
 $lang->action->historyEdit    = 'The history editor cannot be empty.';
 
 $lang->action->history = new stdclass();
-$lang->action->history->action = 'Bound action';
+$lang->action->history->action = 'Link';
 $lang->action->history->field  = 'Field';
 $lang->action->history->old    = 'Old value';
 $lang->action->history->new    = 'New value';
@@ -65,7 +65,7 @@ $lang->action->objectTypes['caseresult']  = 'Case Result';
 $lang->action->objectTypes['stepresult']  = 'Case Steps';
 $lang->action->objectTypes['testtask']    = 'Test Build';
 $lang->action->objectTypes['user']        = 'User';
-$lang->action->objectTypes['doc']         = 'Document';
+$lang->action->objectTypes['doc']         = 'Doc';
 $lang->action->objectTypes['doclib']      = 'Doc Lib';
 $lang->action->objectTypes['todo']        = 'To-Dos';
 $lang->action->objectTypes['branch']      = 'Branch';
@@ -104,19 +104,19 @@ $lang->action->desc->started        = '$date, started by <strong>$actor</strong>
 $lang->action->desc->restarted      = '$date, continued by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->delayed        = '$date, delayde by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->suspended      = '$date, suspended by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->recordestimate = '$date, man-hour recorded by <strong>$actor</strong> and it consumed <strong>$extra</strong> hours.';
-$lang->action->desc->editestimate   = '$date, <strong>$actor</strong> edited man-hour.';
-$lang->action->desc->deleteestimate = '$date, <strong>$actor</strong> delete man-hour.';
+$lang->action->desc->recordestimate = '$date, recorded by <strong>$actor</strong> and it consumed <strong>$extra</strong> hours.';
+$lang->action->desc->editestimate   = '$date, <strong>$actor</strong> edited Hour.';
+$lang->action->desc->deleteestimate = '$date, <strong>$actor</strong> delete Hour.';
 $lang->action->desc->canceled       = '$date, cancelled by <strong>$actor</strong>.' . "\n";
-$lang->action->desc->svncommited    = '$date, submitted by <strong>$actor</strong> and the version is <strong>#$extra</strong>.' . "\n";
-$lang->action->desc->gitcommited    = '$date, submitted by <strong>$actor</strong> and the version is <strong>#$extra</strong>.' . "\n";
+$lang->action->desc->svncommited    = '$date, <strong>$actor</strong> committed and the version is <strong>#$extra</strong>.' . "\n";
+$lang->action->desc->gitcommited    = '$date, <strong>$actor</strong> committed and the version is <strong>#$extra</strong>.' . "\n";
 $lang->action->desc->finished       = '$date, finished by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->paused         = '$date, paused by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->verified       = '$date, verified by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->diff1          = '<strong><i>%s</i></strong> has been changed. Its value was "%s" and the new value is "%s".<br />' . "\n";
 $lang->action->desc->diff2          = '<strong><i>%s</i></strong> has been changed. The difference is ' . "\n" . "<blockquote>%s</blockquote>" . "\n<div class='hidden'>%s</div>";
 $lang->action->desc->diff3          = 'File Name %s was changed to %s .' . "\n";
-$lang->action->desc->linked2bug     = '$date Link to build <strong>$extra</strong> by <strong>$actor</strong>';
+$lang->action->desc->linked2bug     = '$date Linked to <strong>$extra</strong> by <strong>$actor</strong>';
 
 /* 关联用例和移除用例时的历史操作记录。*/
 $lang->action->desc->linkrelatedcase   = '$date, <strong>$actor</strong> linked relevant use case <strong>$extra</strong>.' . "\n";
@@ -131,8 +131,8 @@ $lang->action->label->edited              = 'Edited';
 $lang->action->label->assigned            = 'Assigned';
 $lang->action->label->closed              = 'Closed';
 $lang->action->label->deleted             = 'Deleted';
-$lang->action->label->deletedfile         = 'Deleted File';
-$lang->action->label->editfile            = 'Edit File';
+$lang->action->label->deletedfile         = 'Deleted';
+$lang->action->label->editfile            = 'Edit';
 $lang->action->label->erased              = 'Ereased';
 $lang->action->label->undeleted           = 'Restored';
 $lang->action->label->hidden              = 'Hidden';
@@ -169,8 +169,8 @@ $lang->action->label->subdividestory      = "Decompose Story";
 $lang->action->label->unlinkchildstory    = "Unlink";
 $lang->action->label->started             = 'Initiated';
 $lang->action->label->restarted           = 'Continued';
-$lang->action->label->recordestimate      = 'Recorded Man-Hour';
-$lang->action->label->editestimate        = 'Edited Man-Hour';
+$lang->action->label->recordestimate      = 'Recorded Hour';
+$lang->action->label->editestimate        = 'Edited Hour';
 $lang->action->label->canceled            = 'Cancelled';
 $lang->action->label->finished            = 'Finished';
 $lang->action->label->paused              = 'Paused';
@@ -179,7 +179,7 @@ $lang->action->label->delayed             = 'Delayed';
 $lang->action->label->suspended           = 'Suspended';
 $lang->action->label->login               = 'Login';
 $lang->action->label->logout              = "Logout";
-$lang->action->label->deleteestimate      = "Deleted Man-Hour";
+$lang->action->label->deleteestimate      = "Deleted Hour";
 $lang->action->label->linked2build        = "Linked";
 $lang->action->label->linked2bug          = "Linked";
 
@@ -198,7 +198,7 @@ $lang->action->label->testsuite   = 'Test Suite|testsuite|view|suiteID=%s';
 $lang->action->label->caselib     = 'Case Library|testsuite|libview|libID=%s';
 $lang->action->label->todo        = 'To-Dos|todo|view|todoID=%s';
 $lang->action->label->doclib      = 'Doc Lib|doc|browse|libID=%s';
-$lang->action->label->doc         = 'Document|doc|view|docID=%s';
+$lang->action->label->doc         = 'Doc|doc|view|docID=%s';
 $lang->action->label->user        = 'User|user|view|account=%s';
 $lang->action->label->testreport  = 'Report|testreport|view|report=%s';
 $lang->action->label->entry       = 'Entry|entry|browse|';
@@ -217,7 +217,7 @@ $lang->action->search->objectTypeList['story']       = 'Story';
 $lang->action->search->objectTypeList['task']        = 'Task'; 
 $lang->action->search->objectTypeList['testtask']    = 'Test Task';     
 $lang->action->search->objectTypeList['user']        = 'User'; 
-$lang->action->search->objectTypeList['doc']         = 'Document';
+$lang->action->search->objectTypeList['doc']         = 'Doc';
 $lang->action->search->objectTypeList['doclib']      = 'Doc Lib';
 $lang->action->search->objectTypeList['todo']        = 'To-Dos';
 $lang->action->search->objectTypeList['build']       = 'Build';
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 5d969c580a..4db584e6cd 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -230,7 +230,7 @@ $lang->bug->typeList['others']       = 'Other';
 
 $lang->bug->statusList['']         = '';
 $lang->bug->statusList['active']   = 'Active';
-$lang->bug->statusList['resolved'] = 'Reolved';
+$lang->bug->statusList['resolved'] = 'Resolved';
 $lang->bug->statusList['closed']   = 'Closed';
 
 $lang->bug->confirmedList[1] = 'Confirmed';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index d4719ac050..a200844426 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -68,7 +68,7 @@ $lang->duplicate       = '%s has the same title as existing file.';
 $lang->ipLimited       = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /></head><body>Sorry, current IP Login has been restricted. PLease contact Admin to unrestrict it.</body></html>";
 $lang->unfold          = '+';
 $lang->fold            = '-';
-$lang->homepage        = 'Set as Homepage';
+$lang->homepage        = 'Set as Home';
 $lang->tutorial        = 'Tutorial';
 $lang->changeLog       = 'Change Log';
 $lang->manual          = 'Manual';
@@ -88,7 +88,7 @@ $lang->showAll       = '[[Show All]]';
 
 $lang->future       = 'Pending';
 $lang->year         = 'Year';
-$lang->workingHour  = 'Man-Hour';
+$lang->workingHour  = 'Hour';
 
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
@@ -106,7 +106,7 @@ $lang->menu->my       = '<i class="icon-home"></i><span>Dashboard</span>|my|inde
 $lang->menu->product  = $lang->productCommon . '|product|index';
 $lang->menu->project  = $lang->projectCommon . '|project|index';
 $lang->menu->qa       = 'QA|qa|index';
-$lang->menu->doc      = 'Document|doc|index';
+$lang->menu->doc      = 'Doc|doc|index';
 $lang->menu->report   = 'Report|report|index';
 $lang->menu->company  = 'Company|company|index';
 $lang->menu->admin    = 'Administration|admin|index';
@@ -123,7 +123,7 @@ $lang->searchObjects['build']       = 'Build';
 $lang->searchObjects['release']     = 'Release';
 $lang->searchObjects['productplan'] = $lang->productCommon . 'Plan';
 $lang->searchObjects['testtask']    = 'Test Task';
-$lang->searchObjects['doc']         = 'Document';
+$lang->searchObjects['doc']         = 'Doc';
 $lang->searchObjects['testsuite']   = 'Case Library';
 $lang->searchObjects['testreport']  = 'Test Report';
 $lang->searchTips                   = 'ID (ctrl+g)';
@@ -193,14 +193,14 @@ $lang->product->menu->dynamic  = 'Dynamic|product|dynamic|productID=%s';
 $lang->product->menu->plan     = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan');
 $lang->product->menu->release  = array('link' => 'Release|release|browse|productID=%s',     'subModule' => 'release');
 $lang->product->menu->roadmap  = 'Roadmap|product|roadmap|productID=%s';
-$lang->product->menu->doc      = array('link' => 'Document|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
+$lang->product->menu->doc      = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
 $lang->product->menu->branch   = '@branch@|branch|manage|productID=%s';
 $lang->product->menu->module   = 'Module|tree|browse|productID=%s&view=story';
 $lang->product->menu->view     = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit');
 $lang->product->menu->project  = "{$lang->projectCommon}|product|project|status=all&productID=%s";
 $lang->product->menu->create   = array('link' => "<i class='icon-plus'></i>&nbsp;Add{$lang->productCommon}|product|create", 'float' => 'right');
 $lang->product->menu->all      = array('link' => "<i class='icon-cubes'></i>&nbsp;All{$lang->productCommon}|product|all|productID=%s", 'float' => 'right');
-$lang->product->menu->index    = array('link' => "<i class='icon-home'></i>{$lang->productCommon}Homepage|product|index|locate=no", 'float' => 'right');
+$lang->product->menu->index    = array('link' => "<i class='icon-home'></i>{$lang->productCommon}|product|index|locate=no", 'float' => 'right');
 
 $lang->story       = new stdclass();
 $lang->productplan = new stdclass();
@@ -224,12 +224,12 @@ $lang->project->menu->dynamic   = 'Dynamic|project|dynamic|projectID=%s';
 $lang->project->menu->build     = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'build');
 $lang->project->menu->testtask  = array('link' => 'Test Task|project|testtask|projectID=%s');
 $lang->project->menu->team      = array('link' => 'Team|project|team|projectID=%s', 'alias' => 'managemembers');
-$lang->project->menu->doc       = array('link' => 'Document|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc');
+$lang->project->menu->doc       = array('link' => 'Doc|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc');
 $lang->project->menu->product   = $lang->productCommon . '|project|manageproducts|projectID=%s';
 $lang->project->menu->view      = array('link' => 'Overview|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close');
 $lang->project->menu->create    = array('link' => "<i class='icon-plus'></i>&nbsp;Add{$lang->projectCommon}|project|create", 'float' => 'right');
 $lang->project->menu->all       = array('link' => "<i class='icon-th-large'></i>&nbsp;All{$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right');
-$lang->project->menu->index     = array('link' => "<i class='icon-home'></i>{$lang->projectCommon}Homepage|project|index|locate=no", 'float' => 'right');
+$lang->project->menu->index     = array('link' => "<i class='icon-home'></i>{$lang->projectCommon}|project|index|locate=no", 'float' => 'right');
 
 $lang->task  = new stdclass();
 $lang->build = new stdclass();
@@ -336,7 +336,7 @@ $lang->user->menu  = $lang->company->menu;
 /* 后台管理菜单设置。*/
 $lang->admin = new stdclass();
 $lang->admin->menu = new stdclass();
-$lang->admin->menu->index     = array('link' => 'Homepage|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
+$lang->admin->menu->index     = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
 $lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension');
 $lang->admin->menu->custom    = array('link' => 'Custom|custom|set', 'subModule' => 'custom');
 $lang->admin->menu->mail      = array('link' => 'Email|mail|index', 'subModule' => 'mail');
@@ -457,12 +457,12 @@ $lang->pager = new stdclass();
 $lang->pager->noRecord     = "No History";
 $lang->pager->digest       = " <strong>%s</strong> in total. %s <strong>%s/%s</strong> &nbsp; ";
 $lang->pager->recPerPage   = " <strong>%s</strong> per page";
-$lang->pager->first        = "<i class='icon-step-backward' title='Homepage'></i>";
+$lang->pager->first        = "<i class='icon-step-backward' title='Home'></i>";
 $lang->pager->pre          = "<i class='icon-play icon-rotate-180' title='Previous Page'></i>";
 $lang->pager->next         = "<i class='icon-play' title='Next Page'></i>";
 $lang->pager->last         = "<i class='icon-step-forward' title='Last Page'></i>";
 $lang->pager->locate       = "GO!";
-$lang->pager->previousPage = "Previous";
+$lang->pager->previousPage = "Prev";
 $lang->pager->nextPage     = "Next";
 $lang->pager->summery      = "<strong>%s-%s</strong> of <strong>%s</strong>.";
 
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 475e5ffa23..07ab03f68a 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -104,7 +104,7 @@ $lang->custom->reviewList[0]  = 'Off';
 $lang->custom->deletedList[1] = 'Show';
 $lang->custom->deletedList[0] = 'Hide';
 
-$lang->custom->workingHours   = 'Man-Hour/Day';
+$lang->custom->workingHours   = 'hours/day';
 $lang->custom->weekend        = 'Weekend';
 $lang->custom->weekendList[2] = '2-Day Off';
 $lang->custom->weekendList[1] = '1-Day Off';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index a92279a9ec..8c251b96bd 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -95,7 +95,7 @@ $lang->dev->groupList['my']      = 'Dashboard';
 $lang->dev->groupList['product'] = $lang->productCommon;
 $lang->dev->groupList['project'] = $lang->projectCommon;
 $lang->dev->groupList['qa']      = 'QA';
-$lang->dev->groupList['doc']     = 'Document';
+$lang->dev->groupList['doc']     = 'Doc';
 $lang->dev->groupList['company'] = 'Company';
 $lang->dev->groupList['admin']   = 'Admin';
 $lang->dev->groupList['other']   = 'Others';
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 7058ef7f62..07f25f7343 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -33,7 +33,7 @@ $lang->doc->basicInfo      = 'Basic Info';
 $lang->doc->deleted        = 'Deleted';
 $lang->doc->fileObject     = 'The Object';
 $lang->doc->whiteList      = 'White List';
-$lang->doc->contentType    = 'Document Format';
+$lang->doc->contentType    = 'Format';
 $lang->doc->separator      = "<i class='icon-angle-right'></i>";
 $lang->doc->fileTitle      = 'File Title';
 $lang->doc->filePath       = 'File Path';
@@ -46,7 +46,7 @@ $lang->doc->users          = 'Users';
 
 $lang->doc->moduleDoc      = 'By Module';
 $lang->doc->searchDoc      = 'By Search';
-$lang->doc->allDoc         = 'All Document';
+$lang->doc->allDoc         = 'All';
 $lang->doc->openedByMe     = 'Opened By Me';
 $lang->doc->orderByOpen    = 'Recently Added';
 $lang->doc->orderByEdit    = 'Recently Modifie';
@@ -87,8 +87,8 @@ $lang->doc->libTypeList['product'] = $lang->productCommon . ' Library';
 $lang->doc->libTypeList['project'] = $lang->projectCommon . ' Library';
 $lang->doc->libTypeList['custom']  = 'Custom Library';
 
-$lang->doc->systemLibs['product'] = $lang->productCommon . 'DocumentLibrary';
-$lang->doc->systemLibs['project'] = $lang->projectCommon . 'DocumentLibrary';
+$lang->doc->systemLibs['product'] = $lang->productCommon . 'Doc Lib';
+$lang->doc->systemLibs['project'] = $lang->projectCommon . 'Doc Lib';
 
 global $config;
 if($config->global->flow == 'onlyStory' or $config->global->flow == 'onlyTest') unset($lang->doc->systemLibs['project']);
@@ -115,25 +115,25 @@ $lang->doc->browseTypeList['card'] = 'Card';
 $lang->doc->confirmDelete      = "Do you want to delete this document?";
 $lang->doc->confirmDeleteLib   = "Do you want to delete this Doc Lib?";
 $lang->doc->errorEditSystemDoc = "System Doc Lib needs no modifications.";
-$lang->doc->errorEmptyProduct  = "No {$lang->productCommon}. Document cannot be created.";
-$lang->doc->errorEmptyProject  = "No {$lang->projectCommon}. Document cannot be created.";
+$lang->doc->errorEmptyProduct  = "No {$lang->productCommon}. It cannot be created.";
+$lang->doc->errorEmptyProject  = "No {$lang->projectCommon}. It cannot be created.";
 $lang->doc->errorMainSysLib    = "Can not delete this library.";
 $lang->doc->accessDenied       = "Access denied!";
-$lang->doc->versionNotFount    = 'The document is not exist in this version.';
+$lang->doc->versionNotFount    = 'It is not exist in this version.';
 
 $lang->doc->placeholder = new stdclass();
 $lang->doc->placeholder->url = 'Url';
 
 $lang->doclib = new stdclass();
-$lang->doclib->name    = 'Library Name';
-$lang->doclib->control = 'Access Control';
+$lang->doclib->name    = 'Name';
+$lang->doclib->control = 'Privilege';
 $lang->doclib->group   = 'Group';
 $lang->doclib->user    = 'User';
 $lang->doclib->files   = 'Files';
-$lang->doclib->all     = 'All Libraries';
-$lang->doclib->select  = 'Select Library';
+$lang->doclib->all     = 'All';
+$lang->doclib->select  = 'Select';
 $lang->doclib->project = $lang->projectCommon . ' Library';
 $lang->doclib->product = $lang->productCommon . ' Library';
 
-$lang->doclib->main['product'] = $lang->productCommon . ' Main Library';
-$lang->doclib->main['project'] = $lang->projectCommon . ' Main Library';
+$lang->doclib->main['product'] = $lang->productCommon . ' Main';
+$lang->doclib->main['project'] = $lang->projectCommon . ' Main';
diff --git a/module/editor/lang/en.php b/module/editor/lang/en.php
index fd8abd4f45..a6bd08f16d 100644
--- a/module/editor/lang/en.php
+++ b/module/editor/lang/en.php
@@ -50,7 +50,7 @@ $lang->editor->modules['common']      = 'Common Modules';
 $lang->editor->modules['company']     = 'Company';
 $lang->editor->modules['convert']     = 'Convert';
 $lang->editor->modules['dept']        = 'Department';
-$lang->editor->modules['doc']         = 'Document';
+$lang->editor->modules['doc']         = 'Doc';
 $lang->editor->modules['extension']   = 'Extensiona';
 $lang->editor->modules['file']        = 'File';
 $lang->editor->modules['group']       = 'Group';
@@ -69,7 +69,7 @@ $lang->editor->modules['story']       = 'Story';
 $lang->editor->modules['task']        = 'Task';
 $lang->editor->modules['testcase']    = 'Case';
 $lang->editor->modules['testtask']    = 'Test Task';
-$lang->editor->modules['todo']        = 'To-Dos';
+$lang->editor->modules['todo']        = 'To-Do';
 $lang->editor->modules['tree']        = 'Module';
 $lang->editor->modules['upgrade']     = 'Upgrade';
 $lang->editor->modules['user']        = 'User';
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index e64fa54319..02b9197e3c 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -33,15 +33,15 @@ $lang->product->otherInfo = 'Other Info';
 
 $lang->product->plans    = 'Plans';
 $lang->product->releases = 'Releases';
-$lang->product->docs     = 'Documents';
+$lang->product->docs     = 'Doc';
 $lang->product->bugs     = 'Linked Bug';
-$lang->product->projects = "Linked {$lang->projectCommon}s";
+$lang->product->projects = "Linked {$lang->projectCommon}";
 $lang->product->cases    = 'Cases';
 $lang->product->builds   = 'Builds';
 $lang->product->roadmap  = 'Roadmap';
-$lang->product->doc      = 'Documents';
+$lang->product->doc      = 'Doc';
 $lang->product->project  = $lang->projectCommon . 'List';
-$lang->product->build    = 'Build List';
+$lang->product->build    = 'Build';
 
 $lang->product->activeStories    = 'Activated Story';
 $lang->product->changedStories   = 'Changed Story';
@@ -107,7 +107,7 @@ $lang->product->aclList['open']    = "Default({$lang->productCommon} with View p
 $lang->product->aclList['private'] = "Private{$lang->productCommon}({$lang->projectCommon}team members only)";
 $lang->product->aclList['custom']  = 'Custom(Team members and Whitelisr members have access to it.)';
 
-$lang->product->storySummary = " <strong>%s</strong> Story in total on this page, <strong>%s</strong> man-hour estimated. Case coverage is <strong>%s</strong>.";
+$lang->product->storySummary = " <strong>%s</strong> Story(ies), <strong>%s</strong> hour(s) estimated, case coverage is <strong>%s</strong> on this page.";
 $lang->product->noMatched    = '"%s" cannot be found.' . $lang->productCommon;
 
 $lang->product->featureBar['browse']['unclosed']     = $lang->product->unclosed;
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index 65d05886b0..381cf223f2 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -47,7 +47,7 @@ $lang->productplan->end     = 'End';
 $lang->productplan->last    = 'Last plan';
 
 $lang->productplan->endList[7]   = '1 Week';
-$lang->productplan->endList[14]  = '1 Weeks';
+$lang->productplan->endList[14]  = '2 Weeks';
 $lang->productplan->endList[31]  = '1 Month';
 $lang->productplan->endList[62]  = '2 Months';
 $lang->productplan->endList[93]  = '3 Months';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index ff8496dab2..df68c9cc59 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -176,12 +176,12 @@ $lang->project->aboveAllProject = "All the above {$lang->projectCommon}";
 /* 页面提示。*/
 $lang->project->selectProject   = "Select {$lang->projectCommon}";
 $lang->project->beginAndEnd     = 'Time Frame';
-$lang->project->lblStats        = 'Man-Hour Report';
-$lang->project->stats           = 'Available <strong>%s</strong> man-hour, <strong>%s</strong> man-hour Estimated, <strong>%s</strong> man-hour Consumed, <strong>%s</strong> man-hour.';
-$lang->project->taskSummary     = " <strong>%s</strong> Tasks on this page, <strong>%s</strong> Wait, <strong>%s</strong> Doing. <strong>%s</strong> man-hour Estimated, <strong>%s</strong> man-hour Consumed, <strong>%s</strong> man-hour Remained.";
-$lang->project->memberHours     = "%s has <strong>%s</strong> man-hour available ";
-$lang->project->groupSummary    = "<strong>%s</strong> Tasks in this group, Wait <strong>%s</strong>, Doing <strong>%s</strong>. <strong>%s</strong> man-hour Estimated , <strong>%s</strong> man-hour Consumed, <strong>%s</strong> man-hour Remained.";
-$lang->project->groupSummaryAB  = "Total Tasks <strong>%s</strong>, Wait <strong>%s</strong>, Doing <strong>%s</strong>.<br /> <strong>%s</strong> man-hour Estimated, <strong>%s</strong> man-hour Consumed，<strong>%s</strong> man-hour Remained.";
+$lang->project->lblStats        = 'Hour Report';
+$lang->project->stats           = '<strong>%s</strong> Hour(s) available, <strong>%s</strong> Hour(s) Estimated, <strong>%s</strong> Hour(s) Consumed, <strong>%s</strong> Hour(s) Remained.';
+$lang->project->taskSummary     = " <strong>%s</strong> Tasks on this page, <strong>%s</strong> Wait, <strong>%s</strong> Doing. <strong>%s</strong> Hour(s) Estimated, <strong>%s</strong> Hour(s) Consumed, <strong>%s</strong> Hour(s) Remained.";
+$lang->project->memberHours     = "%s has <strong>%s</strong> Hour(s) available ";
+$lang->project->groupSummary    = "<strong>%s</strong> Tasks in this group, Wait <strong>%s</strong>, Doing <strong>%s</strong>. <strong>%s</strong> Hour(s) Estimated , <strong>%s</strong> Hour(s) Consumed, <strong>%s</strong> Hour(s) Remained.";
+$lang->project->groupSummaryAB  = "Total Tasks <strong>%s</strong>, Wait <strong>%s</strong>, Doing <strong>%s</strong>.<br /> <strong>%s</strong> Hour(s) Estimated, <strong>%s</strong> Hour(s) Consumed，<strong>%s</strong> Hour(s) Remained.";
 $lang->project->noTimeSummary   = " <strong>%s</strong> Tasks in this group, Wait <strong>%s</strong>, Doing <strong>%s</strong>.";
 $lang->project->wbs             = "Decompose Task";
 $lang->project->batchWBS        = "Batch Decompose";
@@ -235,7 +235,7 @@ $lang->project->charts->burn->graph->showValues   = 0;
 
 $lang->project->placeholder = new stdclass();
 $lang->project->placeholder->code      = "{$lang->projectCommon} Code";
-$lang->project->placeholder->totalLeft = 'Total man-hour remained when start Project';
+$lang->project->placeholder->totalLeft = 'Hour(s) remained at the beginning of Project';
 
 $lang->project->selectGroup = new stdclass();
 $lang->project->selectGroup->done = '(Done)';
diff --git a/module/report/lang/en.php b/module/report/lang/en.php
index 983b0967e5..c2425feee5 100644
--- a/module/report/lang/en.php
+++ b/module/report/lang/en.php
@@ -64,11 +64,11 @@ $lang->report->deviationRate = 'Deviation Rate';
 $lang->report->total         = 'Total';
 $lang->report->to            = 'to';
 $lang->report->taskTotal     = "Total Tasks";
-$lang->report->manhourTotal  = "Total Man-Hour";
+$lang->report->manhourTotal  = "Total Hours";
 $lang->report->validRate     = "Efficiency";
 $lang->report->validRateTips = "Solution is fixed or postponed / status is resolved or closed.";
 $lang->report->unplanned     = 'Unplanned';
-$lang->report->workday       = 'Man-Hour/Day';
+$lang->report->workday       = 'Hours/Day';
 $lang->report->diffDays      = 'Work Days';
 
 $lang->report->conditions    = 'Filter by:';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 32453af207..8034df3b04 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -32,7 +32,7 @@ $lang->story->caseCount   = 'Test Cases';
 $lang->story->taskCountAB = 'T';
 $lang->story->bugCountAB  = 'B';
 $lang->story->caseCountAB = 'C';
-$lang->story->linkStory   = 'Link Story';
+$lang->story->linkStory   = 'Link';
 $lang->story->unlinkStory = 'UnLinked';
 $lang->story->export      = "Export Data";
 $lang->story->zeroCase    = "Zero Case";
@@ -58,7 +58,7 @@ $lang->story->title          = 'Title';
 $lang->story->spec           = 'Description';
 $lang->story->verify         = 'Acceptance';
 $lang->story->pri            = 'Priority';
-$lang->story->estimate       = 'Estimated Man-Hour';
+$lang->story->estimate       = 'Estimated Hour';
 $lang->story->estimateAB     = 'Est.';
 $lang->story->hour           = 'Hour';
 $lang->story->status         = 'Status';
@@ -76,12 +76,12 @@ $lang->story->closedDate     = 'Closed On';
 $lang->story->closedReason   = 'Close Reason';
 $lang->story->rejectedReason = 'Reject Reason';
 $lang->story->reviewedBy     = 'Reviewer';
-$lang->story->reviewedDate   = 'Review Date';
+$lang->story->reviewedDate   = 'Review on';
 $lang->story->version        = 'Version';
 $lang->story->plan           = 'Plan';
 $lang->story->planAB         = 'Plan';
 $lang->story->comment        = 'Comment';
-$lang->story->linkStories    = 'Link Story';
+$lang->story->linkStories    = 'Linked Story';
 $lang->story->childStories   = 'Decompose Story';
 $lang->story->duplicateStory = 'Duplicate Story';
 $lang->story->reviewResult   = 'Review Results';
@@ -139,7 +139,7 @@ $lang->story->sourceList['customer']   = 'Customer';
 $lang->story->sourceList['user']       = 'User';
 $lang->story->sourceList['po']         = $lang->productCommon . ' Owner';
 $lang->story->sourceList['market']     = 'Marketing';
-$lang->story->sourceList['service']    = 'Customer service';
+$lang->story->sourceList['service']    = 'Customer Service';
 $lang->story->sourceList['operation']  = 'Operations';
 $lang->story->sourceList['support']    = 'Technical support';
 $lang->story->sourceList['competitor'] = 'Competitor';
@@ -195,7 +195,7 @@ $lang->story->form->resource  = 'Resource allocation. How finished it? How long
 $lang->story->form->file      = 'Files. If there are Story linked files, please click Here to upload.';
 
 $lang->story->action = new stdclass();
-$lang->story->action->reviewed            = array('main' => '$date, recorded by <strong>$actor</strong>. Review result is <strong>$extra</strong>.', 'extra' => 'reviewResultList');
+$lang->story->action->reviewed            = array('main' => '$date, recorded by <strong>$actor</strong>. The result is <strong>$extra</strong>.', 'extra' => 'reviewResultList');
 $lang->story->action->closed              = array('main' => '$date, closed by <strong>$actor</strong>. The reasion is <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
 $lang->story->action->linked2plan         = array('main' => '$date, linked by <strong>$actor</strong> to Plan <strong>$extra</strong>');
 $lang->story->action->unlinkedfromplan    = array('main' => '$date, unlinked by <strong>$actor</strong> from Plan <strong>$extra</strong>.');
@@ -224,7 +224,7 @@ $lang->story->report->charts['storysPerPlan']           = 'per Plan';
 $lang->story->report->charts['storysPerStatus']         = 'per Status';
 $lang->story->report->charts['storysPerStage']          = 'per Stage';
 $lang->story->report->charts['storysPerPri']            = 'per Priority';
-$lang->story->report->charts['storysPerEstimate']       = 'per Estimated Man-Hour';
+$lang->story->report->charts['storysPerEstimate']       = 'per Estimated Hour';
 $lang->story->report->charts['storysPerOpenedBy']       = 'per CreatedBy';
 $lang->story->report->charts['storysPerAssignedTo']     = 'per AssignedTo';
 $lang->story->report->charts['storysPerClosedReason']   = 'per Closed Reason';
@@ -259,7 +259,7 @@ $lang->story->report->storysPerPri->item          = 'Priority';
 $lang->story->report->storysPerOpenedBy->item     = 'Account';
 $lang->story->report->storysPerAssignedTo->item   = 'User';
 $lang->story->report->storysPerClosedReason->item = 'Reason';
-$lang->story->report->storysPerEstimate->item     = 'Estimated Man-Hour';
+$lang->story->report->storysPerEstimate->item     = 'Estimated Hour';
 $lang->story->report->storysPerChange->item       = 'Change';
 
 $lang->story->report->storysPerProduct->graph      = new stdclass();
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 4be4e50ab0..ce963b3b31 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -21,7 +21,7 @@ $lang->task->delete             = "Delete";
 $lang->task->deleted            = "Deleted";
 $lang->task->delayed            = 'Delayed';
 $lang->task->view               = "Info";
-$lang->task->logEfforts         = "Man-Hour";
+$lang->task->logEfforts         = "Hour";
 $lang->task->record             = "Est.";
 $lang->task->start              = "Start";
 $lang->task->restart            = "Continue";
@@ -58,7 +58,7 @@ $lang->task->leftAB            = 'Remained';
 $lang->task->consumed          = 'Consumed';
 $lang->task->consumedAB        = 'Consume';
 $lang->task->hour              = 'Hour';
-$lang->task->consumedThisTime  = 'Man-Hour';
+$lang->task->consumedThisTime  = 'Hour';
 $lang->task->leftThisTime      = 'Remained';
 $lang->task->datePlan          = 'Plan';
 $lang->task->estStarted        = 'Start Date';
@@ -89,9 +89,9 @@ $lang->task->closedReason      = 'Cancelled Reason';
 $lang->task->lastEditedBy      = 'Last Edited By';
 $lang->task->lastEditedDate    = 'Last Edited on';
 $lang->task->lastEdited        = 'Last Edited';
-$lang->task->recordEstimate    = 'Man-Hour';
-$lang->task->editEstimate      = 'Edit Man-Hour';
-$lang->task->deleteEstimate    = 'Delete Man-Hour';
+$lang->task->recordEstimate    = 'Hour';
+$lang->task->editEstimate      = 'Edit';
+$lang->task->deleteEstimate    = 'Delete';
 $lang->task->colorTag          = 'Color Tag';
 $lang->task->files             = 'Files';
 $lang->task->hasConsumed       = 'Consumed';
@@ -160,21 +160,21 @@ $lang->task->successSaved          = "Created!";
 $lang->task->delayWarning          = " <strong class='delayed f-14px'> Delay %s days </strong>";
 $lang->task->remindBug             = "This Task is converted from a Bug. Do you want to update te Bug:%s?";
 $lang->task->confirmChangeProject  = "If you change {$lang->projectCommon}, the related Module, Story and Assignor will be changed. Do you want to do it?";
-$lang->task->confirmFinish         = '"Estimated remianed hour" is 0. Do you want to change the Status to "Done"?';
-$lang->task->confirmRecord         = '"Remain hour" is 0. Do you want to set Task as "Done"?';
-$lang->task->noticeLinkStory       = "No story has been related. You can %s for this project, then %s.";
-$lang->task->noticeSaveRecord      = 'Your man-hour is not saved. Please save it first.';
+$lang->task->confirmFinish         = '"Remianed Hour" is 0. Do you want to change the Status to "Done"?';
+$lang->task->confirmRecord         = '"Remained Hour" is 0. Do you want to set Task as "Done"?';
+$lang->task->noticeLinkStory       = "No story has been linked. You can %s for this project, then %s.";
+$lang->task->noticeSaveRecord      = 'Your Hour is not saved. Please save it first.';
 $lang->task->commentActions        = '%s. %s, commented by <strong>%s</strong>.';
 
 $lang->task->error = new stdclass();
 $lang->task->error->consumedNumber   = '"Consumed" must be numbers.';
 $lang->task->error->estimateNumber   = '"Estimated" must be numbers.';
 $lang->task->error->consumedSmall    = '"Consumed" must larger than before.';
-$lang->task->error->consumedThisTime = 'Please enter "Man-Hour"';
-$lang->task->error->left             = 'Please enter "Remained"';
+$lang->task->error->consumedThisTime = 'Please enter "Hour"';
+$lang->task->error->left             = 'Please enter "Remained Hour"';
 $lang->task->error->work             = '"Remark" must be less than %d characteres.';
-$lang->task->error->skipClose        = 'Task: %s is not“Done”or “Cancelled”. Confirm to close them?';
-$lang->task->error->consumed         = 'Task: %s man-hour must be more than 0. Ignore changes to this Task.';
+$lang->task->error->skipClose        = 'Task: %s is not “Done” or “Cancelled”. Do you want to close it?';
+$lang->task->error->consumed         = 'Task: %s Hour must be more than 0. Ignore changes to this Task.';
 
 /* Report. */
 $lang->task->report = new stdclass();
@@ -190,9 +190,9 @@ $lang->task->report->charts['tasksPerType']         = 'per Category';
 $lang->task->report->charts['tasksPerPri']          = 'per Priority';
 $lang->task->report->charts['tasksPerStatus']       = 'per Status';
 $lang->task->report->charts['tasksPerDeadline']     = 'per Deadline';
-$lang->task->report->charts['tasksPerEstimate']     = 'per Estimated Man-Hour';
-$lang->task->report->charts['tasksPerLeft']         = 'per Remained Man-Hour';
-$lang->task->report->charts['tasksPerConsumed']     = 'per Consumed Man-Hour';
+$lang->task->report->charts['tasksPerEstimate']     = 'per Estimated Hour';
+$lang->task->report->charts['tasksPerLeft']         = 'per Remained Hour';
+$lang->task->report->charts['tasksPerConsumed']     = 'per Consumed Hour';
 $lang->task->report->charts['tasksPerFinishedBy']   = 'per FinishedBy';
 $lang->task->report->charts['tasksPerClosedReason'] = 'per Close Reason';
 $lang->task->report->charts['finishedTasksPerDay']  = 'per Finished/Day';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index ce72756b13..62b8b5f73b 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -41,10 +41,10 @@ $lang->user->join        = 'Join Date';
 $lang->user->visits      = 'Visit Count';
 $lang->user->ip          = 'Last IP';
 $lang->user->last        = 'Last Login';
-$lang->user->ranzhi      = 'Ranger account';
+$lang->user->ranzhi      = 'Zdoo Account';
 $lang->user->ditto       = 'Ditto';
 $lang->user->originalPassword = 'Old Password';
-$lang->user->verifyPassword   = 'Please enter your password';
+$lang->user->verifyPassword   = 'Enter your password';
 $lang->user->resetPassword    = 'Forgot Password?';
 
 $lang->user->index           = "Home";
@@ -55,14 +55,14 @@ $lang->user->edit            = "Edit";
 $lang->user->batchEdit       = "Batch Edit";
 $lang->user->unlock          = "Unlock";
 $lang->user->delete          = "Delete";
-$lang->user->unbind          = "Unbind Ranger";
+$lang->user->unbind          = "Unbind Zdoo";
 $lang->user->login           = "Login";
 $lang->user->mobileLogin     = "Mobile";
 $lang->user->editProfile     = "Edit";
 $lang->user->deny            = "Access Denied";
 $lang->user->confirmDelete   = "Are you sure to delete this user?";
 $lang->user->confirmUnlock   = "Are you sure to unlock this user?";
-$lang->user->confirmUnbind   = "Are you sure to unbind this user from Ranger?";
+$lang->user->confirmUnbind   = "Are you sure to unbind this user from Zdoo?";
 $lang->user->relogin         = "Login Again";
 $lang->user->asGuest         = "Guest";
 $lang->user->goback          = "Back";
@@ -102,9 +102,9 @@ $lang->user->roleList['dev']    = 'Developer';
 $lang->user->roleList['qa']     = 'Tester';
 $lang->user->roleList['pm']     = 'Project Manager';
 $lang->user->roleList['po']     = 'Product Owner';
-$lang->user->roleList['td']     = 'Technical Supervisor';
-$lang->user->roleList['pd']     = 'Product Supervisor';
-$lang->user->roleList['qd']     = 'QA Supervisor';
+$lang->user->roleList['td']     = 'Technical Director';
+$lang->user->roleList['pd']     = 'Product Director';
+$lang->user->roleList['qd']     = 'QA Director';
 $lang->user->roleList['top']    = 'Senior Manager';
 $lang->user->roleList['others'] = 'Other';
 
@@ -115,7 +115,7 @@ $lang->user->passwordStrengthList[0] = "<span style='color:red'>Weak</span>";
 $lang->user->passwordStrengthList[1] = "<span style='color:#000'>Good</span>";
 $lang->user->passwordStrengthList[2] = "<span style='color:green'>Strong</span>";
 
-$lang->user->statusList['active'] = 'Activate';
+$lang->user->statusList['active'] = 'Activated';
 $lang->user->statusList['delete'] = 'Deleted';
 
 $lang->user->keepLogin['on']      = 'Keep login';