Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

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

Browse Source
This commit is contained in:
wangyidong
2016-12-08 14:11:56 +08:00
parent a2db678341 6471624de8
commit b8be575cb2
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+6 -6
View File
@@ -45,7 +45,7 @@ $lang->action->dynamic->search = 'Search';
$lang->action->objectTypes['product'] = $lang->productCommon;
$lang->action->objectTypes['story'] = 'Story';
$lang->action->objectTypes['productplan'] = 'Planning';
$lang->action->objectTypes['productplan'] = 'Plan';
$lang->action->objectTypes['release'] = 'Release';
$lang->action->objectTypes['project'] = $lang->projectCommon;
$lang->action->objectTypes['task'] = 'Task';
@@ -131,8 +131,8 @@ $lang->action->label->frombug = 'Converted from Bug';
$lang->action->label->totask = 'Convert to Task';
$lang->action->label->svncommited = 'SVN Commit';
$lang->action->label->gitcommited = 'Git Commit';
$lang->action->label->linked2plan = 'Link to Planning';
$lang->action->label->unlinkedfromplan = 'Unlink from Planning';
$lang->action->label->linked2plan = 'Link to Plan';
$lang->action->label->unlinkedfromplan = 'Unlink from Plan';
$lang->action->label->changestatus = 'Change Status';
$lang->action->label->marked = 'Marked';
$lang->action->label->linked2project = "Link {$lang->projectCommon}";
@@ -147,7 +147,7 @@ $lang->action->label->subdividestory = "Decompose Story";
$lang->action->label->unlinkchildstory = "Unlink decomposed Story";
$lang->action->label->started = 'Initiated';
$lang->action->label->restarted = 'Continued';
$lang->action->label->recordestimate = 'Historyed Man-Hour';
$lang->action->label->recordestimate = 'Recorded Man-Hour';
$lang->action->label->editestimate = 'Edited Man-Hour';
$lang->action->label->canceled = 'Cancelled';
$lang->action->label->finished = 'Finished';
@@ -160,7 +160,7 @@ $lang->action->label->deleteestimate = "Deleted Man-Hour";
/* 用来生成相应对象的链接。*/
$lang->action->label->product = $lang->productCommon . '|product|view|productID=%s';
$lang->action->label->productplan = 'Planning|productplan|view|productID=%s';
$lang->action->label->productplan = 'Plan|productplan|view|productID=%s';
$lang->action->label->release = 'Release|release|view|productID=%s';
$lang->action->label->story = 'Story|story|view|storyID=%s';
$lang->action->label->project = "{$lang->projectCommon}|project|view|projectID=%s";
@@ -192,7 +192,7 @@ $lang->action->search->objectTypeList['doclib'] = 'Doc Lib';
$lang->action->search->objectTypeList['todo'] = 'To-Dos';
$lang->action->search->objectTypeList['build'] = 'Build';
$lang->action->search->objectTypeList['release'] = 'Release';
$lang->action->search->objectTypeList['productplan'] = 'Planning';
$lang->action->search->objectTypeList['productplan'] = 'Plan';
$lang->action->search->objectTypeList['branch'] = 'Branch';
/* 用来在动态显示中显示动作 */
module/block/lang/en.php
+3 -3
View File
@@ -129,7 +129,7 @@ $lang->block->availableBlocks->case = 'My Cases';
$lang->block->availableBlocks->story = 'My Stories';
$lang->block->availableBlocks->product = $lang->productCommon . 'List';
$lang->block->availableBlocks->project = $lang->projectCommon . 'List';
$lang->block->availableBlocks->plan = 'Planning List';
$lang->block->availableBlocks->plan = 'Plans';
$lang->block->availableBlocks->release = 'Release List';
$lang->block->availableBlocks->build = 'Builds';
$lang->block->availableBlocks->testtask = 'Test Builds';
@@ -143,7 +143,7 @@ $lang->block->modules['product'] = new stdclass();
$lang->block->modules['product']->availableBlocks = new stdclass();
$lang->block->modules['product']->availableBlocks->list = $lang->productCommon . 'List';
$lang->block->modules['product']->availableBlocks->story = 'Stories';
$lang->block->modules['product']->availableBlocks->plan = 'Planning List';
$lang->block->modules['product']->availableBlocks->plan = 'Plans';
$lang->block->modules['product']->availableBlocks->release = 'Release List';
$lang->block->modules['project'] = new stdclass();
$lang->block->modules['project']->availableBlocks = new stdclass();
@@ -248,7 +248,7 @@ $lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|';
$lang->block->flowchart = array();
$lang->block->flowchart[] = array('Administration', 'Manage a Company', 'Add Users', 'Maintain Privileges');
$lang->block->flowchart[] = array('Product Manager', 'Add Products', 'Maintain Modules', 'Maintain Planning', 'Maintain Stories', 'Create Release');
$lang->block->flowchart[] = array('Product Manager', 'Add Products', 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Release');
$lang->block->flowchart[] = array('Project Manager', 'Add Projects', 'Maintain Teams', 'Link Products', 'Link Stories', 'Decompose Tasks');
$lang->block->flowchart[] = array('DEV Team', 'Claim TaskS/BugS', 'Update Status', 'Finish Tasks/Bugs');
$lang->block->flowchart[] = array('Testing Team', 'Write Cases', 'Implement Cases', 'Submit Bugs', 'Fix Bugs', 'Close Bugs');
module/bug/lang/en.php
+2 -2
View File
@@ -334,8 +334,8 @@ $lang->bug->action = new stdclass();
$lang->bug->action->resolved = array('main' => '$date, solved by <strong>$actor</strong> and the solution is <strong>$extra</strong> $appendLink.', 'extra' => 'resolutionList');
$lang->bug->action->tostory = array('main' => '$date, transferred by <strong>$actor</strong> to <strong>Story</strong> with ID <strong>$extra</strong>.');
$lang->bug->action->totask = array('main' => '$date, imported by <strong>$actor</strong> as <strong>Task</strong> with ID <strong>$extra</strong>.');
$lang->bug->action->linked2plan = array('main' => '$date, linked by <strong>$actor</strong> to Planning <strong>$extra</strong>.');
$lang->bug->action->unlinkedfromplan = array('main' => '$date, deleted by <strong>$actor</strong> from Planning <strong>$extra</strong>.');
$lang->bug->action->linked2plan = array('main' => '$date, linked by <strong>$actor</strong> to Plan <strong>$extra</strong>.');
$lang->bug->action->unlinkedfromplan = array('main' => '$date, deleted by <strong>$actor</strong> from Plan <strong>$extra</strong>.');
$lang->bug->action->linked2build = array('main' => '$date, linked by <strong>$actor</strong> to Build <strong>$extra</strong>.');
$lang->bug->action->unlinkedfrombuild = array('main' => '$date, removed by <strong>$actor</strong> from Build <strong>$extra</strong>.');
$lang->bug->action->linked2release = array('main' => '$date, linked by <strong>$actor</strong> to Release <strong>$extra</strong>.');
module/common/lang/en.php
+2 -2
View File
@@ -118,7 +118,7 @@ $lang->searchObjects['product'] = $lang->productCommon;
$lang->searchObjects['user'] = 'User';
$lang->searchObjects['build'] = 'Build';
$lang->searchObjects['release'] = 'Release';
$lang->searchObjects['productplan'] = $lang->productCommon . 'Planning';
$lang->searchObjects['productplan'] = $lang->productCommon . 'Plan';
$lang->searchObjects['testtask'] = 'Testing Build';
$lang->searchObjects['doc'] = 'Document';
$lang->searchTips = 'ID (ctrl+g)';
@@ -181,7 +181,7 @@ $lang->product->menu = new stdclass();
$lang->product->menu->list = array('link' => '%s', 'fixed' => true);
$lang->product->menu->story = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->menu->dynamic = 'Dynamic|product|dynamic|productID=%s';
$lang->product->menu->plan = array('link' => 'Planning|productplan|browse|productID=%s', 'subModule' => 'productplan');
$lang->product->menu->plan = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan');
$lang->product->menu->release = array('link' => 'Release|release|browse|productID=%s', 'subModule' => 'release');
$lang->product->menu->roadmap = 'Roadmap|product|roadmap|productID=%s';
$lang->product->menu->doc = array('link' => 'Document|product|doc|productID=%s', 'subModule' => 'doc');
module/convert/lang/en.php
+1 -1
View File
@@ -82,7 +82,7 @@ $lang->convert->redmine->projects = $lang->projectCommon;
$lang->convert->redmine->stories = 'Story';
$lang->convert->redmine->tasks = 'Task';
$lang->convert->redmine->bugs = 'Bug';
$lang->convert->redmine->productPlans = $lang->productCommon . 'Planning';
$lang->convert->redmine->productPlans = $lang->productCommon . 'Plan';
$lang->convert->redmine->teams = 'Team';
$lang->convert->redmine->releases = 'Release';
$lang->convert->redmine->builds = 'Build';
module/dev/lang/en.php
+1 -1
View File
@@ -40,7 +40,7 @@ $lang->dev->tableList['history'] = 'History';
$lang->dev->tableList['lang'] = 'Language';
$lang->dev->tableList['module'] = 'Module';
$lang->dev->tableList['product'] = $lang->productCommon;
$lang->dev->tableList['productplan'] = $lang->productCommon . 'Planning';
$lang->dev->tableList['productplan'] = $lang->productCommon . 'Plan';
$lang->dev->tableList['project'] = $lang->projectCommon;
$lang->dev->tableList['projectproduct'] = $lang->projectCommon . $lang->productCommon;
$lang->dev->tableList['projectstory'] = $lang->projectCommon . 'Story';
module/productplan/lang/en.php
+1 -1
View File
@@ -9,7 +9,7 @@
* @version $Id: en.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->productplan->common = $lang->productCommon . 'Planning';
$lang->productplan->common = $lang->productCommon . 'Plan';
$lang->productplan->browse = "View";
$lang->productplan->index = "List";
$lang->productplan->create = "Create";
module/story/lang/en.php
+10 -10
View File
@@ -38,11 +38,11 @@ $lang->story->export = "Export Data";
$lang->story->zeroCase = "Zero Case";
$lang->story->zeroTask = "Zero Task";
$lang->story->reportChart = "Report";
$lang->story->batchChangePlan = "Batch Change Planning";
$lang->story->batchChangeBranch = "Batch Change Branch";
$lang->story->batchChangeStage = "Batch Change Stage";
$lang->story->batchChangePlan = "Batch Change Plans";
$lang->story->batchChangeBranch = "Batch Change Branches";
$lang->story->batchChangeStage = "Batch Change Stages";
$lang->story->batchAssignTo = "Batch Assign";
$lang->story->batchChangeModule = "Batch Change Module";
$lang->story->batchChangeModule = "Batch Change Modules";
$lang->story->common = 'Story';
$lang->story->id = 'ID';
@@ -76,7 +76,7 @@ $lang->story->rejectedReason = 'RejectED Reason';
$lang->story->reviewedBy = 'Reviewed By';
$lang->story->reviewedDate = 'Reviewed on';
$lang->story->version = 'Version';
$lang->story->plan = 'Planning';
$lang->story->plan = 'Plan';
$lang->story->planAB = 'Plan';
$lang->story->comment = 'Comment';
$lang->story->linkStories = 'Linke Story';
@@ -194,8 +194,8 @@ $lang->story->form->file = 'Files. If there are Story related files, please
$lang->story->action = new stdclass();
$lang->story->action->reviewed = array('main' => '$date, recorded by <strong>$actor</strong>. Review result is <strong>$extra</strong>.', 'extra' => 'reviewResultList');
$lang->story->action->closed = array('main' => '$date, closed by <strong>$actor</strong>. The reasion is <strong>$extra</strong> $appendLink.', 'extra' => 'reasonList');
$lang->story->action->linked2plan = array('main' => '$date, linked by <strong>$actor</strong> to Planning <strong>$extra</strong>');
$lang->story->action->unlinkedfromplan = array('main' => '$date, removed by <strong>$actor</strong> from Planning <strong>$extra</strong>.');
$lang->story->action->linked2plan = array('main' => '$date, linked by <strong>$actor</strong> to Plan <strong>$extra</strong>');
$lang->story->action->unlinkedfromplan = array('main' => '$date, removed by <strong>$actor</strong> from Plan <strong>$extra</strong>.');
$lang->story->action->linked2project = array('main' => '$date, linked by <strong>$actor</strong> to ' . $lang->projectCommon . ' <strong>$extra</strong>.');
$lang->story->action->unlinkedfromproject = array('main' => '$date, removed by <strong>$actor</strong> from ' . $lang->projectCommon . ' <strong>$extra</strong>.');
$lang->story->action->linked2build = array('main' => '$date, linked by <strong>$actor</strong> to Build <strong>$extra</strong>');
@@ -217,7 +217,7 @@ $lang->story->report->value = 'Story Count';
$lang->story->report->charts['storysPerProduct'] = $lang->productCommon . 'Story Count';
$lang->story->report->charts['storysPerModule'] = 'Story per Module';
$lang->story->report->charts['storysPerSource'] = 'Story per Source';
$lang->story->report->charts['storysPerPlan'] = 'Story per Planning';
$lang->story->report->charts['storysPerPlan'] = 'Story per Plan';
$lang->story->report->charts['storysPerStatus'] = 'Story per Status';
$lang->story->report->charts['storysPerStage'] = 'Story per Stage';
$lang->story->report->charts['storysPerPri'] = 'Story per Priority';
@@ -249,7 +249,7 @@ $lang->story->report->storysPerChange = new stdclass();
$lang->story->report->storysPerProduct->item = $lang->productCommon;
$lang->story->report->storysPerModule->item = 'Module';
$lang->story->report->storysPerSource->item = 'Source';
$lang->story->report->storysPerPlan->item = 'Planning';
$lang->story->report->storysPerPlan->item = 'Plan';
$lang->story->report->storysPerStatus->item = 'Status';
$lang->story->report->storysPerStage->item = 'Stage';
$lang->story->report->storysPerPri->item = 'Priority';
@@ -275,7 +275,7 @@ $lang->story->report->storysPerChange->graph = new stdclass();
$lang->story->report->storysPerProduct->graph->xAxisName = $lang->productCommon;
$lang->story->report->storysPerModule->graph->xAxisName = 'Module';
$lang->story->report->storysPerSource->graph->xAxisName = 'Source';
$lang->story->report->storysPerPlan->graph->xAxisName = 'Planning';
$lang->story->report->storysPerPlan->graph->xAxisName = 'Plan';
$lang->story->report->storysPerStatus->graph->xAxisName = 'Status';
$lang->story->report->storysPerStage->graph->xAxisName = 'Stage';
$lang->story->report->storysPerPri->graph->xAxisName = 'Priority';