Merge branch 'master' of github.com:easysoft/zentaopms

module/tree/lang/en.php

@@ -37,7 +37,7 @@ $lang->tree->dragAndSort        = "Drag and Sort";
 $lang->tree->sort               = "Sort";
 $lang->tree->addChild           = "Add Child";
 $lang->tree->confirmDelete      = 'Do you want to delete this Module and its Children?';
-$lang->tree->confirmDeleteLine  = 'Do you want to delete this Product Line and its Children?';
+$lang->tree->confirmDeleteLine  = 'Do you want to delete this Product Line?';
 $lang->tree->confirmRoot        = "Changes on {$lang->productCommon} will change the Story, Bug, Case of {$lang->productCommon} it belongs to, as well as the realtion of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous, please be aware of it. Do you want to change?";
 $lang->tree->successSave        = 'Saved.';
 $lang->tree->successFixed       = 'Fixed.';

module/tree/lang/zh-cn.php

@@ -37,7 +37,7 @@ $lang->tree->dragAndSort        = "拖放排序";
 $lang->tree->sort               = "排序";
 $lang->tree->addChild           = "增加子模块";
 $lang->tree->confirmDelete      = '该模块及其子模块都会被删除，您确定删除吗？';
-$lang->tree->confirmDeleteLine  = '该产品线及其子产品线都会被删除，您确定删除吗？';
+$lang->tree->confirmDeleteLine  = '您确定删除该产品线吗？';
 $lang->tree->confirmRoot        = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的需求、Bug、用例的所属{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";
 $lang->tree->successSave        = '成功保存';
 $lang->tree->successFixed       = '成功修正数据！';

module/upgrade/view/consistency.html.php

@@ -20,7 +20,7 @@
       <div class='modal-body'>
         <h4><?php echo $lang->upgrade->noticeSQL;?></h4>
         <p class='text-danger code'>
-          SET @@sql_mode= '' <br />
+          SET @@sql_mode= '';<br />
           <?php echo nl2br($alterSQL);?>
         </p>
       </div>