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

module/admin/lang/en.php

@@ -56,7 +56,7 @@ $lang->admin->safe = new stdclass();
 $lang->admin->safe->common     = 'Security Policy';
 $lang->admin->safe->set        = 'Password Settings';
 $lang->admin->safe->password   = 'Password Strength';
-$lang->admin->safe->weak       = 'Common Weak Password';
+$lang->admin->safe->weak       = 'Common Weak Passwords';
 $lang->admin->safe->reason     = 'Type';
 $lang->admin->safe->checkWeak  = 'Weak Password Scan';
 $lang->admin->safe->changeWeak = 'Force to change weak password';

module/common/view/kindeditor.html.php

@@ -43,6 +43,7 @@ $uid = uniqid('');
     {
         cssPath: [config.themeRoot + 'zui/css/min.css'],
         width: '100%',
+        placeholder: <?php echo json_encode($lang->noticePasteImg);?>,
         height: '200px',
         filterMode: true,
         bodyClass: 'article-content',

module/file/lang/en.php

@@ -21,7 +21,7 @@ $lang->file->label         = 'Label:';
 $lang->file->maxUploadSize = "<span class='text-red'>%s</span>";
 $lang->file->applyTemplate = "Apply Template";
 $lang->file->tplTitle      = "Template Name";
-$lang->file->tplTitleAB    = "Template";
+$lang->file->tplTitleAB    = "Templates";
 $lang->file->setPublic     = "Set Public Template";
 $lang->file->exportFields  = "Fields";
 $lang->file->exportRange   = "Data";

module/git/lang/en.php

@@ -13,4 +13,4 @@
 $lang->git->common  = 'Git';
 $lang->git->cat     = 'View Source Code';
 $lang->git->diff    = 'Compare Source Code';
-$lang->git->apiSync = 'API: Synchronize Git Log';
+$lang->git->apiSync = 'API: Synchronize Git Logs';

module/productplan/lang/en.php

@@ -23,6 +23,7 @@ $lang->productplan->batchEdit  = 'Batch Edit';
 $lang->productplan->batchUnlink      = "Batch Unlink";
 $lang->productplan->linkStory        = "Link Story";
 $lang->productplan->unlinkStory      = "Unlink Story";
+$lang->productplan->unlinkStoryAB    = "Unlink";
 $lang->productplan->batchUnlinkStory = "Batch Unlink";
 $lang->productplan->linkedStories    = 'Linked Stories';
 $lang->productplan->unlinkedStories  = 'Unlinked Stories';

module/productplan/lang/zh-cn.php

@@ -23,6 +23,7 @@ $lang->productplan->batchEdit  = '批量编辑';
 $lang->productplan->batchUnlink      = "批量移除";
 $lang->productplan->linkStory        = "关联需求";
 $lang->productplan->unlinkStory      = "移除需求";
+$lang->productplan->unlinkStoryAB    = "移除";
 $lang->productplan->batchUnlinkStory = "批量移除需求";
 $lang->productplan->linkedStories    = '需求';
 $lang->productplan->unlinkedStories  = '未关联需求';

module/productplan/view/view.html.php

@@ -173,7 +173,7 @@
             <div class='table-actions btn-toolbar'>
               <?php $actionLink = inlink('batchUnlinkStory', "planID=$plan->id&orderBy=$orderBy");?>
               <div class='btn-group dropup'>
-                <?php echo html::commonButton($lang->productplan->unlinkStory, ($canBatchUnlink ? '' : 'disabled') . "onclick=\"setFormAction('$actionLink', 'hiddenwin', this)\"");?>
+                <?php echo html::commonButton($lang->productplan->unlinkStoryAB, ($canBatchUnlink ? '' : 'disabled') . "onclick=\"setFormAction('$actionLink', 'hiddenwin', this)\"");?>
                 <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
                 <ul class='dropdown-menu'>
                   <?php

module/project/lang/en.php

@@ -152,6 +152,7 @@ $lang->project->batchEdit         = "Batch Edit";
 $lang->project->manageMembers     = 'Manage Team';
 $lang->project->unlinkMember      = 'Remove Member';
 $lang->project->unlinkStory       = 'Unlink Story';
+$lang->project->unlinkStoryAB     = 'Unlink';
 $lang->project->batchUnlinkStory  = 'Batch Unlink Stories';
 $lang->project->importTask        = 'Transfer Task';
 $lang->project->importPlanStories = 'Link Stories By Plan';

module/project/lang/zh-cn.php

@@ -153,6 +153,7 @@ $lang->project->batchEdit         = "批量编辑";
 $lang->project->manageMembers     = '团队管理';
 $lang->project->unlinkMember      = '移除成员';
 $lang->project->unlinkStory       = '移除需求';
+$lang->project->unlinkStoryAB     = '移除需求';
 $lang->project->batchUnlinkStory  = '批量移除需求';
 $lang->project->importTask        = '转入任务';
 $lang->project->importPlanStories = '按计划关联需求';

module/project/view/story.html.php

@@ -236,7 +236,7 @@
           if(common::hasPriv('project', 'batchUnlinkStory'))
           {
               $actionLink = $this->createLink('project', 'batchUnlinkStory', "projectID=$project->id");
-              echo html::commonButton($lang->project->unlinkStory, "data-form-action='$actionLink'");
+              echo html::commonButton($lang->project->unlinkStoryAB, "data-form-action='$actionLink'");
           }
           ?>
         </div>

module/project/view/view.html.php

@@ -229,7 +229,7 @@
                     <tr>
                       <td colspan="4">
                         <?php $progress = ($project->totalConsumed + $project->totalLeft) ? round($project->totalConsumed / ($project->totalConsumed + $project->totalLeft), 3) * 100 : 0;?>
-                        <?php echo $lang->projectCommon . $lang->project->progress;?> <em><?php echo $progress . $lang->percent;?></em> &nbsp;
+                        <?php echo $lang->project->progress;?> <em><?php echo $progress . $lang->percent;?></em> &nbsp;
                         <div class="progress inline-block">
                           <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $progress . $lang->percent;?>"></div>
                         </div>

module/testreport/css/create.css

@@ -4,3 +4,4 @@
 #mainContent .detail-title {background: #eee; padding: 10px;}
 #mainContent .detail-content {padding: 0;}
 #mainContent .detail .form-actions {padding-bottom: 20px;}
+#mainContent .main-header h2 .input-group{margin-top:1px;}

module/testreport/view/create.html.php

@@ -34,7 +34,7 @@
         <div class="detail-content">
           <table class='table table-form'>
             <tr>
-              <th class='w-80px'><?php echo $lang->testreport->startEnd?></th>
+              <th class='w-100px'><?php echo $lang->testreport->startEnd?></th>
               <td class='w-p50'>
                 <div class='input-group'>
                   <?php echo html::input('begin', $begin, "class='form-control form-date'")?>

module/testreport/view/edit.html.php

@@ -25,7 +25,7 @@
         <div class='detail-title'><?php echo $lang->testreport->legendBasic?></div>
         <table class='table table-form'>
           <tr>
-            <th class='w-80px'><?php echo $lang->testreport->startEnd?></th>
+            <th class='w-100px'><?php echo $lang->testreport->startEnd?></th>
             <td class='w-p50'>
               <div class='input-group'>
                 <?php echo html::input('begin', $report->begin, "class='form-control form-date'")?>

module/testsuite/lang/en.php

@@ -57,8 +57,8 @@ $lang->testsuite->authorList['public']  = 'Public';
 $lang->caselib->common = 'Case Library';
 $lang->caselib->all    = 'All Case Libraries';
 
-$lang->testsuite->createLib  = 'Create Library';
-$lang->testsuite->editLib    = 'Edit Library';
+$lang->testsuite->createLib  = 'Create Case Library';
+$lang->testsuite->editLib    = 'Edit Case Library';
 $lang->testsuite->library    = 'View Cases in Library';
 $lang->testsuite->createCase = 'Create Case';
 $lang->testsuite->libView    = 'Library Detail';

module/todo/lang/en.php

@@ -21,7 +21,7 @@ $lang->todo->batchCreate  = "Batch Add ";
 $lang->todo->edit         = "Edit Todo";
 $lang->todo->close        = "Close Todo";
 $lang->todo->batchClose   = "Batch Close";
-$lang->todo->batchEdit    = "Batch Edit Todo";
+$lang->todo->batchEdit    = "Batch Edit Todos";
 $lang->todo->view         = "Todo Detail";
 $lang->todo->finish       = "Finish Todo";
 $lang->todo->batchFinish  = "Batch Finish";

module/tree/lang/en.php

@@ -32,7 +32,7 @@ $lang->tree->manageBugChild     = 'Manage Child Bugs';
 $lang->tree->manageCaseChild    = 'Manage Child Cases';
 $lang->tree->manageCaselibChild = 'Manage Child Libraries';
 $lang->tree->manageTaskChild    = "Manage Child {$lang->projectCommon} Modules";
-$lang->tree->syncFromProduct    = 'Copy from Other Products';
+$lang->tree->syncFromProduct    = "Copy from Other {$lang->projectCommon}s";
 $lang->tree->dragAndSort        = "Drag to order";
 $lang->tree->sort               = "Order";
 $lang->tree->addChild           = "Add Child Module";