diff --git a/module/action/lang/en.php b/module/action/lang/en.php index b96d35d37b..668865e0e7 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -68,8 +68,8 @@ $lang->action->desc->common = '$date, $action by action->desc->extra = '$date, $action as $extra by $actor.' . "\n"; $lang->action->desc->opened = '$date, created by $actor .' . "\n"; $lang->action->desc->created = '$date, created by $actor .' . "\n"; -$lang->action->desc->changed = '$date, modified by $actor .' . "\n"; -$lang->action->desc->edited = '$date, Edited by $actor .' . "\n"; +$lang->action->desc->changed = '$date, changed by $actor .' . "\n"; +$lang->action->desc->edited = '$date, edited by $actor .' . "\n"; $lang->action->desc->assigned = '$date, $actor assigned to $extra.' . "\n"; $lang->action->desc->closed = '$date, closed by $actor .' . "\n"; $lang->action->desc->deleted = '$date, deleted by $actor .' . "\n"; @@ -97,8 +97,8 @@ $lang->action->desc->svncommited = '$date, submitted by $actoraction->desc->gitcommited = '$date, submitted by $actor and the version is #$extra.' . "\n"; $lang->action->desc->finished = '$date, finished by $actor.' . "\n"; $lang->action->desc->paused = '$date, paused by $actor.' . "\n"; -$lang->action->desc->diff1 = '%s has been modified. Its value was "%s" and the new value is "%s".
' . "\n"; -$lang->action->desc->diff2 = '%s has been modified. The difference is ' . "\n" . "
%s
" . "\n"; +$lang->action->desc->diff1 = '%s has been changed. Its value was "%s" and the new value is "%s".
' . "\n"; +$lang->action->desc->diff2 = '%s has been changed. The difference is ' . "\n" . "
%s
" . "\n"; $lang->action->desc->diff3 = 'File Name %s was changed to %s .' . "\n"; /* 关联用例和移除用例时的历史操作记录。*/ diff --git a/module/build/lang/en.php b/module/build/lang/en.php index a6b65a44ff..7f1ae081c2 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -41,7 +41,7 @@ $lang->build->unlinkStory = 'Remove Story'; $lang->build->unlinkBug = 'Remove Bug'; $lang->build->stories = 'Finished Story'; $lang->build->bugs = 'Solved Bug'; -$lang->build->generatedBugs = 'Generated Bug'; +$lang->build->generatedBugs = 'Remained Bug'; $lang->build->noProduct = " This {$lang->projectCommon} has not relateed to {$lang->productCommon}, so Build cannot be created. Please first relate {$lang->productCommon}"; $lang->build->finishStories = ' %s Stories have been finished.'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 002e6604f4..7f6a209410 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -184,7 +184,7 @@ $lang->product->menu->dynamic = 'Dynamic|product|dynamic|productID=%s'; $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'); +$lang->product->menu->doc = array('link' => 'Document|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); $lang->product->menu->branch = '@branch@|branch|manage|productID=%s'; $lang->product->menu->module = 'Module|tree|browse|productID=%s&view=story'; $lang->product->menu->view = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit'); @@ -215,7 +215,7 @@ $lang->project->menu->dynamic = 'Dynamic|project|dynamic|projectID=%s'; $lang->project->menu->build = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'build'); $lang->project->menu->testtask = 'Testing|project|testtask|projectID=%s'; $lang->project->menu->team = array('link' => 'Team|project|team|projectID=%s', 'alias' => 'managemembers'); -$lang->project->menu->doc = array('link' => 'Document|project|doc|porjectID=%s', 'subModule' => 'doc'); +$lang->project->menu->doc = array('link' => 'Document|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc'); $lang->project->menu->product = $lang->productCommon . '|project|manageproducts|projectID=%s'; $lang->project->menu->view = array('link' => 'Overview|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); $lang->project->menu->create = array('link' => " Add{$lang->projectCommon}|project|create", 'float' => 'right'); @@ -384,7 +384,7 @@ $lang->error->passwordrule = "Password should meet requirements. It should be $lang->error->accessDenied = 'Access is denied.'; $lang->error->pasteImg = 'Paste Image is not allowed in your browser!'; $lang->error->noData = 'No Data'; -$lang->error->editedByOther = 'This record might have been modified. Please refresh and try to edit again!'; +$lang->error->editedByOther = 'This record might have been changed. Please refresh and try to edit again!'; $lang->error->tutorialData = 'No data can be imported in tutorial mode. Please exit tutorial first!'; /* 分页信息。*/ diff --git a/module/datatable/lang/en.php b/module/datatable/lang/en.php index cc2330c5a1..e53e67ac3e 100644 --- a/module/datatable/lang/en.php +++ b/module/datatable/lang/en.php @@ -14,7 +14,7 @@ $lang->datatable->required = 'Required'; $lang->datatable->branch = 'Branch'; $lang->datatable->platform = 'Platform'; -$lang->datatable->showModule = 'Show module in title'; +$lang->datatable->showModule = 'Show/Hide Module Name'; $lang->datatable->showModuleList[] = 'N/A'; -$lang->datatable->showModuleList['base'] = 'Base node'; -$lang->datatable->showModuleList['end'] = 'End node'; +$lang->datatable->showModuleList['base'] = 'Base Node'; +$lang->datatable->showModuleList['end'] = 'End Node'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 233f9310c6..1909585d06 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -21,7 +21,7 @@ $lang->doc->digest = 'Summary'; $lang->doc->comment = 'Remark'; $lang->doc->type = 'Type'; $lang->doc->content = 'Text'; -$lang->doc->keywords = 'Keyword'; +$lang->doc->keywords = 'Keywords'; $lang->doc->url = 'URL'; $lang->doc->files = 'File'; $lang->doc->addedBy = 'Added By'; @@ -51,21 +51,21 @@ $lang->doc->delete = 'Delete'; $lang->doc->browse = 'List'; $lang->doc->view = 'Details'; $lang->doc->diff = 'Diff'; -$lang->doc->manageType = 'Type'; -$lang->doc->editType = 'Edit Type'; -$lang->doc->deleteType = 'Delete Type'; -$lang->doc->addType = 'Add Type'; +$lang->doc->manageType = 'Manage Category'; +$lang->doc->editType = 'Edit'; +$lang->doc->deleteType = 'Delete'; +$lang->doc->addType = 'Add'; -$lang->doc->libName = 'Library Name'; -$lang->doc->libType = 'Library Type'; +$lang->doc->libName = 'Name'; +$lang->doc->libType = 'Category'; $lang->doc->custom = 'Custom Library'; $lang->doc->customAB = 'Custom Library'; $lang->doc->createLib = 'Create Library'; -$lang->doc->allLibs = 'Library List'; +$lang->doc->allLibs = 'Libraries'; $lang->doc->objectLibs = "{$lang->productCommon}/{$lang->projectCommon} Library List"; -$lang->doc->showFiles = 'Files Library'; -$lang->doc->editLib = 'Edit Library'; -$lang->doc->deleteLib = 'Delete Library'; +$lang->doc->showFiles = 'File Library'; +$lang->doc->editLib = 'Edit'; +$lang->doc->deleteLib = 'Delete'; $lang->doc->fixedMenu = 'Fixed In Menu'; $lang->doc->removeMenu = 'Remove From Menu'; @@ -84,13 +84,13 @@ $lang->doc->aclList['open'] = 'Public'; $lang->doc->aclList['custom'] = 'Custom'; $lang->doc->aclList['private'] = 'Private'; -$lang->doc->types['text'] = 'Html'; -$lang->doc->types['url'] = 'Link'; +$lang->doc->types['text'] = 'Text'; +$lang->doc->types['url'] = 'URL'; $lang->doc->contentTypeList['html'] = 'HTML'; $lang->doc->contentTypeList['markdown'] = 'MarkDown'; -$lang->doc->browseType = 'Browse Type'; +$lang->doc->browseType = 'Categories'; $lang->doc->browseTypeList['list'] = 'List'; $lang->doc->browseTypeList['menu'] = 'Menu'; $lang->doc->browseTypeList['tree'] = 'Tree'; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index d6519df135..6be2075c9d 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -67,9 +67,9 @@ $lang->install->dataRoot = 'Uploaded File Directory'; $lang->install->session = 'Session Save Path'; $lang->install->sessionFail = 'Edit the php.ini file to set session.save_path.'; $lang->install->mkdirWin = '

%s directory has to be created.
Run
mkdir %s

command line.'; -$lang->install->chmodWin = ' "%s" privilege has to be modified.'; +$lang->install->chmodWin = ' "%s" privilege has to be changed.'; $lang->install->mkdirLinux = '

%s directory has to be created.
Run
mkdir -p %s

command line.'; -$lang->install->chmodLinux = ' "%s" privilege has to be modified.
Run
chmod o=rwx -R %s command line.'; +$lang->install->chmodLinux = ' "%s" privilege has to be changed.
Run
chmod o=rwx -R %s command line.'; $lang->install->defaultLang = 'Default Lang'; $lang->install->dbHost = 'Database Host'; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index e203b3fbd5..a5dd4d623b 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -20,7 +20,7 @@ $lang->product->create = "Create {$lang->productCommon}"; $lang->product->delete = "Delete {$lang->productCommon}"; $lang->product->deleted = "Deleted"; $lang->product->close = "Close"; -$lang->product->select = "Please select {$lang->productCommon}"; +$lang->product->select = " Select {$lang->productCommon}"; $lang->product->mine = 'My responsibility:'; $lang->product->other = 'Other:'; $lang->product->closed = 'Closed'; diff --git a/module/product/view/browsedata.html.php b/module/product/view/browsedata.html.php index 4a886e9fda..768e39929f 100644 --- a/module/product/view/browsedata.html.php +++ b/module/product/view/browsedata.html.php @@ -17,8 +17,7 @@ idAB);?> priAB);?> story->title);?> - story->planAB);?> - story->source);?> + story->planAB);?> openedByAB);?> assignedToAB);?> story->estimateAB);?> @@ -49,7 +48,6 @@ title, null, "style='color: $story->color'");?> planTitle;?> - story->sourceList[$story->source];?> openedBy, $story->openedBy);?> assignedTo, $story->assignedTo);?> estimate;?> diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index 37221227fc..cb8871dc42 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -21,15 +21,15 @@ $lang->productplan->basicInfo = 'Basic Info'; $lang->productplan->batchEdit = 'Batch Edit'; $lang->productplan->batchUnlink = "Batch Remove"; -$lang->productplan->linkStory = "Relate Story"; +$lang->productplan->linkStory = "Related Story"; $lang->productplan->unlinkStory = "Remove Story"; -$lang->productplan->batchUnlinkStory = "Batch Remove Story"; -$lang->productplan->linkedStories = 'Related Story'; +$lang->productplan->batchUnlinkStory = "Batch Remove"; +$lang->productplan->linkedStories = 'Relate Story'; $lang->productplan->unlinkedStories = 'Unrelated'; $lang->productplan->linkBug = "Relate Bug"; $lang->productplan->unlinkBug = "Remove Bug"; -$lang->productplan->batchUnlinkBug = "Batch Remove Bug"; +$lang->productplan->batchUnlinkBug = "Batch Remove"; $lang->productplan->linkedBugs = 'Related Bug'; $lang->productplan->unlinkedBugs = 'Unrelated'; @@ -57,6 +57,6 @@ $lang->productplan->errorNoBegin = 'ID %s begin time should not be empty.'; $lang->productplan->errorNoEnd = 'ID %s end time should not be empty.'; $lang->productplan->beginGeEnd = 'ID %s begin time value should not be greater than t.'; -$lang->productplan->featureBar['browse']['unexpired'] = 'Unexpired'; +$lang->productplan->featureBar['browse']['unexpired'] = 'On Time'; $lang->productplan->featureBar['browse']['all'] = 'All'; $lang->productplan->featureBar['browse']['overdue'] = 'Overdue'; diff --git a/module/release/lang/en.php b/module/release/lang/en.php index 1d7d61627a..4acbd1c8e9 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -17,7 +17,7 @@ $lang->release->linkBug = "Relate Bug"; $lang->release->delete = "Delete"; $lang->release->deleted = 'Deleted'; $lang->release->view = "Info"; -$lang->release->browse = "Browse"; +$lang->release->browse = "Releases"; $lang->release->changeStatus = "Change Status"; $lang->release->batchUnlink = "Batch Unrelate"; $lang->release->batchUnlinkStory = "Batch Unrelate"; @@ -41,7 +41,7 @@ $lang->release->unlinkStory = 'Remove Story'; $lang->release->unlinkBug = 'Remove Bug'; $lang->release->stories = 'Finished Story'; $lang->release->bugs = 'Solved Bug'; -$lang->release->generatedBugs = 'Generated Bug'; +$lang->release->generatedBugs = 'Remained Bug'; $lang->release->finishStories = 'Finished %s Story'; $lang->release->resolvedBugs = 'Solved %s Bug'; $lang->release->createdBugs = 'Generated %s Bug'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index d599e84680..a45478264a 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -12,7 +12,7 @@ $lang->story->create = "Create"; $lang->story->batchCreate = "Batch Create"; $lang->story->change = "Change"; -$lang->story->changed = 'Changed Story'; +$lang->story->changed = 'Change'; $lang->story->review = 'Review'; $lang->story->batchReview = 'Batch Review'; $lang->story->edit = "Edit"; @@ -32,7 +32,7 @@ $lang->story->caseCount = 'Test Cases'; $lang->story->taskCountAB = 'T'; $lang->story->bugCountAB = 'B'; $lang->story->caseCountAB = 'C'; -$lang->story->linkStory = 'Related Story'; +$lang->story->linkStory = 'Relate Story'; $lang->story->unlinkStory = 'Unrelated'; $lang->story->export = "Export Data"; $lang->story->zeroCase = "Zero Case"; @@ -102,7 +102,7 @@ $lang->story->statusList['closed'] = 'Closed'; $lang->story->statusList['changed'] = 'Changed'; $lang->story->stageList[''] = ''; -$lang->story->stageList['wait'] = 'Pending'; +$lang->story->stageList['wait'] = 'Wait'; $lang->story->stageList['planned'] = 'Planned'; $lang->story->stageList['projected'] = 'Projected'; $lang->story->stageList['developing'] = 'Developing'; @@ -172,7 +172,7 @@ $lang->story->lblReview = 'Review'; $lang->story->lblActivate = 'Activate'; $lang->story->lblClose = 'Close'; -$lang->story->checkAffection = 'Check Impact'; +$lang->story->checkAffection = 'Impact'; $lang->story->affectedProjects = 'Affected' . $lang->projectCommon; $lang->story->affectedBugs = 'Affected Bug'; $lang->story->affectedCases = 'Affected Case'; @@ -210,22 +210,22 @@ $lang->story->action->unlinkchildstory = array('main' => '$date, removed by < /* 统计报表。*/ $lang->story->report = new stdclass(); $lang->story->report->common = 'Report'; -$lang->story->report->select = 'Please select the type of Report'; +$lang->story->report->select = 'Select the type of Story Report'; $lang->story->report->create = 'Generate'; $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 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'; -$lang->story->report->charts['storysPerEstimate'] = 'Story per Estimated Man-Hour'; -$lang->story->report->charts['storysPerOpenedBy'] = 'Story per CreatedBy'; -$lang->story->report->charts['storysPerAssignedTo'] = 'Story per AssignedTo'; -$lang->story->report->charts['storysPerClosedReason'] = 'Story per Closed Reason'; -$lang->story->report->charts['storysPerChange'] = 'Story per Change'; +$lang->story->report->charts['storysPerProduct'] = 'per ' . $lang->productCommon; +$lang->story->report->charts['storysPerModule'] = 'per Module'; +$lang->story->report->charts['storysPerSource'] = 'per Source'; +$lang->story->report->charts['storysPerPlan'] = 'per Plan'; +$lang->story->report->charts['storysPerStatus'] = 'per Status'; +$lang->story->report->charts['storysPerStage'] = 'per Stage'; +$lang->story->report->charts['storysPerPri'] = 'per Priority'; +$lang->story->report->charts['storysPerEstimate'] = 'per Estimated Man-Hour'; +$lang->story->report->charts['storysPerOpenedBy'] = 'per CreatedBy'; +$lang->story->report->charts['storysPerAssignedTo'] = 'per AssignedTo'; +$lang->story->report->charts['storysPerClosedReason'] = 'per Closed Reason'; +$lang->story->report->charts['storysPerChange'] = 'per Change'; $lang->story->report->options = new stdclass(); $lang->story->report->options->graph = new stdclass(); diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 6864c2dfec..5336d7017e 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -165,23 +165,23 @@ $lang->task->error->consumed = 'Task: %s man-hour must be more than 0. I /* 统计报表。*/ $lang->task->report = new stdclass(); $lang->task->report->common = 'Report'; -$lang->task->report->select = 'Please select the type of the Task'; +$lang->task->report->select = 'Select the type of Task Report'; $lang->task->report->create = 'Create'; $lang->task->report->value = 'Task Count'; -$lang->task->report->charts['tasksPerProject'] = $lang->projectCommon . ' Tasks'; -$lang->task->report->charts['tasksPerModule'] = 'Modules'; -$lang->task->report->charts['tasksPerAssignedTo'] = 'Assigned To'; -$lang->task->report->charts['tasksPerType'] = 'Type'; -$lang->task->report->charts['tasksPerPri'] = 'Priority'; -$lang->task->report->charts['tasksPerStatus'] = 'Status'; -$lang->task->report->charts['tasksPerDeadline'] = 'Deadline'; -$lang->task->report->charts['tasksPerEstimate'] = 'Estimation'; -$lang->task->report->charts['tasksPerLeft'] = 'Remained'; -$lang->task->report->charts['tasksPerConsumed'] = 'onsumed'; -$lang->task->report->charts['tasksPerFinishedBy'] = 'Finished By'; -$lang->task->report->charts['tasksPerClosedReason'] = 'Close Reason'; -$lang->task->report->charts['finishedTasksPerDay'] = 'Finished per Day'; +$lang->task->report->charts['tasksPerProject'] = 'per ' . $lang->projectCommon; +$lang->task->report->charts['tasksPerModule'] = 'per Module'; +$lang->task->report->charts['tasksPerAssignedTo'] = 'per AssignedTo'; +$lang->task->report->charts['tasksPerType'] = 'per Category'; +$lang->task->report->charts['tasksPerPri'] = 'per Priority'; +$lang->task->report->charts['tasksPerStatus'] = 'per Status'; +$lang->task->report->charts['tasksPerDeadline'] = 'per Deadline'; +$lang->task->report->charts['tasksPerEstimate'] = 'per Estimated Man-Hour'; +$lang->task->report->charts['tasksPerLeft'] = 'per Remained Man-Hour'; +$lang->task->report->charts['tasksPerConsumed'] = 'per Consumed Man-Hour'; +$lang->task->report->charts['tasksPerFinishedBy'] = 'per FinishedBy'; +$lang->task->report->charts['tasksPerClosedReason'] = 'per Close Reason'; +$lang->task->report->charts['finishedTasksPerDay'] = 'per Finished/Day'; $lang->task->report->options = new stdclass(); $lang->task->report->options->graph = new stdclass(); diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 91509f6f12..74255c5ebc 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -15,13 +15,13 @@ $lang->tree->edit = 'Edit'; $lang->tree->delete = 'Delete'; $lang->tree->browse = 'General Module'; $lang->tree->browseTask = 'Task Module'; -$lang->tree->manage = 'Module'; +$lang->tree->manage = 'Manage Module'; $lang->tree->fix = 'Fix'; -$lang->tree->manageProduct = "Manage {$lang->productCommon} Module"; -$lang->tree->manageProject = "Manage {$lang->projectCommon} Project"; -$lang->tree->manageBug = 'Manage Bug Module'; -$lang->tree->manageCase = 'Manage Case Module'; -$lang->tree->manageCustomDoc = 'Manage DocLib Type'; +$lang->tree->manageProduct = "Manage {$lang->productCommon}"; +$lang->tree->manageProject = "Manage {$lang->projectCommon}"; +$lang->tree->manageBug = 'Manage Bug'; +$lang->tree->manageCase = 'Manage Case'; +$lang->tree->manageCustomDoc = 'Manage DocLib'; $lang->tree->updateOrder = 'Update Order'; $lang->tree->manageChild = 'Manage Child Module'; $lang->tree->manageStoryChild = 'Manage Child Story'; @@ -30,8 +30,8 @@ $lang->tree->manageCaseChild = 'Manage Child Case'; $lang->tree->manageTaskChild = "Manage Child {$lang->projectCommon}"; $lang->tree->syncFromProduct = 'Copy'; $lang->tree->dragAndSort = "Drag and Sort"; -$lang->tree->sort = "Ranking"; -$lang->tree->addChild = "Add Child Module"; +$lang->tree->sort = "Sort"; +$lang->tree->addChild = "Add Child"; $lang->tree->confirmDelete = 'Do you want to delete this Module and its Children?'; $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?"; @@ -44,7 +44,7 @@ $lang->tree->parent = 'Parent'; $lang->tree->child = 'Child'; $lang->tree->owner = 'Owner'; $lang->tree->order = 'Order'; -$lang->tree->short = 'Short'; +$lang->tree->short = 'Sort'; $lang->tree->all = 'All Modules'; $lang->tree->projectDoc = "{$lang->projectCommon} Doc"; $lang->tree->product = $lang->productCommon;