From 723394fd3b9ab5e7c5d9862a3db69029c879432f Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 27 May 2019 15:17:03 +0800
Subject: [PATCH 1/7] * Finish task #5458.

---
 module/action/model.php              |  2 +-
 module/company/view/dynamic.html.php | 11 ++++++++++-
 module/product/view/dynamic.html.php | 11 ++++++++++-
 module/project/view/dynamic.html.php | 11 ++++++++++-
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index 11a69d2cc8..12af391227 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1052,7 +1052,7 @@ class actionModel extends model
         foreach($actions as $action)
         {
             $timeStamp    = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date);
-            $date         = date(DT_DATE4, $timeStamp);
+            $date         = $this->app->getClientLang() == 'en' ? date('M d', $timeStamp) : date(DT_DATE4, $timeStamp);
             $action->time = date(DT_TIME2, $timeStamp);
             $dateGroup[$date][] = $action;
         }
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index 895a431dd5..6ab0150ea0 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -39,7 +39,16 @@
   <div id='dynamics'>
     <?php $firstAction = '';?>
     <?php foreach($dateGroups as $date => $actions):?>
-    <?php $isToday = date(DT_DATE4) == $date;?>
+    <?php 
+    if($this->app->getClientLang() == 'en')
+    {   
+        $isToday = date('M d') == $date;
+    }   
+    else
+    {   
+        $isToday = date(DT_DATE4) == $date;
+    } 
+    ?>
     <div class="dynamic <?php if($isToday) echo 'active';?>">
       <div class="dynamic-date">
         <?php if($isToday):?>
diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php
index de1858fe8a..a6a9adbe3f 100755
--- a/module/product/view/dynamic.html.php
+++ b/module/product/view/dynamic.html.php
@@ -39,7 +39,16 @@
     <?php else:?>
     <?php $firstAction = '';?>
     <?php foreach($dateGroups as $date => $actions):?>
-    <?php $isToday = date(DT_DATE4) == $date;?>
+    <?php 
+    if($this->app->getClientLang() == 'en')
+    {   
+        $isToday = date('M d') == $date;
+    }   
+    else
+    {   
+        $isToday = date(DT_DATE4) == $date;
+    }
+    ?>
     <div class="dynamic <?php if($isToday) echo 'active';?>">
       <div class="dynamic-date">
         <?php if($isToday):?>
diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php
index c1875b3433..b77efcea5a 100755
--- a/module/project/view/dynamic.html.php
+++ b/module/project/view/dynamic.html.php
@@ -40,7 +40,16 @@
   <div id="dynamics">
     <?php $firstAction = '';?>
     <?php foreach($dateGroups as $date => $actions):?>
-    <?php $isToday = date(DT_DATE4) == $date;?>
+    <?php 
+    if($this->app->getClientLang() == 'en')
+    {
+        $isToday = date('M d') == $date;
+    }
+    else
+    {
+        $isToday = date(DT_DATE4) == $date;
+    }
+    ?>
     <div class="dynamic <?php if($isToday) echo 'active';?>">
       <div class="dynamic-date">
         <?php if($isToday):?>

From 1607193c434830a3bf91cf6e350b88b8a3129150 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 27 May 2019 16:42:44 +0800
Subject: [PATCH 2/7] * Code for dayup.

---
 module/tree/control.php          |  8 ++++++++
 module/tree/view/browse.html.php | 14 +++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/module/tree/control.php b/module/tree/control.php
index 6f0323946e..dd4ee7b392 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -163,6 +163,14 @@ class tree extends control
             $title      = $this->lang->tree->manageTrainskill;
             $position[] = $this->lang->tree->manageTrainskill;
         }
+        elseif($viewType == 'trainpost')
+        {   
+            $this->lang->set('menugroup.tree', 'train');
+            $this->lang->tree->menu = $this->lang->trainpost->menu;
+
+            $title      = $this->lang->tree->manageTrainpost;
+            $position[] = $this->lang->tree->manageTrainpost;
+        }
 
         $parentModules = $this->tree->getParents($currentModuleID);
         $this->view->title           = $title;
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index ba380cf525..6b2351bac4 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -15,7 +15,7 @@
 <?php $this->app->loadLang('doc');?>
 <?php $hasBranch = (strpos('story|bug|case', $viewType) !== false and (!empty($root->type) && $root->type != 'normal')) ? true : false;?>
 <?php $name = $viewType == 'line' ? $lang->tree->line : (($viewType == 'doc' or $viewType == 'feedback') ? $lang->tree->cate : $lang->tree->name);?>
-<?php $title = ($viewType == 'line' or $viewType == 'trainskill') ? '' : ((strpos($viewType, 'doc') !== false || strpos($viewType, 'feedback') !== false) ? $lang->doc->childType : $lang->tree->child);?>
+<?php $title = ($viewType == 'line' or $viewType == 'trainskill' or $viewType == 'trainpost') ? '' : ((strpos($viewType, 'doc') !== false || strpos($viewType, 'feedback') !== false) ? $lang->doc->childType : $lang->tree->child);?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php $backLink = $this->session->{$viewType . 'List'} ? $this->session->{$viewType . 'List'} : 'javascript:history.go(-1)';?>
@@ -24,7 +24,7 @@
     </a>
     <div class="divider"></div>
     <div class="page-title">
-      <?php $rootName = $viewType == 'line' or $viewType == 'trainskill' ? '' : $root->name;?>
+      <?php $rootName = $viewType == 'line' or $viewType == 'trainskill' or $viewType == 'trainpost' ? '' : $root->name;?>
       <span class="text" title='<?php echo $rootName;?>'>
         <?php
         if($viewType == 'doc')
@@ -43,6 +43,10 @@
         {
             echo $lang->tree->manageTrainskill;
         }
+        elseif($viewType == 'trainpost')
+        {
+            echo $lang->tree->manageTrainpost;
+        }
         else
         {
             echo $lang->tree->common . $lang->colon . $root->name;
@@ -68,7 +72,7 @@
       <div class="panel-heading">
         <div class="panel-title">
           <?php $manageChild = 'manage' . ucfirst($viewType) . 'Child';?>
-          <?php if(strpos($viewType, 'trainskill') === false ) echo strpos($viewType, 'doc') !== false ? $lang->doc->manageType : $lang->tree->$manageChild;?>
+          <?php if(strpos($viewType, 'trainskill') === false and strpos($viewType, 'trainpost') === false) echo strpos($viewType, 'doc') !== false ? $lang->doc->manageType : $lang->tree->$manageChild;?>
         </div>
         <?php if($viewType == 'story' and $allProduct):?>
         <div class="panel-actions btn-toolbar"><?php echo html::a('javascript:toggleCopy()', $lang->tree->syncFromProduct, '', "class='btn btn-sm'")?></div>
@@ -78,7 +82,7 @@
         <form id='childrenForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'manageChild', "root=$rootID&viewType=$viewType");?>'>
           <table class='table table-form table-auto'>
             <tr>
-              <?php if($viewType != 'line' && $viewType != 'trainskill'):?>
+              <?php if($viewType != 'line' && $viewType != 'trainskill' && $viewType != 'trainpost'):?>
               <td class="text-middle text-right with-padding">
                 <?php
                 echo "<span>" . html::a($this->createLink('tree', 'browse', "root=$rootID&viewType=$viewType"), empty($root->name) ? '' : $root->name) . "<i class='icon icon-angle-right muted'></i></span>";
@@ -145,7 +149,7 @@
               </td>
             </tr>
             <tr>
-              <?php if($viewType != 'line' && $viewType != 'trainskill'):?>
+              <?php if($viewType != 'line' && $viewType != 'trainskill' && $viewType != 'trainpost'):?>
               <td></td>
               <?php endif;?>
               <td colspan="2" class="form-actions">

From ad457bdb2b289405473519b261b265e107bb1d6b Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 27 May 2019 16:47:30 +0800
Subject: [PATCH 3/7] * Fix detail.

---
 module/tree/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/tree/control.php b/module/tree/control.php
index dd4ee7b392..8fef7d1d4f 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -166,7 +166,7 @@ class tree extends control
         elseif($viewType == 'trainpost')
         {   
             $this->lang->set('menugroup.tree', 'train');
-            $this->lang->tree->menu = $this->lang->trainpost->menu;
+            $this->lang->tree->menu = $this->lang->train->menu;
 
             $title      = $this->lang->tree->manageTrainpost;
             $position[] = $this->lang->tree->manageTrainpost;

From f5f8e0df062fa365c081da724b7fbc1402df1b6f Mon Sep 17 00:00:00 2001
From: reneeteng <crystaltoffee@hotmail.com>
Date: Mon, 27 May 2019 17:01:57 +0800
Subject: [PATCH 4/7]  * Lang file update.

---
 module/bug/lang/en.php      |  2 +-
 module/custom/lang/en.php   |  4 ++--
 module/entry/lang/en.php    |  6 +++---
 module/score/lang/en.php    | 12 ++++++------
 module/sso/lang/en.php      |  4 ++--
 module/story/lang/en.php    | 20 ++++++++++----------
 module/task/lang/en.php     |  2 +-
 module/testcase/lang/en.php | 12 ++++++------
 module/testtask/lang/en.php | 32 ++++++++++++++++----------------
 module/tree/lang/en.php     |  4 ++--
 module/user/lang/en.php     | 12 ++++++------
 11 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 7b9fa5d4a1..73c764dcef 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -37,7 +37,7 @@ $lang->bug->confirmed        = 'Confirmed';
 $lang->bug->toTask           = 'Convert to Task';
 $lang->bug->toStory          = 'Convert to Story';
 $lang->bug->mailto           = 'Mail To';
-$lang->bug->openedBy         = 'Created by';
+$lang->bug->openedBy         = 'CreatedBy';
 $lang->bug->openedDate       = 'Created';
 $lang->bug->openedDateAB     = 'Created';
 $lang->bug->openedBuild      = 'Open Build';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index fcc73d1017..39ebdbc798 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -108,14 +108,14 @@ $lang->custom->notice->invalidStrlen['twoHundred'] = 'The key should be <= 225 c
 
 $lang->custom->storyReview    = 'Review';
 $lang->custom->forceReview    = 'Review';
-$lang->custom->forceNotReview = 'No Review';
+$lang->custom->forceNotReview = 'Need Review';
 $lang->custom->reviewList[1]  = 'On';
 $lang->custom->reviewList[0]  = 'Off';
 
 $lang->custom->deletedList[1] = 'Show';
 $lang->custom->deletedList[0] = 'Hide';
 
-$lang->custom->workingHours   = 'hours/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/entry/lang/en.php b/module/entry/lang/en.php
index 33d1a0741a..e4723be3df 100644
--- a/module/entry/lang/en.php
+++ b/module/entry/lang/en.php
@@ -19,9 +19,9 @@ $lang->entry->code        = 'Code';
 $lang->entry->key         = 'Key';
 $lang->entry->ip          = 'IP';
 $lang->entry->desc        = 'Description';
-$lang->entry->createdBy   = 'Created By';
+$lang->entry->createdBy   = 'CreatedBy';
 $lang->entry->createdDate = 'Created';
-$lang->entry->editedby    = 'Edited By';
+$lang->entry->editedby    = 'EditedBy';
 $lang->entry->editedDate  = 'Edited';
 $lang->entry->date        = 'Requesting Time';
 $lang->entry->url         = 'Requesting URL';
@@ -32,7 +32,7 @@ $lang->entry->notify        = 'Notify';
 
 $lang->entry->note = new stdClass();
 $lang->entry->note->name    = 'Name';
-$lang->entry->note->code    = 'Alias should be letters and numbers';
+$lang->entry->note->code    = 'Code should be letters and numbers';
 $lang->entry->note->ip      = "Use comma to seperate IPs. IP segment is supported, e.g. 192.168.1.*";
 $lang->entry->note->allIP   = 'All IPs';
 $lang->entry->note->account = 'Entry Account';
diff --git a/module/score/lang/en.php b/module/score/lang/en.php
index d08584416e..c93a525072 100644
--- a/module/score/lang/en.php
+++ b/module/score/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 $lang->score->common       = 'My Point';
-$lang->score->record       = 'Point History';
+$lang->score->record       = 'Points';
 $lang->score->current      = 'My Points';
 $lang->score->level        = 'Level Point';
 $lang->score->reset        = 'Reset';
@@ -14,9 +14,9 @@ $lang->score->id      = 'ID';
 $lang->score->userID  = 'UserID';
 $lang->score->account = 'User';
 $lang->score->module  = 'Module';
-$lang->score->method  = 'Method';
+$lang->score->method  = 'Action';
 $lang->score->before  = 'Before';
-$lang->score->score   = 'Point';
+$lang->score->score   = '+/-';
 $lang->score->after   = 'After';
 $lang->score->time    = 'Time';
 $lang->score->desc    = 'Description';
@@ -32,7 +32,7 @@ $lang->score->modules['doc']         = 'Doc';
 $lang->score->modules['todo']        = 'Todo';
 $lang->score->modules['story']       = 'Story';
 $lang->score->modules['bug']         = 'Bug';
-$lang->score->modules['testcase']    = 'Test Case';
+$lang->score->modules['testcase']    = 'Case';
 $lang->score->modules['testtask']    = 'Test';
 $lang->score->modules['build']       = 'Build';
 $lang->score->modules['project']     = 'Project';
@@ -43,8 +43,8 @@ $lang->score->modules['search']      = 'Search';
 
 $lang->score->methods['task']['create']              = 'Create Task';
 $lang->score->methods['task']['close']               = 'Close Task';
-$lang->score->methods['task']['finish']              = 'Complete Task';
-$lang->score->methods['tutorial']['finish']          = 'Complete Tutorial';
+$lang->score->methods['task']['finish']              = 'Finish Task';
+$lang->score->methods['tutorial']['finish']          = 'Finish Tutorial';
 $lang->score->methods['user']['login']               = 'Login';
 $lang->score->methods['user']['changePassword']      = 'Change Password';
 $lang->score->methods['user']['editProfile']         = 'Edit Profile';
diff --git a/module/sso/lang/en.php b/module/sso/lang/en.php
index 7d9ad9f1d6..a7acedae9f 100644
--- a/module/sso/lang/en.php
+++ b/module/sso/lang/en.php
@@ -13,7 +13,7 @@ $lang->sso = new stdclass();
 $lang->sso->settings = 'Settings';
 $lang->sso->turnon   = 'On';
 $lang->sso->redirect = 'Auto Jump to Zdoo';
-$lang->sso->code     = 'Alias';
+$lang->sso->code     = 'Code';
 $lang->sso->key      = 'Secret Key';
 $lang->sso->addr     = 'Address';
 $lang->sso->bind     = 'User Binding';
@@ -31,7 +31,7 @@ $lang->sso->bindTypeList['add']  = 'Add User';
 
 $lang->sso->help = <<<EOD
 <p>1. Zdoo address is required. If use PATH_INFO, it is http://YOUR ZDOO ADDRESS/sys/sso-check.html If GET, it is http://YOUR ZDOO ADDRESS/sys/index.php?m=sso&f=check</p>
-<p>2. Alias and Secret Key must be the same as set in Zdoo.</p>
+<p>2. Code and Secret Key must be the same as set in Zdoo.</p>
 EOD;
 $lang->sso->bindNotice     = 'User that is just added has no permissions. You have to ask ZenTao Admin to grant permissions to the User.';
 $lang->sso->bindNoPassword = 'Password should not be empty.';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index f043b2e1b0..508d643727 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -36,7 +36,7 @@ $lang->story->bugCountAB  = 'B';
 $lang->story->caseCountAB = 'C';
 $lang->story->linkStory   = 'Link';
 $lang->story->unlinkStory = 'UnLinked';
-$lang->story->export      = "Export Data";
+$lang->story->export      = "Export";
 $lang->story->zeroCase    = "Story w/o cases";
 $lang->story->zeroTask    = "Story w/o tasks";
 $lang->story->reportChart = "Report";
@@ -68,17 +68,17 @@ $lang->story->hour           = 'Hours';
 $lang->story->status         = 'Status';
 $lang->story->stage          = 'Phase';
 $lang->story->stageAB        = 'Phase';
-$lang->story->stagedBy       = 'Set By';
-$lang->story->mailto         = 'Mail to';
+$lang->story->stagedBy       = 'SetBy';
+$lang->story->mailto         = 'Mailto';
 $lang->story->openedBy       = 'CreatedBy';
 $lang->story->openedDate     = 'Created';
 $lang->story->assignedTo     = 'AssignedTo';
 $lang->story->assignedDate   = 'Assigned';
 $lang->story->lastEditedBy   = 'Last Edited';
 $lang->story->lastEditedDate = 'Edited';
-$lang->story->closedBy       = 'Closed by';
+$lang->story->closedBy       = 'ClosedBy';
 $lang->story->closedDate     = 'Closed';
-$lang->story->closedReason   = 'Close Reason';
+$lang->story->closedReason   = 'Reason';
 $lang->story->rejectedReason = 'Reject Reason';
 $lang->story->reviewedBy     = 'ReviewedBy';
 $lang->story->reviewedDate   = 'Reviewed';
@@ -97,7 +97,7 @@ $lang->story->colorTag       = 'Color';
 $lang->story->files          = 'Files';
 $lang->story->copy           = "Copy Story";
 $lang->story->total          = "Total";
-$lang->story->allStories     = 'All';
+$lang->story->allStories     = 'All Stories';
 $lang->story->unclosed       = 'Unclosed';
 $lang->story->deleted        = 'Deleted';
 
@@ -138,7 +138,7 @@ $lang->story->reasonList['bydesign']   = 'By Design';
 $lang->story->reviewResultList['']        = '';
 $lang->story->reviewResultList['pass']    = 'Pass';
 $lang->story->reviewResultList['revert']  = 'Revert';
-$lang->story->reviewResultList['clarify'] = 'Clarify';
+$lang->story->reviewResultList['clarify'] = 'To be clarified';
 $lang->story->reviewResultList['reject']  = 'Reject';
 
 $lang->story->reviewList[0] = 'No';
@@ -157,7 +157,7 @@ $lang->story->sourceList['partner']    = 'Partner';
 $lang->story->sourceList['dev']        = 'Dev Team';
 $lang->story->sourceList['tester']     = 'QA Team';
 $lang->story->sourceList['bug']        = 'Bug';
-$lang->story->sourceList['other']      = 'Other';
+$lang->story->sourceList['other']      = 'Others';
 
 $lang->story->priList[]  = '';
 $lang->story->priList[1] = '1';
@@ -168,7 +168,7 @@ $lang->story->priList[4] = '4';
 $lang->story->legendBasicInfo      = 'Basic Info';
 $lang->story->legendLifeTime       = 'Story Life ';
 $lang->story->legendRelated        = 'Related Info';
-$lang->story->legendMailto         = 'Mail to';
+$lang->story->legendMailto         = 'Mailto';
 $lang->story->legendAttatch        = 'Files';
 $lang->story->legendProjectAndTask = $lang->projectCommon . ' Tasks';
 $lang->story->legendBugs           = 'Linked Bug';
@@ -237,7 +237,7 @@ $lang->story->report->charts['storysPerPlan']           = 'by Plan';
 $lang->story->report->charts['storysPerStatus']         = 'by Status';
 $lang->story->report->charts['storysPerStage']          = 'by Phase';
 $lang->story->report->charts['storysPerPri']            = 'by Priority';
-$lang->story->report->charts['storysPerEstimate']       = 'by Estimate';
+$lang->story->report->charts['storysPerEstimate']       = 'by Estimates';
 $lang->story->report->charts['storysPerOpenedBy']       = 'by CreatedBy';
 $lang->story->report->charts['storysPerAssignedTo']     = 'by Assignee';
 $lang->story->report->charts['storysPerClosedReason']   = 'by Closed Reason';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index bd88bed761..09bff84a90 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -53,7 +53,7 @@ $lang->task->storyVerify       = 'Acceptance Criteria';
 $lang->task->name              = 'Name';
 $lang->task->type              = 'Type';
 $lang->task->pri               = 'Priority';
-$lang->task->mailto            = 'Mail to';
+$lang->task->mailto            = 'Mailto';
 $lang->task->estimate          = 'Estimates';
 $lang->task->estimateAB        = 'Est.(h)';
 $lang->task->left              = 'Hours Left';
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 457442856e..1afc36294c 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -22,9 +22,9 @@ $lang->testcase->pri              = 'Priority';
 $lang->testcase->type             = 'Type';
 $lang->testcase->status           = 'Status';
 $lang->testcase->steps            = 'Steps';
-$lang->testcase->openedBy         = 'Created by';
+$lang->testcase->openedBy         = 'CreatedBy';
 $lang->testcase->openedDate       = 'Created';
-$lang->testcase->lastEditedBy     = 'Edited by';
+$lang->testcase->lastEditedBy     = 'EditedBy';
 $lang->testcase->result           = 'Result';
 $lang->testcase->real             = 'Details';
 $lang->testcase->keywords         = 'Tags';
@@ -33,18 +33,18 @@ $lang->testcase->linkCase         = 'Linked Cases';
 $lang->testcase->linkCases        = 'Link Cases';
 $lang->testcase->unlinkCase       = 'Unlink Cases';
 $lang->testcase->stage            = 'Phase';
-$lang->testcase->reviewedBy       = 'Reviewed by';
+$lang->testcase->reviewedBy       = 'ReviewedBy';
 $lang->testcase->reviewedDate     = 'Reviewed';
 $lang->testcase->reviewResult     = 'Review Result';
 $lang->testcase->reviewedByAB     = 'By';
 $lang->testcase->reviewedDateAB   = 'Date';
 $lang->testcase->reviewResultAB   = 'Result';
-$lang->testcase->forceNotReview   = 'No Review';
-$lang->testcase->lastEditedByAB   = 'Edited by';
+$lang->testcase->forceNotReview   = 'Need Review';
+$lang->testcase->lastEditedByAB   = 'EditedBy';
 $lang->testcase->lastEditedDateAB = 'Edited';
 $lang->testcase->lastEditedDate   = 'Edited';
 $lang->testcase->version          = 'Case Version';
-$lang->testcase->lastRunner       = 'Last RunBy';
+$lang->testcase->lastRunner       = 'RunBy';
 $lang->testcase->lastRunDate      = 'Last Run';
 $lang->testcase->assignedTo       = 'AssingedTo';
 $lang->testcase->colorTag         = 'Color';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 1abc702539..8449289e5e 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 $lang->testtask->index            = "Home";
-$lang->testtask->create           = "Submit Test";
+$lang->testtask->create           = "Submit Test Request";
 $lang->testtask->reportChart      = 'Report';
 $lang->testtask->delete           = "Delete";
 $lang->testtask->view             = "Overview";
@@ -22,7 +22,7 @@ $lang->testtask->unlinkCase       = "Unlink";
 $lang->testtask->batchUnlinkCases = "Batch Unlink Case";
 $lang->testtask->batchAssign      = "Batch Assign";
 $lang->testtask->runCase          = "Run";
-$lang->testtask->batchRun         = "Batch run";
+$lang->testtask->batchRun         = "Batch Run";
 $lang->testtask->results          = "Result";
 $lang->testtask->createBug        = "Bug(+)";
 $lang->testtask->assign           = 'Assign';
@@ -32,14 +32,14 @@ $lang->testtask->pre              = 'Prev.';
 $lang->testtask->next             = 'Next';
 $lang->testtask->start            = "Start";
 $lang->testtask->close            = "Close";
-$lang->testtask->wait             = "Pending";
+$lang->testtask->wait             = "Waiting";
 $lang->testtask->block            = "Block";
 $lang->testtask->activate         = "Activate";
 $lang->testtask->testing          = "Testing";
 $lang->testtask->blocked          = "Blocked";
 $lang->testtask->done             = "Tested";
 $lang->testtask->totalStatus      = "All";
-$lang->testtask->all              = "All " . $lang->productCommon;
+$lang->testtask->all              = "All " . $lang->productCommon . "s";  
 $lang->testtask->allTasks         = 'All Tests';
 $lang->testtask->collapseAll      = 'Collapse';
 $lang->testtask->expandAll        = 'Expand';
@@ -51,7 +51,7 @@ $lang->testtask->project        = $lang->projectCommon;
 $lang->testtask->build          = 'Build';
 $lang->testtask->owner          = 'Owner';
 $lang->testtask->pri            = 'Priority';
-$lang->testtask->name           = 'Name';
+$lang->testtask->name           = 'Request Name';
 $lang->testtask->begin          = 'Begin';
 $lang->testtask->end            = 'End';
 $lang->testtask->desc           = 'Description';
@@ -59,8 +59,8 @@ $lang->testtask->mailto         = 'Mailto';
 $lang->testtask->status         = 'Status';
 $lang->testtask->assignedTo     = 'Assigned';
 $lang->testtask->linkVersion    = 'Build';
-$lang->testtask->lastRunAccount = 'Last Run by';
-$lang->testtask->lastRunTime    = 'Last Run on';
+$lang->testtask->lastRunAccount = 'RunBy';
+$lang->testtask->lastRunTime    = 'Last Run';
 $lang->testtask->lastRunResult  = 'Result';
 $lang->testtask->reportField    = 'Report';
 $lang->testtask->files          = 'Upload';
@@ -68,8 +68,8 @@ $lang->testtask->case           = 'Case';
 $lang->testtask->version        = 'Version';
 $lang->testtask->caseResult     = 'Test Result';
 $lang->testtask->stepResults    = 'Step Result';
-$lang->testtask->lastRunner     = 'Last Run by';
-$lang->testtask->lastRunDate    = 'Last Run on';
+$lang->testtask->lastRunner     = 'RunBy';
+$lang->testtask->lastRunDate    = 'Last Run';
 $lang->testtask->date           = 'Tested on';;
 
 $lang->testtask->beginAndEnd    = 'Duration';
@@ -79,7 +79,7 @@ $lang->testtask->legendDesc      = 'Description';
 $lang->testtask->legendReport    = 'Report';
 $lang->testtask->legendBasicInfo = 'Basic Info';
 
-$lang->testtask->statusList['wait']    = 'Pending';
+$lang->testtask->statusList['wait']    = 'Waiting';
 $lang->testtask->statusList['doing']   = 'Doing';
 $lang->testtask->statusList['done']    = 'Done';
 $lang->testtask->statusList['blocked'] = 'Blocked';
@@ -95,7 +95,7 @@ $lang->testtask->linkByBuild   = 'Copy from build';
 $lang->testtask->linkByStory   = 'Link by Story';
 $lang->testtask->linkByBug     = 'Link by Bug';
 $lang->testtask->linkBySuite   = 'Link by Suite';
-$lang->testtask->passAll       = 'Pass all';
+$lang->testtask->passAll       = 'Pass All';
 $lang->testtask->pass          = 'Pass';
 $lang->testtask->fail          = 'Failed';
 $lang->testtask->showResult    = 'Executed <span class="text-info">%s</span> times';
@@ -103,16 +103,16 @@ $lang->testtask->showFail      = 'Failed <span class="text-danger">%s</span> tim
 
 $lang->testtask->confirmDelete     = 'Do you want to delete this test build?';
 $lang->testtask->confirmUnlinkCase = 'Do you want to unlink this case?';
-$lang->testtask->noticeNoOther     = 'There are no other tests for this product';
+$lang->testtask->noticeNoOther     = 'There are no test requests for this product';
 $lang->testtask->noTesttask        = 'No tests. ';
 $lang->testtask->checkLinked       = "Please check whether the product that the test is linked to has been linked to a project.";
 
-$lang->testtask->assignedToMe  = 'AssignToMe';
+$lang->testtask->assignedToMe  = 'AssignedToMe';
 $lang->testtask->allCases      = 'All Cases';
 
 $lang->testtask->lblCases      = 'Case';
 $lang->testtask->lblUnlinkCase = 'Unlink Case';
-$lang->testtask->lblRunCase    = 'Execute Case';
+$lang->testtask->lblRunCase    = 'Run Case';
 $lang->testtask->lblResults    = 'Result';
 
 $lang->testtask->placeholder = new stdclass();
@@ -147,8 +147,8 @@ $lang->testtask->report->charts['testTaskPerRunner']    = 'RunBy Report';
 $lang->testtask->report->charts['bugSeverityGroups']    = 'Bug Severity Distribution';
 $lang->testtask->report->charts['bugStatusGroups']      = 'Bug Status Distribution';
 $lang->testtask->report->charts['bugOpenedByGroups']    = 'Bug CreateBy Distribution';
-$lang->testtask->report->charts['bugResolvedByGroups']  = 'Bug ResolveBy Distribution';
-$lang->testtask->report->charts['bugResolutionGroups']  = 'Bug Resolution Distribution';
+$lang->testtask->report->charts['bugResolvedByGroups']  = 'Bug SolveBy Distribution';
+$lang->testtask->report->charts['bugResolutionGroups']  = 'Bug Solution Distribution';
 $lang->testtask->report->charts['bugModuleGroups']      = 'Bug Module Distribution';
 
 $lang->testtask->report->options = new stdclass();
diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php
index 5f502f24b7..f81d54b713 100644
--- a/module/tree/lang/en.php
+++ b/module/tree/lang/en.php
@@ -57,7 +57,7 @@ $lang->tree->child      = 'Child Module';
 $lang->tree->lineChild  = 'Child Product Line';
 $lang->tree->owner      = 'Owner';
 $lang->tree->order      = 'Order';
-$lang->tree->short      = 'Alias';
+$lang->tree->short      = 'Abbr.';
 $lang->tree->all        = 'All Modules';
-$lang->tree->projectDoc = "{$lang->projectCommon} Doc";
+$lang->tree->projectDoc = "{$lang->projectCommon} Document";
 $lang->tree->product    = $lang->productCommon;
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index e5b1b6326b..d6d23eab23 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -20,7 +20,7 @@ $lang->user->role        = 'Role';
 $lang->user->group       = 'Group';
 $lang->user->realname    = 'Name';
 $lang->user->nickname    = 'Nickname';
-$lang->user->commiter    = 'SCM Account';
+$lang->user->commiter    = 'SVN/GIT Account';
 $lang->user->birthyear   = 'DOB';
 $lang->user->gender      = 'Gender';
 $lang->user->email       = 'Email';
@@ -32,12 +32,12 @@ $lang->user->skype       = 'Skype';
 $lang->user->qq          = 'QQ';
 $lang->user->mobile      = 'Mobile';
 $lang->user->phone       = 'Phone';
-$lang->user->weixin      = 'Wechat';
-$lang->user->dingding    = 'Ding Ding';
+$lang->user->weixin      = 'WeChat';
+$lang->user->dingding    = 'DingDing';
 $lang->user->slack       = 'Slack';
 $lang->user->whatsapp    = 'WhatsApp';
 $lang->user->address     = 'Address';
-$lang->user->zipcode     = 'Zip Code';
+$lang->user->zipcode     = 'ZipCode';
 $lang->user->join        = 'Joined';
 $lang->user->visits      = 'Visits';
 $lang->user->ip          = 'Last IP';
@@ -84,7 +84,7 @@ $lang->user->task        = 'Task';
 $lang->user->bug         = 'Bug';
 $lang->user->test        = 'QA';
 $lang->user->testTask    = 'Test';
-$lang->user->testCase    = 'Test Case';
+$lang->user->testCase    = 'Case';
 $lang->user->schedule    = 'Schedule';
 $lang->user->todo        = 'Todo';
 $lang->user->story       = 'Story';
@@ -172,7 +172,7 @@ $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contacts = new stdclass();
 $lang->user->contacts->common   = 'Contacts';
 $lang->user->contacts->listName = 'List Name';
-$lang->user->contacts->userList = 'User Lisit';
+$lang->user->contacts->userList = 'User List';
 
 $lang->user->contacts->manage        = 'Manage List';
 $lang->user->contacts->contactsList  = 'Contact List';

From 09245b6f2f33024ed2a86b54b40cbe9357de2f63 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 28 May 2019 08:59:09 +0800
Subject: [PATCH 5/7] * Fix productstatisticblock width.

---
 module/block/view/productstatisticblock.html.php | 2 +-
 module/product/lang/en.php                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php
index 8fe1db2093..e125c8d359 100644
--- a/module/block/view/productstatisticblock.html.php
+++ b/module/block/view/productstatisticblock.html.php
@@ -24,7 +24,7 @@
 .product-info .progress {position: absolute; left: 10px; top: 35px; right: 90px;}
 .product-info .progress-info {position: absolute; left: 8px; top: 10px; width: 180px; font-size: 12px;}
 .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 100px;}
-html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 130px;}
+html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 90px;}
 .product-info .type-value,
 .product-info .type-label {font-size: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 .product-info .type-value {font-size: 14px;}
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index a041c6c003..6a16287d1f 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -73,7 +73,7 @@ $lang->product->branch        = '%s';
 $lang->product->qa            = 'QA';
 $lang->product->release       = 'Release';
 $lang->product->allRelease    = 'All Releases';
-$lang->product->maintain      = 'Under Maintenance';
+$lang->product->maintain      = 'Maintenance';
 $lang->product->latestDynamic = 'Dynamics';
 $lang->product->plan          = 'Plan';
 $lang->product->iteration     = 'Iterations';

From e8a1ee93f3af937855c6448b9d6588e4ac21a218 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 28 May 2019 09:08:28 +0800
Subject: [PATCH 6/7] * Finish task #5560.

---
 module/block/view/projectstatisticblock.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php
index 964229cf31..364a8a527b 100644
--- a/module/block/view/projectstatisticblock.html.php
+++ b/module/block/view/projectstatisticblock.html.php
@@ -12,7 +12,7 @@
 .product-info .progress {position: absolute; left: 10px; top: 35px; right: 100px;}
 .product-info .progress-info {position: absolute; left: 8px; top: 10px; width: 180px; font-size: 12px;}
 .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 100px;}
-html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 130px;}
+html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 110px;}
 .product-info .type-value,
 .product-info .type-label {font-size: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 .product-info .type-value {font-size: 14px;}

From f0f52d3bc632f2a78d3de75a4cd192a0e7526f49 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 28 May 2019 09:21:23 +0800
Subject: [PATCH 7/7] * Finish task #5558.

---
 module/block/view/todoblock.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php
index 6bb6062547..6101362feb 100644
--- a/module/block/view/todoblock.html.php
+++ b/module/block/view/todoblock.html.php
@@ -23,7 +23,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
 .block-todoes .todoes > li:hover {background-color: #e9f2fb;}
 .block-todoes .todo-title {padding: 5px;}
 .block-todoes .todo-pri {margin: 0 5px;}
-.block-todoes .todo-time {display: inline-block; padding: 0 5px; font-size: 12px; color: #8e939a; width: 100px;}
+.block-todoes .todo-time {display: inline-block; padding: 0 5px; font-size: 12px; color: #8e939a; width: 75px;}
 .block-todoes .todo-check {position: absolute; top: 5px; left: 10px; display: block; width: 20px; height: 20px; font-size: 20px; color: transparent; cursor: pointer; background: #fff; border: 2px solid #eee; border-radius: 50%;}
 .block-todoes .todo-check:hover {border-color: #8e939a;}
 .block-todoes .active > .todo-check {color: #00da88; background: transparent;border: none;}