ZPL license. It integrates with Product Management, Project Management, QA Management, Document Management, Todos Management, Company Management etc. ZenTao is the best choice for software project management.
@@ -41,7 +41,7 @@ EOT;
$lang->install->newReleased= "Notice：Official Website has the latest version%s, released on %s.";
$lang->install->or = 'Or';
-$lang->install->checking = 'System Checking';
+$lang->install->checking = 'System Checkup';
$lang->install->ok = 'Passed(√)';
$lang->install->fail = 'Failed(×)';
$lang->install->loaded = 'Loaded';
@@ -52,27 +52,27 @@ $lang->install->writable = 'Writable ';
$lang->install->notWritable= 'Not Writable ';
$lang->install->phpINI = 'PHP ini File';
$lang->install->checkItem = 'Item';
-$lang->install->current = 'Current Settings';
-$lang->install->result = 'Results';
-$lang->install->action = 'Actions';
+$lang->install->current = 'Current Setting';
+$lang->install->result = 'Result';
+$lang->install->action = 'Action';
$lang->install->phpVersion = 'PHP Version';
$lang->install->phpFail = 'PHP Version has to be 5.2.0+';
$lang->install->pdo = 'PDO';
-$lang->install->pdoFail = 'Edit PHP ini file to load PDO extsion.';
+$lang->install->pdoFail = 'Edit php.ini to load PDO extsion.';
$lang->install->pdoMySQL = 'PDO_MySQL';
-$lang->install->pdoMySQLFail = 'Edit PHP ini file to load PDO_MySQL extsion.';
+$lang->install->pdoMySQLFail = 'Edit php.ini to load PDO_MySQL extsion.';
$lang->install->json = 'JSON Extension';
-$lang->install->jsonFail = 'Edit the php.ini file to load JSON extension.';
+$lang->install->jsonFail = 'Edit php.ini to load JSON extension.';
$lang->install->openssl = 'OpenSSL Extension';
-$lang->install->opensslFail = 'Edit the php.ini file to load openssl extension.';
+$lang->install->opensslFail = 'Edit php.ini to load openssl extension.';
$lang->install->mbstring = 'Mbstring Extension';
-$lang->install->mbstringFail = 'Edit the php.ini file to load mbstring extension.';
+$lang->install->mbstringFail = 'Edit php.ini to load mbstring extension.';
$lang->install->zlib = 'Zlib Extension';
-$lang->install->zlibFail = 'Edit the php.ini file to load zlib extension.';
+$lang->install->zlibFail = 'Edit php.ini to load zlib extension.';
$lang->install->curl = 'Curl Extension';
-$lang->install->curlFail = 'Edit the php.ini file to load curl extension.';
+$lang->install->curlFail = 'Edit php.ini to load curl extension.';
$lang->install->filter = 'Filter Extension';
$lang->install->filterFail = 'Edit the php.ini file to load filter extension.';
$lang->install->gd = 'GD Extension';
@@ -96,14 +96,14 @@ $lang->install->dbUser = 'Database User';
$lang->install->dbPassword = 'Database Password';
$lang->install->dbName = 'Database Name';
$lang->install->dbPrefix = 'Table Prefix';
-$lang->install->clearDB = 'Clean tables if already exist.';
+$lang->install->clearDB = 'Clean tables if it already exists.';
$lang->install->importDemoData = 'Import Demo Data';
-$lang->install->working = 'Work Mode';
+$lang->install->working = 'Operation Mode';
$lang->install->requestTypes['GET'] = 'GET';
$lang->install->requestTypes['PATH_INFO'] = 'PATH_INFO';
-$lang->install->workingList['full'] = 'Full Development Management';
+$lang->install->workingList['full'] = 'Application Lifecycle Management';
$lang->install->workingList['onlyTest'] = 'Only Test Management';
$lang->install->workingList['onlyStory'] = 'Only Story Management';
$lang->install->workingList['onlyTask'] = 'Only Task Management';
@@ -115,10 +115,10 @@ $lang->install->errorTableExists = 'Data table has existed. If ZenTao has bee
$lang->install->errorCreateTable = 'Failed to create the table.';
$lang->install->errorImportDemoData = 'Failed to import demo data.';
-$lang->install->setConfig = 'Create Config File';
+$lang->install->setConfig = 'Create config file';
$lang->install->key = 'Item';
$lang->install->value = 'Value';
-$lang->install->saveConfig = 'Save Config';
+$lang->install->saveConfig = 'Save config';
$lang->install->save2File = 'Copy the content in the text box above and save it to " %s ". You can change this config file later.
';
$lang->install->saved2File = 'Config file has been saved to " %s ". You can change this file later.';
$lang->install->errorNotSaveConfig = 'Config file is not saved.';
@@ -130,7 +130,7 @@ $lang->install->password = 'Admin Password';
$lang->install->errorEmptyPassword = 'Password should not be blank.';
$lang->install->groupList['ADMIN']['name'] = 'Admin';
-$lang->install->groupList['ADMIN']['desc'] = 'System Administrator';
+$lang->install->groupList['ADMIN']['desc'] = 'System Admin';
$lang->install->groupList['DEV']['name'] = 'Dev';
$lang->install->groupList['DEV']['desc'] = 'Developer';
$lang->install->groupList['QA']['name'] = 'QA';
@@ -150,7 +150,7 @@ $lang->install->groupList['TOP']['desc'] = 'Senior Manager';
$lang->install->groupList['OTHERS']['name'] = 'Other';
$lang->install->groupList['OTHERS']['desc'] = 'other users';
$lang->install->groupList['LIMITED']['name'] = 'Limited User';
-$lang->install->groupList['LIMITED']['desc'] = 'can only edit contents related to itself';
+$lang->install->groupList['LIMITED']['desc'] = 'User can only edit contents related to itself';
$lang->install->cronList[''] = 'Monitor cron';
$lang->install->cronList['moduleName=project&methodName=computeburn'] = 'Update Burndown Chart';
@@ -173,7 +173,7 @@ EOT;
$lang->install->product = array('chanzhi', 'ranzhi');
-$lang->install->promotion = "Products of Nature Easy Soft:";
+$lang->install->promotion = "Products from Nature Easy Soft team:";
$lang->install->chanzhi = new stdclass();
$lang->install->chanzhi->name = 'ZSITE content management system.';
$lang->install->chanzhi->logo = 'images/main/chanzhi_en.png';
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index ef69befdae..3e0d64dbeb 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -16,12 +16,12 @@ $lang->my->dynamic = 'My Dynamic';
$lang->my->editProfile = 'Edit Profile';
$lang->my->changePassword = 'Edit Password';
$lang->my->unbind = 'Unbind Ranger';
-$lang->my->manageContacts = 'Maintain Contact';
+$lang->my->manageContacts = 'Manage Contact';
$lang->my->deleteContacts = 'Delete Contact';
$lang->my->shareContacts = 'Share the list';
-$lang->my->limited = 'Restricted operation (editing only content related to itself)';
-$lang->my->score = 'My Score';
-$lang->my->scoreRule = 'Score Rule';
+$lang->my->limited = 'Restricted actions (editing only content related to itself)';
+$lang->my->score = 'My Point';
+$lang->my->scoreRule = 'Point Rule';
$lang->my->noTodo = 'No todos. ';
$lang->my->taskMenu = new stdclass();
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index adb19f4620..08f8ebb7b1 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -24,7 +24,7 @@ $lang->product->select = "Select {$lang->productCommon}";
$lang->product->mine = 'My responsibility:';
$lang->product->other = 'Other:';
$lang->product->closed = 'Closed';
-$lang->product->updateOrder = 'Ranking';
+$lang->product->updateOrder = 'Order';
$lang->product->all = "All {$lang->productCommon}";
$lang->product->export = 'Export Data';
@@ -44,7 +44,7 @@ $lang->product->project = $lang->projectCommon . 'List';
$lang->product->build = 'Build';
$lang->product->currentProject = "Current {$lang->projectCommon}";
-$lang->product->activeStories = 'Activated Story';
+$lang->product->activeStories = 'Active Story';
$lang->product->changedStories = 'Changed Story';
$lang->product->draftStories = 'Draft Story';
$lang->product->closedStories = 'Closed Story';
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index 49e31e6c8f..024d866410 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -16,7 +16,7 @@ $lang->productplan->create = "Create Plan";
$lang->productplan->edit = "Edit";
$lang->productplan->delete = "Delete";
$lang->productplan->view = "Details";
-$lang->productplan->bugSummary = "%s Bugs in total on this page.";
+$lang->productplan->bugSummary = "Total %s Bugs on this page.";
$lang->productplan->basicInfo = 'Basic Info';
$lang->productplan->batchEdit = 'Batch Edit';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index d75dd248ad..6dee2ad118 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -19,7 +19,7 @@ $lang->project->begin = 'Begin';
$lang->project->end = 'End';
$lang->project->dateRange = 'Duration';
$lang->project->to = 'To';
-$lang->project->days = 'Man-Day';
+$lang->project->days = 'Man Day';
$lang->project->day = 'day';
$lang->project->workHour = 'Hours';
$lang->project->totalHours = 'Work Hours';
@@ -231,13 +231,13 @@ $lang->project->confirmUnlinkMember = "Do you want to unlink this User from {$
$lang->project->confirmUnlinkStory = "Do you want to unlink this Story from {$lang->projectCommon}?";
$lang->project->errorNoLinkedProducts = "No linked {$lang->productCommon} found in {$lang->projectCommon}. You will be directed to {$lang->productCommon}linked page.";
$lang->project->errorSameProducts = "{$lang->projectCommon} cannot be linked with multiple identical {$lang->productCommon}。";
-$lang->project->accessDenied = "Access to {$lang->projectCommon} is denied!";
+$lang->project->accessDenied = "Your access to {$lang->projectCommon} is denied!";
$lang->project->tips = 'Note';
$lang->project->afterInfo = "{$lang->projectCommon} is created. Next you can ";
$lang->project->setTeam = 'Set Team';
$lang->project->linkStory = 'Link Story';
$lang->project->createTask = 'Create Task';
-$lang->project->goback = "Return";
+$lang->project->goback = "Back";
$lang->project->noweekend = 'Without Weekend';
$lang->project->withweekend = 'With Weekend';
$lang->project->interval = 'Intervals';
diff --git a/module/score/lang/en.php b/module/score/lang/en.php
index c90e904297..fd0a1ea07d 100644
--- a/module/score/lang/en.php
+++ b/module/score/lang/en.php
@@ -1,11 +1,11 @@
score->common = 'My Score';
-$lang->score->record = 'Score Record';
-$lang->score->current = 'Current Score';
-$lang->score->level = 'Level Score';
+$lang->score->common = 'My Point';
+$lang->score->record = 'Point Record';
+$lang->score->current = 'Current Point';
+$lang->score->level = 'Level Point';
$lang->score->reset = 'Reset';
-$lang->score->tips = 'Yesterday added score: %d
Total score: %d';
-$lang->score->resetTips = 'It will take a long time. Do not close the window.';
+$lang->score->tips = 'Yesterday added: %d
Total: %d';
+$lang->score->resetTips = 'It will take a while. Do not close the window.';
$lang->score->resetStart = 'Start';
$lang->score->resetLoading = 'Processing: ';
$lang->score->resetFinish = 'Finished';
@@ -16,11 +16,11 @@ $lang->score->account = 'User';
$lang->score->module = 'Module';
$lang->score->method = 'Method';
$lang->score->before = 'Before';
-$lang->score->score = 'Score';
+$lang->score->score = 'Point';
$lang->score->after = 'After';
$lang->score->time = 'Time';
$lang->score->desc = 'Description';
-$lang->score->noLimit = 'No limited';
+$lang->score->noLimit = 'No limit';
$lang->score->times = 'Times';
$lang->score->hour = 'Hour';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 29566e99d3..6ad6daecd2 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -68,17 +68,17 @@ $lang->story->stage = 'Phase';
$lang->story->stageAB = 'Phase';
$lang->story->mailto = 'Mail to';
$lang->story->openedBy = 'Creator';
-$lang->story->openedDate = 'Create on';
+$lang->story->openedDate = 'Created';
$lang->story->assignedTo = 'Assignee';
-$lang->story->assignedDate = 'Assigned on';
+$lang->story->assignedDate = 'Assigned';
$lang->story->lastEditedBy = 'Last Edited';
-$lang->story->lastEditedDate = 'Edited on';
+$lang->story->lastEditedDate = 'Edited';
$lang->story->closedBy = 'Closed by';
-$lang->story->closedDate = 'Closed on';
+$lang->story->closedDate = 'Closed';
$lang->story->closedReason = 'Close Reason';
$lang->story->rejectedReason = 'Reject Reason';
$lang->story->reviewedBy = 'Reviewer';
-$lang->story->reviewedDate = 'Reviewed on';
+$lang->story->reviewedDate = 'Reviewed';
$lang->story->version = 'Version';
$lang->story->plan = 'Plan';
$lang->story->planAB = 'Plan';
@@ -305,4 +305,4 @@ $lang->story->chosen = new stdClass();
$lang->story->chosen->reviewedBy = 'Choose Reviewer';
$lang->story->notice = new stdClass();
-$lang->story->notice->closed = 'Stories you select are closed!';
+$lang->story->notice->closed = 'Story that you select are closed!';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 0551caa9a8..861b05b2ee 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -181,6 +181,7 @@ $lang->story->lblChange = '變更需求';
$lang->story->lblReview = '評審需求';
$lang->story->lblActivate = '激活需求';
$lang->story->lblClose = '關閉需求';
+$lang->story->lblTBC = '任務Bug用例';
$lang->story->checkAffection = '影響範圍';
$lang->story->affectedProjects = '影響的' . $lang->projectCommon;
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index a6256b73a1..5b2efaaac7 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -12,7 +12,7 @@
$lang->task->index = "Index";
$lang->task->create = "Create Task";
$lang->task->batchCreate = "Batch Create";
-$lang->task->batchCreateChildren = "Batch Create Children";
+$lang->task->batchCreateChildren = "Batch Create Child";
$lang->task->batchEdit = "Batch Edit";
$lang->task->batchChangeModule = "Batch Change Module";
$lang->task->batchClose = "Batch Close";
@@ -23,7 +23,7 @@ $lang->task->deleted = "Deleted";
$lang->task->delayed = 'Delayed';
$lang->task->view = "Overview";
$lang->task->logEfforts = "Hour";
-$lang->task->record = "Est.";
+$lang->task->record = "Est";
$lang->task->start = "Start";
$lang->task->restart = "Continue";
$lang->task->finish = "Finish";
@@ -48,8 +48,8 @@ $lang->task->module = 'Module';
$lang->task->moduleAB = 'Module';
$lang->task->story = 'Story';
$lang->task->storyAB = 'Story';
-$lang->task->storySpec = 'Story Description';
-$lang->task->storyVerify = 'Acceptance Criteria';
+$lang->task->storySpec = 'Description';
+$lang->task->storyVerify = 'Acceptance';
$lang->task->name = 'Name';
$lang->task->type = 'Type';
$lang->task->pri = 'Priority';
@@ -77,24 +77,24 @@ $lang->task->assignTo = $lang->task->assign;
$lang->task->batchAssignTo = 'Batch Assign';
$lang->task->assignedTo = 'Assignee';
$lang->task->assignedToAB = 'Assignee';
-$lang->task->assignedDate = 'Assign on';
+$lang->task->assignedDate = 'Assigned';
$lang->task->openedBy = 'Created by';
-$lang->task->openedDate = 'Created on';
+$lang->task->openedDate = 'Created';
$lang->task->openedDateAB = 'Add';
$lang->task->finishedBy = 'Finished';
$lang->task->finishedByAB = 'Finished';
-$lang->task->finishedDate = 'Finished on';
-$lang->task->finishedDateAB = 'Finished on';
+$lang->task->finishedDate = 'Finished';
+$lang->task->finishedDateAB = 'Finished';
$lang->task->finishedList = 'Finished list';
$lang->task->canceledBy = 'Cancelled by';
-$lang->task->canceledDate = 'Cancelled on';
+$lang->task->canceledDate = 'Cancelled';
$lang->task->closedBy = 'Closed by';
-$lang->task->closedDate = 'Close Date';
+$lang->task->closedDate = 'Closed';
$lang->task->closedReason = 'Cancel Reason';
$lang->task->lastEditedBy = 'Edited by';
-$lang->task->lastEditedDate = 'Edited on';
+$lang->task->lastEditedDate = 'Edited';
$lang->task->lastEdited = 'Last Edited';
-$lang->task->recordEstimate = 'Make Progress';
+$lang->task->recordEstimate = 'Progress';
$lang->task->editEstimate = 'Edit Est.';
$lang->task->deleteEstimate = 'Delete Est.';
$lang->task->colorTag = 'Color Tag';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index b9287e0c17..3ef571cfba 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -39,6 +39,7 @@ $lang->task->confirmStoryChange = "確認需求變動";
$lang->task->progress = '進度';
$lang->task->progressTips = '已消耗/(已消耗+剩餘)';
$lang->task->copy = '複製任務';
+$lang->task->waitTask = '未開始的任務';
$lang->task->common = '任務';
$lang->task->id = '編號';
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 85a0b169bd..86a6d396b1 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -23,7 +23,7 @@ $lang->testcase->type = 'Type';
$lang->testcase->status = 'Status';
$lang->testcase->steps = 'Steps';
$lang->testcase->openedBy = 'Created by';
-$lang->testcase->openedDate = 'Created on';
+$lang->testcase->openedDate = 'Created';
$lang->testcase->lastEditedBy = 'Edited by';
$lang->testcase->result = 'Result';
$lang->testcase->real = 'Details';
@@ -34,15 +34,15 @@ $lang->testcase->linkCases = 'Link Cases';
$lang->testcase->unlinkCase = 'Unlink Cases';
$lang->testcase->stage = 'Phase';
$lang->testcase->reviewedBy = 'Reviewed by';
-$lang->testcase->reviewedDate = 'Reviewed on';
+$lang->testcase->reviewedDate = 'Reviewed';
$lang->testcase->reviewResult = 'Review Result';
$lang->testcase->reviewedByAB = 'By';
$lang->testcase->reviewedDateAB = 'Date';
$lang->testcase->reviewResultAB = 'Result';
$lang->testcase->forceNotReview = 'No Review';
$lang->testcase->lastEditedByAB = 'Edited by';
-$lang->testcase->lastEditedDateAB = 'Edited on';
-$lang->testcase->lastEditedDate = 'Edited on';
+$lang->testcase->lastEditedDateAB = 'Edited';
+$lang->testcase->lastEditedDate = 'Edited';
$lang->testcase->version = 'Case Version';
$lang->testcase->lastRunner = 'LastRun';
$lang->testcase->lastRunDate = 'Time';
@@ -59,7 +59,7 @@ $lang->testcase->bugs = 'Bugs Generated';
$lang->testcase->bugsAB = 'B';
$lang->testcase->results = 'Results';
$lang->testcase->resultsAB = 'R';
-$lang->testcase->stepNumber = 'Number of steps';
+$lang->testcase->stepNumber = 'No.. of steps';
$lang->testcase->stepNumberAB = 'S';
$lang->testcase->createBug = 'Convert to Bug';
$lang->testcase->fromModule = 'Source Module';
@@ -102,7 +102,7 @@ $lang->testcase->group = 'Group';
$lang->testcase->groupName = 'Group Name';
$lang->testcase->step = 'Step';
$lang->testcase->stepChild = 'Child';
-$lang->testcase->viewAll = 'View All';
+$lang->testcase->viewAll = 'All';
$lang->testcase->new = 'New';
@@ -177,7 +177,7 @@ $lang->testcase->statusList[''] = '';
$lang->testcase->statusList['wait'] = 'Wait';
$lang->testcase->statusList['normal'] = 'Normal';
$lang->testcase->statusList['blocked'] = 'Blocked';
-$lang->testcase->statusList['investigate'] = 'Investigating';
+$lang->testcase->statusList['investigate'] = 'Studying';
$lang->testcase->resultList['n/a'] = 'Ignore';
$lang->testcase->resultList['pass'] = 'Pass';
@@ -194,7 +194,7 @@ $lang->testcase->mustChooseResult = 'Review result is required.';
$lang->testcase->noModule = 'You have no modules
Manage now
';
$lang->testcase->noCase = 'No cases. ';
-$lang->testcase->searchStories = 'Enter to searcu Story';
+$lang->testcase->searchStories = 'Enter to search Story';
$lang->testcase->selectLib = 'Select Library';
$lang->testcase->action = new stdclass();
diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php
index 918be94678..4389b77224 100644
--- a/module/testreport/lang/en.php
+++ b/module/testreport/lang/en.php
@@ -5,7 +5,7 @@ $lang->testreport->create = 'Create Report';
$lang->testreport->edit = 'Edit Report';
$lang->testreport->delete = 'Delete';
$lang->testreport->export = 'Export';
-$lang->testreport->view = 'Report Details';
+$lang->testreport->view = 'Details';
$lang->testreport->recreate = 'Re-Create';
$lang->testreport->title = 'Title';
@@ -47,8 +47,8 @@ $lang->testreport->legendMore = 'More';
$lang->testreport->bugSeverityGroups = 'Bug Severity Distribution';
$lang->testreport->bugTypeGroups = 'Bug Type Distribution';
$lang->testreport->bugStatusGroups = 'Bug Status Distribution';
-$lang->testreport->bugOpenedByGroups = 'Bug Creator Distribution';
-$lang->testreport->bugResolvedByGroups = 'Bug Solver Distribution';
+$lang->testreport->bugOpenedByGroups = 'Bug CreateBy Distribution';
+$lang->testreport->bugResolvedByGroups = 'Bug ResolveBy Distribution';
$lang->testreport->bugResolutionGroups = 'Bug Resolution Distribution';
$lang->testreport->bugModuleGroups = 'Bug Module Distribution';
$lang->testreport->legacyBugs = 'Legacy Bugs';
@@ -59,13 +59,13 @@ $lang->testreport->caseSummary = ' %s cases in Total : testreport->buildSummary = 'Tested %s build.';
$lang->testreport->confirmDelete = 'Do you want to delete this report?';
$lang->testreport->moreNotice = 'More features can be extended with reference to the ZenTao extension manual, or you can contact us at renee@easysoft.ltd for customization.';
-$lang->testreport->exportNotice = "Export By ZenTaoPMS";
+$lang->testreport->exportNotice = "Exported By ZenTaoPMS";
$lang->testreport->noReport = "No report has been generated. Please check it later.";
$lang->testreport->foundBugTip = "Bugs created in this build and created in the test period.";
$lang->testreport->legacyBugTip = "Active Bugs, or the resolved beyond the test period.";
$lang->testreport->fromCaseBugTip = "Bugs created after failed cases in the test period.";
-$lang->testreport->errorTrunk = "The trunk version cannot create a test report. Please modify the associated version!";
-$lang->testreport->moreProduct = "You can only create test reports the same product.";
+$lang->testreport->errorTrunk = "The trunk cannot create a test report for. Please modify the linked build!";
+$lang->testreport->moreProduct = "You can only create test reports for the same product.";
$lang->testreport->bugSummary = <<%s Bug(s) generated in total ,
diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php
index c66e8bf2e6..950db4f807 100644
--- a/module/testsuite/lang/en.php
+++ b/module/testsuite/lang/en.php
@@ -15,7 +15,7 @@ $lang->testsuite->delete = "Delete";
$lang->testsuite->view = "Overview";
$lang->testsuite->edit = "Edit";
$lang->testsuite->browse = "Suite List";
-$lang->testsuite->linkCase = "Link Cases";
+$lang->testsuite->linkCase = "Link Case";
$lang->testsuite->linkVersion = "Version";
$lang->testsuite->unlinkCase = "Unlink";
$lang->testsuite->batchUnlinkCases = "Batch Unlink Case";
@@ -37,7 +37,7 @@ $lang->testsuite->addedDate = 'Date';
$lang->testsuite->legendDesc = 'Description';
$lang->testsuite->legendBasicInfo = 'Basic Info';
-$lang->testsuite->unlinkedCases = 'Unlinked Cases';
+$lang->testsuite->unlinkedCases = 'Unlinked Case';
$lang->testsuite->confirmDelete = 'Do you want to delete this suite?';
$lang->testsuite->libraryDelete = 'Do you want to delete this library？';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index abcb3ab575..23a7c83165 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -15,8 +15,8 @@ $lang->testtask->reportChart = 'Report';
$lang->testtask->delete = "Delete";
$lang->testtask->view = "Overview";
$lang->testtask->edit = "Edit";
-$lang->testtask->browse = "Test Tasks";
-$lang->testtask->linkCase = "Link Cases";
+$lang->testtask->browse = "Test Task";
+$lang->testtask->linkCase = "Link Case";
$lang->testtask->selectVersion = "Select Version";
$lang->testtask->unlinkCase = "Unlink";
$lang->testtask->batchUnlinkCases = "Batch unlink cases";
@@ -26,9 +26,9 @@ $lang->testtask->batchRun = "Batch Run";
$lang->testtask->results = "Result";
$lang->testtask->createBug = "Bug(+)";
$lang->testtask->assign = 'Assign';
-$lang->testtask->cases = 'Cases';
+$lang->testtask->cases = 'Case';
$lang->testtask->groupCase = "By Group";
-$lang->testtask->pre = 'Previous';
+$lang->testtask->pre = 'Prev';
$lang->testtask->next = 'Next';
$lang->testtask->start = "Start";
$lang->testtask->close = "Close";
@@ -69,7 +69,7 @@ $lang->testtask->version = 'Version';
$lang->testtask->caseResult = 'Test Result';
$lang->testtask->stepResults = 'Step Results';
$lang->testtask->lastRunner = 'Last Run By';
-$lang->testtask->lastRunDate = 'Last Run Date';
+$lang->testtask->lastRunDate = 'Last Run';
$lang->testtask->date = 'Date';
$lang->testtask->beginAndEnd = 'Date';
@@ -105,15 +105,15 @@ $lang->testtask->confirmDelete = 'Do you want to delete this test build?';
$lang->testtask->confirmUnlinkCase = 'Do you want to unlink this Case?';
$lang->testtask->noticeNoOther = 'There are no other test task for this product';
$lang->testtask->noTesttask = 'No test tasks. ';
-$lang->testtask->checkLinked = "Please check if the testtask product is linked to project.";
+$lang->testtask->checkLinked = "Please check if the testtask product is linked to a project.";
$lang->testtask->assignedToMe = 'My';
-$lang->testtask->allCases = 'AllCases';
+$lang->testtask->allCases = 'All Cases';
$lang->testtask->lblCases = 'Cases';
$lang->testtask->lblUnlinkCase = 'Unlink Case';
$lang->testtask->lblRunCase = 'Run Case';
-$lang->testtask->lblResults = 'Results';
+$lang->testtask->lblResults = 'Result';
$lang->testtask->placeholder = new stdclass();
$lang->testtask->placeholder->begin = 'Begin';
@@ -137,7 +137,7 @@ $lang->testtask->unexecuted = 'Not performed';
/* 统计报表。*/
$lang->testtask->report = new stdclass();
$lang->testtask->report->common = 'Report';
-$lang->testtask->report->select = 'Select report type';
+$lang->testtask->report->select = 'Type';
$lang->testtask->report->create = 'Generate';
$lang->testtask->report->charts['testTaskPerRunResult'] = 'Result Report';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 1990e93e77..094f801e5e 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -12,7 +12,7 @@
$lang->todo->common = 'Todo';
$lang->todo->index = "Home";
$lang->todo->create = "Add Todo";
-$lang->todo->createCycle = "Add Recurring Todo";
+$lang->todo->createCycle = "Add Recur Todo";
$lang->todo->assignTo = "Assign";
$lang->todo->activate = "Activate";
$lang->todo->batchCreate = "Batch Add";
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index b3afeaeac6..52472df7a0 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -14,7 +14,7 @@ $lang->upgrade->result = 'Result';
$lang->upgrade->fail = 'Failed';
$lang->upgrade->success = 'Upgraded';
$lang->upgrade->tohome = 'Visit ZenTao';
-$lang->upgrade->license = 'Zentao PMS has started using Z PUBLIC LICENSE(ZPL) 1.2.';
+$lang->upgrade->license = 'Zentao is under Z PUBLIC LICENSE(ZPL) 1.2.';
$lang->upgrade->warnning= 'Warning!';
$lang->upgrade->checkExtension = 'Check Extension';
$lang->upgrade->warnningContent = <<upgrade->warnningContent = <<zentao.bak
EOT;
-$lang->upgrade->createFileWinCMD = 'Open command line, execute echo > %s';
-$lang->upgrade->createFileLinuxCMD = 'Execute in command line: touch %s';
-$lang->upgrade->setStatusFile = 'Please finish the following action
+$lang->upgrade->createFileWinCMD = 'Open command line and execute echo > %s';
+$lang->upgrade->createFileLinuxCMD = 'Execute command line: touch %s';
+$lang->upgrade->setStatusFile = 'Please finish the following actions
- %s
- Or delete "%s" and create ok.txt and leave it blank.
@@ -38,11 +38,11 @@ $lang->upgrade->setStatusFile = 'Please finish the following action
upgrade->selectVersion = 'Select Version';
$lang->upgrade->continue = 'Continue';
$lang->upgrade->noteVersion = "Select the compatible version, or it might cause data loss.";
-$lang->upgrade->fromVersion = 'From Version';
-$lang->upgrade->toVersion = 'Upgrade to Version';
+$lang->upgrade->fromVersion = 'From';
+$lang->upgrade->toVersion = 'Upgrade to';
$lang->upgrade->confirm = 'Confirm SQL';
$lang->upgrade->sureExecute = 'Execute';
-$lang->upgrade->forbiddenExt = 'Extension is not compatible with the upgraded version. It has been deactivated:';
-$lang->upgrade->updateFile = 'Attachment information has to be updated.';
+$lang->upgrade->forbiddenExt = 'Extension is not compatible with the version. It has been deactivated:';
+$lang->upgrade->updateFile = 'File information has to be updated.';
include dirname(__FILE__) . '/version.php';
diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php
index a9e0eb4275..c6093fa9f5 100644
--- a/module/upgrade/lang/version.php
+++ b/module/upgrade/lang/version.php
@@ -97,3 +97,4 @@ $lang->upgrade->fromVersions['10_2'] = '10.2';
$lang->upgrade->fromVersions['10_3'] = '10.3';
$lang->upgrade->fromVersions['10_3_1'] = '10.3.1';
$lang->upgrade->fromVersions['10_4'] = '10.4';
+$lang->upgrade->fromVersions['10_5'] = '10.5';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 2229faed8c..059209d3eb 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -240,6 +240,7 @@ class upgradeModel extends model
case '10_4':
$this->execSQL($this->getUpgradeFile('10.4'));
$this->changeTaskParentValue();
+ case '10_5':
}
$this->deletePatch();
@@ -356,6 +357,7 @@ class upgradeModel extends model
case '10_3':
case '10_3_1': $confirmContent .= file_get_contents($this->getUpgradeFile('10.3.1'));
case '10_4': $confirmContent .= file_get_contents($this->getUpgradeFile('10.4'));
+ case '10_5':
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index c708ac598c..f11c3e0a0a 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -59,10 +59,10 @@ $lang->user->unbind = "Unbind Zdoo";
$lang->user->login = "Login";
$lang->user->mobileLogin = "Mobile";
$lang->user->editProfile = "Edit";
-$lang->user->deny = "Access is denied.";
-$lang->user->confirmDelete = "Are you sure to delete this user?";
-$lang->user->confirmUnlock = "Are you sure to unlock this user?";
-$lang->user->confirmUnbind = "Are you sure to unbind this user from Zdoo?";
+$lang->user->deny = "Your access is denied.";
+$lang->user->confirmDelete = "Do you want to delete this user?";
+$lang->user->confirmUnlock = "Do you want to unlock this user?";
+$lang->user->confirmUnbind = "Do you want to unbind this user from Zdoo?";
$lang->user->relogin = "Login Again";
$lang->user->asGuest = "Guest";
$lang->user->goback = "Back";
@@ -93,11 +93,11 @@ $lang->user->testTask2Him = 'Build';
$lang->user->case2Him = 'Case Assigned';
$lang->user->caseByHim = 'Case Opened';
-$lang->user->errorDeny = "Sorry, your access to %s of %s has been denied. Please contact your Admin to get permissions. Click Back to return.";
+$lang->user->errorDeny = "Sorry, your access to %s of %s is denied. Please contact your Admin to get permissions. Click Back to return.";
$lang->user->loginFailed = "Login failed. Please check your account and password.";
$lang->user->lockWarning = "You can try %s times.";
$lang->user->loginLocked = "Please contact the administrator to unlock your account or try %s mins later.";
-$lang->user->weakPassword = "Your password does not meet the complexity requirements.";
+$lang->user->weakPassword = "Your password does not meet the requirements.";
$lang->user->roleList[''] = '';
$lang->user->roleList['dev'] = 'Developer';
@@ -130,12 +130,12 @@ $lang->user->tpl->content = 'Content';
$lang->user->tpl->public = 'Public';
$lang->user->placeholder = new stdclass();
-$lang->user->placeholder->account = 'Letters, Underline and Numbers, at least 3 characters';
+$lang->user->placeholder->account = 'Letters, underline and numbers, 3 characters minimum';
$lang->user->placeholder->password1 = 'six characters at lease ';
-$lang->user->placeholder->role = "Role affects content and user order.";
-$lang->user->placeholder->group = "Group decides user privilege.";
+$lang->user->placeholder->role = "Role is related to content and user order.";
+$lang->user->placeholder->group = "Group is related to user privileges.";
$lang->user->placeholder->commiter = 'SVN/Git account';
-$lang->user->placeholder->verify = 'Please input your login password.';
+$lang->user->placeholder->verify = 'Please enter your login password.';
$lang->user->placeholder->passwordStrength[1] = 'Letters and Numbers, at least 6 characters';
$lang->user->placeholder->passwordStrength[2] = 'Letters, Numbers and special characters, at lease 10 characters';