From d8a12f6f760dffefd6f24613c8b8fb98ba573211 Mon Sep 17 00:00:00 2001
From: holan20180123 <liyuchun@easycorp.ltd>
Date: Tue, 20 Jul 2021 11:45:59 +0800
Subject: [PATCH]  * Adjust project to execution when merage database.

---
 module/upgrade/view/mergebyline.html.php    | 2 +-
 module/upgrade/view/mergebyproduct.html.php | 2 +-
 module/upgrade/view/mergebysprint.html.php  | 2 +-
 module/upgrade/view/mergeprogram.html.php   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/upgrade/view/mergebyline.html.php b/module/upgrade/view/mergebyline.html.php
index a623c75001..fbd0255a9d 100644
--- a/module/upgrade/view/mergebyline.html.php
+++ b/module/upgrade/view/mergebyline.html.php
@@ -35,7 +35,7 @@
           <input type='checkbox' id='checkAllProducts'><label for='checkAllProducts'><strong><?php echo $lang->productCommon;?></strong></label>
         </div>
         <div class='item checkbox-primary' title="<?php echo $lang->selectAll?>">
-          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->projectCommon;?></strong></label>
+          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->executionCommon;?></strong></label>
         </div>
       </div>
       <div class='line-groups'>
diff --git a/module/upgrade/view/mergebyproduct.html.php b/module/upgrade/view/mergebyproduct.html.php
index 00264ce5cf..e7e9781ea4 100644
--- a/module/upgrade/view/mergebyproduct.html.php
+++ b/module/upgrade/view/mergebyproduct.html.php
@@ -16,7 +16,7 @@
           <input type='checkbox' id='checkAllProducts'><label for='checkAllProducts'><strong><?php echo $lang->productCommon;?></strong></label>
         </div>
         <div class='item checkbox-primary' title="<?php echo $lang->selectAll?>">
-          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->projectCommon;?></strong></label>
+          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->executionCommon;?></strong></label>
         </div>
       </div>
       <div class='line-groups'>
diff --git a/module/upgrade/view/mergebysprint.html.php b/module/upgrade/view/mergebysprint.html.php
index cb76631ebf..38540ca6d6 100644
--- a/module/upgrade/view/mergebysprint.html.php
+++ b/module/upgrade/view/mergebysprint.html.php
@@ -9,7 +9,7 @@
     <div class='cell'>
       <div class='lineGroup-title'>
         <div class='item checkbox-primary' title="<?php echo $lang->selectAll?>">
-          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->projectCommon;?></strong></label>
+          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->executionCommon;?></strong></label>
         </div>
       </div>
       <div class='line-groups sprintGroup'>
diff --git a/module/upgrade/view/mergeprogram.html.php b/module/upgrade/view/mergeprogram.html.php
index 71b65cd015..decaf826c6 100644
--- a/module/upgrade/view/mergeprogram.html.php
+++ b/module/upgrade/view/mergeprogram.html.php
@@ -35,7 +35,7 @@
         <table class='table table-hover table-form'>
           <thead>
             <tr>
-              <th><?php echo $lang->projectCommon;?></th>
+              <th><?php echo $lang->executionCommon;?></th>
               <th class='divider'></th>
               <th class='w-p50'><?php echo $lang->upgrade->selectProject;?></th>
             </tr>