Merge branch 'tsj_fixbug'

module/custom/lang/zh-cn.php

@@ -261,7 +261,7 @@ $lang->custom->modeIntroductionList['ALM']   = '概念更加完整、严谨，
 $lang->custom->features['program']              = '项目集';
 $lang->custom->features['productRR']            = "{$lang->productCommon}-研发需求";
 $lang->custom->features['productUR']            = "{$lang->productCommon}-用户需求";
-$lang->custom->features['productLine']          = "{$lang->productCommon}-{$lang->productCommon}线";
+$lang->custom->features['productLine']          = "{$lang->productCommon}-产品线";
 $lang->custom->features['projectScrum']         = "{$lang->projectCommon}-敏捷模型";
 $lang->custom->features['projectWaterfall']     = "{$lang->projectCommon}-瀑布模型";
 $lang->custom->features['projectKanban']        = "{$lang->projectCommon}-看板模型";

module/my/lang/de.php

@@ -103,7 +103,7 @@ $lang->my->executionLink = 'Execution Default Page';
 $lang->my->programLinkList = array();
 $lang->my->programLinkList['program-browse']  = 'Project Set List/View all project sets';
 $lang->my->programLinkList['program-kanban']  = 'Project Set Kanban/You can visually view the progress of all project sets';
-$lang->my->programLinkList['program-project'] = "{$lang->projectCommon} list of the most recent {$lang->projectCommon} set/You can view all items under the current {$lang->projectCommon} set";
+$lang->my->programLinkList['program-project'] = "{$lang->projectCommon} list of the most recent program/You can view all items under the current program";
 
 $lang->my->productLinkList = array();
 $lang->my->productLinkList['product-all']       = "{$lang->productCommon} List/Can view all {$lang->productCommon}s";

module/my/lang/en.php

@@ -103,7 +103,7 @@ $lang->my->executionLink = 'Execution Default Page';
 $lang->my->programLinkList = array();
 $lang->my->programLinkList['program-browse']  = 'Project Set List/View all project sets';
 $lang->my->programLinkList['program-kanban']  = 'Project Set Kanban/You can visually view the progress of all project sets';
-$lang->my->programLinkList['program-project'] = "{$lang->projectCommon} list of the most recent {$lang->projectCommon} set/You can view all items under the current {$lang->projectCommon} set";
+$lang->my->programLinkList['program-project'] = "{$lang->projectCommon} list of the most recent program/You can view all items under the current program";
 
 $lang->my->productLinkList = array();
 $lang->my->productLinkList['product-all']       = "{$lang->productCommon} List/Can view all {$lang->productCommon}s";

module/my/lang/fr.php

@@ -103,7 +103,7 @@ $lang->my->executionLink = 'Execution Default Page';
 $lang->my->programLinkList = array();
 $lang->my->programLinkList['program-browse']  = 'Project Set List/View all project sets';
 $lang->my->programLinkList['program-kanban']  = 'Project Set Kanban/You can visually view the progress of all project sets';
-$lang->my->programLinkList['program-project'] = "{$lang->projectCommon} list of the most recent {$lang->projectCommon} set/You can view all items under the current {$lang->projectCommon} set";
+$lang->my->programLinkList['program-project'] = "{$lang->projectCommon} list of the most recent program/You can view all items under the current program";
 
 $lang->my->productLinkList = array();
 $lang->my->productLinkList['product-all']       = "{$lang->productCommon} List/Can view all {$lang->productCommon}s";

module/product/lang/de.php

@@ -27,8 +27,8 @@ $lang->product->closed           = 'Geschlossen';
 $lang->product->closedProduct    = "Closed {$lang->productCommon}";
 $lang->product->updateOrder      = 'Ranking';
 $lang->product->all              = "{$lang->productCommon} List";
-$lang->product->manageLine       = "Manage {$lang->productCommon} Line";
-$lang->product->newLine          = "Create {$lang->productCommon} Line";
+$lang->product->manageLine       = "Manage Product Line";
+$lang->product->newLine          = "Create Product Line";
 $lang->product->export           = 'Exportiere Daten';
 $lang->product->dashboard        = 'Dashboard';
 $lang->product->changeProgram    = "{$lang->productCommon} confirmation of the scope of influence of adjustment of the program set";
@@ -98,10 +98,10 @@ $lang->product->programChangeTip     = "The {$lang->projectCommon}s linked with
 $lang->product->notChangeProgramTip  = "The {$lang->SRCommon} of {$lang->productCommon} has been linked to the following {$lang->projectCommon}s, please cancel the link before proceeding";
 $lang->product->confirmChangeProgram = "The {$lang->projectCommon}s linked with this {$lang->productCommon}: %s is also linked with other {$lang->productCommon}s, whether to transfer {$lang->projectCommon}s to the modified program set.";
 $lang->product->changeProgramError   = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the {$lang->projectCommon}, please unlink it before proceeding";
-$lang->product->changeLineError      = "{$lang->productCommon}s already exist under the {$lang->productCommon} line, so the program within them cannot be modified.";
+$lang->product->changeLineError      = "{$lang->productCommon}s already exist under the product line, so the program within them cannot be modified.";
 $lang->product->programEmpty         = 'Program should not be empty!';
-$lang->product->nameIsDuplicate      = "『%s』 {$lang->productCommon} line already exists, please reset!";
-$lang->product->nameIsDuplicated     = "{$lang->productCommon} Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
+$lang->product->nameIsDuplicate      = "『%s』 product line already exists, please reset!";
+$lang->product->nameIsDuplicated     = "Product Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
 $lang->product->reviewStory          = 'You are not a reviewer for needs "%s" , and cannot review. This operation has been filtered';
 
 $lang->product->id             = 'ID';
@@ -109,8 +109,8 @@ $lang->product->program        = "Program";
 $lang->product->name           = 'Name';
 $lang->product->code           = 'Alias';
 $lang->product->shadow         = "Shadow {$lang->productCommon}";
-$lang->product->line           = "{$lang->productCommon} Line";
-$lang->product->lineName       = "{$lang->productCommon} Line Name";
+$lang->product->line           = "Product Line";
+$lang->product->lineName       = "Product Line Name";
 $lang->product->order          = 'Sortierung';
 $lang->product->bind           = 'In/Depedent';
 $lang->product->type           = 'Typ';

module/product/lang/en.php

@@ -27,8 +27,8 @@ $lang->product->closed           = 'Closed';
 $lang->product->closedProduct    = "Closed {$lang->productCommon}";
 $lang->product->updateOrder      = 'Order';
 $lang->product->all              = "{$lang->productCommon} List";
-$lang->product->manageLine       = "Manage {$lang->productCommon} Line";
-$lang->product->newLine          = "Create {$lang->productCommon} Line";
+$lang->product->manageLine       = "Manage Product Line";
+$lang->product->newLine          = "Create Product Line";
 $lang->product->export           = 'Export';
 $lang->product->dashboard        = "Dashboard";
 $lang->product->changeProgram    = "{$lang->productCommon} confirmation of the scope of influence of adjustment of the program set";
@@ -98,10 +98,10 @@ $lang->product->programChangeTip     = "The {$lang->projectCommon}s linked with
 $lang->product->notChangeProgramTip  = "The {$lang->SRCommon} of {$lang->productCommon} has been linked to the following {$lang->projectCommon}s, please cancel the link before proceeding";
 $lang->product->confirmChangeProgram = "The {$lang->projectCommon}s linked with this {$lang->productCommon}: %s is also linked with other {$lang->productCommon}s, whether to transfer {$lang->projectCommon}s to the modified program set.";
 $lang->product->changeProgramError   = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the {$lang->projectCommon}, please unlink it before proceeding";
-$lang->product->changeLineError      = "{$lang->productCommon}s already exist under the {$lang->productCommon} line, so the program within them cannot be modified.";
+$lang->product->changeLineError      = "{$lang->productCommon}s already exist under the product line, so the program within them cannot be modified.";
 $lang->product->programEmpty         = 'Program should not be empty!';
-$lang->product->nameIsDuplicate      = "『%s』 {$lang->productCommon} line already exists, please reset!";
-$lang->product->nameIsDuplicated     = "{$lang->productCommon} Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
+$lang->product->nameIsDuplicate      = "『%s』 product line already exists, please reset!";
+$lang->product->nameIsDuplicated     = "Product Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
 $lang->product->reviewStory          = 'You are not a reviewer for needs "%s" , and cannot review. This operation has been filtered';
 
 $lang->product->id             = 'ID';
@@ -109,8 +109,8 @@ $lang->product->program        = "Program";
 $lang->product->name           = "{$lang->productCommon} Name";
 $lang->product->code           = 'Code';
 $lang->product->shadow         = "Shadow {$lang->productCommon}";
-$lang->product->line           = "{$lang->productCommon} Line";
-$lang->product->lineName       = "{$lang->productCommon} Line Name";
+$lang->product->line           = "Product Line";
+$lang->product->lineName       = "Product Line Name";
 $lang->product->order          = 'Rank';
 $lang->product->bind           = 'In/Depedent';
 $lang->product->type           = 'Type';

module/product/lang/fr.php

@@ -27,8 +27,8 @@ $lang->product->closed           = 'Fermés';
 $lang->product->closedProduct    = "Closed {$lang->productCommon}";
 $lang->product->updateOrder      = 'Ordre';
 $lang->product->all              = "{$lang->productCommon} List";
-$lang->product->manageLine       = "Manage {$lang->productCommon} Line";
-$lang->product->newLine          = "Create {$lang->productCommon} Line";
+$lang->product->manageLine       = "Manage Product Line";
+$lang->product->newLine          = "Create Product Line";
 $lang->product->export           = 'Export';
 $lang->product->dashboard        = "Dashboard";
 $lang->product->changeProgram    = "{$lang->productCommon} confirmation of the scope of influence of adjustment of the program set";
@@ -98,10 +98,10 @@ $lang->product->programChangeTip     = "The {$lang->projectCommon}s linked with
 $lang->product->notChangeProgramTip  = "The {$lang->SRCommon} of {$lang->productCommon} has been linked to the following {$lang->projectCommon}s, please cancel the link before proceeding";
 $lang->product->confirmChangeProgram = "The {$lang->projectCommon}s linked with this {$lang->productCommon}: %s is also linked with other {$lang->productCommon}s, whether to transfer {$lang->projectCommon}s to the modified program set.";
 $lang->product->changeProgramError   = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the {$lang->projectCommon}, please unlink it before proceeding";
-$lang->product->changeLineError      = "{$lang->productCommon}s already exist under the {$lang->productCommon} line, so the program within them cannot be modified.";
+$lang->product->changeLineError      = "{$lang->productCommon}s already exist under the product line, so the program within them cannot be modified.";
 $lang->product->programEmpty         = 'Program should not be empty!';
-$lang->product->nameIsDuplicate      = "『%s』 {$lang->productCommon} line already exists, please reset!";
-$lang->product->nameIsDuplicated     = "{$lang->productCommon} Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
+$lang->product->nameIsDuplicate      = "『%s』 product line already exists, please reset!";
+$lang->product->nameIsDuplicated     = "Product Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
 $lang->product->reviewStory          = 'You are not a reviewer for needs "%s" , and cannot review. This operation has been filtered';
 
 $lang->product->id             = 'ID';
@@ -109,8 +109,8 @@ $lang->product->program        = "Program";
 $lang->product->name           = "Nom du {$lang->productCommon}";
 $lang->product->code           = 'Code';
 $lang->product->shadow         = "Shadow {$lang->productCommon}";
-$lang->product->line           = "{$lang->productCommon} Line";
-$lang->product->lineName       = "{$lang->productCommon} Line Name";
+$lang->product->line           = "Product Line";
+$lang->product->lineName       = "Product Line Name";
 $lang->product->order          = 'Rang';
 $lang->product->bind           = 'In/Depedent';
 $lang->product->type           = 'Type';

module/product/lang/zh-cn.php

@@ -27,8 +27,8 @@ $lang->product->closed           = '已关闭';
 $lang->product->closedProduct    = "已关闭的{$lang->productCommon}";
 $lang->product->updateOrder      = '排序';
 $lang->product->all              = "所有{$lang->productCommon}";
-$lang->product->manageLine       = "维护{$lang->productCommon}线";
-$lang->product->newLine          = "新建{$lang->productCommon}线";
+$lang->product->manageLine       = "维护产品线";
+$lang->product->newLine          = "新建产品线";
 $lang->product->export           = '导出数据';
 $lang->product->dashboard        = "{$lang->productCommon}仪表盘";
 $lang->product->changeProgram    = "{$lang->productCommon}调整所属项目集影响范围确认";
@@ -98,10 +98,10 @@ $lang->product->programChangeTip     = "如下{$lang->projectCommon}只关联了
 $lang->product->notChangeProgramTip  = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到如下{$lang->projectCommon}，请点击{$lang->projectCommon}名称进入{$lang->SRCommon}列表取消关联后再操作";
 $lang->product->confirmChangeProgram = "如下{$lang->projectCommon}既关联了该{$lang->productCommon}又关联了其他{$lang->productCommon}，请确认是否继续关联该{$lang->productCommon}，勾选后将取消与其他{$lang->productCommon}的关联关系，同时转移至新项目集下。";
 $lang->product->changeProgramError   = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到{$lang->projectCommon}，请取消关联后再操作";
-$lang->product->changeLineError      = "{$lang->productCommon}线下已有{$lang->productCommon}，不可修改所属项目集。";
+$lang->product->changeLineError      = "产品线下已有{$lang->productCommon}，不可修改所属项目集。";
 $lang->product->programEmpty         = '项目集不能为空';
-$lang->product->nameIsDuplicate      = "『%s』{$lang->productCommon}线已经存在，请重新设置！";
-$lang->product->nameIsDuplicated     = "{$lang->productCommon}线已经有『%s』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。";
+$lang->product->nameIsDuplicate      = "『%s』产品线已经存在，请重新设置！";
+$lang->product->nameIsDuplicated     = "产品线已经有『%s』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。";
 $lang->product->reviewStory          = '您不是研发需求 "%s" 的评审人，无法评审，本次操作已被过滤。';
 
 $lang->product->id             = '编号';
@@ -109,8 +109,8 @@ $lang->product->program        = "所属项目集";
 $lang->product->name           = "{$lang->productCommon}名称";
 $lang->product->code           = "{$lang->productCommon}代号";
 $lang->product->shadow         = "是否影子{$lang->productCommon}";
-$lang->product->line           = "{$lang->productCommon}线";
-$lang->product->lineName       = "{$lang->productCommon}线名称";
+$lang->product->line           = "产品线";
+$lang->product->lineName       = "产品线名称";
 $lang->product->order          = '排序';
 $lang->product->bind           = "是否独立{$lang->productCommon}";
 $lang->product->type           = "{$lang->productCommon}类型";

module/product/model.php

@@ -170,15 +170,14 @@ class productModel extends model
     {
         if(defined('TUTORIAL')) return $productID;
 
-        $product = $this->getById($productID);
-        if(!empty($product) and $product->shadow) $this->accessDenied($this->lang->product->notExists);
-
         if($productID == 0 and $this->cookie->preProductID and isset($products[$this->cookie->preProductID])) $productID = $this->cookie->preProductID;
         if($productID == 0 and $this->session->product == '') $productID = key($products);
         $this->session->set('product', (int)$productID, $this->app->tab);
 
         if(!isset($products[$this->session->product]))
         {
+            $product = $this->getById($productID);
+
             if(empty($product) or $product->deleted == 1) $productID = key($products);
             $this->session->set('product', (int)$productID, $this->app->tab);
             if($productID && strpos(",{$this->app->user->view->products},", ",{$productID},") === false)
@@ -2587,6 +2586,8 @@ class productModel extends model
         if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$productID,") === false and $productID != 0 and !defined('TUTORIAL')) return $this->accessDenied($this->lang->product->accessDenied);
 
         $product = $this->getByID($productID);
+        if(!empty($product) and $product->shadow) $this->accessDenied($this->lang->product->notExists);
+
         $params  = array('branch' => $branch);
         common::setMenuVars('product', $productID, $params);
         if(!$product) return;

module/task/lang/zh-cn.php

@@ -296,8 +296,8 @@ $lang->task->error->notempty          = '%s必须大于0。';
 $lang->task->error->teamLeftEmpty     = '请维护团队工时。';
 $lang->task->error->beginLtExecution  = "任务开始日期应大于等于%s的开始日期：%s。";
 $lang->task->error->beginGtExecution  = "任务开始日期应小于等于%s的结束日期：%s。";
-$lang->task->error->endGtExecution    = "任务结束日期应小于等于%s的结束日期：%s。";
-$lang->task->error->endLtExecution    = "任务结束日期应大于等于%s的开始日期：%s。";
+$lang->task->error->endGtExecution    = "任务截止日期应小于等于%s的结束日期：%s。";
+$lang->task->error->endLtExecution    = "任务截止日期应大于等于%s的开始日期：%s。";
 $lang->task->error->dateExceed        = "任务%s的计划日期超过该{$lang->execution->common}计划日期，将自动改为{$lang->execution->common}的计划日期。";
 
 /* Report. */

module/task/model.php

@@ -424,7 +424,7 @@ class taskModel extends model
             if(!empty($this->config->limitTaskDate))
             {
                 $this->checkEstStartedAndDeadline($executionID, $task->estStarted, $task->deadline);
-                return false;
+                if(dao::isError()) return false;
             }
 
             if(!helper::isZeroDate($task->deadline) and $task->deadline < $task->estStarted)
@@ -1403,7 +1403,7 @@ class taskModel extends model
             if(!empty($this->config->limitTaskDate))
             {
                 $this->checkEstStartedAndDeadline($oldTask->execution, $task->estStarted, $task->deadline, "task:{$taskID} ");
-                return false;
+                if(dao::isError()) return false;
             }
 
             if(empty($task->closedReason) and $task->status == 'closed')
@@ -4505,9 +4505,9 @@ class taskModel extends model
         if(empty($execution) or empty($this->config->limitTaskDate)) return false;
         if(empty($execution->multiple)) $this->lang->execution->common = $this->lang->project->common;
 
-        if(!empty($estStarted) and $estStarted < $execution->begin) dao::$errors['estStarted'][] = $pre . sprintf($this->lang->task->error->beginLtExecution, $this->lang->execution->common, $execution->begin);
-        if(!empty($estStarted) and $estStarted > $execution->end)   dao::$errors['estStarted'][] = $pre . sprintf($this->lang->task->error->beginGtExecution, $this->lang->execution->common, $execution->end);
-        if(!empty($deadline) and $deadline > $execution->end)       dao::$errors['deadline'][]   = $pre . sprintf($this->lang->task->error->endGtExecution, $this->lang->execution->common, $execution->end);
-        if(!empty($deadline) and $deadline < $execution->begin)     dao::$errors['deadline'][]   = $pre . sprintf($this->lang->task->error->endLtExecution, $this->lang->execution->common, $execution->begin);
+        if(!empty($estStarted) and !helper::isZeroDate($estStarted) and $estStarted < $execution->begin) dao::$errors['estStarted'][] = $pre . sprintf($this->lang->task->error->beginLtExecution, $this->lang->execution->common, $execution->begin);
+        if(!empty($estStarted) and !helper::isZeroDate($estStarted) and $estStarted > $execution->end)   dao::$errors['estStarted'][] = $pre . sprintf($this->lang->task->error->beginGtExecution, $this->lang->execution->common, $execution->end);
+        if(!empty($deadline) and !helper::isZeroDate($deadline) and $deadline > $execution->end)       dao::$errors['deadline'][]   = $pre . sprintf($this->lang->task->error->endGtExecution, $this->lang->execution->common, $execution->end);
+        if(!empty($deadline) and !helper::isZeroDate($deadline) and $deadline < $execution->begin)     dao::$errors['deadline'][]   = $pre . sprintf($this->lang->task->error->endLtExecution, $this->lang->execution->common, $execution->begin);
     }
 }

module/tree/lang/de.php

@@ -19,7 +19,7 @@ $lang->tree->manage               = 'Modul verwalten';
 $lang->tree->fix                  = 'Fix';
 $lang->tree->manageProduct        = "Verwalte {$lang->productCommon}";
 $lang->tree->manageExecution      = "Verwalte {$lang->executionCommon}";
-$lang->tree->manageLine           = "Manage {$lang->productCommon} Line";
+$lang->tree->manageLine           = "Manage Product Line";
 $lang->tree->manageBug            = 'Verwalte Bugs';
 $lang->tree->manageCase           = 'Verwalte Fälle';
 $lang->tree->manageCaseLib        = 'Verwalte Bibliothek';
@@ -42,7 +42,7 @@ $lang->tree->addChild             = "Hinzufügen";
 $lang->tree->confirmDelete        = 'Do you want to delete this module and its child modules?';
 $lang->tree->confirmDeleteMenu    = 'Do you want to delete this menu and its child menus?';
 $lang->tree->confirmDelCategory   = 'Möchten Sie diese Kategorie und ihre Kinderkategorien löschen?';
-$lang->tree->confirmDeleteLine    = "Do you want to delete this {$lang->productCommon} line?";
+$lang->tree->confirmDeleteLine    = "Do you want to delete this product line?";
 $lang->tree->confirmDeleteGroup   = 'Do you want to delete this group and its child groups?';
 $lang->tree->confirmRoot          = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
 $lang->tree->confirmRoot4Doc      = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?";
@@ -56,7 +56,7 @@ $lang->tree->syncProductModule    = 'Sync Module';
 $lang->tree->module       = 'Modul';
 $lang->tree->name         = 'Name';
 $lang->tree->wordName     = 'Name';
-$lang->tree->line         = "{$lang->productCommon} Line";
+$lang->tree->line         = "Product Line";
 $lang->tree->cate         = 'Kategorie Name';
 $lang->tree->dir          = 'Directory';
 $lang->tree->root         = 'Root';
@@ -69,7 +69,7 @@ $lang->tree->child        = 'Untergeordnet';
 $lang->tree->subCategory  = 'SubCategory';
 $lang->tree->editCategory = 'Kategorie bearbeiten';
 $lang->tree->delCategory  = 'Kategorie löschen';
-$lang->tree->lineChild    = "Child {$lang->productCommon} Line";
+$lang->tree->lineChild    = "Child Product Line";
 $lang->tree->owner        = 'Besitzer';
 $lang->tree->order        = 'Reihenfolge';
 $lang->tree->short        = 'Sortierung';

module/tree/lang/en.php

@@ -19,7 +19,7 @@ $lang->tree->manage               = 'Manage Module';
 $lang->tree->fix                  = 'Fix Module';
 $lang->tree->manageProduct        = "Manage {$lang->productCommon} Modules";
 $lang->tree->manageExecution      = "Manage {$lang->execution->common} Modules";
-$lang->tree->manageLine           = "Manage {$lang->productCommon} Line";
+$lang->tree->manageLine           = "Manage Product Line";
 $lang->tree->manageBug            = 'Manage Bug';
 $lang->tree->manageCase           = 'Manage Case';
 $lang->tree->manageCaseLib        = 'Manage Library';
@@ -28,7 +28,7 @@ $lang->tree->manageApiChild       = 'Manage API Directory';
 $lang->tree->updateOrder          = 'Rank Module';
 $lang->tree->manageChild          = 'Manage Child Modules';
 $lang->tree->manageStoryChild     = 'Manage Child Modules';
-$lang->tree->manageLineChild      = "Manage {$lang->productCommon} Line";
+$lang->tree->manageLineChild      = "Manage Product Line";
 $lang->tree->manageBugChild       = 'Manage Child Modules of Bugs';
 $lang->tree->manageCaseChild      = 'Manage Child Cases';
 $lang->tree->manageCaselibChild   = 'Manage Child Libraries';
@@ -42,7 +42,7 @@ $lang->tree->addChild             = "Add Child Module";
 $lang->tree->confirmDelete        = 'Do you want to delete this module and its child modules?';
 $lang->tree->confirmDeleteMenu    = 'Do you want to delete this menu and its child menus?';
 $lang->tree->confirmDelCategory   = 'Do you want to delete this category and its child categories?';
-$lang->tree->confirmDeleteLine    = "Do you want to delete this {$lang->productCommon} line?";
+$lang->tree->confirmDeleteLine    = "Do you want to delete this product line?";
 $lang->tree->confirmDeleteGroup   = 'Do you want to delete this group and its child groups?';
 $lang->tree->confirmRoot          = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?";
 $lang->tree->confirmRoot4Doc      = "Any changes to the library will change the document of library it belongs to, which is dangerous. Do you want to change it?";
@@ -56,7 +56,7 @@ $lang->tree->syncProductModule    = 'Sync Module';
 $lang->tree->module       = 'Module';
 $lang->tree->name         = 'Module Name';
 $lang->tree->wordName     = 'Name';
-$lang->tree->line         = "{$lang->productCommon} Line";
+$lang->tree->line         = "Product Line";
 $lang->tree->cate         = 'Category';
 $lang->tree->dir          = 'Directory';
 $lang->tree->root         = 'Root';
@@ -69,7 +69,7 @@ $lang->tree->child        = 'Children';
 $lang->tree->subCategory  = 'SubCategory';
 $lang->tree->editCategory = 'Edit Category';
 $lang->tree->delCategory  = 'Delete Category';
-$lang->tree->lineChild    = "Child {$lang->productCommon} Line";
+$lang->tree->lineChild    = "Child Product Line";
 $lang->tree->owner        = 'Owner';
 $lang->tree->order        = 'Order';
 $lang->tree->short        = 'Abbr.';

module/tree/lang/zh-cn.php

@@ -19,7 +19,7 @@ $lang->tree->manage               = '维护模块';
 $lang->tree->fix                  = '修正数据';
 $lang->tree->manageProduct        = "维护{$lang->productCommon}视图模块";
 $lang->tree->manageExecution      = "维护{$lang->execution->common}视图模块";
-$lang->tree->manageLine           = "维护{$lang->productCommon}线";
+$lang->tree->manageLine           = "维护产品线";
 $lang->tree->manageBug            = '维护测试视图模块';
 $lang->tree->manageCase           = '维护用例视图模块';
 $lang->tree->manageCaseLib        = '维护用例库模块';
@@ -28,7 +28,7 @@ $lang->tree->manageApiChild       = '维护接口库目录';
 $lang->tree->updateOrder          = '更新排序';
 $lang->tree->manageChild          = '维护子模块';
 $lang->tree->manageStoryChild     = '维护子模块';
-$lang->tree->manageLineChild      = "维护{$lang->productCommon}线";
+$lang->tree->manageLineChild      = "维护产品线";
 $lang->tree->manageBugChild       = '维护Bug子模块';
 $lang->tree->manageCaseChild      = '维护用例子模块';
 $lang->tree->manageCaselibChild   = '维护用例库子模块';
@@ -42,7 +42,7 @@ $lang->tree->addChild             = "增加子模块";
 $lang->tree->confirmDelete        = '该模块及其子模块都会被删除，您确定删除吗？';
 $lang->tree->confirmDeleteMenu    = '该目录及其子目录都会被删除，您确定删除吗？';
 $lang->tree->confirmDelCategory   = '该分类及其子分类都会被删除，您确定删除吗？';
-$lang->tree->confirmDeleteLine    = "您确定删除该{$lang->productCommon}线吗？";
+$lang->tree->confirmDeleteLine    = "您确定删除该产品线吗？";
 $lang->tree->confirmDeleteGroup   = '该分组及其子分组都会被删除，您确定删除吗？';
 $lang->tree->confirmRoot          = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的{$lang->SRCommon}、Bug、用例的所属{$lang->productCommon}，以及{$lang->executionCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
 $lang->tree->confirmRoot4Doc      = "修改所属文档库，会同时修改该分类下文档的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
@@ -56,7 +56,7 @@ $lang->tree->syncProductModule    = "同步{$lang->productCommon}模块";
 $lang->tree->module       = '模块';
 $lang->tree->name         = '模块名称';
 $lang->tree->wordName     = '名称';
-$lang->tree->line         = "{$lang->productCommon}线名称";
+$lang->tree->line         = "产品线名称";
 $lang->tree->cate         = '分类名称';
 $lang->tree->dir          = '目录名称';
 $lang->tree->root         = "所属{$lang->productCommon}";
@@ -69,7 +69,7 @@ $lang->tree->child        = '子模块';
 $lang->tree->subCategory  = '子分类';
 $lang->tree->editCategory = '编辑分类';
 $lang->tree->delCategory  = '删除分类';
-$lang->tree->lineChild    = "子{$lang->productCommon}线";
+$lang->tree->lineChild    = "子产品线";
 $lang->tree->owner        = '负责人';
 $lang->tree->order        = '排序';
 $lang->tree->short        = '简称';

module/upgrade/lang/de.php

@@ -66,7 +66,7 @@ $lang->upgrade->allLines        = "All Product 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->existLine       = 'Existing product lines';
 $lang->upgrade->product         = $lang->productCommon;
 $lang->upgrade->project         = 'Iteration';
 $lang->upgrade->repo            = 'Repo';

module/upgrade/lang/en.php

@@ -66,7 +66,7 @@ $lang->upgrade->allLines        = "All Product 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->existLine       = 'Existing product lines';
 $lang->upgrade->product         = $lang->productCommon;
 $lang->upgrade->project         = 'Iteration';
 $lang->upgrade->repo            = 'Repo';

module/upgrade/lang/fr.php

@@ -66,7 +66,7 @@ $lang->upgrade->allLines        = "All Product 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->existLine       = 'Existing product lines';
 $lang->upgrade->product         = $lang->productCommon;
 $lang->upgrade->project         = 'Iteration';
 $lang->upgrade->repo            = 'Repo';

module/upgrade/lang/zh-cn.php

@@ -62,11 +62,11 @@ $lang->upgrade->toBIZ5Guide   = '禅道企业版5版本升级';
 $lang->upgrade->toMAXGuide    = '禅道旗舰版版本升级';
 
 $lang->upgrade->line            = '产品线';
-$lang->upgrade->allLines        = "所有{$lang->productCommon}线";
+$lang->upgrade->allLines        = "所有产品线";
 $lang->upgrade->program         = '目标项目集和项目';
 $lang->upgrade->existProgram    = '已有项目集';
 $lang->upgrade->existProject    = '已有项目';
-$lang->upgrade->existLine       = '已有' . $lang->productCommon . '线';
+$lang->upgrade->existLine       = '已有产品线';
 $lang->upgrade->product         = $lang->productCommon;
 $lang->upgrade->project         = '迭代';
 $lang->upgrade->repo            = '版本库';