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
2019-06-04 14:21:22 +08:00
parent e9dc74bfda 608a56b71e
commit d490cfbaef
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/action/lang/en.php
View File

@@ -354,8 +354,8 @@ $lang->action->dynamicAction->user['undeleted'] = 'Restore User';
$lang->action->dynamicAction->user['hidden'] = 'Hide User';
$lang->action->dynamicAction->user['loginxuanxuan'] = 'Login Xuan';
$lang->action->dynamicAction->entry['created'] = 'Add Entry';
$lang->action->dynamicAction->entry['edited'] = 'Edit Entry';
$lang->action->dynamicAction->entry['created'] = 'Add Application';
$lang->action->dynamicAction->entry['edited'] = 'Edit Application';
/* 用来生成相应对象的链接。*/
$lang->action->label->product = $lang->productCommon . '|product|view|productID=%s';
@@ -375,7 +375,7 @@ $lang->action->label->doclib = 'Doc Library|doc|browse|libID=%s';
$lang->action->label->doc = 'Doc|doc|view|docID=%s';
$lang->action->label->user = 'User|user|view|account=%s';
$lang->action->label->testreport = 'Report|testreport|view|report=%s';
$lang->action->label->entry = 'Entry|entry|browse|';
$lang->action->label->entry = 'Application|entry|browse|';
$lang->action->label->webhook = 'Webhook|webhook|browse|';
$lang->action->label->space = ' ';
@@ -385,7 +385,7 @@ $lang->action->search->objectTypeList['product'] = $lang->productCommon;
$lang->action->search->objectTypeList['project'] = $lang->projectCommon;
$lang->action->search->objectTypeList['bug'] = 'Bug';
$lang->action->search->objectTypeList['case'] = 'Case';
$lang->action->search->objectTypeList['caseresult'] = 'Case Results';
$lang->action->search->objectTypeList['caseresult'] = 'Case Result';
$lang->action->search->objectTypeList['stepresult'] = 'Case Steps';
$lang->action->search->objectTypeList['story'] = 'Story';
$lang->action->search->objectTypeList['task'] = 'Task';

8
module/admin/lang/en.php
View File

@@ -41,8 +41,8 @@ $lang->admin->register = new stdclass();
$lang->admin->register->common = 'Bind Account';
$lang->admin->register->caption = 'Register in ZenTao Community';
$lang->admin->register->click = 'Register here';
$lang->admin->register->lblAccount = '>= 3 letters and numbers.';
$lang->admin->register->lblPasswd = '>= 6 letters and numbers.';
$lang->admin->register->lblAccount = '>= 3 letters and numbers';
$lang->admin->register->lblPasswd = '>= 6 letters and numbers';
$lang->admin->register->submit = 'Register';
$lang->admin->register->bind = "Bind Exsiting Account";
$lang->admin->register->success = "You have registered!";
@@ -65,7 +65,7 @@ $lang->admin->safe->modeList[0] = 'N/A';
$lang->admin->safe->modeList[1] = 'Medium';
$lang->admin->safe->modeList[2] = 'Strong';
$lang->admin->safe->modeRuleList[1] = ' >= 6 upper and lower case, numbers';
$lang->admin->safe->modeRuleList[1] = ' >= 6 upper and lower case, and numbers';
$lang->admin->safe->modeRuleList[2] = ' >= 10 upper and lower case, numbers and special characters.';
$lang->admin->safe->reasonList['weak'] = 'Common Weak Password';
@@ -77,5 +77,5 @@ $lang->admin->safe->reasonList['birthday'] = 'Same as your DOB';
$lang->admin->safe->modifyPasswordList[1] = 'Yes';
$lang->admin->safe->modifyPasswordList[0] = 'No';
$lang->admin->safe->noticeMode = 'Password will be checked when Login, Add and Edit user.';
$lang->admin->safe->noticeMode = 'Password will be checked when a user logs in, or a user is added and edited.';
$lang->admin->safe->noticeStrong = '';

4
module/block/lang/en.php
View File

@@ -356,7 +356,7 @@ $lang->block->typeList->product['closed'] = 'Closed';
$lang->block->typeList->product['all'] = 'All';
$lang->block->typeList->product['involved'] = 'Involved';
$lang->block->typeList->project['undone'] = 'Uncompleted';
$lang->block->typeList->project['undone'] = 'Unfinished';
$lang->block->typeList->project['doing'] = 'Ongoing';
$lang->block->typeList->project['all'] = 'All';
$lang->block->typeList->project['involved'] = 'Involved';
@@ -398,6 +398,6 @@ $lang->block->gridOptions[4] = 'Right';
$lang->block->flowchart = array();
$lang->block->flowchart[] = array('Administrator', 'Add Department', 'Add User', 'Maintain Privileges');
$lang->block->flowchart[] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases');
$lang->block->flowchart[] = array('Scrum Master', 'Add ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Decompose Tasks');
$lang->block->flowchart[] = array('Scrum Master', 'Add ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Create Tasks');
$lang->block->flowchart[] = array('Dev Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs');
$lang->block->flowchart[] = array('QA Team', 'Write Cases', 'Run Cases', 'Report Bugs', 'Verify Bugs', 'Close Bugs');

2
module/common/lang/en.php
View File

@@ -393,7 +393,7 @@ $lang->admin->subMenu->dev = new stdclass();
$lang->admin->subMenu->dev->api = array('link' => 'API|dev|api');
$lang->admin->subMenu->dev->db = array('link' => 'Database|dev|db');
$lang->admin->subMenu->dev->editor = array('link' => 'Editor|editor|index', 'subModule' => 'editor');
$lang->admin->subMenu->dev->entry = array('link' => 'Entry|entry|browse', 'subModule' => 'entry');
$lang->admin->subMenu->dev->entry = array('link' => 'Application|entry|browse', 'subModule' => 'entry');
$lang->admin->subMenu->data = new stdclass();
$lang->admin->subMenu->data->backup = array('link' => 'Backup|backup|index', 'subModule' => 'backup');

2
module/dev/lang/en.php
View File

@@ -96,7 +96,7 @@ $lang->dev->tableList['storystage'] = 'Story Phase';
$lang->dev->tableList['tutorial'] = 'Tutorial';
$lang->dev->tableList['suitecase'] = 'Suite Case';
$lang->dev->tableList['score'] = 'Score';
$lang->dev->tableList['entry'] = 'Entry';
$lang->dev->tableList['entry'] = 'Application';
$lang->dev->tableList['webhook'] = 'WebHook';
$lang->dev->tableList['log'] = 'Log';
$lang->dev->tableList['message'] = 'Message';

2
module/doc/lang/en.php
View File

@@ -10,7 +10,7 @@
* @link http://www.zentao.net
*/
/* Fields. */
$lang->doc->common = 'Doc';
$lang->doc->common = 'Document';
$lang->doc->id = 'ID';
$lang->doc->product = $lang->productCommon;
$lang->doc->project = $lang->projectCommon;

10
module/entry/lang/en.php
View File

@@ -1,13 +1,13 @@
<?php
$lang->entry->common = 'Entry';
$lang->entry->list = 'Entry List';
$lang->entry->common = 'Application';
$lang->entry->list = 'Applications';
$lang->entry->api = 'API';
$lang->entry->webhook = 'Webhook';
$lang->entry->log = 'Log';
$lang->entry->setting = 'Settings';
$lang->entry->browse = 'Browse';
$lang->entry->create = 'Create Entry';
$lang->entry->create = 'Add Application';
$lang->entry->edit = 'Edit';
$lang->entry->delete = 'Delete';
$lang->entry->createKey = 'Regenerate Secret Key';
@@ -35,7 +35,7 @@ $lang->entry->note->name = 'Name';
$lang->entry->note->code = 'Code should be letters and numbers';
$lang->entry->note->ip = "Use comma to seperate IPs. IP segment is supported, e.g. 192.168.1.*";
$lang->entry->note->allIP = 'All IPs';
$lang->entry->note->account = 'Entry Account';
$lang->entry->note->account = 'Application Account';
$lang->entry->errmsg['PARAM_CODE_MISSING'] = 'Parameter code is missing.';
$lang->entry->errmsg['PARAM_TOKEN_MISSING'] = 'Parameter token is missing.';
@@ -45,5 +45,5 @@ $lang->entry->errmsg['INVALID_TOKEN'] = 'Invalid token.';
$lang->entry->errmsg['SESSION_VERIFY_FAILED'] = 'Session verification failed.';
$lang->entry->errmsg['IP_DENIED'] = 'IP is denied.';
$lang->entry->errmsg['ACCOUNT_UNBOUND'] = 'Account is not bound.';
$lang->entry->errmsg['EMPTY_ENTRY'] = 'Entry does not exist.';
$lang->entry->errmsg['EMPTY_ENTRY'] = 'Application does not exist.';
$lang->entry->errmsg['CALLED_TIME'] = 'Token has expired';

10
module/project/lang/en.php
View File

@@ -46,7 +46,7 @@ $lang->project->hours = 'Estimates: %s, Cost: %s, Left: %s.';
$lang->project->viewBug = 'Bugs';
$lang->project->noProduct = "No {$lang->productCommon} yet.";
$lang->project->createStory = "Create Story";
$lang->project->all = 'All ';
$lang->project->all = 'All Projects';
$lang->project->undone = 'Unfinished';
$lang->project->unclosed = 'Unclosed';
$lang->project->typeDesc = 'No story, bug, build, test, or burndown chart is allowed in OPS';
@@ -70,7 +70,7 @@ $lang->project->export = 'Export';
$lang->project->typeList['sprint'] = 'Sprint';
$lang->project->typeList['waterfall'] = 'Waterfall';
$lang->project->typeList['ops'] = 'OPS';
$lang->project->endList[7] = '1 Week';
$lang->project->endList[14] = '2 Weeks';
$lang->project->endList[31] = '1 Month';
@@ -105,7 +105,7 @@ $lang->project->aclList['private'] = 'Private (For team members only.)';
$lang->project->aclList['custom'] = 'Whitelist (Team members and the whitelist users can access it.)';
/* 方法列表。*/
$lang->project->index = "Home";
$lang->project->index = "Project Home";
$lang->project->task = 'Tasks';
$lang->project->groupTask = 'Group View';
$lang->project->story = 'Story';
@@ -118,7 +118,7 @@ $lang->project->burn = 'Burndown';
$lang->project->computeBurn = 'Update';
$lang->project->burnData = 'Burndown Data';
$lang->project->fixFirst = 'Edit 1st-Day Estimates';
$lang->project->team = 'Team Member';
$lang->project->team = 'Members';
$lang->project->doc = 'Document';
$lang->project->doclib = 'Docoment Library';
$lang->project->manageProducts = 'Linked ' . $lang->productCommon . 's';
@@ -137,7 +137,7 @@ $lang->project->edit = "Edit Project";
$lang->project->batchEdit = "Batch Edit";
$lang->project->manageMembers = 'Manage Team';
$lang->project->unlinkMember = 'Remove Member';
$lang->project->unlinkStory = 'Unlink Story';
$lang->project->unlinkStory = 'Unlink';
$lang->project->batchUnlinkStory = 'Batch Unlink Stories';
$lang->project->importTask = 'Transfer Task';
$lang->project->importPlanStories = 'Link Stories By Plans';