From 23d5f2bd3e5c98700c4a6e1302665c395daf3a61 Mon Sep 17 00:00:00 2001
From: jinianlan <jinianlan@qq.com>
Date: Mon, 8 Jul 2019 15:05:26 +0800
Subject: [PATCH] * finish task #6021,#6009,#6007,#6006

---
 module/backup/lang/en.php      |  2 +-
 module/doc/view/index.html.php |  2 +-
 module/user/lang/en.php        | 20 ++++++++++----------
 module/user/lang/zh-cn.php     |  2 +-
 module/webhook/lang/en.php     |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/module/backup/lang/en.php b/module/backup/lang/en.php
index 92a6375d5c..d3bc95fea2 100644
--- a/module/backup/lang/en.php
+++ b/module/backup/lang/en.php
@@ -3,7 +3,7 @@ $lang->backup->common      = 'Backup';
 $lang->backup->index       = 'Home';
 $lang->backup->history     = 'History';
 $lang->backup->delete      = 'Delete';
-$lang->backup->backup      = 'Back Up';
+$lang->backup->backup      = 'BackUp';
 $lang->backup->restore     = 'Restore';
 $lang->backup->change      = 'Edit Expiration';
 $lang->backup->changeAB    = 'Edit';
diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php
index ecfca69294..af4d93ed4d 100644
--- a/module/doc/view/index.html.php
+++ b/module/doc/view/index.html.php
@@ -125,7 +125,7 @@
       <div class="col-sm-7">
         <div class="panel block-files block-sm" style="height: 290px;">
           <div class="panel-heading">
-            <div class="panel-title"><?php echo $lang->project->undone . ($app->getClientLang() == 'en' ? ' ' : '') . $lang->projectCommon;?></div>
+            <div class="panel-title"><?php echo $lang->project->undone . ($app->getClientLang() == 'en' ? ' ' : '') ."{$lang->projectCommon}s";?></div>
             <nav class="panel-actions nav nav-default">
               <li><?php echo html::a($this->createLink('doc', 'allLibs', 'type=project'), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
             </nav>
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index fb008526c8..8bccf25541 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -94,17 +94,17 @@ $lang->user->todo        = 'Todo';
 $lang->user->story       = 'Stories';
 $lang->user->dynamic     = 'Dynamics';
 
-$lang->user->openedBy    = 'CreatedBy %s';
-$lang->user->assignedTo  = 'AssignedTo %s';
-$lang->user->finishedBy  = 'FinishedBy %s';
-$lang->user->resolvedBy  = 'ResolvedBy %s';
-$lang->user->closedBy    = 'ClosedBy %s';
-$lang->user->reviewedBy  = 'ReviewedBy %s';
-$lang->user->canceledBy  = 'CancelledBy %s';
+$lang->user->openedBy    = 'CreatedBy%s';
+$lang->user->assignedTo  = 'AssignedTo%s';
+$lang->user->finishedBy  = 'FinishedBy%s';
+$lang->user->resolvedBy  = 'ResolvedBy%s';
+$lang->user->closedBy    = 'ClosedBy%s';
+$lang->user->reviewedBy  = 'ReviewedBy%s';
+$lang->user->canceledBy  = 'CancelledBy%s';
 
-$lang->user->testTask2Him = 'BuildBy %s';
-$lang->user->case2Him     = 'CaseAssignedTo %s';
-$lang->user->caseByHim    = 'CaseCreatedBy %s';
+$lang->user->testTask2Him = 'AssignTo%s';
+$lang->user->case2Him     = 'CaseAssignedTo%s';
+$lang->user->caseByHim    = 'CaseCreatedBy%s';
 
 $lang->user->errorDeny    = "Sorry, your access to <b>%s</b> of <b>%s</b> is denied. Please contact your Admin to get privileges. Click Back to return.";
 $lang->user->loginFailed  = "Login failed. Please check your account and password.";
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index 6d38ff8bc9..f2aea2b414 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -102,7 +102,7 @@ $lang->user->closedBy    = '由%s关闭';
 $lang->user->reviewedBy  = '由%s评审';
 $lang->user->canceledBy  = '由%s取消';
 
-$lang->user->testTask2Him = '%s负责版本';
+$lang->user->testTask2Him = '%s负责的版本';
 $lang->user->case2Him     = '给%s的用例';
 $lang->user->caseByHim    = '%s建的用例';
 
diff --git a/module/webhook/lang/en.php b/module/webhook/lang/en.php
index 9280ab02dd..e2bea9c193 100644
--- a/module/webhook/lang/en.php
+++ b/module/webhook/lang/en.php
@@ -57,7 +57,7 @@ $lang->webhook->trimWords = '';
 $lang->webhook->note = new stdClass();
 $lang->webhook->note->async   = 'If the sending type is asynchronous, you have to go to Admin-System to turn on the cron.';
 $lang->webhook->note->product = "All actions will trigger the hook if {$lang->productCommon} is empty, or only actions of {$lang->productCommon} will trigger it.";
-$lang->webhook->note->project = "All actions will trigger the hook if {$lang->projectCommon} is empty, or only actions of {$lang->projectCommon} will trigger it.";
+$lang->webhook->note->project = "All actions will trigger the hook if {$lang->projectCommon} is empty, or only actions of selected {$lang->projectCommon} will trigger it.";
 
 $lang->webhook->note->typeList['bearychat'] = 'Add a ZenTao bot in bearychat and get the webhook url.';
 $lang->webhook->note->typeList['dingding']  = 'Add a customized bot in dingding and get the webhook url.';