From 28744fa8221b45f91614bd4d1a5ef3c1c8c6c6fa Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Mon, 12 Jul 2021 16:04:48 +0800
Subject: [PATCH 1/3] * Finish task #39998.

---
 module/project/view/ajaxgetdropmenu.html.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index 810f1a9b76..ce1f51f7ad 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -9,8 +9,9 @@
 .table-row .table-col .list-group .nav-tabs>li.active>a:before {position: absolute; right: 0; bottom: -1px; left: 0; display: block; height: 2px; content: ' '; background: #0c64eb; }
 .nav-tabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover {border: none;}
 
-.table-row .table-col .list-group .tab-content {margin-top: 10px; padding-left: 15px;}
+.table-row .table-col .list-group .tab-content {margin-top: 10px;}
 .table-row .table-col .list-group .tab-content ul {list-style: none; margin: 0}
+.table-row .table-col .list-group .tab-content .tab-pane>ul {padding-left: 12px;}
 .table-row .table-col .list-group .tab-content li a i.icon {font-size: 15px !important;}
 .table-row .table-col .list-group .tab-content li a i.icon:before {min-width: 16px !important;}
 .table-row .table-col .list-group .tab-content li .label {margin-top: 2px; position: unset;}
@@ -98,16 +99,18 @@ foreach($projects as $programID => $programProjects)
       <ul class="nav nav-tabs">
         <?php if($iCharges): ?>
         <li class="active"><?php echo html::a('#myProject', $lang->project->myProject, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?><span class="text-muted"><?php echo $iCharges;?></span><li>
-        <?php endif;?>
-        <?php if($others): ?>
         <li><?php echo html::a('#other', $lang->project->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?><span class="text-muted"><?php echo $others;?></span><li>
         <?php endif;?>
       </ul>
+      <?php
+      $myProjectActive = $iCharges ? 'active' : '';
+      $otherActive     = $iCharges ? '' : 'active';
+      ?>
       <div class="tab-content">
-        <div class="tab-pane active" id="myProject">
+        <div class="tab-pane <?php echo $myProjectActive;?>" id="myProject">
           <?php echo $myProjectsHtml;?>
         </div>
-        <div class="tab-pane" id="other">
+        <div class="tab-pane <?php echo $otherActive;?>" id="other">
           <?php echo $normalProjectsHtml;?>
         </div>
       </div>

From cea7d733f5680a6343a41adca8f31eeff06e5e79 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 12 Jul 2021 16:27:54 +0800
Subject: [PATCH 2/3] * Fix details.

---
 module/story/model.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index 7d7c665d16..9b3143ad49 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3437,10 +3437,10 @@ class storyModel extends model
                     {
                         $story->children[$storyID]->reviewer  = array_keys($reviewerList);
                         $story->children[$storyID]->notReview = array();
-                    }
-                    foreach($reviewerList as $reviewer => $reviewInfo)
-                    {
-                        if($reviewInfo->result == '') $story->children[$storyID]->notReview[] = $reviewer;
+                        foreach($reviewerList as $reviewer => $reviewInfo)
+                        {
+                            if($reviewInfo->result == '') $story->children[$storyID]->notReview[] = $reviewer;
+                        }
                     }
                 }
             }

From 106ffc839e1ab94a6e1c2d95a1a1dc6d1b2c17ae Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Mon, 12 Jul 2021 16:34:59 +0800
Subject: [PATCH 3/3] * Finish task #40011.

---
 module/upgrade/control.php                |  2 +
 module/upgrade/js/mergeprogram.js         | 11 +++++
 module/upgrade/lang/de.php                | 49 +++++++++++-----------
 module/upgrade/lang/en.php                | 50 +++++++++++------------
 module/upgrade/lang/fr.php                | 49 +++++++++++-----------
 module/upgrade/lang/vi.php                | 49 +++++++++++-----------
 module/upgrade/lang/zh-cn.php             | 49 +++++++++++-----------
 module/upgrade/model.php                  |  2 +
 module/upgrade/view/mergeprogram.html.php |  2 +-
 9 files changed, 141 insertions(+), 122 deletions(-)

diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index 6b06d64aea..93ae7084f3 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -258,10 +258,12 @@ class upgrade extends control
                 /* Process merged products and projects. */
                 if($_POST['projectType'] == 'execution')
                 {
+                    /* Use historical projects as execution upgrades. */
                     $this->upgrade->processMergedData($programID, $projectList, $lineID, $linkedProducts, $linkedSprints);
                 }
                 else
                 {
+                    /* Use historical projects as project upgrades. */
                     foreach($linkedSprints as $sprint)
                     {
                         $this->upgrade->processMergedData($programID, $projectList[$sprint], $lineID, $sprintProducts[$sprint], array($sprint => $sprint));
diff --git a/module/upgrade/js/mergeprogram.js b/module/upgrade/js/mergeprogram.js
index 3a1b2bafbb..b1eac77dda 100644
--- a/module/upgrade/js/mergeprogram.js
+++ b/module/upgrade/js/mergeprogram.js
@@ -10,6 +10,7 @@ $(function()
     $('#checkAllProducts').prop('checked', checkedProduct);
     $('#checkAllProjects').prop('checked', checkedProduct);
 
+    /* Define drag to select relevant parameters. */
     var options = {
         selector: 'input',
         listenClick: false,
@@ -102,6 +103,7 @@ $(function()
         }
     };
 
+    /* Initialize the drag selected. */
     $('#lineBox').selectable(options);
     $('#source').selectable(options);
 
@@ -109,6 +111,7 @@ $(function()
     $('#source .cell').height($('#source').height());
     $('#programBox .cell').height($('#programBox').height() - 20);
 
+    /* Select all product line events. */
     $('#checkAllLines').click(function()
     {
         if($(this).is(':checked'))
@@ -156,6 +159,7 @@ $(function()
         })
     })
 
+    /* Select all product events. */
     $('#checkAllProducts').click(function()
     {
         var lineID = $('li.active').attr('lineid');
@@ -176,6 +180,7 @@ $(function()
         hiddenProject();
     })
 
+    /* Select all project events. */
     $('#checkAllProjects').click(function()
     {
         var lineID = $('li.active').attr('lineid');
@@ -204,6 +209,7 @@ $(function()
 
     setProgramByProduct($(':checkbox:checked[data-productid]'));
 
+    /* Select a product line event. */
     $('[name^=productLines]').change(function()
     {
         var value  = $(this).val();
@@ -228,6 +234,7 @@ $(function()
             $('[data-line=' + value + ']').prop('checked', false);
         }
 
+        /* Determine whether all product line buttons are selected. */
         var checked = true;
         $('[name^=productLines]').each(function()
         {
@@ -332,6 +339,7 @@ $(function()
         setProgramEnd(programEnd);
         setProjectPM();
 
+        /* Determine whether products and projects are selected. */
         if($('#checkAllLines').is(':checked'))
         {
             $('#checkAllProducts').prop('checked', true);
@@ -353,6 +361,7 @@ $(function()
             $('#checkAllProjects').prop('checked', false);
         }
 
+        /* Determine whether all products and all projects buttons are selected. */
         var checkedProduct = true;
         var productLine    = $('.nav li.active').attr('lineid');
         $("[id^='products\[" + productLine + "\]']").each(function()
@@ -362,6 +371,7 @@ $(function()
         $('#checkAllProducts').prop('checked', checkedProduct);
         $('#checkAllProjects').prop('checked', checkedProduct);
 
+        /* Determines whether to display an project related form control. */
         $('[id^=sprints]').each(function()
         {
             if($(this).prop('checked'))
@@ -468,6 +478,7 @@ $(function()
 
     hiddenProject();
 
+    /* Toggles data migration mode events. */
     $('input[name="projectType"]').change(function()
     {
         if($(this).val() == 'execution')
diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php
index b7a8fc1097..c78fb2559f 100644
--- a/module/upgrade/lang/de.php
+++ b/module/upgrade/lang/de.php
@@ -89,31 +89,32 @@ $lang->upgrade->to20Desc      = <<<EOD
 </div>
 EOD;
 $lang->upgrade->mergeProgramDesc = <<<EOD
-<p>Next, we will migrate the previous historical product and iteration data to the project set and under the project, with the following scenario for migration.</p><br />
-<h4>Option 1: Product and iteration organized by product line </h4>
-<p>It is possible to migrate the entire product line and its following products and iterations into one project set and project, although you can also migrate them separately as needed.</p>
-<h4>Option 2: Iteration of product-based organizations </h4>
-<p>You can select multiple products and the iterations below them to migrate to a project set and project, or you can select a particular product and the iterations below it to migrate to a project set and project.</p>
-<h4>Option 3: Independent iterations </h4>
-<p>Several iterations can be selected to migrate to a single project set, or independently.</p>
-<h4>Option 4: Iterations linked to multiple products.</h4>
-<p>These iterations can be selected to fall under a new project.</p>
+<p>Next, ZenTao will migrate the existing data of {$lang->productCommon} and {$lang->projectCommon} to Program and Project. It will be one of the followings:</p><br />
+<h4>1. Manage {$lang->productCommon} and {$lang->projectCommon} by Product Line </h4>
+<p>Migrate the data of {$lang->productCommon} and {$lang->projectCommon} by Product Line to a Program. You can also migrate it separately.</p>
+<h4>2. Manage {$lang->projectCommon} by {$lang->productCommon}</h4>
+<p>You can migrate the data of several {$lang->productCommon}s and {$lang->projectCommon}s to one Program. Or select {$lang->projectCommon}s of a {$lang->productCommon} and {$lang->productCommon} to a Program.</p>
+<h4>2. Independent {$lang->projectCommon}</h4>
+<p>Choose several {$lang->projectCommon}s and migrate them to one Program, or migrate them separately.</p>
+<h4>4. Link {$lang->projectCommon}s of several {$lang->productCommon}s</h4>
+<p>You can set {$lang->projectCommon}s as one new project.</p>
 EOD;
 
-$lang->upgrade->line         = 'Product Line';
-$lang->upgrade->allLines     = 'All Lines';
-$lang->upgrade->program      = 'Merge Project';
-$lang->upgrade->existProgram = 'Existing programs';
-$lang->upgrade->existProject = 'Existing projects';
-$lang->upgrade->existLine    = 'Existing' . $lang->productCommon . ' lines';
-$lang->upgrade->product      = $lang->productCommon;
-$lang->upgrade->project      = 'Iteration';
-$lang->upgrade->repo         = 'Repo';
-$lang->upgrade->mergeRepo    = 'Merge Repo';
-$lang->upgrade->setProgram   = 'Set the project to which the program belongs';
-$lang->upgrade->dataMethod   = 'Data migration method';
-$lang->upgrade->begin        = 'Begin Date';
-$lang->upgrade->end          = 'End Date';
+$lang->upgrade->line          = 'Product Line';
+$lang->upgrade->allLines      = 'All Lines';
+$lang->upgrade->program       = 'Merge Project';
+$lang->upgrade->existProgram  = 'Existing programs';
+$lang->upgrade->existProject  = 'Existing projects';
+$lang->upgrade->existLine     = 'Existing' . $lang->productCommon . ' lines';
+$lang->upgrade->product       = $lang->productCommon;
+$lang->upgrade->project       = 'Iteration';
+$lang->upgrade->repo          = 'Repo';
+$lang->upgrade->mergeRepo     = 'Merge Repo';
+$lang->upgrade->setProgram    = 'Set the project to which the program belongs';
+$lang->upgrade->dataMethod    = 'Data migration method';
+$lang->upgrade->begin         = 'Begin Date';
+$lang->upgrade->end           = 'End Date';
+$lang->upgrade->selectProject = 'The target project';
 
 $lang->upgrade->newProgram         = 'Create';
 $lang->upgrade->projectEmpty       = 'Project must be not empty.';
@@ -121,7 +122,7 @@ $lang->upgrade->mergeSummary       = "Dear users, there are %s products and %s i
 $lang->upgrade->mergeByProductLine = "PRODUCTLINE-BASED iterations: Consolidate the entire product line and the products and iterations below it into one large project.";
 $lang->upgrade->mergeByProduct     = "PRODUCT-BASED iterations: You can select multiple products and their lower iterations to merge into a large project, or you can select a product to merge its lower iterations into a larger project";
 $lang->upgrade->mergeByProject     = "Independent iterations: You can select several iterations and merge them into one large project, or merge them independently";
-$lang->upgrade->mergeByMoreLink    = "Iteration that relates multiple products: select which product the iteration belongs to.";
+$lang->upgrade->mergeByMoreLink    = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: select which project the {$lang->projectCommon} belongs to.";
 $lang->upgrade->mergeRepoTips      = "Merge the selected version library under the selected product.";
 
 $lang->upgrade->needBuild4Add    = 'Full text retrieval has been added in this upgrad. Please create an index.';
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index 6e1387b283..b04b36b2c3 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -69,17 +69,16 @@ $lang->upgrade->to15Desc      = <<<EOD
 </br>
 <p><strong>How do you plan to use the new version of ZenTao?</strong></p>
 EOD;
-
 $lang->upgrade->mergeProgramDesc = <<<EOD
-<p>Next, we will migrate the previous historical product and iteration data to the project set and under the project, with the following scenario for migration.</p><br />
-<h4>Option 1: Product and iteration organized by product line </h4>
-<p>It is possible to migrate the entire product line and its following products and iterations into one project set and project, although you can also migrate them separately as needed.</p>
-<h4>Option 2: Iteration of product-based organizations </h4>
-<p>You can select multiple products and the iterations below them to migrate to a project set and project, or you can select a particular product and the iterations below it to migrate to a project set and project.</p>
-<h4>Option 3: Independent iterations </h4>
-<p>Several iterations can be selected to migrate to a single project set, or independently.</p>
-<h4>Option 4: Iterations linked to multiple products.</h4>
-<p>These iterations can be selected to fall under a new project.</p>
+<p>Next, ZenTao will migrate the existing data of {$lang->productCommon} and {$lang->projectCommon} to Program and Project. It will be one of the followings:</p><br />
+<h4>1. Manage {$lang->productCommon} and {$lang->projectCommon} by Product Line </h4>
+<p>Migrate the data of {$lang->productCommon} and {$lang->projectCommon} by Product Line to a Program. You can also migrate it separately.</p>
+<h4>2. Manage {$lang->projectCommon} by {$lang->productCommon}</h4>
+<p>You can migrate the data of several {$lang->productCommon}s and {$lang->projectCommon}s to one Program. Or select {$lang->projectCommon}s of a {$lang->productCommon} and {$lang->productCommon} to a Program.</p>
+<h4>2. Independent {$lang->projectCommon}</h4>
+<p>Choose several {$lang->projectCommon}s and migrate them to one Program, or migrate them separately.</p>
+<h4>4. Link {$lang->projectCommon}s of several {$lang->productCommon}s</h4>
+<p>You can set {$lang->projectCommon}s as one new project.</p>
 EOD;
 
 $lang->upgrade->to15Mode['classic'] = 'Keep the old version';
@@ -88,20 +87,21 @@ $lang->upgrade->to15Mode['new']     = 'New program management mode';
 $lang->upgrade->selectedModeTips['classic'] = 'You can also switch to the new program set management mode in the background-Customize in the future.';
 $lang->upgrade->selectedModeTips['new']     = 'Switching to the program management mode requires merging the previous data, and the system will guide you to complete this operation.';
 
-$lang->upgrade->line         = 'Product Line';
-$lang->upgrade->allLines     = 'All Lines';
-$lang->upgrade->program      = 'Merge Project';
-$lang->upgrade->existProgram = 'Existing programs';
-$lang->upgrade->existProject = 'Existing projects';
-$lang->upgrade->existLine    = 'Existing' . $lang->productCommon . ' lines';
-$lang->upgrade->product      = $lang->productCommon;
-$lang->upgrade->project      = 'Iteration';
-$lang->upgrade->repo         = 'Repo';
-$lang->upgrade->mergeRepo    = 'Merge Repo';
-$lang->upgrade->setProgram   = 'Set the project to which the program belongs';
-$lang->upgrade->dataMethod   = 'Data migration method';
-$lang->upgrade->begin        = 'Begin Date';
-$lang->upgrade->end          = 'End Date';
+$lang->upgrade->line          = 'Product Line';
+$lang->upgrade->allLines      = 'All Lines';
+$lang->upgrade->program       = 'Merge Project';
+$lang->upgrade->existProgram  = 'Existing programs';
+$lang->upgrade->existProject  = 'Existing projects';
+$lang->upgrade->existLine     = 'Existing' . $lang->productCommon . ' lines';
+$lang->upgrade->product       = $lang->productCommon;
+$lang->upgrade->project       = 'Iteration';
+$lang->upgrade->repo          = 'Repo';
+$lang->upgrade->mergeRepo     = 'Merge Repo';
+$lang->upgrade->setProgram    = 'Set the project to which the program belongs';
+$lang->upgrade->dataMethod    = 'Data migration method';
+$lang->upgrade->begin         = 'Begin Date';
+$lang->upgrade->end           = 'End Date';
+$lang->upgrade->selectProject = 'The target project';
 
 $lang->upgrade->newProgram         = 'Create';
 $lang->upgrade->projectEmpty       = 'Project must be not empty.';
@@ -109,7 +109,7 @@ $lang->upgrade->mergeSummary       = "Dear users, there are %s products and %s i
 $lang->upgrade->mergeByProductLine = "PRODUCTLINE-BASED iterations: Consolidate the entire product line and the products and iterations below it into one large project.";
 $lang->upgrade->mergeByProduct     = "PRODUCT-BASED iterations: You can select multiple products and their lower iterations to merge into a large project, or you can select a product to merge its lower iterations into a larger project";
 $lang->upgrade->mergeByProject     = "Independent iterations: You can select several iterations and merge them into one large project, or merge them independently";
-$lang->upgrade->mergeByMoreLink    = "Iteration that relates multiple products: select which product the iteration belongs to.";
+$lang->upgrade->mergeByMoreLink    = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: select which project the {$lang->projectCommon} belongs to.";
 $lang->upgrade->mergeRepoTips      = "Merge the selected version library under the selected product.";
 $lang->upgrade->needBuild4Add      = 'Full text retrieval has been added in this upgrade. Need create index. Please go [Admin->System->BuildIndex] page to build index.';
 
diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php
index c07356c80e..56a4023400 100644
--- a/module/upgrade/lang/fr.php
+++ b/module/upgrade/lang/fr.php
@@ -90,31 +90,32 @@ $lang->upgrade->to20Desc      = <<<EOD
 </div>
 EOD;
 $lang->upgrade->mergeProgramDesc = <<<EOD
-<p>Next, we will migrate the previous historical product and iteration data to the project set and under the project, with the following scenario for migration.</p><br />
-<h4>Option 1: Product and iteration organized by product line </h4>
-<p>It is possible to migrate the entire product line and its following products and iterations into one project set and project, although you can also migrate them separately as needed.</p>
-<h4>Option 2: Iteration of product-based organizations </h4>
-<p>You can select multiple products and the iterations below them to migrate to a project set and project, or you can select a particular product and the iterations below it to migrate to a project set and project.</p>
-<h4>Option 3: Independent iterations </h4>
-<p>Several iterations can be selected to migrate to a single project set, or independently.</p>
-<h4>Option 4: Iterations linked to multiple products.</h4>
-<p>These iterations can be selected to fall under a new project.</p>
+<p>Next, ZenTao will migrate the existing data of {$lang->productCommon} and {$lang->projectCommon} to Program and Project. It will be one of the followings:</p><br />
+<h4>1. Manage {$lang->productCommon} and {$lang->projectCommon} by Product Line </h4>
+<p>Migrate the data of {$lang->productCommon} and {$lang->projectCommon} by Product Line to a Program. You can also migrate it separately.</p>
+<h4>2. Manage {$lang->projectCommon} by {$lang->productCommon}</h4>
+<p>You can migrate the data of several {$lang->productCommon}s and {$lang->projectCommon}s to one Program. Or select {$lang->projectCommon}s of a {$lang->productCommon} and {$lang->productCommon} to a Program.</p>
+<h4>2. Independent {$lang->projectCommon}</h4>
+<p>Choose several {$lang->projectCommon}s and migrate them to one Program, or migrate them separately.</p>
+<h4>4. Link {$lang->projectCommon}s of several {$lang->productCommon}s</h4>
+<p>You can set {$lang->projectCommon}s as one new project.</p>
 EOD;
 
-$lang->upgrade->line         = 'Product Line';
-$lang->upgrade->allLines     = 'All Lines';
-$lang->upgrade->program      = 'Merge Project';
-$lang->upgrade->existProgram = 'Existing programs';
-$lang->upgrade->existProject = 'Existing projects';
-$lang->upgrade->existLine    = 'Existing' . $lang->productCommon . ' lines';
-$lang->upgrade->product      = $lang->productCommon;
-$lang->upgrade->project      = 'Iteration';
-$lang->upgrade->repo         = 'Repo';
-$lang->upgrade->mergeRepo    = 'Merge Repo';
-$lang->upgrade->setProgram   = 'Set the project to which the program belongs';
-$lang->upgrade->dataMethod   = 'Data migration method';
-$lang->upgrade->begin        = 'Begin Date';
-$lang->upgrade->end          = 'End Date';
+$lang->upgrade->line          = 'Product Line';
+$lang->upgrade->allLines      = 'All Lines';
+$lang->upgrade->program       = 'Merge Project';
+$lang->upgrade->existProgram  = 'Existing programs';
+$lang->upgrade->existProject  = 'Existing projects';
+$lang->upgrade->existLine     = 'Existing' . $lang->productCommon . ' lines';
+$lang->upgrade->product       = $lang->productCommon;
+$lang->upgrade->project       = 'Iteration';
+$lang->upgrade->repo          = 'Repo';
+$lang->upgrade->mergeRepo     = 'Merge Repo';
+$lang->upgrade->setProgram    = 'Set the project to which the program belongs';
+$lang->upgrade->dataMethod    = 'Data migration method';
+$lang->upgrade->begin         = 'Begin Date';
+$lang->upgrade->end           = 'End Date';
+$lang->upgrade->selectProject = 'The target project';
 
 $lang->upgrade->newProgram         = 'Create';
 $lang->upgrade->projectEmpty       = 'Project must be not empty.';
@@ -122,7 +123,7 @@ $lang->upgrade->mergeSummary       = "Dear users, there are %s products and %s i
 $lang->upgrade->mergeByProductLine = "PRODUCTLINE-BASED iterations: Consolidate the entire product line and the products and iterations below it into one large project.";
 $lang->upgrade->mergeByProduct     = "PRODUCT-BASED iterations: You can select multiple products and their lower iterations to merge into a large project, or you can select a product to merge its lower iterations into a larger project";
 $lang->upgrade->mergeByProject     = "Independent iterations: You can select several iterations and merge them into one large project, or merge them independently";
-$lang->upgrade->mergeByMoreLink    = "Iteration that relates multiple products: select which product the iteration belongs to.";
+$lang->upgrade->mergeByMoreLink    = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: select which project the {$lang->projectCommon} belongs to.";
 $lang->upgrade->mergeRepoTips      = "Merge the selected version library under the selected product.";
 
 $lang->upgrade->needBuild4Add    = 'Full text retrieval has been added in this upgrad. Please create an index.';
diff --git a/module/upgrade/lang/vi.php b/module/upgrade/lang/vi.php
index 0b42dd37cd..7891020322 100644
--- a/module/upgrade/lang/vi.php
+++ b/module/upgrade/lang/vi.php
@@ -90,31 +90,32 @@ $lang->upgrade->to20Desc      = <<<EOD
 </div>
 EOD;
 $lang->upgrade->mergeProgramDesc = <<<EOD
-<p>Next, we will migrate the previous historical product and iteration data to the project set and under the project, with the following scenario for migration.</p><br />
-<h4>Option 1: Product and iteration organized by product line </h4>
-<p>It is possible to migrate the entire product line and its following products and iterations into one project set and project, although you can also migrate them separately as needed.</p>
-<h4>Option 2: Iteration of product-based organizations </h4>
-<p>You can select multiple products and the iterations below them to migrate to a project set and project, or you can select a particular product and the iterations below it to migrate to a project set and project.</p>
-<h4>Option 3: Independent iterations </h4>
-<p>Several iterations can be selected to migrate to a single project set, or independently.</p>
-<h4>Option 4: Iterations linked to multiple products.</h4>
-<p>These iterations can be selected to fall under a new project.</p>
+<p>Next, ZenTao will migrate the existing data of {$lang->productCommon} and {$lang->projectCommon} to Program and Project. It will be one of the followings:</p><br />
+<h4>1. Manage {$lang->productCommon} and {$lang->projectCommon} by Product Line </h4>
+<p>Migrate the data of {$lang->productCommon} and {$lang->projectCommon} by Product Line to a Program. You can also migrate it separately.</p>
+<h4>2. Manage {$lang->projectCommon} by {$lang->productCommon}</h4>
+<p>You can migrate the data of several {$lang->productCommon}s and {$lang->projectCommon}s to one Program. Or select {$lang->projectCommon}s of a {$lang->productCommon} and {$lang->productCommon} to a Program.</p>
+<h4>2. Independent {$lang->projectCommon}</h4>
+<p>Choose several {$lang->projectCommon}s and migrate them to one Program, or migrate them separately.</p>
+<h4>4. Link {$lang->projectCommon}s of several {$lang->productCommon}s</h4>
+<p>You can set {$lang->projectCommon}s as one new project.</p>
 EOD;
 
-$lang->upgrade->line         = 'Product Line';
-$lang->upgrade->allLines     = 'All Lines';
-$lang->upgrade->program      = 'Merge Project';
-$lang->upgrade->existProgram = 'Existing programs';
-$lang->upgrade->existProject = 'Existing projects';
-$lang->upgrade->existLine    = 'Existing' . $lang->productCommon . ' lines';
-$lang->upgrade->product      = $lang->productCommon;
-$lang->upgrade->project      = 'Iteration';
-$lang->upgrade->repo         = 'Repo';
-$lang->upgrade->mergeRepo    = 'Merge Repo';
-$lang->upgrade->setProgram   = 'Set the project to which the program belongs';
-$lang->upgrade->dataMethod   = 'Data migration method';
-$lang->upgrade->begin        = 'Begin Date';
-$lang->upgrade->end          = 'End Date';
+$lang->upgrade->line          = 'Product Line';
+$lang->upgrade->allLines      = 'All Lines';
+$lang->upgrade->program       = 'Merge Project';
+$lang->upgrade->existProgram  = 'Existing programs';
+$lang->upgrade->existProject  = 'Existing projects';
+$lang->upgrade->existLine     = 'Existing' . $lang->productCommon . ' lines';
+$lang->upgrade->product       = $lang->productCommon;
+$lang->upgrade->project       = 'Iteration';
+$lang->upgrade->repo          = 'Repo';
+$lang->upgrade->mergeRepo     = 'Merge Repo';
+$lang->upgrade->setProgram    = 'Set the project to which the program belongs';
+$lang->upgrade->dataMethod    = 'Data migration method';
+$lang->upgrade->begin         = 'Begin Date';
+$lang->upgrade->end           = 'End Date';
+$lang->upgrade->selectProject = 'The target project';
 
 $lang->upgrade->newProgram         = 'Create';
 $lang->upgrade->projectEmpty       = 'Project must be not empty.';
@@ -122,7 +123,7 @@ $lang->upgrade->mergeSummary       = "Dear users, there are %s products and %s i
 $lang->upgrade->mergeByProductLine = "PRODUCTLINE-BASED iterations: Consolidate the entire product line and the products and iterations below it into one large project.";
 $lang->upgrade->mergeByProduct     = "PRODUCT-BASED iterations: You can select multiple products and their lower iterations to merge into a large project, or you can select a product to merge its lower iterations into a larger project";
 $lang->upgrade->mergeByProject     = "Independent iterations: You can select several iterations and merge them into one large project, or merge them independently";
-$lang->upgrade->mergeByMoreLink    = "Iteration that relates multiple products: select which product the iteration belongs to.";
+$lang->upgrade->mergeByMoreLink    = "{$lang->projectCommon} that relates multiple {$lang->productCommon}: select which project the {$lang->projectCommon} belongs to.";
 $lang->upgrade->mergeRepoTips      = "Merge the selected version library under the selected product.";
 $lang->upgrade->needBuild4Add      = 'Full text retrieval has been added in this upgrad. Vui lòng create an index.';
 
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index b07d60dd42..5806f8b518 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -71,15 +71,15 @@ $lang->upgrade->to15Desc       = <<<EOD
 EOD;
 
 $lang->upgrade->mergeProgramDesc = <<<EOD
-<p>接下来我们会把之前历史产品和迭代数据迁移到项目集和项目下，迁移的方案如下：</p><br />
-<h4>方案一：以产品线组织的产品和迭代 </h4>
-<p>可以将整个产品线及其下面的产品和迭代迁移到一个项目集和项目中，当然您也可以根据需要分开迁移。</p>
-<h4>方案二：以产品组织的迭代 </h4>
-<p>可以选择多个产品及其下面的迭代迁移到一个项目集和项目中，也可以选择某一个产品和产品下面的迭代迁移到项目集和项目中。</p>
-<h4>方案三：独立的迭代</h4>
-<p>可以选择若干个迭代迁移到一个项目集中，也可以独立迁移。</p>
-<h4>方案四：关联多个产品的迭代</h4>
-<p>可以选择这些迭代归属于某个新项目下。</p>
+<p>接下来我们会把之前历史{$lang->productCommon}和{$lang->projectCommon}数据迁移到项目集和项目下，迁移的情况如下：</p><br />
+<h4>情况一：以产品线组织的{$lang->productCommon}和{$lang->projectCommon} </h4>
+<p>可以将整个产品线及其下面的{$lang->productCommon}和{$lang->projectCommon}迁移到一个项目集中，当然您也可以根据需要分开迁移。</p>
+<h4>情况二：以{$lang->productCommon}组织的{$lang->projectCommon} </h4>
+<p>可以选择多个{$lang->productCommon}及其下面的{$lang->projectCommon}迁移到一个项目集中，也可以选择某一个{$lang->productCommon}和{$lang->productCommon}下面的{$lang->projectCommon}迁移到项目集中。</p>
+<h4>情况三：独立的{$lang->projectCommon}</h4>
+<p>可以选择若干个{$lang->projectCommon}迁移到一个项目集中，也可以独立迁移。</p>
+<h4>情况四：关联多个{$lang->productCommon}的{$lang->projectCommon}</h4>
+<p>可以选择这些{$lang->projectCommon}归属于某个新项目下。</p>
 EOD;
 
 $lang->upgrade->to15Mode['classic'] = '保持老版本的习惯';
@@ -88,20 +88,21 @@ $lang->upgrade->to15Mode['new']     = '全新项目集管理模式';
 $lang->upgrade->selectedModeTips['classic'] = '后续您还可以在后台-自定义里面切换为全新项目集管理的模式。';
 $lang->upgrade->selectedModeTips['new']     = '切换为项目集管理模式需要对之前的数据进行归并处理，系统会引导您完成这个操作。';
 
-$lang->upgrade->line         = '产品线';
-$lang->upgrade->allLines     = '所有产品线';
-$lang->upgrade->program      = '目标项目集和项目';
-$lang->upgrade->existProgram = '已有项目集';
-$lang->upgrade->existProject = '已有项目';
-$lang->upgrade->existLine    = '已有' . $lang->productCommon . '线';
-$lang->upgrade->product      = $lang->productCommon;
-$lang->upgrade->project      = '迭代';
-$lang->upgrade->repo         = '版本库';
-$lang->upgrade->mergeRepo    = '归并版本库';
-$lang->upgrade->setProgram   = '设置项目所属项目集';
-$lang->upgrade->dataMethod   = '数据迁移方式';
-$lang->upgrade->begin        = '开始日期';
-$lang->upgrade->end          = '结束日期';
+$lang->upgrade->line          = '产品线';
+$lang->upgrade->allLines      = '所有产品线';
+$lang->upgrade->program       = '目标项目集和项目';
+$lang->upgrade->existProgram  = '已有项目集';
+$lang->upgrade->existProject  = '已有项目';
+$lang->upgrade->existLine     = '已有' . $lang->productCommon . '线';
+$lang->upgrade->product       = $lang->productCommon;
+$lang->upgrade->project       = '迭代';
+$lang->upgrade->repo          = '版本库';
+$lang->upgrade->mergeRepo     = '归并版本库';
+$lang->upgrade->setProgram    = '设置项目所属项目集';
+$lang->upgrade->dataMethod    = '数据迁移方式';
+$lang->upgrade->begin         = '开始日期';
+$lang->upgrade->end           = '结束日期';
+$lang->upgrade->selectProject = '目标项目';
 
 $lang->upgrade->newProgram         = '新建';
 $lang->upgrade->projectEmpty       = '所属项目不能为空！';
@@ -109,7 +110,7 @@ $lang->upgrade->mergeSummary       = "尊敬的用户，您的系统中共有%s
 $lang->upgrade->mergeByProductLine = "以产品线组织的产品和迭代：将整个产品线及其下面的产品和迭代归并到一个项目集和项目中，也可以分开归并。";
 $lang->upgrade->mergeByProduct     = "以产品组织的迭代：可以选择多个产品及其下面的迭代归并到一个项目集和项目中，也可以选择某一个产品将其下面所属的迭代归并到项目集和项目中。";
 $lang->upgrade->mergeByProject     = "独立的迭代：可以选择若干迭代归并到一个项目中，也可以独立归并。";
-$lang->upgrade->mergeByMoreLink    = "关联多个产品的迭代：选择这个迭代归属于哪一个产品。";
+$lang->upgrade->mergeByMoreLink    = "关联多个{$lang->productCommon}的{$lang->projectCommon}：选择这个{$lang->projectCommon}归属于哪一个项目。";
 $lang->upgrade->mergeRepoTips      = "将选中的版本库归并到所选产品下。";
 $lang->upgrade->needBuild4Add      = '本次升级需要创建索引。请到 [后台->系统->重建索引] 页面，重新创建索引。';
 
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index e722536278..982d274eff 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -4334,10 +4334,12 @@ class upgradeModel extends model
             $this->app->loadLang('doc');
             if($data->projectType == 'execution')
             {
+                /* Use historical projects as execution upgrades. */
                 $projectList = $this->createProject($programID, $data);
             }
             else
             {
+                /* Use historical projects as project upgrades. */
                 $nameList = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in($projectIdList)->fetchPairs();
                 foreach($projectIdList as $project)
                 {
diff --git a/module/upgrade/view/mergeprogram.html.php b/module/upgrade/view/mergeprogram.html.php
index dcc3c5b431..6c496619e5 100644
--- a/module/upgrade/view/mergeprogram.html.php
+++ b/module/upgrade/view/mergeprogram.html.php
@@ -37,7 +37,7 @@
             <tr>
               <th><?php echo $lang->upgrade->project;?></th>
               <th class='divider'></th>
-              <th class='w-p50'><?php echo $lang->upgrade->program;?></th>
+              <th class='w-p50'><?php echo $lang->upgrade->selectProject;?></th>
             </tr>
           </thead>
           <tbody>