From 2e4b6d22b6261ac34b38c4012fcb09702e78e479 Mon Sep 17 00:00:00 2001 From: tengfei Date: Tue, 29 Nov 2016 15:37:28 +0800 Subject: [PATCH 1/4] language review on 11/29. --- module/action/lang/en.php | 2 +- module/block/lang/en.php | 50 +++++++++++++++++++-------------------- module/bug/lang/en.php | 6 ++--- module/dev/lang/en.php | 6 ++--- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 6995551c3c..4c2bd698f9 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -108,7 +108,7 @@ $lang->action->desc->unlinkrelatedcase = '$date, $actor removed /* 用来显示动态信息。*/ $lang->action->label = new stdclass(); $lang->action->label->created = 'Created'; -$lang->action->label->opened = 'Opened'; +$lang->action->label->opened = 'Open'; $lang->action->label->changed = 'Changed'; $lang->action->label->edited = 'Edited'; $lang->action->label->assigned = 'Assigned'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 712f6fb1b7..5f197fd56c 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -10,14 +10,14 @@ * @link http://www.ranzhi.org */ $lang->block = new stdclass(); -$lang->block->common = 'Block'; +$lang->block->common = 'Widget'; $lang->block->name = 'Name'; $lang->block->style = 'Style'; $lang->block->grid = 'Grid'; $lang->block->color = 'Color'; $lang->block->lblModule = 'Module'; -$lang->block->lblBlock = 'Block'; +$lang->block->lblBlock = 'Widget'; $lang->block->lblNum = 'Number'; $lang->block->lblHtml = 'HTML'; $lang->block->dynamic = 'Dynamic'; @@ -27,10 +27,10 @@ $lang->block->params = new stdclass(); $lang->block->params->name = 'Name'; $lang->block->params->value = 'Value'; -$lang->block->createBlock = 'Add Block'; -$lang->block->editBlock = 'Edit Block'; -$lang->block->ordersSaved = 'Sequence saved.'; -$lang->block->confirmRemoveBlock = 'Do you want to remove Block【{0}】?'; +$lang->block->createBlock = 'Create Widget'; +$lang->block->editBlock = 'Edit'; +$lang->block->ordersSaved = 'Ranking is saved.'; +$lang->block->confirmRemoveBlock = 'Do you want to remove Widget【{0}】?'; $lang->block->refresh = 'Refresh'; $lang->block->hidden = 'Hide'; $lang->block->dynamicInfo = "%s, %s %s %s %s."; @@ -118,21 +118,21 @@ $lang->block->default['my']['9']['source'] = 'qa'; $lang->block->num = 'Number'; $lang->block->type = 'Type'; -$lang->block->orderBy = 'Sequence'; +$lang->block->orderBy = 'Ranking'; $lang->block->availableBlocks = new stdclass(); $lang->block->availableBlocks->todo = 'My To-Dos'; -$lang->block->availableBlocks->task = 'My Task'; -$lang->block->availableBlocks->bug = 'My Bug'; -$lang->block->availableBlocks->case = 'My Case'; -$lang->block->availableBlocks->story = 'My Story'; +$lang->block->availableBlocks->task = 'My Tasks'; +$lang->block->availableBlocks->bug = 'My Bugs'; +$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->release = 'Release List'; -$lang->block->availableBlocks->build = 'Build List'; -$lang->block->availableBlocks->testtask = 'Test Build List'; +$lang->block->availableBlocks->build = 'Builds'; +$lang->block->availableBlocks->testtask = 'Test Builds'; $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; @@ -142,22 +142,22 @@ $lang->block->moduleList['todo'] = 'To-Dos'; $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 = 'Story List'; +$lang->block->modules['product']->availableBlocks->story = 'Stories'; $lang->block->modules['product']->availableBlocks->plan = 'Planning List'; $lang->block->modules['product']->availableBlocks->release = 'Release List'; $lang->block->modules['project'] = new stdclass(); $lang->block->modules['project']->availableBlocks = new stdclass(); $lang->block->modules['project']->availableBlocks->list = $lang->projectCommon . 'List'; -$lang->block->modules['project']->availableBlocks->task = 'Task List'; -$lang->block->modules['project']->availableBlocks->build = 'Build List'; +$lang->block->modules['project']->availableBlocks->task = 'Tasks'; +$lang->block->modules['project']->availableBlocks->build = 'Builds'; $lang->block->modules['qa'] = new stdclass(); $lang->block->modules['qa']->availableBlocks = new stdclass(); -$lang->block->modules['qa']->availableBlocks->bug = 'Bug List'; -$lang->block->modules['qa']->availableBlocks->case = 'Case List'; -$lang->block->modules['qa']->availableBlocks->testtask = 'Test Build List'; +$lang->block->modules['qa']->availableBlocks->bug = 'Bugs'; +$lang->block->modules['qa']->availableBlocks->case = 'Cases'; +$lang->block->modules['qa']->availableBlocks->testtask = 'Test Builds'; $lang->block->modules['todo'] = new stdclass(); $lang->block->modules['todo']->availableBlocks = new stdclass(); -$lang->block->modules['todo']->availableBlocks->list = 'To-Do List'; +$lang->block->modules['todo']->availableBlocks->list = 'To-Dos'; $lang->block->orderByList = new stdclass(); @@ -247,8 +247,8 @@ $lang->block->modules['common']->moreLinkList = new stdclass(); $lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|'; $lang->block->flowchart = array(); -$lang->block->flowchart[] = array('Admin', 'Manage a Company', 'Add User', 'Maintain Privilege'); -$lang->block->flowchart[] = array('Product Manager', 'Add Product', 'Maintain a Module', 'Maintain Planning', 'Maintain a Story', 'Create Release'); -$lang->block->flowchart[] = array('Project Manager', 'Add Project', 'MaintainTeam', 'Link a Product', 'Link a Story', 'Decompose a Task'); -$lang->block->flowchart[] = array('R&D Team', 'Claim a Task/Bug', 'Update Status', 'Finish a Task/Bug'); -$lang->block->flowchart[] = array('Testing Team', 'Write a Case', 'Implement a Case', 'Submit a Bug', 'Bug', 'Off a Bug'); +$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('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'); diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 0fae9b8e65..bd92d763de 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -36,9 +36,9 @@ $lang->bug->toTask = 'Convert to Task'; $lang->bug->toStory = 'Convert to Story'; $lang->bug->mailto = 'Mail To'; $lang->bug->openedBy = 'Opened By'; -$lang->bug->openedDate = 'Opened Date'; -$lang->bug->openedDateAB = 'Opened Date'; -$lang->bug->openedBuild = 'Opened Build'; +$lang->bug->openedDate = 'Open Date'; +$lang->bug->openedDateAB = 'Open Date'; +$lang->bug->openedBuild = 'Open Build'; $lang->bug->assignedTo = 'Assigned To'; $lang->bug->assignedDate = 'Assigned Date'; $lang->bug->resolvedBy = 'Resolved By'; diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php index 9f38cd86c2..78da058d65 100644 --- a/module/dev/lang/en.php +++ b/module/dev/lang/en.php @@ -4,7 +4,7 @@ $lang->dev->api = 'API'; $lang->dev->db = 'Database'; $lang->dev->editor = 'Editor'; $lang->dev->dbList = 'Database'; -$lang->dev->moduleList = 'ModuleList'; +$lang->dev->moduleList = 'Modules'; $lang->dev->params = 'Parameters'; $lang->dev->type = 'Type'; $lang->dev->desc = 'Description'; @@ -35,7 +35,7 @@ $lang->dev->tableList['effort'] = 'Effort'; $lang->dev->tableList['extension'] = 'Extension'; $lang->dev->tableList['file'] = 'File'; $lang->dev->tableList['group'] = 'Group'; -$lang->dev->tableList['grouppriv'] = 'Group Privilege'; +$lang->dev->tableList['grouppriv'] = 'Privileges'; $lang->dev->tableList['history'] = 'History'; $lang->dev->tableList['lang'] = 'Language'; $lang->dev->tableList['module'] = 'Module'; @@ -46,7 +46,7 @@ $lang->dev->tableList['projectproduct'] = $lang->projectCommon . $lang->productC $lang->dev->tableList['projectstory'] = $lang->projectCommon . 'Story'; $lang->dev->tableList['release'] = 'Release'; $lang->dev->tableList['story'] = 'Story'; -$lang->dev->tableList['storyspec'] = 'StoryDescription'; +$lang->dev->tableList['storyspec'] = ' Description'; $lang->dev->tableList['task'] = 'Task'; $lang->dev->tableList['taskestimate'] = 'Estimated Task'; $lang->dev->tableList['team'] = 'Team'; From b7c509aa09dfcd2b3356844918610ceebaf29e37 Mon Sep 17 00:00:00 2001 From: tengfei Date: Wed, 30 Nov 2016 09:22:47 +0800 Subject: [PATCH 2/4] * verification->acceptance --- module/mail/lang/en.php | 2 +- module/user/lang/en.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php index 40665b2d60..9b9a490600 100755 --- a/module/mail/lang/en.php +++ b/module/mail/lang/en.php @@ -19,7 +19,7 @@ $lang->mail->fromName = 'Sender'; $lang->mail->domain = 'Domain'; $lang->mail->host = 'SMTP Server'; $lang->mail->port = 'SMTP Port'; -$lang->mail->auth = 'Verification Required'; +$lang->mail->auth = 'Acceptance Required'; $lang->mail->username = 'SMTP Account'; $lang->mail->password = 'SMTP Password'; $lang->mail->secure = 'Secure'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 86396930fd..ddbf64e33a 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -26,7 +26,7 @@ $lang->user->gender = 'Gender'; $lang->user->email = 'Email'; $lang->user->basicInfo = 'Basic Info'; $lang->user->accountInfo = 'Account'; -$lang->user->verify = 'Verification'; +$lang->user->verify = 'Acceptance'; $lang->user->contactInfo = 'Contact'; $lang->user->skype = 'Skype'; $lang->user->qq = 'QQ'; From 6b8f460ede19ceef87de10f53565efee826b4bf3 Mon Sep 17 00:00:00 2001 From: tengfei Date: Wed, 30 Nov 2016 10:28:54 +0800 Subject: [PATCH 3/4] * bak. --- .gitignore | 1 + module/admin/lang/en.php | 2 +- module/admin/lang/en.php.bak | 64 +++++++ module/branch/lang/en.php | 4 +- module/branch/lang/en.php.bak | 10 + module/dept/lang/en.php | 10 +- module/dept/lang/en.php.bak | 30 +++ module/editor/lang/en.php | 4 +- module/editor/lang/en.php.bak | 74 ++++++++ module/extension/lang/en.php | 6 +- module/extension/lang/en.php.bak | 106 +++++++++++ module/file/lang/en.php | 2 +- module/file/lang/en.php.bak | 41 ++++ module/group/lang/en.php | 26 +-- module/group/lang/en.php.bak | 90 +++++++++ module/index/lang/en.php | 4 +- module/index/lang/en.php.bak | 3 + module/mail/lang/en.php | 6 +- module/mail/lang/en.php.bak | 90 +++++++++ module/my/lang/en.php | 18 +- module/my/lang/en.php.bak | 47 +++++ module/product/lang/en.php | 34 ++-- module/product/lang/en.php.bak | 108 +++++++++++ module/productplan/lang/en.php | 12 +- module/productplan/lang/en.php.bak | 62 ++++++ module/qa/lang/en.php | 2 +- module/qa/lang/en.php.bak | 13 ++ module/release/lang/en.php | 2 +- module/release/lang/en.php.bak | 66 +++++++ module/report/lang/en.php | 16 +- module/report/lang/en.php.bak | 91 +++++++++ module/search/lang/en.php | 6 +- module/search/lang/en.php.bak | 42 +++++ module/sso/lang/en.php | 10 +- module/sso/lang/en.php.bak | 38 ++++ module/story/lang/en.php | 24 +-- module/story/lang/en.php.bak | 290 +++++++++++++++++++++++++++++ module/task/lang/en.php | 4 +- module/task/lang/en.php.bak | 248 ++++++++++++++++++++++++ module/testcase/lang/en.php | 14 +- module/testcase/lang/en.php.bak | 154 +++++++++++++++ module/testtask/lang/en.php | 24 +-- module/testtask/lang/en.php.bak | 105 +++++++++++ module/todo/lang/en.php | 4 +- module/todo/lang/en.php.bak | 75 ++++++++ module/tree/lang/en.php | 4 +- module/tree/lang/en.php.bak | 50 +++++ module/upgrade/lang/en.php | 2 +- module/upgrade/lang/en.php.bak | 113 +++++++++++ module/user/lang/en.php | 10 +- module/user/lang/en.php.bak | 167 +++++++++++++++++ www/install.php | 37 ---- www/upgrade.php | 46 ----- 53 files changed, 2303 insertions(+), 208 deletions(-) create mode 100644 module/admin/lang/en.php.bak create mode 100644 module/branch/lang/en.php.bak create mode 100644 module/dept/lang/en.php.bak create mode 100644 module/editor/lang/en.php.bak create mode 100644 module/extension/lang/en.php.bak create mode 100644 module/file/lang/en.php.bak create mode 100644 module/group/lang/en.php.bak create mode 100644 module/index/lang/en.php.bak create mode 100644 module/mail/lang/en.php.bak create mode 100644 module/my/lang/en.php.bak create mode 100644 module/product/lang/en.php.bak create mode 100644 module/productplan/lang/en.php.bak create mode 100644 module/qa/lang/en.php.bak create mode 100644 module/release/lang/en.php.bak create mode 100644 module/report/lang/en.php.bak create mode 100644 module/search/lang/en.php.bak create mode 100644 module/sso/lang/en.php.bak create mode 100644 module/story/lang/en.php.bak create mode 100644 module/task/lang/en.php.bak create mode 100644 module/testcase/lang/en.php.bak create mode 100644 module/testtask/lang/en.php.bak create mode 100644 module/todo/lang/en.php.bak create mode 100644 module/tree/lang/en.php.bak create mode 100644 module/upgrade/lang/en.php.bak create mode 100644 module/user/lang/en.php.bak delete mode 100644 www/install.php delete mode 100644 www/upgrade.php diff --git a/.gitignore b/.gitignore index 8b5ad3eb44..6660e45da4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ tmp/model/* tmp/cache/* tmp/extension/* .gitkeep +.bak diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index b513f269f2..599d97c9ef 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -45,7 +45,7 @@ $lang->admin->safe->password = 'Password Security'; $lang->admin->safe->weak = 'Common Weak Password'; $lang->admin->safe->reason = 'Type'; $lang->admin->safe->checkWeak = 'Weak Password Check'; -$lang->admin->safe->modifyPasswordFirstLogin = 'Modify password in frist login'; +$lang->admin->safe->modifyPasswordFirstLogin = 'Modify password when login for the first time.'; $lang->admin->safe->modeList[0] = 'N/A'; $lang->admin->safe->modeList[1] = 'Medium'; diff --git a/module/admin/lang/en.php.bak b/module/admin/lang/en.php.bak new file mode 100644 index 0000000000..b513f269f2 --- /dev/null +++ b/module/admin/lang/en.php.bak @@ -0,0 +1,64 @@ + + * @package admin + * @version $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $ + * @link http://www.zentao.net + */ +$lang->admin->common = 'Administration'; +$lang->admin->index = 'Admin Homepage'; +$lang->admin->checkDB = 'Check Database Library'; +$lang->admin->sso = 'RangerTeam'; +$lang->admin->safeIndex = 'Security'; +$lang->admin->checkWeak = 'Weak Password Check'; + +$lang->admin->info = new stdclass(); +$lang->admin->info->version = 'Current Version is %s,'; +$lang->admin->info->links = 'You can visit '; +$lang->admin->info->account = "Your ZenTao account is %s."; + +$lang->admin->notice = new stdclass(); +$lang->admin->notice->register = "Note: You haven't registered in ZenTao(www.zentao.net), register %s and get the latest ZenTao news."; +$lang->admin->notice->ignore = "Ignore"; + +$lang->admin->register = new stdclass(); +$lang->admin->register->caption = 'Register'; +$lang->admin->register->click = 'Click Here'; +$lang->admin->register->lblAccount = 'must be 3 characters combination of letters and numbers at least.'; +$lang->admin->register->lblPasswd = 'must be 6 characters combination of letters and numbers at least.'; +$lang->admin->register->submit = 'Register'; +$lang->admin->register->bind = "If you have already registered an account, link your account %s."; +$lang->admin->register->success = "You have registered with us!"; + +$lang->admin->bind = new stdclass(); +$lang->admin->bind->caption = 'Link an Account'; +$lang->admin->bind->success = "Account has been linked!"; + +$lang->admin->safe = new stdclass(); +$lang->admin->safe->common = 'Security'; +$lang->admin->safe->set = 'Password Security Settings'; +$lang->admin->safe->password = 'Password Security'; +$lang->admin->safe->weak = 'Common Weak Password'; +$lang->admin->safe->reason = 'Type'; +$lang->admin->safe->checkWeak = 'Weak Password Check'; +$lang->admin->safe->modifyPasswordFirstLogin = 'Modify password in frist login'; + +$lang->admin->safe->modeList[0] = 'N/A'; +$lang->admin->safe->modeList[1] = 'Medium'; +$lang->admin->safe->modeList[2] = 'Strong'; + +$lang->admin->safe->reasonList['weak'] = 'Common Weak Password'; +$lang->admin->safe->reasonList['account'] = 'Same as your account'; +$lang->admin->safe->reasonList['mobile'] = 'Same as your mobile number'; +$lang->admin->safe->reasonList['phone'] = 'Same as your phone number'; +$lang->admin->safe->reasonList['birthday'] = 'Same as your DOB'; + +$lang->admin->safe->modifyPasswordList[1] = 'Must'; +$lang->admin->safe->modifyPasswordList[0] = 'No'; + +$lang->admin->safe->noticeMode = 'User password will be checked when login, add/edit user password.'; +$lang->admin->safe->noticeStrong = 'The more capitalized letters and numbers a password has, the more secure it is!'; diff --git a/module/branch/lang/en.php b/module/branch/lang/en.php index 4c4bf25705..701e97bd08 100644 --- a/module/branch/lang/en.php +++ b/module/branch/lang/en.php @@ -6,5 +6,5 @@ $lang->branch->delete = 'Delete Branch'; $lang->branch->manageTitle = '%s Management'; $lang->branch->all = 'All'; -$lang->branch->confirmDelete = 'Are you sure delete this @branch@?'; -$lang->branch->canNotDelete = 'It has data in @branch@, can not deleted.'; +$lang->branch->confirmDelete = 'Do you want to delete this @branch@?'; +$lang->branch->canNotDelete = 'There is data in @branch@. It cannot be deleted.'; diff --git a/module/branch/lang/en.php.bak b/module/branch/lang/en.php.bak new file mode 100644 index 0000000000..4c4bf25705 --- /dev/null +++ b/module/branch/lang/en.php.bak @@ -0,0 +1,10 @@ +branch->common = 'Branch'; +$lang->branch->manage = 'Manage a Branch'; +$lang->branch->delete = 'Delete Branch'; + +$lang->branch->manageTitle = '%s Management'; +$lang->branch->all = 'All'; + +$lang->branch->confirmDelete = 'Are you sure delete this @branch@?'; +$lang->branch->canNotDelete = 'It has data in @branch@, can not deleted.'; diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php index 0dafeb84f5..3b8801e1a4 100644 --- a/module/dept/lang/en.php +++ b/module/dept/lang/en.php @@ -10,13 +10,13 @@ * @link http://www.zentao.net */ $lang->dept->common = 'Department'; -$lang->dept->manageChild = "Child Dept"; -$lang->dept->edit = "Edit Dept"; -$lang->dept->delete = "Delete Dept"; -$lang->dept->parent = "Parent Dept"; +$lang->dept->manageChild = "Children"; +$lang->dept->edit = "Edit"; +$lang->dept->delete = "Delete"; +$lang->dept->parent = "Parent"; $lang->dept->manager = "Manager"; $lang->dept->name = "Dept Name"; -$lang->dept->browse = "View Dept"; +$lang->dept->browse = "Departments"; $lang->dept->manage = "Maintain Dept"; $lang->dept->updateOrder = "Update/Order"; $lang->dept->add = "Add Dept"; diff --git a/module/dept/lang/en.php.bak b/module/dept/lang/en.php.bak new file mode 100644 index 0000000000..0dafeb84f5 --- /dev/null +++ b/module/dept/lang/en.php.bak @@ -0,0 +1,30 @@ + + * @package dept + * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ + * @link http://www.zentao.net + */ +$lang->dept->common = 'Department'; +$lang->dept->manageChild = "Child Dept"; +$lang->dept->edit = "Edit Dept"; +$lang->dept->delete = "Delete Dept"; +$lang->dept->parent = "Parent Dept"; +$lang->dept->manager = "Manager"; +$lang->dept->name = "Dept Name"; +$lang->dept->browse = "View Dept"; +$lang->dept->manage = "Maintain Dept"; +$lang->dept->updateOrder = "Update/Order"; +$lang->dept->add = "Add Dept"; +$lang->dept->dragAndSort = "Drag and Sort"; + +$lang->dept->confirmDelete = " Do you want to delete this Dept?"; +$lang->dept->successSave = " Saved!"; + +$lang->dept->error = new stdclass(); +$lang->dept->error->hasSons = 'This Dept has child Dept. You cannot be deleted!'; +$lang->dept->error->hasUsers = 'This Dept has staff. It cannot be deleted!'; diff --git a/module/editor/lang/en.php b/module/editor/lang/en.php index 216db309fd..13bd185819 100644 --- a/module/editor/lang/en.php +++ b/module/editor/lang/en.php @@ -1,7 +1,7 @@ editor->common = 'Editor'; $lang->editor->api = 'API'; -$lang->editor->index = 'Homepage'; +$lang->editor->index = 'Home'; $lang->editor->newMethod = 'New Method'; $lang->editor->extend = 'Extension'; $lang->editor->api = 'API'; @@ -15,7 +15,7 @@ $lang->editor->edit = 'Edit Extension'; $lang->editor->save = 'Save Page'; $lang->editor->delete = 'Delete Page'; -$lang->editor->moduleList = 'Module List'; +$lang->editor->moduleList = 'Modules'; $lang->editor->filePath = "Extension:"; $lang->editor->sourceFile = 'Source File:'; $lang->editor->fileName = "File Name:"; diff --git a/module/editor/lang/en.php.bak b/module/editor/lang/en.php.bak new file mode 100644 index 0000000000..216db309fd --- /dev/null +++ b/module/editor/lang/en.php.bak @@ -0,0 +1,74 @@ +editor->common = 'Editor'; +$lang->editor->api = 'API'; +$lang->editor->index = 'Homepage'; +$lang->editor->newMethod = 'New Method'; +$lang->editor->extend = 'Extension'; +$lang->editor->api = 'API'; +$lang->editor->newLang = 'New Language'; +$lang->editor->newConfig = 'New Config'; +$lang->editor->newHook = 'New Hook'; +$lang->editor->newExtend = 'New Extension'; +$lang->editor->newPage = 'New Page'; +$lang->editor->override = 'Override'; +$lang->editor->edit = 'Edit Extension'; +$lang->editor->save = 'Save Page'; +$lang->editor->delete = 'Delete Page'; + +$lang->editor->moduleList = 'Module List'; +$lang->editor->filePath = "Extension:"; +$lang->editor->sourceFile = 'Source File:'; +$lang->editor->fileName = "File Name:"; +$lang->editor->isOverride = "Overrode Duplicated File"; +$lang->editor->exampleHook = "(e.g. ***.html.hook.php)"; +$lang->editor->exampleJs = "(e.g. ***.js)"; +$lang->editor->exampleCss = "(e.g. ***.css)"; +$lang->editor->examplePHP = "(e.g. ***.php)"; +$lang->editor->pageName = "Page Name:"; + +$lang->editor->deleteConfirm = 'Do you want to delete it?'; +$lang->editor->extendConfirm = 'Do you want to use original code?'; +$lang->editor->repeatFile = 'File Name Dupliceted'; +$lang->editor->repeatPage = 'Page existed. Do you want to override it?'; +$lang->editor->noticeOkFile = 'For security reasons, your Admin account has to be confirmed. \n Please login ZenTao server and create %sFile.\n Note:\n 1. File is blank.\n 2. If the file existed, delete it and then create a new one.'; + +$lang->editor->notWritable = "Not wirtable. Privilege is required. Please try chmod 777 -R "; +$lang->editor->notDelete = 'Cannot be deleted. Please check your permission!'; +$lang->editor->emptyFileName = 'Please enter a File Name!'; + +$lang->editor->translate['config.php'] = 'config'; +$lang->editor->translate['control.php'] = 'control'; +$lang->editor->translate['model.php'] = 'model'; + +$lang->editor->modules['action'] = 'System Log'; +$lang->editor->modules['admin'] = 'Admin'; +$lang->editor->modules['api'] = 'API'; +$lang->editor->modules['bug'] = 'Bug'; +$lang->editor->modules['build'] = 'Build'; +$lang->editor->modules['common'] = 'Common Modules'; +$lang->editor->modules['company'] = 'Company'; +$lang->editor->modules['convert'] = 'Convert'; +$lang->editor->modules['dept'] = 'Department'; +$lang->editor->modules['doc'] = 'Document'; +$lang->editor->modules['extension'] = 'Extensiona'; +$lang->editor->modules['file'] = 'File'; +$lang->editor->modules['group'] = 'Group'; +$lang->editor->modules['index'] = 'Homepage'; +$lang->editor->modules['install'] = 'Install'; +$lang->editor->modules['misc'] = 'Misc'; +$lang->editor->modules['my'] = 'Dashboard'; +$lang->editor->modules['product'] = $lang->productCommon; +$lang->editor->modules['productplan'] = 'Plan'; +$lang->editor->modules['project'] = $lang->projectCommon; +$lang->editor->modules['qa'] = 'Testing'; +$lang->editor->modules['release'] = 'Release'; +$lang->editor->modules['report'] = 'Report'; +$lang->editor->modules['search'] = 'Search'; +$lang->editor->modules['story'] = 'Story'; +$lang->editor->modules['task'] = 'Task'; +$lang->editor->modules['testcase'] = 'Case'; +$lang->editor->modules['testtask'] = 'Test Task'; +$lang->editor->modules['todo'] = 'To-Dos'; +$lang->editor->modules['tree'] = 'Module'; +$lang->editor->modules['upgrade'] = 'Upgrade'; +$lang->editor->modules['user'] = 'User'; diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php index dc067d8b3b..9c3d026eb1 100644 --- a/module/extension/lang/en.php +++ b/module/extension/lang/en.php @@ -67,9 +67,9 @@ $lang->extension->executeCommands = '

Execute command lines below to $lang->extension->successDownloadedPackage = 'Extension downloaded!'; $lang->extension->successCopiedFiles = 'File copied!'; $lang->extension->successInstallDB = 'Database installed!'; -$lang->extension->viewInstalled = 'View Installed'; -$lang->extension->viewAvailable = 'View Available'; -$lang->extension->viewDeactivated = 'View Deactivated'; +$lang->extension->viewInstalled = 'Installed'; +$lang->extension->viewAvailable = 'Available'; +$lang->extension->viewDeactivated = 'Deactivated'; $lang->extension->backDBFile = 'Extension related data has been backed up to %s!'; $lang->extension->noticeOkFile = '

For security reasons, your Admin account has to be confirmed.
Plese Login your ZenTao server and create %s.
diff --git a/module/extension/lang/en.php.bak b/module/extension/lang/en.php.bak new file mode 100644 index 0000000000..dc067d8b3b --- /dev/null +++ b/module/extension/lang/en.php.bak @@ -0,0 +1,106 @@ + + * @package extension + * @version $Id$ + * @link http://www.zentao.net + */ +$lang->extension->common = 'Extension'; +$lang->extension->browse = 'Browse'; +$lang->extension->install = 'Install'; +$lang->extension->installAuto = 'Auto Install'; +$lang->extension->installForce = 'Force Install'; +$lang->extension->uninstall = 'Uninstall'; +$lang->extension->activate = 'Activate'; +$lang->extension->deactivate = 'Deactivate'; +$lang->extension->obtain = 'Get Extension'; +$lang->extension->view = 'Details'; +$lang->extension->downloadAB = 'Download'; +$lang->extension->upload = 'Local Install'; +$lang->extension->erase = 'Erase'; +$lang->extension->upgrade = 'Extension Upgrade'; +$lang->extension->agreeLicense = 'License'; + +$lang->extension->structure = 'Structure'; +$lang->extension->installed = 'Installed'; +$lang->extension->deactivated = 'Deactivated'; +$lang->extension->available = 'Downloaded'; + +$lang->extension->version = 'Version'; +$lang->extension->compatible = 'Compatible'; +$lang->extension->latest = 'Latest:%s，need zentao %s'; +$lang->extension->author = 'Author'; +$lang->extension->license = 'License'; +$lang->extension->site = 'Official Website'; +$lang->extension->downloads = 'Downloads'; +$lang->extension->compatible = 'Compatibility'; +$lang->extension->grade = 'Score'; +$lang->extension->depends = 'Dependent'; + +$lang->extension->publicList[0] = 'Manually'; +$lang->extension->publicList[1] = 'Auto'; + +$lang->extension->compatibleList[0] = 'Unknown'; +$lang->extension->compatibleList[1] = 'Compatible'; + +$lang->extension->byDownloads = 'Downloads'; +$lang->extension->byAddedTime = 'Latest Added'; +$lang->extension->byUpdatedTime = 'Latest Update'; +$lang->extension->bySearch = 'Search'; +$lang->extension->byCategory = 'Category'; + +$lang->extension->installFailed = '%s failed. Error:'; +$lang->extension->uninstallFailed = 'Uninstall failed. Error:'; +$lang->extension->confirmUninstall = 'Uninstal the extension will delete or change related database. Do you want to uninstall?'; +$lang->extension->installFinished = 'Congrats! The extension has been %sed!'; +$lang->extension->refreshPage = 'Refresh'; +$lang->extension->uninstallFinished = 'Extension has been uninstalled.'; +$lang->extension->deactivateFinished = 'Extension has been deactivated.'; +$lang->extension->activateFinished = 'Extension has been activated.'; +$lang->extension->eraseFinished = 'Extension has been removed.'; +$lang->extension->unremovedFiles = 'File or direcroty cannot be deleted. You have to manually delete'; +$lang->extension->executeCommands = '

Execute command lines below to fix the problem:

'; +$lang->extension->successDownloadedPackage = 'Extension downloaded!'; +$lang->extension->successCopiedFiles = 'File copied!'; +$lang->extension->successInstallDB = 'Database installed!'; +$lang->extension->viewInstalled = 'View Installed'; +$lang->extension->viewAvailable = 'View Available'; +$lang->extension->viewDeactivated = 'View Deactivated'; +$lang->extension->backDBFile = 'Extension related data has been backed up to %s!'; +$lang->extension->noticeOkFile = '
For security reasons, your Admin account has to be confirmed.
+
Plese Login your ZenTao server and create %s.
+

Note:

+
    +
  1. File is blank.
    2. +
  2. If the old file exists, please delete it before create one.
    3. +
'; + +$lang->extension->upgradeExt = 'Upgrade'; +$lang->extension->installExt = 'Install'; +$lang->extension->upgradeVersion = '(Upgrade %s to %s.)'; + +$lang->extension->waring = 'Warning!'; + +$lang->extension->errorOccurs = 'Error:'; +$lang->extension->errorGetModules = 'Get Extension Category from www.zentao.net failed. It could be network error. Plase check your network and refresh it.'; +$lang->extension->errorGetExtensions = 'Get Extension from www.zentao.net failed. It could be network error. Please go to www.zentao.net and download the extension, and then upload it to install.'; +$lang->extension->errorDownloadPathNotFound = 'Extension download path %s is not found.
Please run mkdir -p %s in Linux to fix it.'; +$lang->extension->errorDownloadPathNotWritable = 'Extensiond ownload path %sis not writable.
Please run sudo chmod 777 %s in Linux to fix it.'; +$lang->extension->errorPackageFileExists = '%s has existed in the download path.
Please %s it again, CLICK HERE
'; +$lang->extension->errorDownloadFailed = 'Download failed. Please try it again. If still not OK, try to download it manually and upload it to install.'; +$lang->extension->errorMd5Checking = 'Incomplete File. Please download it again. If still not OK, try to download it manually and upload it to install.'; +$lang->extension->errorExtracted = 'Unzip %s failed. It could be an invailid zip file. Error:
%s'; +$lang->extension->errorCheckIncompatible = 'It is incompatible with this versiosn of ZenTao. %sed it and you might not be able to use it.

Choose Force %s or Cancel

'; +$lang->extension->errorFileConflicted = '
%s

is conflicted with others. Choose Override or Cancel

'; +$lang->extension->errorPackageNotFound = '%s is not found. Downloading might be failed. Please download it again.'; +$lang->extension->errorTargetPathNotWritable = '%s is not writable.'; +$lang->extension->errorTargetPathNotExists = '%s is not found.'; +$lang->extension->errorInstallDB = 'Database statements execution failed. Error: %s'; +$lang->extension->errorConflicts = 'Conflicted with “%s”!'; +$lang->extension->errorDepends = 'Dependent extension has not been installed or the version is incorrect:

%s'; +$lang->extension->errorIncompatible = 'Incompatible with this version of ZenTao.'; +$lang->extension->errorUninstallDepends = '“%s” is dependent on this extension. Please do not install it.'; diff --git a/module/file/lang/en.php b/module/file/lang/en.php index 6fa9f56c47..af66704224 100644 --- a/module/file/lang/en.php +++ b/module/file/lang/en.php @@ -13,7 +13,7 @@ $lang->file = new stdclass(); $lang->file->common = 'Attachment'; $lang->file->uploadImages = 'Batch Upload Images'; $lang->file->download = 'Download Files'; -$lang->file->uploadDate = 'UploadDate:'; +$lang->file->uploadDate = 'Uploaded on'; $lang->file->edit = 'Rename'; $lang->file->inputFileName = 'Enter a File Name'; $lang->file->delete = 'Delete File'; diff --git a/module/file/lang/en.php.bak b/module/file/lang/en.php.bak new file mode 100644 index 0000000000..6fa9f56c47 --- /dev/null +++ b/module/file/lang/en.php.bak @@ -0,0 +1,41 @@ + + * @package file + * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ + * @link http://www.zentao.net + */ +$lang->file = new stdclass(); +$lang->file->common = 'Attachment'; +$lang->file->uploadImages = 'Batch Upload Images'; +$lang->file->download = 'Download Files'; +$lang->file->uploadDate = 'UploadDate:'; +$lang->file->edit = 'Rename'; +$lang->file->inputFileName = 'Enter a File Name'; +$lang->file->delete = 'Delete File'; +$lang->file->label = 'Label:'; +$lang->file->maxUploadSize = "%s"; +$lang->file->applyTemplate = "Apply a Template"; +$lang->file->tplTitle = "Template Name"; +$lang->file->setPublic = "Set Public Template"; +$lang->file->exportFields = "Fileds to be Exported"; +$lang->file->defaultTPL = "Default Template"; +$lang->file->setExportTPL = "Settings"; + +$lang->file->errorNotExists = "'%s' is not found."; +$lang->file->errorCanNotWrite = "'%s' is not writable. Please change its permission. Enter sudo chmod -R 777 '%s' in Linux."; +$lang->file->confirmDelete = " Do you want to delete it?"; +$lang->file->errorFileSize = " File size exceeds the limit. It cannot be uploaded!"; +$lang->file->errorFileUpload = " Uploading failed. File size might exceeds the limit."; +$lang->file->dangerFile = " File has been rejected to upload for security issues."; +$lang->file->errorSuffix = 'Format is incorrect. .zip files ONLY!'; +$lang->file->errorExtract = 'Extracting file failed. File might be damaged or invalid files in the zip package.'; +$lang->file->uploadImagesExplain = <<1. If the uploaded file is image zip package, the file name will be the label and images will be the content.

+

2. If the file name containing numbers/underlines, they will be omitted.

+

3. Image formate: jpg, jpeg, gif, png.

+EOD; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 8f960ee89b..b2ef131efe 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -9,21 +9,21 @@ * @version $Id: en.php 4719 2013-05-03 02:20:28Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->group->common = 'Group Privilege'; +$lang->group->common = 'Privileges'; $lang->group->browse = 'View Group'; -$lang->group->create = 'Add Group'; -$lang->group->edit = 'Edit Group'; -$lang->group->copy = 'Copy Group'; -$lang->group->delete = 'Delete Group'; +$lang->group->create = 'Add a Group'; +$lang->group->edit = 'Edit'; +$lang->group->copy = 'Copy'; +$lang->group->delete = 'Delete'; $lang->group->manageView = 'View'; -$lang->group->managePriv = 'Privilege '; -$lang->group->managePrivByGroup = 'Maintain by Group'; -$lang->group->managePrivByModule = 'Maintain by Module'; -$lang->group->byModuleTips = '( Press shift/control to multi select)'; +$lang->group->managePriv = 'Privileges'; +$lang->group->managePrivByGroup = 'Maintain by Groups'; +$lang->group->managePrivByModule = 'Maintain by Moduls'; +$lang->group->byModuleTips = '(Press shift/control to multi select)'; $lang->group->manageMember = 'Members'; $lang->group->confirmDelete = 'Do you want to delete this User Group?'; $lang->group->successSaved = 'Saved!'; -$lang->group->errorNotSaved = 'Not saved. Please selected some actions and groups.'; +$lang->group->errorNotSaved = 'Not saved. Please select actions and groups.'; $lang->group->viewList = 'Acess List'; $lang->group->productList = 'Access is allowed.' . $lang->productCommon; $lang->group->projectList = 'Access is allowed.' . $lang->projectCommon; @@ -32,13 +32,13 @@ $lang->group->noticeVisit = 'N/A means access is not restricted.'; $lang->group->id = 'ID'; $lang->group->name = 'Name'; $lang->group->desc = 'Description'; -$lang->group->users = 'User List'; +$lang->group->users = 'Users'; $lang->group->module = 'Module'; $lang->group->method = 'Method'; $lang->group->priv = 'Privilege'; $lang->group->option = 'Option'; -$lang->group->inside = 'Group users'; -$lang->group->outside = 'Other users'; +$lang->group->inside = 'Group Users'; +$lang->group->outside = 'Other Users'; $lang->group->other = 'Others'; $lang->group->all = 'All'; diff --git a/module/group/lang/en.php.bak b/module/group/lang/en.php.bak new file mode 100644 index 0000000000..8f960ee89b --- /dev/null +++ b/module/group/lang/en.php.bak @@ -0,0 +1,90 @@ + + * @package group + * @version $Id: en.php 4719 2013-05-03 02:20:28Z chencongzhi520@gmail.com $ + * @link http://www.zentao.net + */ +$lang->group->common = 'Group Privilege'; +$lang->group->browse = 'View Group'; +$lang->group->create = 'Add Group'; +$lang->group->edit = 'Edit Group'; +$lang->group->copy = 'Copy Group'; +$lang->group->delete = 'Delete Group'; +$lang->group->manageView = 'View'; +$lang->group->managePriv = 'Privilege '; +$lang->group->managePrivByGroup = 'Maintain by Group'; +$lang->group->managePrivByModule = 'Maintain by Module'; +$lang->group->byModuleTips = '( Press shift/control to multi select)'; +$lang->group->manageMember = 'Members'; +$lang->group->confirmDelete = 'Do you want to delete this User Group?'; +$lang->group->successSaved = 'Saved!'; +$lang->group->errorNotSaved = 'Not saved. Please selected some actions and groups.'; +$lang->group->viewList = 'Acess List'; +$lang->group->productList = 'Access is allowed.' . $lang->productCommon; +$lang->group->projectList = 'Access is allowed.' . $lang->projectCommon; +$lang->group->noticeVisit = 'N/A means access is not restricted.'; + +$lang->group->id = 'ID'; +$lang->group->name = 'Name'; +$lang->group->desc = 'Description'; +$lang->group->users = 'User List'; +$lang->group->module = 'Module'; +$lang->group->method = 'Method'; +$lang->group->priv = 'Privilege'; +$lang->group->option = 'Option'; +$lang->group->inside = 'Group users'; +$lang->group->outside = 'Other users'; +$lang->group->other = 'Others'; +$lang->group->all = 'All'; + +$lang->group->copyOptions['copyPriv'] = 'Copy Privilege'; +$lang->group->copyOptions['copyUser'] = 'Copy User'; + +$lang->group->versions[''] = 'History'; +$lang->group->versions['8_3'] = 'ZenTao8.3'; +$lang->group->versions['8_2_beta'] = 'ZenTao8.2.beta'; +$lang->group->versions['8_0_1'] = 'ZenTao8.0.1'; +$lang->group->versions['8_0'] = 'ZenTao8.0'; +$lang->group->versions['7_4_beta'] = 'ZenTao7.4.beta'; +$lang->group->versions['7_3'] = 'ZenTao7.3'; +$lang->group->versions['7_2'] = 'ZenTao7.2'; +$lang->group->versions['7_1'] = 'ZenTao7.1'; +$lang->group->versions['6_4'] = 'ZenTao6.4'; +$lang->group->versions['6_3'] = 'ZenTao6.3'; +$lang->group->versions['6_2'] = 'ZenTao6.2'; +$lang->group->versions['6_1'] = 'ZenTao6.1'; +$lang->group->versions['5_3'] = 'ZenTao5.3'; +$lang->group->versions['5_1'] = 'ZenTao5.1'; +$lang->group->versions['5_0_beta2'] = 'ZenTao5.0.beta2'; +$lang->group->versions['5_0_beta1'] = 'ZenTao5.0.beta1'; +$lang->group->versions['4_3_beta'] = 'ZenTao4.3.beta'; +$lang->group->versions['4_2_beta'] = 'ZenTao4.2.beta'; +$lang->group->versions['4_1'] = 'ZenTao4.1'; +$lang->group->versions['4_0_1'] = 'ZenTao4.0.1'; +$lang->group->versions['4_0'] = 'ZenTao4.0'; +$lang->group->versions['4_0_beta2'] = 'ZenTao4.0.beta2'; +$lang->group->versions['4_0_beta1'] = 'ZenTao4.0.beta1'; +$lang->group->versions['3_3'] = 'ZenTao3.3'; +$lang->group->versions['3_2_1'] = 'ZenTao3.2.1'; +$lang->group->versions['3_2'] = 'ZenTao3.2'; +$lang->group->versions['3_1'] = 'ZenTao3.1'; +$lang->group->versions['3_0_beta2'] = 'ZenTao3.0.beta2'; +$lang->group->versions['3_0_beta1'] = 'ZenTao3.0.beta1'; +$lang->group->versions['2_4'] = 'ZenTao2.4'; +$lang->group->versions['2_3'] = 'ZenTao2.3'; +$lang->group->versions['2_2'] = 'ZenTao2.2'; +$lang->group->versions['2_1'] = 'ZenTao2.1'; +$lang->group->versions['2_0'] = 'ZenTao2.0'; +$lang->group->versions['1_5'] = 'ZenTao1.5'; +$lang->group->versions['1_4'] = 'ZenTao1.4'; +$lang->group->versions['1_3'] = 'ZenTao1.3'; +$lang->group->versions['1_2'] = 'ZenTao1.2'; +$lang->group->versions['1_1'] = 'ZenTao1.1'; +$lang->group->versions['1_0_1'] = 'ZenTao1.0.1'; + +include (dirname(__FILE__) . '/resource.php'); diff --git a/module/index/lang/en.php b/module/index/lang/en.php index 68ebd01f43..acdccd57de 100644 --- a/module/index/lang/en.php +++ b/module/index/lang/en.php @@ -1,3 +1,3 @@ index->common = 'Homepage'; -$lang->index->index = 'Homepage'; +$lang->index->common = 'Home'; +$lang->index->index = 'Home'; diff --git a/module/index/lang/en.php.bak b/module/index/lang/en.php.bak new file mode 100644 index 0000000000..68ebd01f43 --- /dev/null +++ b/module/index/lang/en.php.bak @@ -0,0 +1,3 @@ +index->common = 'Homepage'; +$lang->index->index = 'Homepage'; diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php index 9b9a490600..668890cb15 100755 --- a/module/mail/lang/en.php +++ b/module/mail/lang/en.php @@ -75,15 +75,15 @@ $lang->mail->sendmailTips = 'Note: Email author will not receive this email.'; $lang->mail->needConfigure = 'Email configuration is not found. Please cinfigure the Email first.'; $lang->mail->nofsocket = 'fsocket related function has been deactivated. Mails cannot send out. Please modify allow_url_fopen in php.ini to turn on Onopenssl, and restart Apache.'; $lang->mail->noOpenssl = 'Please turn on Onopenssl, and restart Apache.'; -$lang->mail->disableSecure = 'No openssl, disable ssl and tls.'; +$lang->mail->disableSecure = 'No openssl. Disable ssl and tls.'; $lang->mail->sendCloudFail = 'Failed. Reason:'; $lang->mail->sendCloudHelp = <<1、Notice SendCloud是SendCloud的Team通知服务。具体可以到notice.sendcloud.net查看

2、accessKey和secretKey可以到登陆后的"设置"页面查看。Email人地址和名称也在"设置"页面设置。

3、Email时，Notice SendCloudContact里面的昵称要跟Email一致，否则无法成功Email。可以到[同步Contact]页面，将ZenTaoUser同步到SendCloudContact中

EOD; -$lang->mail->sendCloudSuccess = 'Success'; -$lang->mail->closeSendCloud = 'Close sendcloud'; +$lang->mail->sendCloudSuccess = 'Done'; +$lang->mail->closeSendCloud = 'Close'; $lang->mail->addressWhiteList = 'Please add the email to the whilte list on email server to avoid be treated as spam'; $lang->mail->placeholder = new stdclass(); diff --git a/module/mail/lang/en.php.bak b/module/mail/lang/en.php.bak new file mode 100644 index 0000000000..9b9a490600 --- /dev/null +++ b/module/mail/lang/en.php.bak @@ -0,0 +1,90 @@ +mail->common = 'Email Settings'; +$lang->mail->index = 'Homepage'; +$lang->mail->detect = 'Testing'; +$lang->mail->edit = 'Edit Settings'; +$lang->mail->save = 'Saved'; +$lang->mail->test = 'Email Testing'; +$lang->mail->reset = 'Reset'; +$lang->mail->browse = 'Email List'; +$lang->mail->delete = 'Delete Email'; +$lang->mail->sendCloud = 'Send Cloud Email'; +$lang->mail->batchDelete = 'Batch Delete'; +$lang->mail->sendcloudUser = 'Sync Contact'; + +$lang->mail->turnon = 'Turn On'; +$lang->mail->async = 'Asynchronous'; +$lang->mail->fromAddress = 'Email Address'; +$lang->mail->fromName = 'Sender'; +$lang->mail->domain = 'Domain'; +$lang->mail->host = 'SMTP Server'; +$lang->mail->port = 'SMTP Port'; +$lang->mail->auth = 'Acceptance Required'; +$lang->mail->username = 'SMTP Account'; +$lang->mail->password = 'SMTP Password'; +$lang->mail->secure = 'Secure'; +$lang->mail->debug = 'Debug'; +$lang->mail->charset = 'Charset'; +$lang->mail->accessKey = 'Access Key'; +$lang->mail->secretKey = 'Secret Key'; + +$lang->mail->selectMTA = 'Email MTA'; +$lang->mail->smtp = 'SMTP Email'; + +$lang->mail->syncedUser = 'Synchronized'; +$lang->mail->unsyncUser = 'Not Synchronized'; +$lang->mail->sync = 'Synchronize'; +$lang->mail->remove = 'Remove'; + +$lang->mail->toList = 'Addressee'; +$lang->mail->subjectName = 'Subject'; +$lang->mail->addedBy = 'Sender'; +$lang->mail->addedDate = 'Added Date'; +$lang->mail->sendTime = 'Send Date'; +$lang->mail->status = 'Status'; +$lang->mail->failReason = 'Fail Reason'; + +$lang->mail->statusList['send'] = 'Sent'; +$lang->mail->statusList['fail'] = 'Failed'; + +$lang->mail->turnonList[1] = 'On'; +$lang->mail->turnonList[0] = 'Off'; + +$lang->mail->asyncList[1] = 'Yes'; +$lang->mail->asyncList[0] = 'No'; + +$lang->mail->debugList[0] = 'Off'; +$lang->mail->debugList[1] = 'Normal'; +$lang->mail->debugList[2] = 'High'; + +$lang->mail->authList[1] = 'Required'; +$lang->mail->authList[0] = 'Not Required'; + +$lang->mail->secureList[''] = 'Plain'; +$lang->mail->secureList['ssl'] = 'ssl'; +$lang->mail->secureList['tls'] = 'tls'; + +$lang->mail->inputFromEmail = 'Enter Email Address'; +$lang->mail->nextStep = 'Next'; +$lang->mail->successSaved = 'Configuration has been saved.'; +$lang->mail->subject = 'Testing Email'; +$lang->mail->content = 'Email configured!'; +$lang->mail->successSended = 'Sent!'; +$lang->mail->confirmDelete = 'Do you want to delete it?'; +$lang->mail->sendmailTips = 'Note: Email author will not receive this email.'; +$lang->mail->needConfigure = 'Email configuration is not found. Please cinfigure the Email first.'; +$lang->mail->nofsocket = 'fsocket related function has been deactivated. Mails cannot send out. Please modify allow_url_fopen in php.ini to turn on Onopenssl, and restart Apache.'; +$lang->mail->noOpenssl = 'Please turn on Onopenssl, and restart Apache.'; +$lang->mail->disableSecure = 'No openssl, disable ssl and tls.'; +$lang->mail->sendCloudFail = 'Failed. Reason:'; +$lang->mail->sendCloudHelp = <<1、Notice SendCloud是SendCloud的Team通知服务。具体可以到notice.sendcloud.net查看

+

2、accessKey和secretKey可以到登陆后的"设置"页面查看。Email人地址和名称也在"设置"页面设置。

+

3、Email时，Notice SendCloudContact里面的昵称要跟Email一致，否则无法成功Email。可以到[同步Contact]页面，将ZenTaoUser同步到SendCloudContact中

+EOD; +$lang->mail->sendCloudSuccess = 'Success'; +$lang->mail->closeSendCloud = 'Close sendcloud'; +$lang->mail->addressWhiteList = 'Please add the email to the whilte list on email server to avoid be treated as spam'; + +$lang->mail->placeholder = new stdclass(); +$lang->mail->placeholder->password = 'Some mail needs to fill in the auth code, specific to the mailbox related settings query.'; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index d63d4bb009..c59083181a 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -2,17 +2,17 @@ $lang->my->common = 'My Zone'; /* Method List。*/ -$lang->my->index = 'Homepage'; +$lang->my->index = 'Home'; $lang->my->todo = 'My To-Dos'; -$lang->my->task = 'My Task'; -$lang->my->bug = 'My Bug'; -$lang->my->testTask = 'My Version'; -$lang->my->testCase = 'My Case'; -$lang->my->story = 'My Story'; -$lang->my->myProject = "My {$lang->projectCommon}"; +$lang->my->task = 'My Tasks'; +$lang->my->bug = 'My Bugs'; +$lang->my->testTask = 'My Builds'; +$lang->my->testCase = 'My Cases'; +$lang->my->story = 'My Stories'; +$lang->my->myProject = "My {$lang->projectCommon}s"; $lang->my->profile = 'My Profile'; $lang->my->dynamic = 'My Dynamic'; -$lang->my->editProfile = 'Edi Profile'; +$lang->my->editProfile = 'Edit Profile'; $lang->my->changePassword = 'Edit Password'; $lang->my->unbind = 'Unbind Ranger'; $lang->my->manageContacts = 'Maintain Contact'; @@ -32,7 +32,7 @@ $lang->my->storyMenu->reviewedByMe = 'Reviewed by Me'; $lang->my->storyMenu->closedByMe = 'Closed by Me'; $lang->my->home = new stdclass(); -$lang->my->home->latest = 'Latest Dynamic'; +$lang->my->home->latest = 'Dynamic'; $lang->my->home->action = "%s, %s %s %s %s."; $lang->my->home->projects = $lang->projectCommon; $lang->my->home->products = $lang->productCommon; diff --git a/module/my/lang/en.php.bak b/module/my/lang/en.php.bak new file mode 100644 index 0000000000..d63d4bb009 --- /dev/null +++ b/module/my/lang/en.php.bak @@ -0,0 +1,47 @@ +my->common = 'My Zone'; + +/* Method List。*/ +$lang->my->index = 'Homepage'; +$lang->my->todo = 'My To-Dos'; +$lang->my->task = 'My Task'; +$lang->my->bug = 'My Bug'; +$lang->my->testTask = 'My Version'; +$lang->my->testCase = 'My Case'; +$lang->my->story = 'My Story'; +$lang->my->myProject = "My {$lang->projectCommon}"; +$lang->my->profile = 'My Profile'; +$lang->my->dynamic = 'My Dynamic'; +$lang->my->editProfile = 'Edi Profile'; +$lang->my->changePassword = 'Edit Password'; +$lang->my->unbind = 'Unbind Ranger'; +$lang->my->manageContacts = 'Maintain Contact'; +$lang->my->deleteContacts = 'Delete Contact'; + +$lang->my->taskMenu = new stdclass(); +$lang->my->taskMenu->assignedToMe = 'Assigned to Me'; +$lang->my->taskMenu->openedByMe = 'Created by Me'; +$lang->my->taskMenu->finishedByMe = 'Finished by Me'; +$lang->my->taskMenu->closedByMe = 'Closed by Me'; +$lang->my->taskMenu->canceledByMe = 'Cancelled by Me'; + +$lang->my->storyMenu = new stdclass(); +$lang->my->storyMenu->assignedToMe = 'Assigned to Me'; +$lang->my->storyMenu->openedByMe = 'Created by Me'; +$lang->my->storyMenu->reviewedByMe = 'Reviewed by Me'; +$lang->my->storyMenu->closedByMe = 'Closed by Me'; + +$lang->my->home = new stdclass(); +$lang->my->home->latest = 'Latest Dynamic'; +$lang->my->home->action = "%s, %s %s %s %s."; +$lang->my->home->projects = $lang->projectCommon; +$lang->my->home->products = $lang->productCommon; +$lang->my->home->createProject = "Create {$lang->projectCommon}"; +$lang->my->home->createProduct = "Create {$lang->productCommon}"; +$lang->my->home->help = "Help"; +$lang->my->home->noProductsTip = "No {$lang->productCommon} found here."; + +$lang->my->form = new stdclass(); +$lang->my->form->lblBasic = 'Basic Info'; +$lang->my->form->lblContact = 'Contact Info'; +$lang->my->form->lblAccount = 'Account Info'; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 820d63a261..7a83a445e3 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -10,10 +10,10 @@ * @link http://www.zentao.net */ $lang->product->common = $lang->productCommon . 'View'; -$lang->product->index = $lang->productCommon . "Homepage"; -$lang->product->browse = "View{$lang->productCommon}"; +$lang->product->index = $lang->productCommon . "Home"; +$lang->product->browse = "{$lang->productCommon}s"; $lang->product->dynamic = "Dynamic"; -$lang->product->view = "{$lang->productCommon}Overview"; +$lang->product->view = "{$lang->productCommon}s"; $lang->product->edit = "Edit {$lang->productCommon}"; $lang->product->batchEdit = "Batch Edit"; $lang->product->create = "Create {$lang->productCommon}"; @@ -24,21 +24,21 @@ $lang->product->select = "Please select {$lang->productCommon}"; $lang->product->mine = 'My responsibility:'; $lang->product->other = 'Other:'; $lang->product->closed = 'Closed'; -$lang->product->updateOrder = 'Sort'; +$lang->product->updateOrder = 'Ranking'; $lang->product->all = "All {$lang->productCommon}"; $lang->product->basicInfo = 'Basic Info'; $lang->product->otherInfo = 'Other Info'; -$lang->product->plans = 'Planning Count'; -$lang->product->releases = 'Release Count'; -$lang->product->docs = 'Document Count'; +$lang->product->plans = 'Plans'; +$lang->product->releases = 'Releases'; +$lang->product->docs = 'Documents'; $lang->product->bugs = 'Linked Bug'; -$lang->product->projects = "Linked {$lang->projectCommon} Count"; -$lang->product->cases = 'Case Count'; -$lang->product->builds = 'Build Count'; +$lang->product->projects = "Linked {$lang->projectCommon}s"; +$lang->product->cases = 'Cases'; +$lang->product->builds = 'Builds'; $lang->product->roadmap = 'Roadmap'; -$lang->product->doc = 'Document List'; +$lang->product->doc = 'Documents'; $lang->product->project = $lang->projectCommon . 'List'; $lang->product->confirmDelete = " Do you want to delete {$lang->productCommon}?"; @@ -51,11 +51,11 @@ $lang->product->code = "{$lang->productCommon} Code"; $lang->product->order = 'Sort'; $lang->product->type = "{$lang->productCommon} Type"; $lang->product->status = 'Status'; -$lang->product->desc = 'Desc'; +$lang->product->desc = 'Description'; $lang->product->PO = "{$lang->productCommon} owner"; -$lang->product->QD = 'Quality director'; -$lang->product->RD = 'Release director'; -$lang->product->acl = 'Access limitation'; +$lang->product->QD = 'Quality Director'; +$lang->product->RD = 'Release Director'; +$lang->product->acl = 'Acceptance'; $lang->product->whitelist = 'Whitelist'; $lang->product->branch = '%s'; @@ -71,7 +71,7 @@ $lang->product->willClose = 'To be Closed'; $lang->product->closedStory = 'Closed'; $lang->product->unclosed = 'Open'; -$lang->product->allStory = 'AllStory'; +$lang->product->allStory = 'All Stories'; $lang->product->allProduct = 'All' . $lang->productCommon; $lang->product->allProductsOfProject = 'All related' . $lang->productCommon; @@ -89,7 +89,7 @@ $lang->product->statusList['normal'] = 'Normal'; $lang->product->statusList['closed'] = 'Closed'; $lang->product->aclList['open'] = "Default({$lang->productCommon} with View permission can access to it)"; -$lang->product->aclList['private'] = "Private {$lang->productCommon}({$lang->productCommon} of pesponsible person and {$lang->projectCommon} team members only)"; +$lang->product->aclList['private'] = "Private{$lang->productCommon}({$lang->projectCommon}team members only)"; $lang->product->aclList['custom'] = 'Custom(Team members and Whitelisr members have access to it.)'; $lang->product->storySummary = " %s Story in total on this page, %s man-hour estimated. Case coverage is %s."; diff --git a/module/product/lang/en.php.bak b/module/product/lang/en.php.bak new file mode 100644 index 0000000000..820d63a261 --- /dev/null +++ b/module/product/lang/en.php.bak @@ -0,0 +1,108 @@ + + * @package product + * @version $Id: en.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $ + * @link http://www.zentao.net + */ +$lang->product->common = $lang->productCommon . 'View'; +$lang->product->index = $lang->productCommon . "Homepage"; +$lang->product->browse = "View{$lang->productCommon}"; +$lang->product->dynamic = "Dynamic"; +$lang->product->view = "{$lang->productCommon}Overview"; +$lang->product->edit = "Edit {$lang->productCommon}"; +$lang->product->batchEdit = "Batch Edit"; +$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->mine = 'My responsibility:'; +$lang->product->other = 'Other:'; +$lang->product->closed = 'Closed'; +$lang->product->updateOrder = 'Sort'; +$lang->product->all = "All {$lang->productCommon}"; + +$lang->product->basicInfo = 'Basic Info'; +$lang->product->otherInfo = 'Other Info'; + +$lang->product->plans = 'Planning Count'; +$lang->product->releases = 'Release Count'; +$lang->product->docs = 'Document Count'; +$lang->product->bugs = 'Linked Bug'; +$lang->product->projects = "Linked {$lang->projectCommon} Count"; +$lang->product->cases = 'Case Count'; +$lang->product->builds = 'Build Count'; +$lang->product->roadmap = 'Roadmap'; +$lang->product->doc = 'Document List'; +$lang->product->project = $lang->projectCommon . 'List'; + +$lang->product->confirmDelete = " Do you want to delete {$lang->productCommon}?"; + +$lang->product->errorNoProduct = "{$lang->productCommon} is not created yet!"; +$lang->product->accessDenied = "You have no access to {$lang->productCommon}."; + +$lang->product->name = "{$lang->productCommon} Name"; +$lang->product->code = "{$lang->productCommon} Code"; +$lang->product->order = 'Sort'; +$lang->product->type = "{$lang->productCommon} Type"; +$lang->product->status = 'Status'; +$lang->product->desc = 'Desc'; +$lang->product->PO = "{$lang->productCommon} owner"; +$lang->product->QD = 'Quality director'; +$lang->product->RD = 'Release director'; +$lang->product->acl = 'Access limitation'; +$lang->product->whitelist = 'Whitelist'; +$lang->product->branch = '%s'; + +$lang->product->searchStory = 'Search'; +$lang->product->assignedToMe = 'Assigned to Me'; +$lang->product->openedByMe = 'Created by Me'; +$lang->product->reviewedByMe = 'Reviewed by Me'; +$lang->product->closedByMe = 'Closed by Me'; +$lang->product->draftStory = 'Draft'; +$lang->product->activeStory = 'Activate'; +$lang->product->changedStory = 'Changed'; +$lang->product->willClose = 'To be Closed'; +$lang->product->closedStory = 'Closed'; +$lang->product->unclosed = 'Open'; + +$lang->product->allStory = 'AllStory'; +$lang->product->allProduct = 'All' . $lang->productCommon; +$lang->product->allProductsOfProject = 'All related' . $lang->productCommon; + +$lang->product->typeList[''] = ''; +$lang->product->typeList['normal'] = 'Normal'; +$lang->product->typeList['branch'] = 'Multi Branch'; +$lang->product->typeList['platform'] = 'Multi Platform'; + +$lang->product->branchName['normal'] = ''; +$lang->product->branchName['branch'] = 'Branch'; +$lang->product->branchName['platform'] = 'Platform'; + +$lang->product->statusList[''] = ''; +$lang->product->statusList['normal'] = 'Normal'; +$lang->product->statusList['closed'] = 'Closed'; + +$lang->product->aclList['open'] = "Default({$lang->productCommon} with View permission can access to it)"; +$lang->product->aclList['private'] = "Private {$lang->productCommon}({$lang->productCommon} of pesponsible person and {$lang->projectCommon} team members only)"; +$lang->product->aclList['custom'] = 'Custom(Team members and Whitelisr members have access to it.)'; + +$lang->product->storySummary = " %s Story in total on this page, %s man-hour estimated. Case coverage is %s."; +$lang->product->noMatched = '"%s" cannot be found.' . $lang->productCommon; + +$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed; +$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory; +$lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe; +$lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe; +$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe; +$lang->product->featureBar['browse']['closedbyme'] = $lang->product->closedByMe; +$lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory; +$lang->product->featureBar['browse']['activestory'] = $lang->product->activeStory; +$lang->product->featureBar['browse']['changedstory'] = $lang->product->changedStory; +$lang->product->featureBar['browse']['willclose'] = $lang->product->willClose; +$lang->product->featureBar['browse']['closedstory'] = $lang->product->closedStory; diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index 3aed6ac071..9bcea7bc98 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -33,24 +33,24 @@ $lang->productplan->batchUnlinkBug = "Batch Remove Bug"; $lang->productplan->linkedBugs = 'Linked Bug'; $lang->productplan->unlinkedBugs = 'Unlinked Bug'; -$lang->productplan->confirmDelete = "Do you want to delete this Planning?"; +$lang->productplan->confirmDelete = "Do you want to delete this Plan?"; $lang->productplan->confirmUnlinkStory = "Do you want to remove this Story?"; $lang->productplan->confirmUnlinkBug = "Do you want to remove this Bug?"; $lang->productplan->id = 'ID'; $lang->productplan->product = $lang->productCommon; $lang->productplan->title = 'Title'; -$lang->productplan->desc = 'Desc'; +$lang->productplan->desc = 'Description'; $lang->productplan->begin = 'Begin'; $lang->productplan->end = 'End'; -$lang->productplan->endList[7] = 'One Week'; -$lang->productplan->endList[14] = 'Two Weeks'; -$lang->productplan->endList[31] = 'One Month'; +$lang->productplan->endList[7] = '1 Week'; +$lang->productplan->endList[14] = '1 Weeks'; +$lang->productplan->endList[31] = '1 Month'; $lang->productplan->endList[62] = '2 Months'; $lang->productplan->endList[93] = '3 Months'; $lang->productplan->endList[186] = '6 Months'; -$lang->productplan->endList[365] = 'One Year'; +$lang->productplan->endList[365] = '1 Year'; $lang->productplan->errorNoTitle = 'ID %s title should not be empty.'; $lang->productplan->errorNoBegin = 'ID %s begin time should not be empty.'; diff --git a/module/productplan/lang/en.php.bak b/module/productplan/lang/en.php.bak new file mode 100644 index 0000000000..3aed6ac071 --- /dev/null +++ b/module/productplan/lang/en.php.bak @@ -0,0 +1,62 @@ + + * @package productplan + * @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->browse = "View"; +$lang->productplan->index = "List"; +$lang->productplan->create = "Create"; +$lang->productplan->edit = "Edit"; +$lang->productplan->delete = "Delete"; +$lang->productplan->view = "Details"; +$lang->productplan->bugSummary = "%s Bugs in total on this page."; +$lang->productplan->basicInfo = 'Basic Info'; +$lang->productplan->batchEdit = 'Batch Edit'; + +$lang->productplan->batchUnlink = "Batch Remove"; +$lang->productplan->linkStory = "Link Story"; +$lang->productplan->unlinkStory = "Remove Story"; +$lang->productplan->batchUnlinkStory = "Batch Remove Story"; +$lang->productplan->linkedStories = 'Linked Story'; +$lang->productplan->unlinkedStories = 'Unlinked Story'; + +$lang->productplan->linkBug = "Link Bug"; +$lang->productplan->unlinkBug = "Remove Bug"; +$lang->productplan->batchUnlinkBug = "Batch Remove Bug"; +$lang->productplan->linkedBugs = 'Linked Bug'; +$lang->productplan->unlinkedBugs = 'Unlinked Bug'; + +$lang->productplan->confirmDelete = "Do you want to delete this Planning?"; +$lang->productplan->confirmUnlinkStory = "Do you want to remove this Story?"; +$lang->productplan->confirmUnlinkBug = "Do you want to remove this Bug?"; + +$lang->productplan->id = 'ID'; +$lang->productplan->product = $lang->productCommon; +$lang->productplan->title = 'Title'; +$lang->productplan->desc = 'Desc'; +$lang->productplan->begin = 'Begin'; +$lang->productplan->end = 'End'; + +$lang->productplan->endList[7] = 'One Week'; +$lang->productplan->endList[14] = 'Two Weeks'; +$lang->productplan->endList[31] = 'One Month'; +$lang->productplan->endList[62] = '2 Months'; +$lang->productplan->endList[93] = '3 Months'; +$lang->productplan->endList[186] = '6 Months'; +$lang->productplan->endList[365] = 'One Year'; + +$lang->productplan->errorNoTitle = 'ID %s title should not be empty.'; +$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']['all'] = 'All'; +$lang->productplan->featureBar['browse']['overdue'] = 'Overdue'; diff --git a/module/qa/lang/en.php b/module/qa/lang/en.php index 84750a49e9..5342f8cd1a 100644 --- a/module/qa/lang/en.php +++ b/module/qa/lang/en.php @@ -9,5 +9,5 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->qa->common = 'Testing View'; +$lang->qa->common = 'Testing'; $lang->qa->index = 'Testing Home'; diff --git a/module/qa/lang/en.php.bak b/module/qa/lang/en.php.bak new file mode 100644 index 0000000000..84750a49e9 --- /dev/null +++ b/module/qa/lang/en.php.bak @@ -0,0 +1,13 @@ + + * @package company + * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ + * @link http://www.zentao.net + */ +$lang->qa->common = 'Testing View'; +$lang->qa->index = 'Testing Home'; diff --git a/module/release/lang/en.php b/module/release/lang/en.php index 8fc86e526e..bd9e53812f 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -34,7 +34,7 @@ $lang->release->product = $lang->productCommon; $lang->release->build = 'Build'; $lang->release->name = 'Name'; $lang->release->date = 'Date'; -$lang->release->desc = 'Desc'; +$lang->release->desc = 'Description'; $lang->release->status = 'Status'; $lang->release->last = 'Last Release'; $lang->release->unlinkStory = 'Remove Story'; diff --git a/module/release/lang/en.php.bak b/module/release/lang/en.php.bak new file mode 100644 index 0000000000..8fc86e526e --- /dev/null +++ b/module/release/lang/en.php.bak @@ -0,0 +1,66 @@ + + * @package release + * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ + * @link http://www.zentao.net + */ +$lang->release->common = 'Release'; +$lang->release->create = "Create"; +$lang->release->edit = "Edit"; +$lang->release->linkStory = "Link Story"; +$lang->release->linkBug = "Link Bug"; +$lang->release->delete = "Delete"; +$lang->release->deleted = 'Deleted'; +$lang->release->view = "Info"; +$lang->release->browse = "Browse"; +$lang->release->changeStatus = "Change Status"; +$lang->release->batchUnlink = "Batch Unlink"; +$lang->release->batchUnlinkStory = "Batch Unlink Story"; +$lang->release->batchUnlinkBug = "Batch unlink Bug"; + +$lang->release->confirmDelete = "Do you want to delete this Release?"; +$lang->release->confirmUnlinkStory = "Do you want to remove this Story?"; +$lang->release->confirmUnlinkBug = "Do you want to remove this Bug?"; + +$lang->release->basicInfo = 'Basic Info'; + +$lang->release->id = 'ID'; +$lang->release->product = $lang->productCommon; +$lang->release->build = 'Build'; +$lang->release->name = 'Name'; +$lang->release->date = 'Date'; +$lang->release->desc = 'Desc'; +$lang->release->status = 'Status'; +$lang->release->last = 'Last Release'; +$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->finishStories = 'Finished %s Story'; +$lang->release->resolvedBugs = 'Solved %s Bug'; +$lang->release->createdBugs = 'Generated %s Bug'; +$lang->release->export = 'Export as HTML'; + +$lang->release->filePath = 'Download : '; +$lang->release->scmPath = 'SCM Path : '; + +$lang->release->exportTypeList['all'] = 'All'; +$lang->release->exportTypeList['story'] = 'Resolved Story'; +$lang->release->exportTypeList['bug'] = 'Resolved Bug'; +$lang->release->exportTypeList['leftbug'] = 'Generated Bug'; + +$lang->release->statusList[''] = ''; +$lang->release->statusList['normal'] = 'Normal'; +$lang->release->statusList['terminate'] = 'Terminate'; + +$lang->release->changeStatusList['normal'] = 'Activate'; +$lang->release->changeStatusList['terminate'] = 'Terminate'; + +$lang->release->action = new stdclass(); +$lang->release->action->changestatus = array('main' => '$date, 由 $actor $extra。', 'extra' => 'changeStatusList'); diff --git a/module/report/lang/en.php b/module/report/lang/en.php index 99b61768af..42fc9c5edb 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -14,7 +14,7 @@ $lang->report->index = 'Home'; $lang->report->list = 'List'; $lang->report->item = 'Item'; $lang->report->value = 'Value'; -$lang->report->percent = 'Percentage'; +$lang->report->percent = 'Percent'; $lang->report->undefined = 'Undefined'; $lang->report->colors[] = 'AFD8F8'; @@ -34,18 +34,18 @@ $lang->report->singleColor[] = 'F6BD0F'; $lang->report->projectDeviation = $lang->projectCommon . ' Deviation'; $lang->report->productSummary = $lang->productCommon . ' Summary'; -$lang->report->bugCreate = 'Bug Summary'; +$lang->report->bugCreate = 'Bugs'; $lang->report->bugAssign = 'Bug Assignment'; $lang->report->workload = 'Workload'; $lang->report->workloadAB = 'Workload'; -$lang->report->bugOpenedDate = 'Bug Opened Date'; +$lang->report->bugOpenedDate = 'Bug Open on'; $lang->report->taskAssignedDate = 'Time Frame'; $lang->report->beginAndEnd = 'Date'; $lang->report->dept = 'Dept'; $lang->reportList->project->lists[10] = $lang->projectCommon . ' deviation|report|projectdeviation'; $lang->reportList->product->lists[10] = $lang->productCommon . ' summary|report|productsummary'; -$lang->reportList->test->lists[10] = 'Bug Summary|report|bugcreate'; +$lang->reportList->test->lists[10] = 'Bugs|report|bugcreate'; $lang->reportList->test->lists[13] = 'Bug Assignment|report|bugassign'; $lang->reportList->staff->lists[10] = 'Workload|report|workload'; @@ -53,9 +53,9 @@ $lang->report->id = 'ID'; $lang->report->project = $lang->projectCommon; $lang->report->product = $lang->productCommon; $lang->report->user = 'Username'; -$lang->report->bug = 'Bug'; +$lang->report->bug = 'Bugs'; $lang->report->task = 'Tasks'; -$lang->report->estimate = 'Estimation'; +$lang->report->estimate = 'Est.'; $lang->report->consumed = 'Consumed'; $lang->report->remain = 'Remained'; $lang->report->deviation = 'Deviation'; @@ -67,10 +67,10 @@ $lang->report->manhourTotal = "Total Man-Hour"; $lang->report->validRate = "Efficiency"; $lang->report->validRateTips = "Solution is fixed/postponed or status is resolved/closed."; $lang->report->unplanned = 'Unplanned'; -$lang->report->workday = 'Man-Hour per Day'; +$lang->report->workday = 'Man-Hour/Day'; $lang->report->diffDays = 'Work Days'; -$lang->report->conditions = 'Conditions:'; +$lang->report->conditions = 'Filter by:'; $lang->report->closedProduct = 'Closed ' . $lang->productCommon; $lang->report->overduePlan = 'Overdue Plan'; diff --git a/module/report/lang/en.php.bak b/module/report/lang/en.php.bak new file mode 100644 index 0000000000..99b61768af --- /dev/null +++ b/module/report/lang/en.php.bak @@ -0,0 +1,91 @@ + + * @package report + * @version $Id: en.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $ + * @link http://www.zentao.net + */ +$lang->report->common = 'Report'; +$lang->report->index = 'Home'; +$lang->report->list = 'List'; +$lang->report->item = 'Item'; +$lang->report->value = 'Value'; +$lang->report->percent = 'Percentage'; +$lang->report->undefined = 'Undefined'; + +$lang->report->colors[] = 'AFD8F8'; +$lang->report->colors[] = 'F6BD0F'; +$lang->report->colors[] = '8BBA00'; +$lang->report->colors[] = 'FF8E46'; +$lang->report->colors[] = '008E8E'; +$lang->report->colors[] = 'D64646'; +$lang->report->colors[] = '8E468E'; +$lang->report->colors[] = '588526'; +$lang->report->colors[] = 'B3AA00'; +$lang->report->colors[] = '008ED6'; +$lang->report->colors[] = '9D080D'; +$lang->report->colors[] = 'A186BE'; + +$lang->report->singleColor[] = 'F6BD0F'; + +$lang->report->projectDeviation = $lang->projectCommon . ' Deviation'; +$lang->report->productSummary = $lang->productCommon . ' Summary'; +$lang->report->bugCreate = 'Bug Summary'; +$lang->report->bugAssign = 'Bug Assignment'; +$lang->report->workload = 'Workload'; +$lang->report->workloadAB = 'Workload'; +$lang->report->bugOpenedDate = 'Bug Opened Date'; +$lang->report->taskAssignedDate = 'Time Frame'; +$lang->report->beginAndEnd = 'Date'; +$lang->report->dept = 'Dept'; + +$lang->reportList->project->lists[10] = $lang->projectCommon . ' deviation|report|projectdeviation'; +$lang->reportList->product->lists[10] = $lang->productCommon . ' summary|report|productsummary'; +$lang->reportList->test->lists[10] = 'Bug Summary|report|bugcreate'; +$lang->reportList->test->lists[13] = 'Bug Assignment|report|bugassign'; +$lang->reportList->staff->lists[10] = 'Workload|report|workload'; + +$lang->report->id = 'ID'; +$lang->report->project = $lang->projectCommon; +$lang->report->product = $lang->productCommon; +$lang->report->user = 'Username'; +$lang->report->bug = 'Bug'; +$lang->report->task = 'Tasks'; +$lang->report->estimate = 'Estimation'; +$lang->report->consumed = 'Consumed'; +$lang->report->remain = 'Remained'; +$lang->report->deviation = 'Deviation'; +$lang->report->deviationRate = 'Deviation Rate'; +$lang->report->total = 'Total'; +$lang->report->to = 'to'; +$lang->report->taskTotal = "Total Tasks"; +$lang->report->manhourTotal = "Total Man-Hour"; +$lang->report->validRate = "Efficiency"; +$lang->report->validRateTips = "Solution is fixed/postponed or status is resolved/closed."; +$lang->report->unplanned = 'Unplanned'; +$lang->report->workday = 'Man-Hour per Day'; +$lang->report->diffDays = 'Work Days'; + +$lang->report->conditions = 'Conditions:'; +$lang->report->closedProduct = 'Closed ' . $lang->productCommon; +$lang->report->overduePlan = 'Overdue Plan'; + +/* daily reminder. */ +$lang->report->idAB = 'ID'; +$lang->report->bugTitle = 'Bug Title'; +$lang->report->taskName = 'Task Name'; +$lang->report->todoName = 'To-Do Name'; +$lang->report->testTaskName = 'Test Task Name'; + +$lang->report->mailTitle = new stdclass(); +$lang->report->mailTitle->begin = 'Notice: You have'; +$lang->report->mailTitle->bug = " Bug(%s),"; +$lang->report->mailTitle->task = " Task(%s),"; +$lang->report->mailTitle->todo = " To-Do(%s),"; +$lang->report->mailTitle->testTask = " Test Task(%s),"; + +$lang->report->proVersion = 'Try ZenTao Pro for more!'; diff --git a/module/search/lang/en.php b/module/search/lang/en.php index b466a7337f..43cae3d159 100644 --- a/module/search/lang/en.php +++ b/module/search/lang/en.php @@ -17,9 +17,9 @@ $lang->search->group1 = '1'; $lang->search->group2 = '2'; $lang->search->buildForm = 'Search Form'; $lang->search->buildQuery = 'Execute Query'; -$lang->search->saveQuery = 'Save Query'; -$lang->search->deleteQuery = 'Delete Query'; -$lang->search->setQueryTitle = 'Please enter the title( Please save before searching.):'; +$lang->search->saveQuery = 'Save'; +$lang->search->deleteQuery = 'Delete'; +$lang->search->setQueryTitle = 'Please enter the title( Save it before searching.):'; $lang->search->select = 'Stories/Tasks Filter'; $lang->search->me = 'Me'; $lang->search->noQuery = 'No query saved!'; diff --git a/module/search/lang/en.php.bak b/module/search/lang/en.php.bak new file mode 100644 index 0000000000..b466a7337f --- /dev/null +++ b/module/search/lang/en.php.bak @@ -0,0 +1,42 @@ + + * @package search + * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ + * @link http://www.zentao.net + */ +$lang->search->common = 'Search'; +$lang->search->reset = 'Reset'; +$lang->search->saveQuery = 'Save'; +$lang->search->myQuery = 'My Queries'; +$lang->search->group1 = '1'; +$lang->search->group2 = '2'; +$lang->search->buildForm = 'Search Form'; +$lang->search->buildQuery = 'Execute Query'; +$lang->search->saveQuery = 'Save Query'; +$lang->search->deleteQuery = 'Delete Query'; +$lang->search->setQueryTitle = 'Please enter the title( Please save before searching.):'; +$lang->search->select = 'Stories/Tasks Filter'; +$lang->search->me = 'Me'; +$lang->search->noQuery = 'No query saved!'; +$lang->search->onMenuBar = 'Show in Menu'; + +$lang->search->operators['='] = '='; +$lang->search->operators['!='] = '!='; +$lang->search->operators['>'] = '>'; +$lang->search->operators['>='] = '>='; +$lang->search->operators['<'] = '<'; +$lang->search->operators['<='] = '<='; +$lang->search->operators['include'] = 'including'; +$lang->search->operators['between'] = 'between'; +$lang->search->operators['notinclude'] = 'excluding'; +$lang->search->operators['belong'] = 'belong to'; + +$lang->search->andor['and'] = 'And'; +$lang->search->andor['or'] = 'Or'; + +$lang->search->null = 'Null'; diff --git a/module/sso/lang/en.php b/module/sso/lang/en.php index f121ce9638..3ebab05df3 100644 --- a/module/sso/lang/en.php +++ b/module/sso/lang/en.php @@ -11,8 +11,8 @@ */ $lang->sso = new stdclass(); $lang->sso->settings = 'Settings'; -$lang->sso->turnon = 'Turn On'; -$lang->sso->code = 'Code'; +$lang->sso->turnon = 'On'; +$lang->sso->code = 'Alias'; $lang->sso->key = 'Key'; $lang->sso->addr = 'Address'; $lang->sso->bind = 'User Binding'; @@ -32,7 +32,7 @@ $lang->sso->help = <<1. Interface address is required. If use PATH_INFO, it is http://YOUR RANGER ADDRESS/sys/sso-check.html If GET, it is http://YOUR RANGER ADDRESS/sys/index.php?m=sso&f=check

2. Code and Key must be the same as set in Ranger.

EOD; -$lang->sso->bindNotice = 'User just added has no rivilege. You have to ask ZenTao Admin to grant permissions to the User.'; -$lang->sso->bindNoPassword = 'Password should not be blank.'; -$lang->sso->bindNoUser = 'Password is wrong, or this User cannot be found!'; +$lang->sso->bindNotice = 'User that is just added has no privilege. You have to ask ZenTao Admin to grant permissions to the User.'; +$lang->sso->bindNoPassword = 'Password should not be empty.'; +$lang->sso->bindNoUser = 'Password is wrong/User cannot be found!'; $lang->sso->bindHasAccount = 'This username already exists. Change your username or bind to it.'; diff --git a/module/sso/lang/en.php.bak b/module/sso/lang/en.php.bak new file mode 100644 index 0000000000..f121ce9638 --- /dev/null +++ b/module/sso/lang/en.php.bak @@ -0,0 +1,38 @@ + + * @package sso + * @version $Id$ + * @link http://www.zentao.net + */ +$lang->sso = new stdclass(); +$lang->sso->settings = 'Settings'; +$lang->sso->turnon = 'Turn On'; +$lang->sso->code = 'Code'; +$lang->sso->key = 'Key'; +$lang->sso->addr = 'Address'; +$lang->sso->bind = 'User Binding'; +$lang->sso->addrNotice = 'Example http://www.ranzhi.com/sys/sso-check.html'; + +$lang->sso->turnonList = array(); +$lang->sso->turnonList[1] = 'On'; +$lang->sso->turnonList[0] = 'Off'; + +$lang->sso->bindType = 'Binding Type'; +$lang->sso->bindUser = 'User Binding'; + +$lang->sso->bindTypeList['bind'] = 'Bind to existing User'; +$lang->sso->bindTypeList['add'] = 'Add User'; + +$lang->sso->help = <<1. Interface address is required. If use PATH_INFO, it is http://YOUR RANGER ADDRESS/sys/sso-check.html If GET, it is http://YOUR RANGER ADDRESS/sys/index.php?m=sso&f=check

+

2. Code and Key must be the same as set in Ranger.

+EOD; +$lang->sso->bindNotice = 'User just added has no rivilege. You have to ask ZenTao Admin to grant permissions to the User.'; +$lang->sso->bindNoPassword = 'Password should not be blank.'; +$lang->sso->bindNoUser = 'Password is wrong, or this User cannot be found!'; +$lang->sso->bindHasAccount = 'This username already exists. Change your username or bind to it.'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index bf0b13c752..f1bbd86e3f 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -48,31 +48,31 @@ $lang->story->product = $lang->productCommon; $lang->story->module = 'Module'; $lang->story->moduleAB = 'Module'; $lang->story->source = 'Source'; -$lang->story->sourceNote = 'Source Note'; +$lang->story->sourceNote = 'Note'; $lang->story->fromBug = 'From Bug'; $lang->story->title = 'Title'; $lang->story->spec = 'Description'; -$lang->story->verify = 'Verify'; +$lang->story->verify = 'Acceptance'; $lang->story->pri = 'Priority'; $lang->story->estimate = 'Estimated Man-Hour'; -$lang->story->estimateAB = 'Estimation'; +$lang->story->estimateAB = 'Est.'; $lang->story->hour = 'Hour'; $lang->story->status = 'Status'; $lang->story->stage = 'Stage'; $lang->story->stageAB = 'Stage'; $lang->story->mailto = 'Mailto'; -$lang->story->openedBy = 'Opened By'; -$lang->story->openedDate = 'Opened Date'; +$lang->story->openedBy = 'Open By'; +$lang->story->openedDate = 'Open on'; $lang->story->assignedTo = 'Assigned To'; $lang->story->assignedDate = 'Assigned Date'; $lang->story->lastEditedBy = 'Last Edited By'; -$lang->story->lastEditedDate = 'Last Edited Date'; +$lang->story->lastEditedDate = 'Last Edited on'; $lang->story->closedBy = 'Closed By'; $lang->story->closedDate = 'Closed Date'; $lang->story->closedReason = 'Closed Reason'; $lang->story->rejectedReason = 'RejectED Reason'; $lang->story->reviewedBy = 'Reviewed By'; -$lang->story->reviewedDate = 'Reviewed Date'; +$lang->story->reviewedDate = 'Reviewed on'; $lang->story->version = 'Version'; $lang->story->plan = 'Planning'; $lang->story->planAB = 'Plan'; @@ -80,10 +80,10 @@ $lang->story->comment = 'Comment'; $lang->story->linkStories = 'Linke Story'; $lang->story->childStories = 'Subdivide Story'; $lang->story->duplicateStory = 'Duplicate Story'; -$lang->story->reviewResult = 'Review Result'; +$lang->story->reviewResult = 'Review Results'; $lang->story->preVersion = 'Previous Version'; -$lang->story->keywords = 'Keyword'; -$lang->story->newStory = 'Continue Add Story.'; +$lang->story->keywords = 'Keywords'; +$lang->story->newStory = 'Continue Adding Story.'; $lang->story->colorTag = 'Color Tag'; $lang->story->files = 'Files'; @@ -115,7 +115,7 @@ $lang->story->reasonList['done'] = 'Done'; $lang->story->reasonList['subdivided'] = 'Subdivided'; $lang->story->reasonList['duplicate'] = 'Duplicate'; $lang->story->reasonList['postponed'] = 'Postponed'; -$lang->story->reasonList['willnotdo'] = "Won't do"; +$lang->story->reasonList['willnotdo'] = "Ignore"; $lang->story->reasonList['cancel'] = 'Cancelled'; $lang->story->reasonList['bydesign'] = 'Default Design'; //$lang->story->reasonList['isbug'] = 'Bug!'; @@ -161,7 +161,7 @@ $lang->story->legendFromBug = 'From Bug'; $lang->story->legendCases = 'Linked Case'; $lang->story->legendLinkStories = 'Linked Story'; $lang->story->legendChildStories = 'Subdivide Story'; -$lang->story->legendSpec = 'Story Desc'; +$lang->story->legendSpec = 'Story Description'; $lang->story->legendVerify = 'Acceptance Criteria'; $lang->story->legendMisc = 'Misc '; diff --git a/module/story/lang/en.php.bak b/module/story/lang/en.php.bak new file mode 100644 index 0000000000..bf0b13c752 --- /dev/null +++ b/module/story/lang/en.php.bak @@ -0,0 +1,290 @@ + + * @package story + * @version $Id: en.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $ + * @link http://www.zentao.net + */ +$lang->story->create = "Create"; +$lang->story->batchCreate = "Batch Create"; +$lang->story->change = "Change"; +$lang->story->changed = 'Changed Story'; +$lang->story->review = 'Review'; +$lang->story->batchReview = 'Batch Review'; +$lang->story->edit = "Edit"; +$lang->story->batchEdit = "Batch Edit"; +$lang->story->subdivide = 'Subdivide'; +$lang->story->close = 'Close'; +$lang->story->batchClose = 'Batch Close'; +$lang->story->activate = 'Activate'; +$lang->story->delete = "Delete"; +$lang->story->view = "Story Details"; +$lang->story->tasks = "Linked Task"; +$lang->story->taskCount = 'Tasks'; +$lang->story->bugCount = 'Bugs'; +$lang->story->caseCount = 'Testcases'; +$lang->story->taskCountAB = 'Tasks'; +$lang->story->bugCountAB = 'Bugs'; +$lang->story->caseCountAB = 'Cases'; +$lang->story->linkStory = 'Link Story'; +$lang->story->unlinkStory = 'Unlink Story'; +$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->batchAssignTo = "Batch Assign"; +$lang->story->batchChangeModule = "Batch Change Module"; + +$lang->story->common = 'Story'; +$lang->story->id = 'ID'; +$lang->story->product = $lang->productCommon; +$lang->story->module = 'Module'; +$lang->story->moduleAB = 'Module'; +$lang->story->source = 'Source'; +$lang->story->sourceNote = 'Source Note'; +$lang->story->fromBug = 'From Bug'; +$lang->story->title = 'Title'; +$lang->story->spec = 'Description'; +$lang->story->verify = 'Verify'; +$lang->story->pri = 'Priority'; +$lang->story->estimate = 'Estimated Man-Hour'; +$lang->story->estimateAB = 'Estimation'; +$lang->story->hour = 'Hour'; +$lang->story->status = 'Status'; +$lang->story->stage = 'Stage'; +$lang->story->stageAB = 'Stage'; +$lang->story->mailto = 'Mailto'; +$lang->story->openedBy = 'Opened By'; +$lang->story->openedDate = 'Opened Date'; +$lang->story->assignedTo = 'Assigned To'; +$lang->story->assignedDate = 'Assigned Date'; +$lang->story->lastEditedBy = 'Last Edited By'; +$lang->story->lastEditedDate = 'Last Edited Date'; +$lang->story->closedBy = 'Closed By'; +$lang->story->closedDate = 'Closed Date'; +$lang->story->closedReason = 'Closed Reason'; +$lang->story->rejectedReason = 'RejectED Reason'; +$lang->story->reviewedBy = 'Reviewed By'; +$lang->story->reviewedDate = 'Reviewed Date'; +$lang->story->version = 'Version'; +$lang->story->plan = 'Planning'; +$lang->story->planAB = 'Plan'; +$lang->story->comment = 'Comment'; +$lang->story->linkStories = 'Linke Story'; +$lang->story->childStories = 'Subdivide Story'; +$lang->story->duplicateStory = 'Duplicate Story'; +$lang->story->reviewResult = 'Review Result'; +$lang->story->preVersion = 'Previous Version'; +$lang->story->keywords = 'Keyword'; +$lang->story->newStory = 'Continue Add Story.'; +$lang->story->colorTag = 'Color Tag'; +$lang->story->files = 'Files'; + +$lang->story->ditto = 'Ditto'; +$lang->story->dittoNotice = 'This Story does not belong to the same Product as the last Story does!'; + +$lang->story->useList[0] = 'Yes'; +$lang->story->useList[1] = 'No'; + +$lang->story->statusList[''] = ''; +$lang->story->statusList['draft'] = 'Draft'; +$lang->story->statusList['active'] = 'Active'; +$lang->story->statusList['closed'] = 'Closed'; +$lang->story->statusList['changed'] = 'Changed'; + +$lang->story->stageList[''] = ''; +$lang->story->stageList['wait'] = 'Pending'; +$lang->story->stageList['planned'] = 'Planned'; +$lang->story->stageList['projected'] = 'Projected'; +$lang->story->stageList['developing'] = 'Developing'; +$lang->story->stageList['developed'] = 'Developed'; +$lang->story->stageList['testing'] = 'Testing'; +$lang->story->stageList['tested'] = 'Tested'; +$lang->story->stageList['verified'] = 'Accepted'; +$lang->story->stageList['released'] = 'Released'; + +$lang->story->reasonList[''] = ''; +$lang->story->reasonList['done'] = 'Done'; +$lang->story->reasonList['subdivided'] = 'Subdivided'; +$lang->story->reasonList['duplicate'] = 'Duplicate'; +$lang->story->reasonList['postponed'] = 'Postponed'; +$lang->story->reasonList['willnotdo'] = "Won't do"; +$lang->story->reasonList['cancel'] = 'Cancelled'; +$lang->story->reasonList['bydesign'] = 'Default Design'; +//$lang->story->reasonList['isbug'] = 'Bug!'; + +$lang->story->reviewResultList[''] = ''; +$lang->story->reviewResultList['pass'] = 'Pass'; +$lang->story->reviewResultList['revert'] = 'Revert'; +$lang->story->reviewResultList['clarify'] = 'Clarify'; +$lang->story->reviewResultList['reject'] = 'Reject'; + +$lang->story->reviewList[0] = 'No'; +$lang->story->reviewList[1] = 'Yes'; + +$lang->story->sourceList[''] = ''; +$lang->story->sourceList['customer'] = 'Customer'; +$lang->story->sourceList['user'] = 'User'; +$lang->story->sourceList['po'] = $lang->productCommon . ' Owner'; +$lang->story->sourceList['market'] = 'Market'; +$lang->story->sourceList['service'] = 'Customer service'; +$lang->story->sourceList['operation'] = 'Operations'; +$lang->story->sourceList['support'] = 'Technical support'; +$lang->story->sourceList['competitor'] = 'Competitor'; +$lang->story->sourceList['partner'] = 'Partner'; +$lang->story->sourceList['dev'] = 'Developer'; +$lang->story->sourceList['tester'] = 'Tester'; +$lang->story->sourceList['bug'] = 'Bug'; +$lang->story->sourceList['other'] = 'Other'; + +$lang->story->priList[] = ''; +$lang->story->priList[3] = '3'; +$lang->story->priList[1] = '1'; +$lang->story->priList[2] = '2'; +$lang->story->priList[4] = '4'; + +$lang->story->legendBasicInfo = 'Basic Info'; +$lang->story->legendLifeTime = 'Story Life '; +$lang->story->legendRelated = 'Related Info'; +$lang->story->legendMailto = 'Mail To'; +$lang->story->legendAttatch = 'Files'; +$lang->story->legendProjectAndTask = $lang->projectCommon . 'Task'; +$lang->story->legendBugs = 'Linked Bug'; +$lang->story->legendFromBug = 'From Bug'; +$lang->story->legendCases = 'Linked Case'; +$lang->story->legendLinkStories = 'Linked Story'; +$lang->story->legendChildStories = 'Subdivide Story'; +$lang->story->legendSpec = 'Story Desc'; +$lang->story->legendVerify = 'Acceptance Criteria'; +$lang->story->legendMisc = 'Misc '; + +$lang->story->lblChange = 'Change'; +$lang->story->lblReview = 'Review'; +$lang->story->lblActivate = 'Activate'; +$lang->story->lblClose = 'Close'; + +$lang->story->checkAffection = 'Check Impact'; +$lang->story->affectedProjects = 'Affected' . $lang->projectCommon; +$lang->story->affectedBugs = 'Affected Bug'; +$lang->story->affectedCases = 'Affected Case'; + +$lang->story->specTemplate = "Please refer to Template. As < User>, I hope that < can accomplish something. >So it will < the value of development>."; +$lang->story->needNotReview = 'No Review'; +$lang->story->successSaved = "Story saved!"; +$lang->story->confirmDelete = "Do you want to delete this Story?"; +$lang->story->errorEmptyChildStory = '『Subdivide Story』canot be blank.'; +$lang->story->mustChooseResult = 'Please select a result.'; +$lang->story->mustChoosePreVersion = 'Please select a Version to revert.'; + +$lang->story->form = new stdclass(); +$lang->story->form->area = 'Story Affiliation'; +$lang->story->form->desc = 'Description and criteria. What Story is it? How to accept it?'; +$lang->story->form->resource = 'Resource allocation. How finished it? How long does it take?'; +$lang->story->form->file = 'Files. If there are Story related files, please click Here to upload.'; + +$lang->story->action = new stdclass(); +$lang->story->action->reviewed = array('main' => '$date, recorded by $actor. Review result is $extra.', 'extra' => 'reviewResultList'); +$lang->story->action->closed = array('main' => '$date, closed by $actor. The reasion is $extra $appendLink.', 'extra' => 'reasonList'); +$lang->story->action->linked2plan = array('main' => '$date, linked by $actor to Planning $extra'); +$lang->story->action->unlinkedfromplan = array('main' => '$date, removed by $actor from Planning $extra.'); +$lang->story->action->linked2project = array('main' => '$date, linked by $actor to ' . $lang->projectCommon . ' $extra.'); +$lang->story->action->unlinkedfromproject = array('main' => '$date, removed by $actor from ' . $lang->projectCommon . ' $extra.'); +$lang->story->action->linked2build = array('main' => '$date, linked by $actor to Build $extra'); +$lang->story->action->unlinkedfrombuild = array('main' => '$date, removed by $actor from Build $extra.'); +$lang->story->action->linked2release = array('main' => '$date, linked by $actor to Release $extra'); +$lang->story->action->unlinkedfromrelease = array('main' => '$date, removed by $actor from Release $extra.'); +$lang->story->action->linkrelatedstory = array('main' => '$date, linked by $actor to Story $extra.'); +$lang->story->action->subdividestory = array('main' => '$date, subdivided by $actor to Story $extra.'); +$lang->story->action->unlinkrelatedstory = array('main' => '$date, removed by $actor from Story $extra.'); +$lang->story->action->unlinkchildstory = array('main' => '$date, removed by $actor Subdivided Story $extra.'); + +/* 统计报表。*/ +$lang->story->report = new stdclass(); +$lang->story->report->common = 'Report'; +$lang->story->report->select = 'Please select the type of 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 Planning'; +$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->options = new stdclass(); +$lang->story->report->options->graph = new stdclass(); +$lang->story->report->options->type = 'pie'; +$lang->story->report->options->width = 500; +$lang->story->report->options->height = 140; + +$lang->story->report->storysPerProduct = new stdclass(); +$lang->story->report->storysPerModule = new stdclass(); +$lang->story->report->storysPerSource = new stdclass(); +$lang->story->report->storysPerPlan = new stdclass(); +$lang->story->report->storysPerStatus = new stdclass(); +$lang->story->report->storysPerStage = new stdclass(); +$lang->story->report->storysPerPri = new stdclass(); +$lang->story->report->storysPerOpenedBy = new stdclass(); +$lang->story->report->storysPerAssignedTo = new stdclass(); +$lang->story->report->storysPerClosedReason = new stdclass(); +$lang->story->report->storysPerEstimate = new stdclass(); +$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->storysPerStatus->item = 'Status'; +$lang->story->report->storysPerStage->item = 'Stage'; +$lang->story->report->storysPerPri->item = 'Priority'; +$lang->story->report->storysPerOpenedBy->item = 'Account'; +$lang->story->report->storysPerAssignedTo->item = 'User'; +$lang->story->report->storysPerClosedReason->item = 'Reason'; +$lang->story->report->storysPerEstimate->item = 'Estimated Man-Hour'; +$lang->story->report->storysPerChange->item = 'Change'; + +$lang->story->report->storysPerProduct->graph = new stdclass(); +$lang->story->report->storysPerModule->graph = new stdclass(); +$lang->story->report->storysPerSource->graph = new stdclass(); +$lang->story->report->storysPerPlan->graph = new stdclass(); +$lang->story->report->storysPerStatus->graph = new stdclass(); +$lang->story->report->storysPerStage->graph = new stdclass(); +$lang->story->report->storysPerPri->graph = new stdclass(); +$lang->story->report->storysPerOpenedBy->graph = new stdclass(); +$lang->story->report->storysPerAssignedTo->graph = new stdclass(); +$lang->story->report->storysPerClosedReason->graph = new stdclass(); +$lang->story->report->storysPerEstimate->graph = new stdclass(); +$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->storysPerStatus->graph->xAxisName = 'Status'; +$lang->story->report->storysPerStage->graph->xAxisName = 'Stage'; +$lang->story->report->storysPerPri->graph->xAxisName = 'Priority'; +$lang->story->report->storysPerOpenedBy->graph->xAxisName = 'Created By'; +$lang->story->report->storysPerAssignedTo->graph->xAxisName = 'Assigned To'; +$lang->story->report->storysPerClosedReason->graph->xAxisName = 'Closed Reason'; +$lang->story->report->storysPerEstimate->graph->xAxisName = 'Estimated Time '; +$lang->story->report->storysPerChange->graph->xAxisName = 'Change'; + +$lang->story->placeholder = new stdclass(); +$lang->story->placeholder->estimate = $lang->story->hour; + +$lang->story->chosen = new stdClass(); +$lang->story->chosen->reviewedBy = 'Choose Reviewer'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 12da8a751b..899890cd16 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -90,8 +90,8 @@ $lang->task->editEstimate = 'Edit Man-Hour'; $lang->task->deleteEstimate = 'Delete Man-Hour'; $lang->task->colorTag = 'Color Tag'; $lang->task->files = 'Files'; -$lang->task->hasConsumed = 'Has Consumed'; -$lang->task->thisConsume = 'This Consumption'; +$lang->task->hasConsumed = 'Total Consumed'; +$lang->task->thisConsume = 'This Consumed'; $lang->task->ditto = 'Ditto'; $lang->task->dittoNotice = "This Task does not belong to the Project as the previous one does!"; diff --git a/module/task/lang/en.php.bak b/module/task/lang/en.php.bak new file mode 100644 index 0000000000..12da8a751b --- /dev/null +++ b/module/task/lang/en.php.bak @@ -0,0 +1,248 @@ + + * @package task + * @version $Id: en.php 5040 2013-07-06 06:22:18Z zhujinyonging@gmail.com $ + * @link http://www.zentao.net + */ +$lang->task->index = "Index"; +$lang->task->create = "Create"; +$lang->task->batchCreate = "Batch Create"; +$lang->task->batchEdit = "Batch Edit"; +$lang->task->batchChangeModule = "Batch Change Module"; +$lang->task->edit = "Update"; +$lang->task->delete = "Delete"; +$lang->task->deleted = "Deleted"; +$lang->task->view = "Info"; +$lang->task->logEfforts = "Man-Hour Log"; +$lang->task->record = "Estimate"; +$lang->task->start = "Start"; +$lang->task->restart = "Continue"; +$lang->task->finish = "Finish"; +$lang->task->pause = "Pause"; +$lang->task->close = "Close"; +$lang->task->batchClose = "Batch Close"; +$lang->task->cancel = "Cancel"; +$lang->task->activate = "Activate"; +$lang->task->export = "Export Data"; +$lang->task->reportChart = "Report Chart"; +$lang->task->fromBug = 'From Bug'; +$lang->task->case = 'Related Case'; +$lang->task->confirmStoryChange = "Confirm Story Change"; +$lang->task->progess = 'Progess'; + +$lang->task->common = 'Task'; +$lang->task->id = 'ID'; +$lang->task->project = $lang->projectCommon; +$lang->task->module = 'Module'; +$lang->task->moduleAB = 'Module'; +$lang->task->story = 'Story'; +$lang->task->storySpec = 'Description'; +$lang->task->storyVerify = 'Acceptance Criteria'; +$lang->task->name = 'Name'; +$lang->task->type = 'Type'; +$lang->task->pri = 'Priority'; +$lang->task->mailto = 'Mailto'; +$lang->task->estimate = 'Estimation'; +$lang->task->estimateAB = 'Estimated'; +$lang->task->left = 'Estimated Left'; +$lang->task->leftAB = 'Left'; +$lang->task->consumed = 'Total Consumed'; +$lang->task->consumedAB = 'Consume'; +$lang->task->hour = 'Hour'; +$lang->task->consumedThisTime = 'Man-Hour'; +$lang->task->leftThisTime = 'Left'; +$lang->task->datePlan = 'Schedule'; +$lang->task->estStarted = 'Estimated Start Time'; +$lang->task->realStarted = 'Actual Start Time'; +$lang->task->date = 'Date'; +$lang->task->deadline = 'Deadline'; +$lang->task->deadlineAB = 'Deadline'; +$lang->task->status = 'Status'; +$lang->task->desc = 'Description'; +$lang->task->assign = 'Assign'; +$lang->task->assignTo = $lang->task->assign; +$lang->task->batchAssignTo = 'Batch Assign'; +$lang->task->assignedTo = 'Assigned To'; +$lang->task->assignedToAB = 'Assigned To'; +$lang->task->assignedDate = 'Assigned Date'; +$lang->task->openedBy = 'Created By'; +$lang->task->openedDate = 'Created Date'; +$lang->task->openedDateAB = 'Add'; +$lang->task->finishedBy = 'Finished By'; +$lang->task->finishedByAB = 'Finish'; +$lang->task->finishedDate = 'Finish Date'; +$lang->task->finishedDateAB = 'Date'; +$lang->task->canceledBy = 'Cancelled By'; +$lang->task->canceledDate = 'Cancel Date'; +$lang->task->closedBy = 'Closed By'; +$lang->task->closedDate = 'Close Date'; +$lang->task->closedReason = 'Cancel Reason'; +$lang->task->lastEditedBy = 'Last Edited By'; +$lang->task->lastEditedDate = 'Last Edit Date'; +$lang->task->lastEdited = 'Last Edit'; +$lang->task->recordEstimate = 'Man-Hour'; +$lang->task->editEstimate = 'Edit Man-Hour'; +$lang->task->deleteEstimate = 'Delete Man-Hour'; +$lang->task->colorTag = 'Color Tag'; +$lang->task->files = 'Files'; +$lang->task->hasConsumed = 'Has Consumed'; +$lang->task->thisConsume = 'This Consumption'; + +$lang->task->ditto = 'Ditto'; +$lang->task->dittoNotice = "This Task does not belong to the Project as the previous one does!"; +$lang->task->selectAllUser = 'All'; +$lang->task->noStory = 'No Story'; +$lang->task->noAssigned = 'Unassigned'; +$lang->task->noFinished = 'Unfinished'; +$lang->task->noClosed = 'Unclosed'; + +$lang->task->statusList[''] = ''; +$lang->task->statusList['wait'] = 'Pending'; +$lang->task->statusList['doing'] = 'Ongoing'; +$lang->task->statusList['done'] = 'Done'; +$lang->task->statusList['pause'] = 'Paused'; +$lang->task->statusList['cancel'] = 'Cancelled'; +$lang->task->statusList['closed'] = 'Closed'; + +$lang->task->typeList[''] = ''; +$lang->task->typeList['design'] = 'Design'; +$lang->task->typeList['devel'] = 'Develop'; +$lang->task->typeList['test'] = 'Testing'; +$lang->task->typeList['study'] = 'Study'; +$lang->task->typeList['discuss'] = 'Discuss'; +$lang->task->typeList['ui'] = 'UI'; +$lang->task->typeList['affair'] = 'Work'; +$lang->task->typeList['misc'] = 'Misc'; + +$lang->task->priList[0] = ''; +$lang->task->priList[3] = '3'; +$lang->task->priList[1] = '1'; +$lang->task->priList[2] = '2'; +$lang->task->priList[4] = '4'; + +$lang->task->reasonList[''] = ''; +$lang->task->reasonList['done'] = 'Done'; +$lang->task->reasonList['cancel'] = 'Cancelled'; + +$lang->task->afterChoices['continueAdding'] = 'Continue adding Tasks'; +$lang->task->afterChoices['toTaskList'] = 'Back to Task List'; +$lang->task->afterChoices['toStoryList'] = 'Back to Story List'; + +$lang->task->legendBasic = 'Basic Info'; +$lang->task->legendEffort = 'Man-Hour'; +$lang->task->legendLife = 'Task Life'; +$lang->task->legendDesc = 'Task Desc'; + +$lang->task->confirmDelete = "Do you want to delete this Task?"; +$lang->task->confirmDeleteEstimate = "Do you want to delete it?"; +$lang->task->copyStoryTitle = "Same Story"; +$lang->task->afterSubmit = "After Created,"; +$lang->task->successSaved = "Created!"; +$lang->task->delayWarning = " Delay %s days "; +$lang->task->remindBug = "This Task is converted from a Bug. Do you want to update te Bug:%s?"; +$lang->task->confirmChangeProject = "If you change {$lang->projectCommon}, the related Module, Story and Assignor will be changed. Do you want to do it?"; +$lang->task->confirmFinish = '"Estimated reamin hour" is 0. Do you want to change the Status to "Done"?'; +$lang->task->confirmRecord = '"Remain hour" is 0. Do you want to set Task as "Done"?'; +$lang->task->noticeLinkStory = "No story to be linked, you can %s for this project, then %s"; +$lang->task->noticeSaveRecord = 'Your man-hour is not saved. Please save it first.'; +$lang->task->commentActions = '%s. %s, commented by %s.'; + +$lang->task->error = new stdclass(); +$lang->task->error->consumedNumber = '"Consumed" must be numbers.'; +$lang->task->error->estimateNumber = '"Estimated" must be numbers.'; +$lang->task->error->consumedSmall = '"Consumed" must larger than before.'; +$lang->task->error->consumedThisTime = 'Please enter "Man-Hour"'; +$lang->task->error->left = 'Please enter "Left"'; +$lang->task->error->work = '"Remark" must be less than 255 characteres.'; +$lang->task->error->skipClose = 'Task: %s is not“Done”or “Cancelled”. Confirm to close them?'; +$lang->task->error->consumed = 'Task: %s man-hour must be more than 0. Ignore changes to this Task.'; + +/* 统计报表。*/ +$lang->task->report = new stdclass(); +$lang->task->report->common = 'Report'; +$lang->task->report->select = 'Please select the type of the Task'; +$lang->task->report->create = 'Create'; +$lang->task->report->value = 'Task Count'; + +$lang->task->report->charts['tasksPerProject'] = $lang->projectCommon . ' Tasks'; +$lang->task->report->charts['tasksPerModule'] = 'Module Tasks'; +$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'] = 'Estimated Time'; +$lang->task->report->charts['tasksPerLeft'] = 'Time Left'; +$lang->task->report->charts['tasksPerConsumed'] = 'Time Consumed'; +$lang->task->report->charts['tasksPerFinishedBy'] = 'Finished By'; +$lang->task->report->charts['tasksPerClosedReason'] = 'Close Reason'; +$lang->task->report->charts['finishedTasksPerDay'] = 'Tasks Finished per Day'; + +$lang->task->report->options = new stdclass(); +$lang->task->report->options->graph = new stdclass(); +$lang->task->report->options->type = 'pie'; +$lang->task->report->options->width = 500; +$lang->task->report->options->height = 140; + +$lang->task->report->tasksPerProject = new stdclass(); +$lang->task->report->tasksPerModule = new stdclass(); +$lang->task->report->tasksPerAssignedTo = new stdclass(); +$lang->task->report->tasksPerType = new stdclass(); +$lang->task->report->tasksPerPri = new stdclass(); +$lang->task->report->tasksPerStatus = new stdclass(); +$lang->task->report->tasksPerDeadline = new stdclass(); +$lang->task->report->tasksPerEstimate = new stdclass(); +$lang->task->report->tasksPerLeft = new stdclass(); +$lang->task->report->tasksPerConsumed = new stdclass(); +$lang->task->report->tasksPerFinishedBy = new stdclass(); +$lang->task->report->tasksPerClosedReason = new stdclass(); +$lang->task->report->finishedTasksPerDay = new stdclass(); + +$lang->task->report->tasksPerProject->item = $lang->projectCommon; +$lang->task->report->tasksPerModule->item = 'Module'; +$lang->task->report->tasksPerAssignedTo->item = 'Account'; +$lang->task->report->tasksPerType->item = 'Type'; +$lang->task->report->tasksPerPri->item = 'Priority'; +$lang->task->report->tasksPerStatus->item = 'Status'; +$lang->task->report->tasksPerDeadline->item = 'Date'; +$lang->task->report->tasksPerEstimate->item = 'Est.'; +$lang->task->report->tasksPerLeft->item = 'Reamin'; +$lang->task->report->tasksPerConsumed->item = 'Consume'; +$lang->task->report->tasksPerFinishedBy->item = 'User'; +$lang->task->report->tasksPerClosedReason->item = 'Reason'; +$lang->task->report->finishedTasksPerDay->item = 'Date'; + +$lang->task->report->tasksPerProject->graph = new stdclass(); +$lang->task->report->tasksPerModule->graph = new stdclass(); +$lang->task->report->tasksPerAssignedTo->graph = new stdclass(); +$lang->task->report->tasksPerType->graph = new stdclass(); +$lang->task->report->tasksPerPri->graph = new stdclass(); +$lang->task->report->tasksPerStatus->graph = new stdclass(); +$lang->task->report->tasksPerDeadline->graph = new stdclass(); +$lang->task->report->tasksPerEstimate->graph = new stdclass(); +$lang->task->report->tasksPerLeft->graph = new stdclass(); +$lang->task->report->tasksPerConsumed->graph = new stdclass(); +$lang->task->report->tasksPerFinishedBy->graph = new stdclass(); +$lang->task->report->tasksPerClosedReason->graph = new stdclass(); +$lang->task->report->finishedTasksPerDay->graph = new stdclass(); + +$lang->task->report->tasksPerProject->graph->xAxisName = $lang->projectCommon; +$lang->task->report->tasksPerModule->graph->xAxisName = 'Module'; +$lang->task->report->tasksPerAssignedTo->graph->xAxisName = 'User'; +$lang->task->report->tasksPerType->graph->xAxisName = 'Type'; +$lang->task->report->tasksPerPri->graph->xAxisName = 'Priority'; +$lang->task->report->tasksPerStatus->graph->xAxisName = 'Status'; +$lang->task->report->tasksPerDeadline->graph->xAxisName = 'Date'; +$lang->task->report->tasksPerEstimate->graph->xAxisName = 'Time'; +$lang->task->report->tasksPerLeft->graph->xAxisName = 'Time'; +$lang->task->report->tasksPerConsumed->graph->xAxisName = 'Time'; +$lang->task->report->tasksPerFinishedBy->graph->xAxisName = 'User'; +$lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Close Reason'; + +$lang->task->report->finishedTasksPerDay->type = 'bar'; +$lang->task->report->finishedTasksPerDay->graph->xAxisName = 'Date'; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index ee5a912b15..14fdac7b65 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -20,8 +20,8 @@ $lang->testcase->pri = 'Priority'; $lang->testcase->type = 'Type'; $lang->testcase->status = 'Status'; $lang->testcase->steps = 'Steps'; -$lang->testcase->openedBy = 'Opened By'; -$lang->testcase->openedDate = 'Opened Date'; +$lang->testcase->openedBy = 'Open By'; +$lang->testcase->openedDate = 'Open on'; $lang->testcase->lastEditedBy = 'Last Edited by'; $lang->testcase->result = 'Result'; $lang->testcase->real = 'Real'; @@ -32,8 +32,8 @@ $lang->testcase->linkCases = 'Link Cases'; $lang->testcase->unlinkCase = 'Unlink Case'; $lang->testcase->stage = 'Stage'; $lang->testcase->lastEditedByAB = 'Last Edited By'; -$lang->testcase->lastEditedDateAB = 'Last Edited Date'; -$lang->testcase->lastEditedDate = 'Last Edited Date'; +$lang->testcase->lastEditedDateAB = 'Last Edited on'; +$lang->testcase->lastEditedDate = 'Last Edited on'; $lang->testcase->version = 'Case Version'; $lang->testcase->lastRunner = 'Last Run By'; $lang->testcase->lastRunDate = 'Run Date'; @@ -62,8 +62,8 @@ $lang->testcase->batchEdit = "Batch Edit "; $lang->testcase->batchChangeModule = "Batch Change Module"; $lang->testcase->delete = "Delete"; $lang->testcase->batchDelete = "Batch Delete "; -$lang->testcase->browse = "Case List"; -$lang->testcase->groupCase = "Group View"; +$lang->testcase->browse = "Cases"; +$lang->testcase->groupCase = "View By"; $lang->testcase->import = "Import"; $lang->testcase->showImport = "Show Import"; $lang->testcase->exportTemplet = "Export Template"; @@ -74,7 +74,7 @@ $lang->testcase->copy = 'Duplicate Case'; $lang->testcase->new = 'New'; -$lang->testcase->num = 'Case Count:'; +$lang->testcase->num = 'Cases:'; $lang->testcase->deleteStep = 'Delete'; $lang->testcase->insertBefore = 'Inserted Before'; diff --git a/module/testcase/lang/en.php.bak b/module/testcase/lang/en.php.bak new file mode 100644 index 0000000000..ee5a912b15 --- /dev/null +++ b/module/testcase/lang/en.php.bak @@ -0,0 +1,154 @@ + + * @package testcase + * @version $Id: en.php 4966 2013-07-02 02:59:25Z wyd621@gmail.com $ + * @link http://www.zentao.net + */ +$lang->testcase->id = 'ID'; +$lang->testcase->product = $lang->productCommon; +$lang->testcase->module = 'Module'; +$lang->testcase->moduleAB = 'Module'; +$lang->testcase->story = 'Story'; +$lang->testcase->title = 'Title'; +$lang->testcase->precondition = 'Prerequisite'; +$lang->testcase->pri = 'Priority'; +$lang->testcase->type = 'Type'; +$lang->testcase->status = 'Status'; +$lang->testcase->steps = 'Steps'; +$lang->testcase->openedBy = 'Opened By'; +$lang->testcase->openedDate = 'Opened Date'; +$lang->testcase->lastEditedBy = 'Last Edited by'; +$lang->testcase->result = 'Result'; +$lang->testcase->real = 'Real'; +$lang->testcase->keywords = 'Keywords'; +$lang->testcase->files = 'Files'; +$lang->testcase->linkCase = 'Linked Cases'; +$lang->testcase->linkCases = 'Link Cases'; +$lang->testcase->unlinkCase = 'Unlink Case'; +$lang->testcase->stage = 'Stage'; +$lang->testcase->lastEditedByAB = 'Last Edited By'; +$lang->testcase->lastEditedDateAB = 'Last Edited Date'; +$lang->testcase->lastEditedDate = 'Last Edited Date'; +$lang->testcase->version = 'Case Version'; +$lang->testcase->lastRunner = 'Last Run By'; +$lang->testcase->lastRunDate = 'Run Date'; +$lang->testcase->assignedTo = 'Assigned To'; +$lang->testcase->colorTag = 'Color Tag'; +$lang->testcase->lastRunResult = 'Result'; +$lang->testcase->allProduct = "All {$lang->productCommon}"; +$lang->testcase->fromBug = 'From Bug'; +$lang->testcase->toBug = 'To Bug'; +$lang->testcase->changed = 'Changed'; +$lang->testcase->createBug = 'Transfer Bug'; +$lang->case = $lang->testcase; // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case. + +$lang->testcase->stepID = 'ID'; +$lang->testcase->stepDesc = 'Step'; +$lang->testcase->stepExpect = 'Expect'; + +$lang->testcase->common = 'Case'; +$lang->testcase->index = "Index"; +$lang->testcase->create = "Create Case"; +$lang->testcase->batchCreate = "Batch Create"; +$lang->testcase->delete = "Delete"; +$lang->testcase->view = "Info"; +$lang->testcase->edit = "Edit"; +$lang->testcase->batchEdit = "Batch Edit "; +$lang->testcase->batchChangeModule = "Batch Change Module"; +$lang->testcase->delete = "Delete"; +$lang->testcase->batchDelete = "Batch Delete "; +$lang->testcase->browse = "Case List"; +$lang->testcase->groupCase = "Group View"; +$lang->testcase->import = "Import"; +$lang->testcase->showImport = "Show Import"; +$lang->testcase->exportTemplet = "Export Template"; +$lang->testcase->export = "Export Data"; +$lang->testcase->confirmChange = 'Confirm Case Change'; +$lang->testcase->confirmStoryChange = 'Confirm Story Change'; +$lang->testcase->copy = 'Duplicate Case'; + +$lang->testcase->new = 'New'; + +$lang->testcase->num = 'Case Count:'; + +$lang->testcase->deleteStep = 'Delete'; +$lang->testcase->insertBefore = 'Inserted Before'; +$lang->testcase->insertAfter = 'Inserted After'; + +$lang->testcase->assignToMe = 'Assigned to Me'; +$lang->testcase->openedByMe = 'Created by Me'; +$lang->testcase->allCases = 'All'; +$lang->testcase->needConfirm = 'Story Change'; +$lang->testcase->bySearch = 'Search'; + +$lang->testcase->lblStory = 'Story'; +$lang->testcase->lblLastEdited = 'Last Edit'; +$lang->testcase->lblTypeValue = 'Type List'; +$lang->testcase->lblStageValue = 'Stage List'; +$lang->testcase->lblStatusValue = 'Status List'; + +$lang->testcase->legendBasicInfo = 'Basic Info'; +$lang->testcase->legendAttatch = 'File'; +$lang->testcase->legendLinkBugs = 'Bug'; +$lang->testcase->legendOpenAndEdit = 'Create/Edit'; +$lang->testcase->legendComment = 'Remark'; + +$lang->testcase->confirmDelete = 'Do you want to delete this Test Case?'; +$lang->testcase->confirmBatchDelete = 'Do you want to batch delete thess Test Cases?'; +$lang->testcase->ditto = 'Ditto'; +$lang->testcase->dittoNotice = 'This Case does not belong to the Product as the previous one!'; + +$lang->testcase->priList[3] = 3; +$lang->testcase->priList[1] = 1; +$lang->testcase->priList[2] = 2; +$lang->testcase->priList[4] = 4; + +/* Define the types. */ +$lang->testcase->typeList[''] = ''; +$lang->testcase->typeList['feature'] = 'Feature'; +$lang->testcase->typeList['performance'] = 'Performance'; +$lang->testcase->typeList['config'] = 'Config'; +$lang->testcase->typeList['install'] = 'Install'; +$lang->testcase->typeList['security'] = 'Security'; +$lang->testcase->typeList['interface'] = 'Interface'; +$lang->testcase->typeList['other'] = 'Other'; + +$lang->testcase->stageList[''] = ''; +$lang->testcase->stageList['unittest'] = 'Unit Testing'; +$lang->testcase->stageList['feature'] = 'Feature Testing'; +$lang->testcase->stageList['intergrate'] = 'Integration Testing'; +$lang->testcase->stageList['system'] = 'System Testing'; +$lang->testcase->stageList['smoke'] = 'Smoking Testing'; +$lang->testcase->stageList['bvt'] = 'BVT Testing'; + +$lang->testcase->groups[''] = 'Group '; +$lang->testcase->groups['story'] = 'Story Group'; + +$lang->testcase->statusList[''] = ''; +$lang->testcase->statusList['normal'] = 'Normal'; +$lang->testcase->statusList['blocked'] = 'Blocked'; +$lang->testcase->statusList['investigate'] = 'Investigating'; + +$lang->testcase->resultList['n/a'] = 'N/A'; +$lang->testcase->resultList['pass'] = 'Pass'; +$lang->testcase->resultList['fail'] = 'Fail'; +$lang->testcase->resultList['blocked'] = 'Blocked'; + +$lang->testcase->buttonToList = 'Back'; + +$lang->testcase->errorEncode = 'No Data. Please select right encoding and upload again!'; +$lang->testcase->noFunction = 'Iconv and mb_convert_encoding is not found. You cannot convert the data into the desired one!'; +$lang->testcase->noRequire = "Row %s has“%s”which is a required field and it should not be blank."; + +$lang->testcase->searchStories = 'Enter to searcu Story'; + +$lang->testcase->featureBar['browse']['all'] = $lang->testcase->allCases; +$lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm; +$lang->testcase->featureBar['browse']['group'] = ''; +$lang->testcase->featureBar['browse']['zerocase'] = ''; +$lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse']; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index a8080c6a8e..0558d5b02c 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -14,7 +14,7 @@ $lang->testtask->create = "Create"; $lang->testtask->delete = "Delete"; $lang->testtask->view = "Info"; $lang->testtask->edit = "Edit"; -$lang->testtask->browse = "Browse"; +$lang->testtask->browse = "Test Tasks"; $lang->testtask->linkCase = "Link Case"; $lang->testtask->unlinkCase = "Unlink Case"; $lang->testtask->batchAssign = "Batch Assign"; @@ -24,7 +24,7 @@ $lang->testtask->results = "Result"; $lang->testtask->createBug = "Bug(+)"; $lang->testtask->assign = 'Assign'; $lang->testtask->cases = 'Cases'; -$lang->testtask->groupCase = "View by Group"; +$lang->testtask->groupCase = "View By"; $lang->testtask->pre = 'Previous'; $lang->testtask->next = 'Next'; $lang->testtask->start = "Start"; @@ -39,9 +39,9 @@ $lang->testtask->build = 'Build'; $lang->testtask->owner = 'Owner'; $lang->testtask->pri = 'Priority'; $lang->testtask->name = 'Name'; -$lang->testtask->begin = 'Begin Date'; -$lang->testtask->end = 'End Date'; -$lang->testtask->desc = 'Desc'; +$lang->testtask->begin = 'Begin'; +$lang->testtask->end = 'End'; +$lang->testtask->desc = 'Description'; $lang->testtask->mailto = 'Mailto'; $lang->testtask->status = 'Status'; $lang->testtask->assignedTo = 'Assign'; @@ -50,14 +50,14 @@ $lang->testtask->lastRunAccount = "Run"; $lang->testtask->lastRunTime = 'Time'; $lang->testtask->lastRunResult = 'Result'; $lang->testtask->report = 'Report'; -$lang->testtask->files = 'Upload Files'; +$lang->testtask->files = 'Upload'; $lang->testtask->legendDesc = 'Desc'; $lang->testtask->legendReport = 'Report'; $lang->testtask->legendBasicInfo = 'Basic Info'; -$lang->testtask->statusList['wait'] = 'Pending'; -$lang->testtask->statusList['doing'] = 'Ongoing'; +$lang->testtask->statusList['wait'] = 'Wait'; +$lang->testtask->statusList['doing'] = 'Doing'; $lang->testtask->statusList['done'] = 'Done'; $lang->testtask->statusList['blocked'] = 'Blocked'; @@ -82,14 +82,14 @@ $lang->testtask->confirmUnlinkCase = 'Do you want to remove this Case?'; $lang->testtask->assignedToMe = 'Assigned to Me'; $lang->testtask->allCases = 'All Cases'; -$lang->testtask->lblCases = 'Case List'; +$lang->testtask->lblCases = 'Cases'; $lang->testtask->lblUnlinkCase = 'Remove Case'; $lang->testtask->lblRunCase = 'Run Case'; -$lang->testtask->lblResults = 'Result'; +$lang->testtask->lblResults = 'Results'; $lang->testtask->placeholder = new stdclass(); -$lang->testtask->placeholder->begin = 'Begin Date'; -$lang->testtask->placeholder->end = 'End Date'; +$lang->testtask->placeholder->begin = 'Begin'; +$lang->testtask->placeholder->end = 'End'; $lang->testtask->mail = new stdclass(); $lang->testtask->mail->create = new stdclass(); diff --git a/module/testtask/lang/en.php.bak b/module/testtask/lang/en.php.bak new file mode 100644 index 0000000000..a8080c6a8e --- /dev/null +++ b/module/testtask/lang/en.php.bak @@ -0,0 +1,105 @@ + + * @package testtask + * @version $Id: en.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ + * @link http://www.zentao.net + */ +$lang->testtask->index = "Index"; +$lang->testtask->create = "Create"; +$lang->testtask->delete = "Delete"; +$lang->testtask->view = "Info"; +$lang->testtask->edit = "Edit"; +$lang->testtask->browse = "Browse"; +$lang->testtask->linkCase = "Link Case"; +$lang->testtask->unlinkCase = "Unlink Case"; +$lang->testtask->batchAssign = "Batch Assign"; +$lang->testtask->runCase = "Run"; +$lang->testtask->batchRun = "Batch Run"; +$lang->testtask->results = "Result"; +$lang->testtask->createBug = "Bug(+)"; +$lang->testtask->assign = 'Assign'; +$lang->testtask->cases = 'Cases'; +$lang->testtask->groupCase = "View by Group"; +$lang->testtask->pre = 'Previous'; +$lang->testtask->next = 'Next'; +$lang->testtask->start = "Start"; +$lang->testtask->close = "Close"; +$lang->testtask->wait = "Build to be Tested"; +$lang->testtask->done = "Tested Build"; + +$lang->testtask->common = 'Test build'; +$lang->testtask->product = $lang->productCommon; +$lang->testtask->project = $lang->projectCommon; +$lang->testtask->build = 'Build'; +$lang->testtask->owner = 'Owner'; +$lang->testtask->pri = 'Priority'; +$lang->testtask->name = 'Name'; +$lang->testtask->begin = 'Begin Date'; +$lang->testtask->end = 'End Date'; +$lang->testtask->desc = 'Desc'; +$lang->testtask->mailto = 'Mailto'; +$lang->testtask->status = 'Status'; +$lang->testtask->assignedTo = 'Assign'; +$lang->testtask->linkVersion = 'Version'; +$lang->testtask->lastRunAccount = "Run"; +$lang->testtask->lastRunTime = 'Time'; +$lang->testtask->lastRunResult = 'Result'; +$lang->testtask->report = 'Report'; +$lang->testtask->files = 'Upload Files'; + +$lang->testtask->legendDesc = 'Desc'; +$lang->testtask->legendReport = 'Report'; +$lang->testtask->legendBasicInfo = 'Basic Info'; + +$lang->testtask->statusList['wait'] = 'Pending'; +$lang->testtask->statusList['doing'] = 'Ongoing'; +$lang->testtask->statusList['done'] = 'Done'; +$lang->testtask->statusList['blocked'] = 'Blocked'; + +$lang->testtask->priList[0] = ''; +$lang->testtask->priList[3] = '3'; +$lang->testtask->priList[1] = '1'; +$lang->testtask->priList[2] = '2'; +$lang->testtask->priList[4] = '4'; + +$lang->testtask->unlinkedCases = 'Unlinked'; +$lang->testtask->linkByStory = 'Link by Story'; +$lang->testtask->linkByBug = 'Link by Bug'; +$lang->testtask->passAll = 'All Pass'; +$lang->testtask->pass = 'Pass'; +$lang->testtask->fail = 'Failed'; +$lang->testtask->showResult = 'Executed %s times'; +$lang->testtask->showFail = 'Failed %s times'; + +$lang->testtask->confirmDelete = 'Do you want to delete this test build?'; +$lang->testtask->confirmUnlinkCase = 'Do you want to remove this Case?'; + +$lang->testtask->assignedToMe = 'Assigned to Me'; +$lang->testtask->allCases = 'All Cases'; + +$lang->testtask->lblCases = 'Case List'; +$lang->testtask->lblUnlinkCase = 'Remove Case'; +$lang->testtask->lblRunCase = 'Run Case'; +$lang->testtask->lblResults = 'Result'; + +$lang->testtask->placeholder = new stdclass(); +$lang->testtask->placeholder->begin = 'Begin Date'; +$lang->testtask->placeholder->end = 'End Date'; + +$lang->testtask->mail = new stdclass(); +$lang->testtask->mail->create = new stdclass(); +$lang->testtask->mail->edit = new stdclass(); +$lang->testtask->mail->close = new stdclass(); +$lang->testtask->mail->create->title = "%s created test task #%s:%s"; +$lang->testtask->mail->edit->title = "%s finished test task #%s:%s"; +$lang->testtask->mail->close->title = "%s closed test task #%s:%s"; + +$lang->testtask->action = new stdclass(); +$lang->testtask->action->testtaskopened = '$date, $actor opened test task $extra.' . "\n"; +$lang->testtask->action->testtaskstarted = '$date, $actor started test task $extra.' . "\n"; +$lang->testtask->action->testtaskclosed = '$date, $actor finished test task$extra.' . "\n"; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index aefa610724..6d9546aa15 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -39,8 +39,8 @@ $lang->todo->private = 'Private'; $lang->todo->confirmBug = 'This To-Do is linked to Bug #%s. Do you want to edit it?'; $lang->todo->confirmTask = 'This To-Do is linked to Task #%s，Do you want to edit it?'; -$lang->todo->statusList['wait'] = 'Pending'; -$lang->todo->statusList['doing'] = 'Ongoing'; +$lang->todo->statusList['wait'] = 'Wait'; +$lang->todo->statusList['doing'] = 'Doing'; $lang->todo->statusList['done'] = 'Done'; //$lang->todo->statusList['cancel'] = 'Cancelled'; //$lang->todo->statusList['postpone'] = 'Delayed'; diff --git a/module/todo/lang/en.php.bak b/module/todo/lang/en.php.bak new file mode 100644 index 0000000000..aefa610724 --- /dev/null +++ b/module/todo/lang/en.php.bak @@ -0,0 +1,75 @@ + + * @package todo + * @version $Id: en.php 4676 2013-04-26 06:08:23Z chencongzhi520@gmail.com $ + * @link http://www.zentao.net + */ +$lang->todo->common = 'To-Dos'; +$lang->todo->index = "Home"; +$lang->todo->create = "Create"; +$lang->todo->batchCreate = "Batch Create"; +$lang->todo->edit = "Edit"; +$lang->todo->batchEdit = "Batch Edit"; +$lang->todo->view = "Info"; +$lang->todo->finish = "Finish"; +$lang->todo->batchFinish = "Batch Finish"; +$lang->todo->export = "Export"; +$lang->todo->delete = "Delete"; +$lang->todo->import2Today = "Import to Today"; +$lang->todo->import = "Import"; +$lang->todo->legendBasic = "Basic Info"; + +$lang->todo->account = 'Owner'; +$lang->todo->date = 'Date'; +$lang->todo->beginAB = 'Begin'; +$lang->todo->endAB = 'End'; +$lang->todo->beginAndEnd = 'Time Frame'; +$lang->todo->type = 'Type'; +$lang->todo->pri = 'Priority'; +$lang->todo->name = 'Name'; +$lang->todo->status = 'Status'; +$lang->todo->desc = 'Description'; +$lang->todo->private = 'Private'; + +$lang->todo->confirmBug = 'This To-Do is linked to Bug #%s. Do you want to edit it?'; +$lang->todo->confirmTask = 'This To-Do is linked to Task #%s，Do you want to edit it?'; + +$lang->todo->statusList['wait'] = 'Pending'; +$lang->todo->statusList['doing'] = 'Ongoing'; +$lang->todo->statusList['done'] = 'Done'; +//$lang->todo->statusList['cancel'] = 'Cancelled'; +//$lang->todo->statusList['postpone'] = 'Delayed'; + +$lang->todo->priList[3] = '3'; +$lang->todo->priList[1] = '1'; +$lang->todo->priList[2] = '2'; +$lang->todo->priList[4] = '4'; + +$lang->todo->typeList['custom'] = 'Custom'; +$lang->todo->typeList['bug'] = 'Bug'; +$lang->todo->typeList['task'] = $lang->projectCommon . 'Task'; + +$lang->todo->confirmDelete = "Are you sure to delete this todo?"; +$lang->todo->thisIsPrivate = 'This is a private todo。:)'; +$lang->todo->lblDisableDate = 'Set time lately'; + +$lang->todo->periods['today'] = 'Today'; +$lang->todo->periods['yesterday'] = 'Yesterday'; +$lang->todo->periods['thisWeek'] = 'This Week'; +$lang->todo->periods['lastWeek'] = 'Last Week'; +$lang->todo->periods['thisMonth'] = 'This Month'; +$lang->todo->periods['lastmonth'] = 'Last Month'; +$lang->todo->periods['thisSeason'] = 'This Season'; +$lang->todo->periods['thisYear'] = 'This Year'; +$lang->todo->periods['future'] = 'Future'; +$lang->todo->periods['before'] = 'Undone'; +$lang->todo->periods['all'] = 'All'; + +$lang->todo->action = new stdclass(); +$lang->todo->action->finished = array('main' => '$date, is finished by $actor.'); +$lang->todo->action->marked = array('main' => '$date, is marked by $actor as $extra.', 'extra' => 'statusList'); diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index c404dd1d86..91509f6f12 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -30,10 +30,10 @@ $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 = "Sort"; +$lang->tree->sort = "Ranking"; $lang->tree->addChild = "Add Child Module"; -$lang->tree->confirmDelete = 'Do you want to delete this Module and its 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?"; $lang->tree->successSave = 'Saved.'; $lang->tree->successFixed = 'Fixed.'; diff --git a/module/tree/lang/en.php.bak b/module/tree/lang/en.php.bak new file mode 100644 index 0000000000..c404dd1d86 --- /dev/null +++ b/module/tree/lang/en.php.bak @@ -0,0 +1,50 @@ + + * @package tree + * @version $Id: en.php 5045 2013-07-06 07:04:40Z zhujinyonging@gmail.com $ + * @link http://www.zentao.net + */ +$lang->tree = new stdclass(); +$lang->tree->common = 'Module'; +$lang->tree->edit = 'Edit'; +$lang->tree->delete = 'Delete'; +$lang->tree->browse = 'General Module'; +$lang->tree->browseTask = 'Task Module'; +$lang->tree->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->updateOrder = 'Update Order'; +$lang->tree->manageChild = 'Manage Child Module'; +$lang->tree->manageStoryChild = 'Manage Child Story'; +$lang->tree->manageBugChild = 'Manage Child Bug'; +$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 = "Sort"; +$lang->tree->addChild = "Add Child Module"; + +$lang->tree->confirmDelete = 'Do you want to delete this Module and its Child?'; +$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?"; +$lang->tree->successSave = 'Saved.'; +$lang->tree->successFixed = 'Fixed.'; +$lang->tree->repeatName = 'The name "%s" has existed!'; + +$lang->tree->name = 'Name'; +$lang->tree->parent = 'Parent'; +$lang->tree->child = 'Child'; +$lang->tree->owner = 'Owner'; +$lang->tree->order = 'Order'; +$lang->tree->short = 'Short'; +$lang->tree->all = 'All Modules'; +$lang->tree->projectDoc = "{$lang->projectCommon} Doc"; +$lang->tree->product = $lang->productCommon; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index d6de5e2b37..c111cd81f0 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -43,7 +43,7 @@ $lang->upgrade->toVersion = 'Upgrade to Version'; $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 = 'Need to update the attachment information.'; +$lang->upgrade->updateFile = 'Attachment information has to be updated.'; $lang->upgrade->fromVersions['0_3beta'] = '0.3 BETA'; $lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA'; diff --git a/module/upgrade/lang/en.php.bak b/module/upgrade/lang/en.php.bak new file mode 100644 index 0000000000..d6de5e2b37 --- /dev/null +++ b/module/upgrade/lang/en.php.bak @@ -0,0 +1,113 @@ + + * @package upgrade + * @version $Id: en.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $ + * @link http://www.zentao.net + */ +$lang->upgrade->common = 'Upgrade'; +$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->warnning= 'Warning!'; +$lang->upgrade->checkExtension = 'Check Extension'; +$lang->upgrade->warnningContent = <<Please backup your database before upgrading ZenTao!

+
+1. Use phpMyAdmin to backup.
+2. Use mysqlCommand to backup.
+   $> mysqldump -u username -p dbname > filename 
+   Change the red text into corresponding Username and Database name.
+   e.g. mysqldump -u root -p zentao >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

+
    +
  • %s
    • +
  • Or delete "%s" and create ok.txt and leave it blank.
    • +
+

I have read and done as instructed above. Continue update.

'; +$lang->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->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 = 'Need to update the attachment information.'; + +$lang->upgrade->fromVersions['0_3beta'] = '0.3 BETA'; +$lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA'; +$lang->upgrade->fromVersions['0_5beta'] = '0.5 BETA'; +$lang->upgrade->fromVersions['0_6beta'] = '0.6 BETA'; +$lang->upgrade->fromVersions['1_0beta'] = '1.0 BETA'; +$lang->upgrade->fromVersions['1_0rc1'] = '1.0 RC1'; +$lang->upgrade->fromVersions['1_0rc2'] = '1.0 RC2'; +$lang->upgrade->fromVersions['1_0'] = '1.0 STABLE'; +$lang->upgrade->fromVersions['1_0_1'] = '1.0.1'; +$lang->upgrade->fromVersions['1_1'] = '1.1'; +$lang->upgrade->fromVersions['1_2'] = '1.2'; +$lang->upgrade->fromVersions['1_3'] = '1.3'; +$lang->upgrade->fromVersions['1_4'] = '1.4'; +$lang->upgrade->fromVersions['1_5'] = '1.5'; +$lang->upgrade->fromVersions['2_0'] = '2.0'; +$lang->upgrade->fromVersions['2_1'] = '2.1'; +$lang->upgrade->fromVersions['2_2'] = '2.2'; +$lang->upgrade->fromVersions['2_3'] = '2.3'; +$lang->upgrade->fromVersions['2_4'] = '2.4'; +$lang->upgrade->fromVersions['3_0_beta1'] = '3.0 BETA1'; +$lang->upgrade->fromVersions['3_0_beta2'] = '3.0 BETA2'; +$lang->upgrade->fromVersions['3_0'] = '3.0 STABLE'; +$lang->upgrade->fromVersions['3_1'] = '3.1'; +$lang->upgrade->fromVersions['3_2'] = '3.2'; +$lang->upgrade->fromVersions['3_2_1'] = '3.2.1'; +$lang->upgrade->fromVersions['3_3'] = '3.3'; +$lang->upgrade->fromVersions['4_0_beta1'] = '4.0 BETA1'; +$lang->upgrade->fromVersions['4_0_beta2'] = '4.0 BETA2'; +$lang->upgrade->fromVersions['4_0'] = '4.0'; +$lang->upgrade->fromVersions['4_0_1'] = '4.0.1'; +$lang->upgrade->fromVersions['4_1'] = '4.1'; +$lang->upgrade->fromVersions['4_2_beta'] = '4.2.beta'; +$lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; +$lang->upgrade->fromVersions['5_0_beta1'] = '5.0.beta1'; +$lang->upgrade->fromVersions['5_0_beta2'] = '5.0.beta2'; +$lang->upgrade->fromVersions['5_0'] = '5.0'; +$lang->upgrade->fromVersions['5_1'] = '5.1'; +$lang->upgrade->fromVersions['5_2'] = '5.2'; +$lang->upgrade->fromVersions['5_2_1'] = '5.2.1'; +$lang->upgrade->fromVersions['5_3'] = '5.3'; +$lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1'; +$lang->upgrade->fromVersions['6_0'] = '6.0'; +$lang->upgrade->fromVersions['6_1'] = '6.1'; +$lang->upgrade->fromVersions['6_2'] = '6.2'; +$lang->upgrade->fromVersions['6_3'] = '6.3'; +$lang->upgrade->fromVersions['6_4'] = '6.4'; +$lang->upgrade->fromVersions['7_0'] = '7.0'; +$lang->upgrade->fromVersions['7_1'] = '7.1'; +$lang->upgrade->fromVersions['7_2'] = '7.2'; +$lang->upgrade->fromVersions['7_2_4'] = '7.2.4'; +$lang->upgrade->fromVersions['7_2_5'] = '7.2.5'; +$lang->upgrade->fromVersions['7_3'] = '7.3'; +$lang->upgrade->fromVersions['7_4_beta'] = '7.4.beta'; +$lang->upgrade->fromVersions['8_0'] = '8.0'; +$lang->upgrade->fromVersions['8_0_1'] = '8.0.1'; +$lang->upgrade->fromVersions['8_1'] = '8.1'; +$lang->upgrade->fromVersions['8_1_3'] = '8.1.3'; +$lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta'; +$lang->upgrade->fromVersions['8_2'] = '8.2'; +$lang->upgrade->fromVersions['8_2_1'] = '8.2.1'; +$lang->upgrade->fromVersions['8_2_2'] = '8.2.2'; +$lang->upgrade->fromVersions['8_2_3'] = '8.2.3'; +$lang->upgrade->fromVersions['8_2_4'] = '8.2.4'; +$lang->upgrade->fromVersions['8_2_5'] = '8.2.5'; +$lang->upgrade->fromVersions['8_2_6'] = '8.2.6'; +$lang->upgrade->fromVersions['8_3'] = '8.3'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index ddbf64e33a..30e1e528d2 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -18,9 +18,9 @@ $lang->user->password = 'Password'; $lang->user->password2 = 'Repeat password'; $lang->user->role = 'Role'; $lang->user->group = 'Group'; -$lang->user->realname = 'Real Name'; +$lang->user->realname = 'Name'; $lang->user->nickname = 'Nickname'; -$lang->user->commiter = 'Commit Account'; +$lang->user->commiter = 'Commiter'; $lang->user->birthyear = 'Birth Year'; $lang->user->gender = 'Gender'; $lang->user->email = 'Email'; @@ -89,7 +89,7 @@ $lang->user->canceledBy = 'Cancelled by him'; $lang->user->testTask2Him = 'His Build'; $lang->user->case2Him = 'His Case'; -$lang->user->caseByHim = 'Case Opened by Him'; +$lang->user->caseByHim = 'Case Open by Him'; $lang->user->errorDeny = "Sorry, your access to %s Module %s Feature has been denied. Please contact Admin to get permission. Click Back to return."; $lang->user->loginFailed = "Login failed. Please check your account and password."; @@ -147,8 +147,8 @@ $lang->user->contacts = new stdclass(); $lang->user->contacts->common = 'Contact'; $lang->user->contacts->listName = 'List Name'; -$lang->user->contacts->manage = 'Manage List'; -$lang->user->contacts->contactsList = 'List'; +$lang->user->contacts->manage = 'Manage'; +$lang->user->contacts->contactsList = 'Contacts'; $lang->user->contacts->selectedUsers = 'Select User'; $lang->user->contacts->selectList = 'Select List'; $lang->user->contacts->createList = 'Create a List'; diff --git a/module/user/lang/en.php.bak b/module/user/lang/en.php.bak new file mode 100644 index 0000000000..ddbf64e33a --- /dev/null +++ b/module/user/lang/en.php.bak @@ -0,0 +1,167 @@ + + * @package user + * @version $Id: en.php 5053 2013-07-06 08:17:37Z wyd621@gmail.com $ + * @link http://www.zentao.net + */ +$lang->user->common = 'User'; +$lang->user->id = 'ID'; +$lang->user->company = 'Company'; +$lang->user->dept = 'Department'; +$lang->user->account = 'Account'; +$lang->user->password = 'Password'; +$lang->user->password2 = 'Repeat password'; +$lang->user->role = 'Role'; +$lang->user->group = 'Group'; +$lang->user->realname = 'Real Name'; +$lang->user->nickname = 'Nickname'; +$lang->user->commiter = 'Commit Account'; +$lang->user->birthyear = 'Birth Year'; +$lang->user->gender = 'Gender'; +$lang->user->email = 'Email'; +$lang->user->basicInfo = 'Basic Info'; +$lang->user->accountInfo = 'Account'; +$lang->user->verify = 'Acceptance'; +$lang->user->contactInfo = 'Contact'; +$lang->user->skype = 'Skype'; +$lang->user->qq = 'QQ'; +$lang->user->yahoo = 'Yahoo!'; +$lang->user->gtalk = 'GTalk'; +$lang->user->wangwang = '旺旺'; +$lang->user->mobile = 'Mobile'; +$lang->user->phone = 'Phone'; +$lang->user->address = 'Address'; +$lang->user->zipcode = 'Zip Code'; +$lang->user->join = 'Join Date'; +$lang->user->visits = 'Visit Count'; +$lang->user->ip = 'Last IP'; +$lang->user->last = 'Last Login'; +$lang->user->ranzhi = 'Ranger account'; +$lang->user->ditto = 'Ditto'; +$lang->user->originalPassword = 'Old Password'; +$lang->user->verifyPassword = 'Please enter your password'; +$lang->user->resetPassword = 'Forgot Password?'; + +$lang->user->index = "Home"; +$lang->user->view = "Info"; +$lang->user->create = "Add"; +$lang->user->batchCreate = "Batch Add User"; +$lang->user->edit = "Edit"; +$lang->user->batchEdit = "Batch Edit"; +$lang->user->unlock = "Unlock"; +$lang->user->delete = "Delete"; +$lang->user->unbind = "Unbind Ranger"; +$lang->user->login = "Login"; +$lang->user->mobileLogin = "Mobile"; +$lang->user->editProfile = "Edit Profile"; +$lang->user->deny = "Access 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 Ranger?"; +$lang->user->relogin = "Login Again"; +$lang->user->asGuest = "Guest"; +$lang->user->goback = "Back"; +$lang->user->deleted = '(Deleted)'; + +$lang->user->profile = 'Profile'; +$lang->user->project = $lang->projectCommon; +$lang->user->task = 'Task'; +$lang->user->bug = 'Bug'; +$lang->user->test = 'Testing'; +$lang->user->testTask = 'Test Task'; +$lang->user->testCase = 'Test Case'; +$lang->user->todo = 'To-Do'; +$lang->user->story = 'Story'; +$lang->user->dynamic = 'Dynamic'; + +$lang->user->openedBy = 'Opened by him'; +$lang->user->assignedTo = 'Assigned to him'; +$lang->user->finishedBy = 'Finished by him'; +$lang->user->resolvedBy = 'Resolved by him'; +$lang->user->closedBy = 'Closed by him'; +$lang->user->reviewedBy = 'Reviewed by him'; +$lang->user->canceledBy = 'Cancelled by him'; + +$lang->user->testTask2Him = 'His Build'; +$lang->user->case2Him = 'His Case'; +$lang->user->caseByHim = 'Case Opened by Him'; + +$lang->user->errorDeny = "Sorry, your access to %s Module %s Feature has been denied. Please contact Admin to get permission. 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 meet the setting requirements."; + +$lang->user->roleList[''] = ''; +$lang->user->roleList['dev'] = 'Developer'; +$lang->user->roleList['qa'] = 'Tester'; +$lang->user->roleList['pm'] = 'Project Manager'; +$lang->user->roleList['po'] = 'Product Owner'; +$lang->user->roleList['td'] = 'Technical Supervisor'; +$lang->user->roleList['pd'] = 'Product Supervisor'; +$lang->user->roleList['qd'] = 'QA Supervisor'; +$lang->user->roleList['top'] = 'Senior Manager'; +$lang->user->roleList['others'] = 'Other'; + +$lang->user->genderList['m'] = 'Male'; +$lang->user->genderList['f'] = 'Female'; + +$lang->user->passwordStrengthList[0] = "Weak"; +$lang->user->passwordStrengthList[1] = "Good"; +$lang->user->passwordStrengthList[2] = "Strong"; + +$lang->user->statusList['active'] = 'Activate'; +$lang->user->statusList['delete'] = 'Deleted'; + +$lang->user->keepLogin['on'] = 'Keep login'; +$lang->user->loginWithDemoUser = 'Login as Demo User:'; + +$lang->user->placeholder = new stdclass(); +$lang->user->placeholder->account = 'must be contain letters, underline, and numbers,at lease three characters'; +$lang->user->placeholder->password1 = 'must be at lease six characters'; +$lang->user->placeholder->role = "Role affects content and user's order."; +$lang->user->placeholder->group = "Group decides user's privilege."; +$lang->user->placeholder->commiter = 'Subversion Account'; +$lang->user->placeholder->verify = 'Password is required to verify.'; + +$lang->user->placeholder->passwordStrength[1] = 'must be contain letters and numbers,at lease six characters'; +$lang->user->placeholder->passwordStrength[2] = 'must be contain letters, numbers and special characters ,at lease 10 characters'; + +$lang->user->error = new stdclass(); +$lang->user->error->account = "ID %s，must be contain letters, underline, and numbers,at lease three characters"; +$lang->user->error->accountDupl = "ID %s，account has been used"; +$lang->user->error->realname = "ID %s，must be real name"; +$lang->user->error->password = "ID %s，password must be 6 characters at least."; +$lang->user->error->mail = "ID %s，please enter valid Email address"; +$lang->user->error->role = "ID %s，role cannot be null."; + +$lang->user->error->verifyPassword = "Wrong password. Please enter your Login Password."; +$lang->user->error->originalPassword = "Old password is incorrect."; + +$lang->user->contacts = new stdclass(); +$lang->user->contacts->common = 'Contact'; +$lang->user->contacts->listName = 'List Name'; + +$lang->user->contacts->manage = 'Manage List'; +$lang->user->contacts->contactsList = 'List'; +$lang->user->contacts->selectedUsers = 'Select User'; +$lang->user->contacts->selectList = 'Select List'; +$lang->user->contacts->createList = 'Create a List'; +$lang->user->contacts->noListYet = 'No contacts list exist. Please create a list first.'; +$lang->user->contacts->confirmDelete = 'Do you want to delete this list?'; +$lang->user->contacts->or = ' or '; + +$lang->user->resetFail = "Reset failed. Please check the account"; +$lang->user->resetSuccess = "Password reset! Please use your new password to login."; +$lang->user->noticeResetFile = "
If you are not Administrator, please contact Administrator to reset your password.
+
If you are, please login into your Zentao host and create the %s file.
+

Note:

+
    +
  1. Keep the ok.txt empty.
    2. +
  2. If ok.txt exists, remove it and create one again.
    3. +
"; diff --git a/www/install.php b/www/install.php deleted file mode 100644 index 04596f2d31..0000000000 --- a/www/install.php +++ /dev/null @@ -1,37 +0,0 @@ - - * @package ZenTaoPMS - * @version $Id: install.php 4677 2013-04-26 06:23:58Z chencongzhi520@gmail.com $ - * @link http://www.zentao.net - */ -error_reporting(0); -session_start(); -define('IN_INSTALL', true); - -/* Load the framework. */ -include '../framework/router.class.php'; -include '../framework/control.class.php'; -include '../framework/model.class.php'; -include '../framework/helper.class.php'; - -/* Instance the app. */ -$app = router::createApp('pms', dirname(dirname(__FILE__)), 'router'); - -/* Check installed or not. */ -if(!isset($_SESSION['installing']) and isset($config->installed) and $config->installed) die(header('location: index.php')); - -/* Reset the config params to make sure the install program will be lauched. */ -$config->set('requestType', 'GET'); -$config->set('default.module', 'install'); -$app->setDebug(); - -/* During the installation, if the database params is setted, auto connect the db. */ -if(isset($config->installed) and $config->installed) $app->connectDB(); - -$app->parseRequest(); -$app->loadModule(); diff --git a/www/upgrade.php b/www/upgrade.php deleted file mode 100644 index b9060a929a..0000000000 --- a/www/upgrade.php +++ /dev/null @@ -1,46 +0,0 @@ - - * @package ZenTaoPMS - * @version $Id: upgrade.php 4677 2013-04-26 06:23:58Z chencongzhi520@gmail.com $ - * @link http://www.zentao.net - */ -/* Judge my.php exists or not. */ -define('IN_UPGRADE', true); -$myConfig = dirname(dirname(__FILE__)) . '/config/my.php'; -if(!file_exists($myConfig)) -{ - echo "文件" . $myConfig . "不存在！ 提示：不要重命名原来的禅道安装目录，下载最新的源码包，覆盖即可。" . "
"; - echo $myConfig . " doesn't exists! Please don't rename zentao before overriding the source code!"; - exit; -} - -error_reporting(0); - -/* Load the framework. */ -include '../framework/router.class.php'; -include '../framework/control.class.php'; -include '../framework/model.class.php'; -include '../framework/helper.class.php'; - -/* Instance the app. */ -$app = router::createApp('pms', dirname(dirname(__FILE__)), 'router'); -$common = $app->loadCommon(); - -/* Reset the config params to make sure the install program will be lauched. */ -$config->set('requestType', 'GET'); -$config->set('default.module', 'upgrade'); -$app->setDebug(); - -/* Check the installed version is the latest or not. */ -$config->installedVersion = $common->loadModel('setting')->getVersion(); -if(version_compare($config->version, $config->installedVersion) <= 0) die(header('location: index.php')); - -/* Run it. */ -$app->parseRequest(); -$common->checkUpgradeStatus(); -$app->loadModule(); From ae1b3f9080cd3776a61c4e6a6783c1ab439c80a4 Mon Sep 17 00:00:00 2001 From: tengfei Date: Wed, 30 Nov 2016 10:35:14 +0800 Subject: [PATCH 4/4] * Delete useless files. --- module/admin/lang/en.php.bak | 64 ------- module/branch/lang/en.php.bak | 10 - module/dept/lang/en.php.bak | 30 --- module/editor/lang/en.php.bak | 74 -------- module/extension/lang/en.php.bak | 106 ----------- module/file/lang/en.php.bak | 41 ---- module/group/lang/en.php.bak | 90 --------- module/index/lang/en.php.bak | 3 - module/mail/lang/en.php.bak | 90 --------- module/my/lang/en.php.bak | 47 ----- module/product/lang/en.php.bak | 108 ----------- module/productplan/lang/en.php.bak | 62 ------ module/qa/lang/en.php.bak | 13 -- module/release/lang/en.php.bak | 66 ------- module/report/lang/en.php.bak | 91 --------- module/search/lang/en.php.bak | 42 ----- module/sso/lang/en.php.bak | 38 ---- module/story/lang/en.php.bak | 290 ----------------------------- module/task/lang/en.php.bak | 248 ------------------------ module/testcase/lang/en.php.bak | 154 --------------- module/testtask/lang/en.php.bak | 105 ----------- module/todo/lang/en.php.bak | 75 -------- module/tree/lang/en.php.bak | 50 ----- module/upgrade/lang/en.php.bak | 113 ----------- module/user/lang/en.php.bak | 167 ----------------- 25 files changed, 2177 deletions(-) delete mode 100644 module/admin/lang/en.php.bak delete mode 100644 module/branch/lang/en.php.bak delete mode 100644 module/dept/lang/en.php.bak delete mode 100644 module/editor/lang/en.php.bak delete mode 100644 module/extension/lang/en.php.bak delete mode 100644 module/file/lang/en.php.bak delete mode 100644 module/group/lang/en.php.bak delete mode 100644 module/index/lang/en.php.bak delete mode 100644 module/mail/lang/en.php.bak delete mode 100644 module/my/lang/en.php.bak delete mode 100644 module/product/lang/en.php.bak delete mode 100644 module/productplan/lang/en.php.bak delete mode 100644 module/qa/lang/en.php.bak delete mode 100644 module/release/lang/en.php.bak delete mode 100644 module/report/lang/en.php.bak delete mode 100644 module/search/lang/en.php.bak delete mode 100644 module/sso/lang/en.php.bak delete mode 100644 module/story/lang/en.php.bak delete mode 100644 module/task/lang/en.php.bak delete mode 100644 module/testcase/lang/en.php.bak delete mode 100644 module/testtask/lang/en.php.bak delete mode 100644 module/todo/lang/en.php.bak delete mode 100644 module/tree/lang/en.php.bak delete mode 100644 module/upgrade/lang/en.php.bak delete mode 100644 module/user/lang/en.php.bak diff --git a/module/admin/lang/en.php.bak b/module/admin/lang/en.php.bak deleted file mode 100644 index b513f269f2..0000000000 --- a/module/admin/lang/en.php.bak +++ /dev/null @@ -1,64 +0,0 @@ - - * @package admin - * @version $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $ - * @link http://www.zentao.net - */ -$lang->admin->common = 'Administration'; -$lang->admin->index = 'Admin Homepage'; -$lang->admin->checkDB = 'Check Database Library'; -$lang->admin->sso = 'RangerTeam'; -$lang->admin->safeIndex = 'Security'; -$lang->admin->checkWeak = 'Weak Password Check'; - -$lang->admin->info = new stdclass(); -$lang->admin->info->version = 'Current Version is %s,'; -$lang->admin->info->links = 'You can visit '; -$lang->admin->info->account = "Your ZenTao account is %s."; - -$lang->admin->notice = new stdclass(); -$lang->admin->notice->register = "Note: You haven't registered in ZenTao(www.zentao.net), register %s and get the latest ZenTao news."; -$lang->admin->notice->ignore = "Ignore"; - -$lang->admin->register = new stdclass(); -$lang->admin->register->caption = 'Register'; -$lang->admin->register->click = 'Click Here'; -$lang->admin->register->lblAccount = 'must be 3 characters combination of letters and numbers at least.'; -$lang->admin->register->lblPasswd = 'must be 6 characters combination of letters and numbers at least.'; -$lang->admin->register->submit = 'Register'; -$lang->admin->register->bind = "If you have already registered an account, link your account %s."; -$lang->admin->register->success = "You have registered with us!"; - -$lang->admin->bind = new stdclass(); -$lang->admin->bind->caption = 'Link an Account'; -$lang->admin->bind->success = "Account has been linked!"; - -$lang->admin->safe = new stdclass(); -$lang->admin->safe->common = 'Security'; -$lang->admin->safe->set = 'Password Security Settings'; -$lang->admin->safe->password = 'Password Security'; -$lang->admin->safe->weak = 'Common Weak Password'; -$lang->admin->safe->reason = 'Type'; -$lang->admin->safe->checkWeak = 'Weak Password Check'; -$lang->admin->safe->modifyPasswordFirstLogin = 'Modify password in frist login'; - -$lang->admin->safe->modeList[0] = 'N/A'; -$lang->admin->safe->modeList[1] = 'Medium'; -$lang->admin->safe->modeList[2] = 'Strong'; - -$lang->admin->safe->reasonList['weak'] = 'Common Weak Password'; -$lang->admin->safe->reasonList['account'] = 'Same as your account'; -$lang->admin->safe->reasonList['mobile'] = 'Same as your mobile number'; -$lang->admin->safe->reasonList['phone'] = 'Same as your phone number'; -$lang->admin->safe->reasonList['birthday'] = 'Same as your DOB'; - -$lang->admin->safe->modifyPasswordList[1] = 'Must'; -$lang->admin->safe->modifyPasswordList[0] = 'No'; - -$lang->admin->safe->noticeMode = 'User password will be checked when login, add/edit user password.'; -$lang->admin->safe->noticeStrong = 'The more capitalized letters and numbers a password has, the more secure it is!'; diff --git a/module/branch/lang/en.php.bak b/module/branch/lang/en.php.bak deleted file mode 100644 index 4c4bf25705..0000000000 --- a/module/branch/lang/en.php.bak +++ /dev/null @@ -1,10 +0,0 @@ -branch->common = 'Branch'; -$lang->branch->manage = 'Manage a Branch'; -$lang->branch->delete = 'Delete Branch'; - -$lang->branch->manageTitle = '%s Management'; -$lang->branch->all = 'All'; - -$lang->branch->confirmDelete = 'Are you sure delete this @branch@?'; -$lang->branch->canNotDelete = 'It has data in @branch@, can not deleted.'; diff --git a/module/dept/lang/en.php.bak b/module/dept/lang/en.php.bak deleted file mode 100644 index 0dafeb84f5..0000000000 --- a/module/dept/lang/en.php.bak +++ /dev/null @@ -1,30 +0,0 @@ - - * @package dept - * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ - * @link http://www.zentao.net - */ -$lang->dept->common = 'Department'; -$lang->dept->manageChild = "Child Dept"; -$lang->dept->edit = "Edit Dept"; -$lang->dept->delete = "Delete Dept"; -$lang->dept->parent = "Parent Dept"; -$lang->dept->manager = "Manager"; -$lang->dept->name = "Dept Name"; -$lang->dept->browse = "View Dept"; -$lang->dept->manage = "Maintain Dept"; -$lang->dept->updateOrder = "Update/Order"; -$lang->dept->add = "Add Dept"; -$lang->dept->dragAndSort = "Drag and Sort"; - -$lang->dept->confirmDelete = " Do you want to delete this Dept?"; -$lang->dept->successSave = " Saved!"; - -$lang->dept->error = new stdclass(); -$lang->dept->error->hasSons = 'This Dept has child Dept. You cannot be deleted!'; -$lang->dept->error->hasUsers = 'This Dept has staff. It cannot be deleted!'; diff --git a/module/editor/lang/en.php.bak b/module/editor/lang/en.php.bak deleted file mode 100644 index 216db309fd..0000000000 --- a/module/editor/lang/en.php.bak +++ /dev/null @@ -1,74 +0,0 @@ -editor->common = 'Editor'; -$lang->editor->api = 'API'; -$lang->editor->index = 'Homepage'; -$lang->editor->newMethod = 'New Method'; -$lang->editor->extend = 'Extension'; -$lang->editor->api = 'API'; -$lang->editor->newLang = 'New Language'; -$lang->editor->newConfig = 'New Config'; -$lang->editor->newHook = 'New Hook'; -$lang->editor->newExtend = 'New Extension'; -$lang->editor->newPage = 'New Page'; -$lang->editor->override = 'Override'; -$lang->editor->edit = 'Edit Extension'; -$lang->editor->save = 'Save Page'; -$lang->editor->delete = 'Delete Page'; - -$lang->editor->moduleList = 'Module List'; -$lang->editor->filePath = "Extension:"; -$lang->editor->sourceFile = 'Source File:'; -$lang->editor->fileName = "File Name:"; -$lang->editor->isOverride = "Overrode Duplicated File"; -$lang->editor->exampleHook = "(e.g. ***.html.hook.php)"; -$lang->editor->exampleJs = "(e.g. ***.js)"; -$lang->editor->exampleCss = "(e.g. ***.css)"; -$lang->editor->examplePHP = "(e.g. ***.php)"; -$lang->editor->pageName = "Page Name:"; - -$lang->editor->deleteConfirm = 'Do you want to delete it?'; -$lang->editor->extendConfirm = 'Do you want to use original code?'; -$lang->editor->repeatFile = 'File Name Dupliceted'; -$lang->editor->repeatPage = 'Page existed. Do you want to override it?'; -$lang->editor->noticeOkFile = 'For security reasons, your Admin account has to be confirmed. \n Please login ZenTao server and create %sFile.\n Note:\n 1. File is blank.\n 2. If the file existed, delete it and then create a new one.'; - -$lang->editor->notWritable = "Not wirtable. Privilege is required. Please try chmod 777 -R "; -$lang->editor->notDelete = 'Cannot be deleted. Please check your permission!'; -$lang->editor->emptyFileName = 'Please enter a File Name!'; - -$lang->editor->translate['config.php'] = 'config'; -$lang->editor->translate['control.php'] = 'control'; -$lang->editor->translate['model.php'] = 'model'; - -$lang->editor->modules['action'] = 'System Log'; -$lang->editor->modules['admin'] = 'Admin'; -$lang->editor->modules['api'] = 'API'; -$lang->editor->modules['bug'] = 'Bug'; -$lang->editor->modules['build'] = 'Build'; -$lang->editor->modules['common'] = 'Common Modules'; -$lang->editor->modules['company'] = 'Company'; -$lang->editor->modules['convert'] = 'Convert'; -$lang->editor->modules['dept'] = 'Department'; -$lang->editor->modules['doc'] = 'Document'; -$lang->editor->modules['extension'] = 'Extensiona'; -$lang->editor->modules['file'] = 'File'; -$lang->editor->modules['group'] = 'Group'; -$lang->editor->modules['index'] = 'Homepage'; -$lang->editor->modules['install'] = 'Install'; -$lang->editor->modules['misc'] = 'Misc'; -$lang->editor->modules['my'] = 'Dashboard'; -$lang->editor->modules['product'] = $lang->productCommon; -$lang->editor->modules['productplan'] = 'Plan'; -$lang->editor->modules['project'] = $lang->projectCommon; -$lang->editor->modules['qa'] = 'Testing'; -$lang->editor->modules['release'] = 'Release'; -$lang->editor->modules['report'] = 'Report'; -$lang->editor->modules['search'] = 'Search'; -$lang->editor->modules['story'] = 'Story'; -$lang->editor->modules['task'] = 'Task'; -$lang->editor->modules['testcase'] = 'Case'; -$lang->editor->modules['testtask'] = 'Test Task'; -$lang->editor->modules['todo'] = 'To-Dos'; -$lang->editor->modules['tree'] = 'Module'; -$lang->editor->modules['upgrade'] = 'Upgrade'; -$lang->editor->modules['user'] = 'User'; diff --git a/module/extension/lang/en.php.bak b/module/extension/lang/en.php.bak deleted file mode 100644 index dc067d8b3b..0000000000 --- a/module/extension/lang/en.php.bak +++ /dev/null @@ -1,106 +0,0 @@ - - * @package extension - * @version $Id$ - * @link http://www.zentao.net - */ -$lang->extension->common = 'Extension'; -$lang->extension->browse = 'Browse'; -$lang->extension->install = 'Install'; -$lang->extension->installAuto = 'Auto Install'; -$lang->extension->installForce = 'Force Install'; -$lang->extension->uninstall = 'Uninstall'; -$lang->extension->activate = 'Activate'; -$lang->extension->deactivate = 'Deactivate'; -$lang->extension->obtain = 'Get Extension'; -$lang->extension->view = 'Details'; -$lang->extension->downloadAB = 'Download'; -$lang->extension->upload = 'Local Install'; -$lang->extension->erase = 'Erase'; -$lang->extension->upgrade = 'Extension Upgrade'; -$lang->extension->agreeLicense = 'License'; - -$lang->extension->structure = 'Structure'; -$lang->extension->installed = 'Installed'; -$lang->extension->deactivated = 'Deactivated'; -$lang->extension->available = 'Downloaded'; - -$lang->extension->version = 'Version'; -$lang->extension->compatible = 'Compatible'; -$lang->extension->latest = 'Latest:%s，need zentao %s'; -$lang->extension->author = 'Author'; -$lang->extension->license = 'License'; -$lang->extension->site = 'Official Website'; -$lang->extension->downloads = 'Downloads'; -$lang->extension->compatible = 'Compatibility'; -$lang->extension->grade = 'Score'; -$lang->extension->depends = 'Dependent'; - -$lang->extension->publicList[0] = 'Manually'; -$lang->extension->publicList[1] = 'Auto'; - -$lang->extension->compatibleList[0] = 'Unknown'; -$lang->extension->compatibleList[1] = 'Compatible'; - -$lang->extension->byDownloads = 'Downloads'; -$lang->extension->byAddedTime = 'Latest Added'; -$lang->extension->byUpdatedTime = 'Latest Update'; -$lang->extension->bySearch = 'Search'; -$lang->extension->byCategory = 'Category'; - -$lang->extension->installFailed = '%s failed. Error:'; -$lang->extension->uninstallFailed = 'Uninstall failed. Error:'; -$lang->extension->confirmUninstall = 'Uninstal the extension will delete or change related database. Do you want to uninstall?'; -$lang->extension->installFinished = 'Congrats! The extension has been %sed!'; -$lang->extension->refreshPage = 'Refresh'; -$lang->extension->uninstallFinished = 'Extension has been uninstalled.'; -$lang->extension->deactivateFinished = 'Extension has been deactivated.'; -$lang->extension->activateFinished = 'Extension has been activated.'; -$lang->extension->eraseFinished = 'Extension has been removed.'; -$lang->extension->unremovedFiles = 'File or direcroty cannot be deleted. You have to manually delete'; -$lang->extension->executeCommands = '

Execute command lines below to fix the problem:

'; -$lang->extension->successDownloadedPackage = 'Extension downloaded!'; -$lang->extension->successCopiedFiles = 'File copied!'; -$lang->extension->successInstallDB = 'Database installed!'; -$lang->extension->viewInstalled = 'View Installed'; -$lang->extension->viewAvailable = 'View Available'; -$lang->extension->viewDeactivated = 'View Deactivated'; -$lang->extension->backDBFile = 'Extension related data has been backed up to %s!'; -$lang->extension->noticeOkFile = '
For security reasons, your Admin account has to be confirmed.
-
Plese Login your ZenTao server and create %s.
-

Note:

-
    -
  1. File is blank.
    2. -
  2. If the old file exists, please delete it before create one.
    3. -
'; - -$lang->extension->upgradeExt = 'Upgrade'; -$lang->extension->installExt = 'Install'; -$lang->extension->upgradeVersion = '(Upgrade %s to %s.)'; - -$lang->extension->waring = 'Warning!'; - -$lang->extension->errorOccurs = 'Error:'; -$lang->extension->errorGetModules = 'Get Extension Category from www.zentao.net failed. It could be network error. Plase check your network and refresh it.'; -$lang->extension->errorGetExtensions = 'Get Extension from www.zentao.net failed. It could be network error. Please go to www.zentao.net and download the extension, and then upload it to install.'; -$lang->extension->errorDownloadPathNotFound = 'Extension download path %s is not found.
Please run mkdir -p %s in Linux to fix it.'; -$lang->extension->errorDownloadPathNotWritable = 'Extensiond ownload path %sis not writable.
Please run sudo chmod 777 %s in Linux to fix it.'; -$lang->extension->errorPackageFileExists = '%s has existed in the download path.
Please %s it again, CLICK HERE
'; -$lang->extension->errorDownloadFailed = 'Download failed. Please try it again. If still not OK, try to download it manually and upload it to install.'; -$lang->extension->errorMd5Checking = 'Incomplete File. Please download it again. If still not OK, try to download it manually and upload it to install.'; -$lang->extension->errorExtracted = 'Unzip %s failed. It could be an invailid zip file. Error:
%s'; -$lang->extension->errorCheckIncompatible = 'It is incompatible with this versiosn of ZenTao. %sed it and you might not be able to use it.

Choose Force %s or Cancel

'; -$lang->extension->errorFileConflicted = '
%s

is conflicted with others. Choose Override or Cancel

'; -$lang->extension->errorPackageNotFound = '%s is not found. Downloading might be failed. Please download it again.'; -$lang->extension->errorTargetPathNotWritable = '%s is not writable.'; -$lang->extension->errorTargetPathNotExists = '%s is not found.'; -$lang->extension->errorInstallDB = 'Database statements execution failed. Error: %s'; -$lang->extension->errorConflicts = 'Conflicted with “%s”!'; -$lang->extension->errorDepends = 'Dependent extension has not been installed or the version is incorrect:

%s'; -$lang->extension->errorIncompatible = 'Incompatible with this version of ZenTao.'; -$lang->extension->errorUninstallDepends = '“%s” is dependent on this extension. Please do not install it.'; diff --git a/module/file/lang/en.php.bak b/module/file/lang/en.php.bak deleted file mode 100644 index 6fa9f56c47..0000000000 --- a/module/file/lang/en.php.bak +++ /dev/null @@ -1,41 +0,0 @@ - - * @package file - * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ - * @link http://www.zentao.net - */ -$lang->file = new stdclass(); -$lang->file->common = 'Attachment'; -$lang->file->uploadImages = 'Batch Upload Images'; -$lang->file->download = 'Download Files'; -$lang->file->uploadDate = 'UploadDate:'; -$lang->file->edit = 'Rename'; -$lang->file->inputFileName = 'Enter a File Name'; -$lang->file->delete = 'Delete File'; -$lang->file->label = 'Label:'; -$lang->file->maxUploadSize = "%s"; -$lang->file->applyTemplate = "Apply a Template"; -$lang->file->tplTitle = "Template Name"; -$lang->file->setPublic = "Set Public Template"; -$lang->file->exportFields = "Fileds to be Exported"; -$lang->file->defaultTPL = "Default Template"; -$lang->file->setExportTPL = "Settings"; - -$lang->file->errorNotExists = "'%s' is not found."; -$lang->file->errorCanNotWrite = "'%s' is not writable. Please change its permission. Enter sudo chmod -R 777 '%s' in Linux."; -$lang->file->confirmDelete = " Do you want to delete it?"; -$lang->file->errorFileSize = " File size exceeds the limit. It cannot be uploaded!"; -$lang->file->errorFileUpload = " Uploading failed. File size might exceeds the limit."; -$lang->file->dangerFile = " File has been rejected to upload for security issues."; -$lang->file->errorSuffix = 'Format is incorrect. .zip files ONLY!'; -$lang->file->errorExtract = 'Extracting file failed. File might be damaged or invalid files in the zip package.'; -$lang->file->uploadImagesExplain = <<1. If the uploaded file is image zip package, the file name will be the label and images will be the content.

-

2. If the file name containing numbers/underlines, they will be omitted.

-

3. Image formate: jpg, jpeg, gif, png.

-EOD; diff --git a/module/group/lang/en.php.bak b/module/group/lang/en.php.bak deleted file mode 100644 index 8f960ee89b..0000000000 --- a/module/group/lang/en.php.bak +++ /dev/null @@ -1,90 +0,0 @@ - - * @package group - * @version $Id: en.php 4719 2013-05-03 02:20:28Z chencongzhi520@gmail.com $ - * @link http://www.zentao.net - */ -$lang->group->common = 'Group Privilege'; -$lang->group->browse = 'View Group'; -$lang->group->create = 'Add Group'; -$lang->group->edit = 'Edit Group'; -$lang->group->copy = 'Copy Group'; -$lang->group->delete = 'Delete Group'; -$lang->group->manageView = 'View'; -$lang->group->managePriv = 'Privilege '; -$lang->group->managePrivByGroup = 'Maintain by Group'; -$lang->group->managePrivByModule = 'Maintain by Module'; -$lang->group->byModuleTips = '( Press shift/control to multi select)'; -$lang->group->manageMember = 'Members'; -$lang->group->confirmDelete = 'Do you want to delete this User Group?'; -$lang->group->successSaved = 'Saved!'; -$lang->group->errorNotSaved = 'Not saved. Please selected some actions and groups.'; -$lang->group->viewList = 'Acess List'; -$lang->group->productList = 'Access is allowed.' . $lang->productCommon; -$lang->group->projectList = 'Access is allowed.' . $lang->projectCommon; -$lang->group->noticeVisit = 'N/A means access is not restricted.'; - -$lang->group->id = 'ID'; -$lang->group->name = 'Name'; -$lang->group->desc = 'Description'; -$lang->group->users = 'User List'; -$lang->group->module = 'Module'; -$lang->group->method = 'Method'; -$lang->group->priv = 'Privilege'; -$lang->group->option = 'Option'; -$lang->group->inside = 'Group users'; -$lang->group->outside = 'Other users'; -$lang->group->other = 'Others'; -$lang->group->all = 'All'; - -$lang->group->copyOptions['copyPriv'] = 'Copy Privilege'; -$lang->group->copyOptions['copyUser'] = 'Copy User'; - -$lang->group->versions[''] = 'History'; -$lang->group->versions['8_3'] = 'ZenTao8.3'; -$lang->group->versions['8_2_beta'] = 'ZenTao8.2.beta'; -$lang->group->versions['8_0_1'] = 'ZenTao8.0.1'; -$lang->group->versions['8_0'] = 'ZenTao8.0'; -$lang->group->versions['7_4_beta'] = 'ZenTao7.4.beta'; -$lang->group->versions['7_3'] = 'ZenTao7.3'; -$lang->group->versions['7_2'] = 'ZenTao7.2'; -$lang->group->versions['7_1'] = 'ZenTao7.1'; -$lang->group->versions['6_4'] = 'ZenTao6.4'; -$lang->group->versions['6_3'] = 'ZenTao6.3'; -$lang->group->versions['6_2'] = 'ZenTao6.2'; -$lang->group->versions['6_1'] = 'ZenTao6.1'; -$lang->group->versions['5_3'] = 'ZenTao5.3'; -$lang->group->versions['5_1'] = 'ZenTao5.1'; -$lang->group->versions['5_0_beta2'] = 'ZenTao5.0.beta2'; -$lang->group->versions['5_0_beta1'] = 'ZenTao5.0.beta1'; -$lang->group->versions['4_3_beta'] = 'ZenTao4.3.beta'; -$lang->group->versions['4_2_beta'] = 'ZenTao4.2.beta'; -$lang->group->versions['4_1'] = 'ZenTao4.1'; -$lang->group->versions['4_0_1'] = 'ZenTao4.0.1'; -$lang->group->versions['4_0'] = 'ZenTao4.0'; -$lang->group->versions['4_0_beta2'] = 'ZenTao4.0.beta2'; -$lang->group->versions['4_0_beta1'] = 'ZenTao4.0.beta1'; -$lang->group->versions['3_3'] = 'ZenTao3.3'; -$lang->group->versions['3_2_1'] = 'ZenTao3.2.1'; -$lang->group->versions['3_2'] = 'ZenTao3.2'; -$lang->group->versions['3_1'] = 'ZenTao3.1'; -$lang->group->versions['3_0_beta2'] = 'ZenTao3.0.beta2'; -$lang->group->versions['3_0_beta1'] = 'ZenTao3.0.beta1'; -$lang->group->versions['2_4'] = 'ZenTao2.4'; -$lang->group->versions['2_3'] = 'ZenTao2.3'; -$lang->group->versions['2_2'] = 'ZenTao2.2'; -$lang->group->versions['2_1'] = 'ZenTao2.1'; -$lang->group->versions['2_0'] = 'ZenTao2.0'; -$lang->group->versions['1_5'] = 'ZenTao1.5'; -$lang->group->versions['1_4'] = 'ZenTao1.4'; -$lang->group->versions['1_3'] = 'ZenTao1.3'; -$lang->group->versions['1_2'] = 'ZenTao1.2'; -$lang->group->versions['1_1'] = 'ZenTao1.1'; -$lang->group->versions['1_0_1'] = 'ZenTao1.0.1'; - -include (dirname(__FILE__) . '/resource.php'); diff --git a/module/index/lang/en.php.bak b/module/index/lang/en.php.bak deleted file mode 100644 index 68ebd01f43..0000000000 --- a/module/index/lang/en.php.bak +++ /dev/null @@ -1,3 +0,0 @@ -index->common = 'Homepage'; -$lang->index->index = 'Homepage'; diff --git a/module/mail/lang/en.php.bak b/module/mail/lang/en.php.bak deleted file mode 100644 index 9b9a490600..0000000000 --- a/module/mail/lang/en.php.bak +++ /dev/null @@ -1,90 +0,0 @@ -mail->common = 'Email Settings'; -$lang->mail->index = 'Homepage'; -$lang->mail->detect = 'Testing'; -$lang->mail->edit = 'Edit Settings'; -$lang->mail->save = 'Saved'; -$lang->mail->test = 'Email Testing'; -$lang->mail->reset = 'Reset'; -$lang->mail->browse = 'Email List'; -$lang->mail->delete = 'Delete Email'; -$lang->mail->sendCloud = 'Send Cloud Email'; -$lang->mail->batchDelete = 'Batch Delete'; -$lang->mail->sendcloudUser = 'Sync Contact'; - -$lang->mail->turnon = 'Turn On'; -$lang->mail->async = 'Asynchronous'; -$lang->mail->fromAddress = 'Email Address'; -$lang->mail->fromName = 'Sender'; -$lang->mail->domain = 'Domain'; -$lang->mail->host = 'SMTP Server'; -$lang->mail->port = 'SMTP Port'; -$lang->mail->auth = 'Acceptance Required'; -$lang->mail->username = 'SMTP Account'; -$lang->mail->password = 'SMTP Password'; -$lang->mail->secure = 'Secure'; -$lang->mail->debug = 'Debug'; -$lang->mail->charset = 'Charset'; -$lang->mail->accessKey = 'Access Key'; -$lang->mail->secretKey = 'Secret Key'; - -$lang->mail->selectMTA = 'Email MTA'; -$lang->mail->smtp = 'SMTP Email'; - -$lang->mail->syncedUser = 'Synchronized'; -$lang->mail->unsyncUser = 'Not Synchronized'; -$lang->mail->sync = 'Synchronize'; -$lang->mail->remove = 'Remove'; - -$lang->mail->toList = 'Addressee'; -$lang->mail->subjectName = 'Subject'; -$lang->mail->addedBy = 'Sender'; -$lang->mail->addedDate = 'Added Date'; -$lang->mail->sendTime = 'Send Date'; -$lang->mail->status = 'Status'; -$lang->mail->failReason = 'Fail Reason'; - -$lang->mail->statusList['send'] = 'Sent'; -$lang->mail->statusList['fail'] = 'Failed'; - -$lang->mail->turnonList[1] = 'On'; -$lang->mail->turnonList[0] = 'Off'; - -$lang->mail->asyncList[1] = 'Yes'; -$lang->mail->asyncList[0] = 'No'; - -$lang->mail->debugList[0] = 'Off'; -$lang->mail->debugList[1] = 'Normal'; -$lang->mail->debugList[2] = 'High'; - -$lang->mail->authList[1] = 'Required'; -$lang->mail->authList[0] = 'Not Required'; - -$lang->mail->secureList[''] = 'Plain'; -$lang->mail->secureList['ssl'] = 'ssl'; -$lang->mail->secureList['tls'] = 'tls'; - -$lang->mail->inputFromEmail = 'Enter Email Address'; -$lang->mail->nextStep = 'Next'; -$lang->mail->successSaved = 'Configuration has been saved.'; -$lang->mail->subject = 'Testing Email'; -$lang->mail->content = 'Email configured!'; -$lang->mail->successSended = 'Sent!'; -$lang->mail->confirmDelete = 'Do you want to delete it?'; -$lang->mail->sendmailTips = 'Note: Email author will not receive this email.'; -$lang->mail->needConfigure = 'Email configuration is not found. Please cinfigure the Email first.'; -$lang->mail->nofsocket = 'fsocket related function has been deactivated. Mails cannot send out. Please modify allow_url_fopen in php.ini to turn on Onopenssl, and restart Apache.'; -$lang->mail->noOpenssl = 'Please turn on Onopenssl, and restart Apache.'; -$lang->mail->disableSecure = 'No openssl, disable ssl and tls.'; -$lang->mail->sendCloudFail = 'Failed. Reason:'; -$lang->mail->sendCloudHelp = <<1、Notice SendCloud是SendCloud的Team通知服务。具体可以到notice.sendcloud.net查看

-

2、accessKey和secretKey可以到登陆后的"设置"页面查看。Email人地址和名称也在"设置"页面设置。

-

3、Email时，Notice SendCloudContact里面的昵称要跟Email一致，否则无法成功Email。可以到[同步Contact]页面，将ZenTaoUser同步到SendCloudContact中

-EOD; -$lang->mail->sendCloudSuccess = 'Success'; -$lang->mail->closeSendCloud = 'Close sendcloud'; -$lang->mail->addressWhiteList = 'Please add the email to the whilte list on email server to avoid be treated as spam'; - -$lang->mail->placeholder = new stdclass(); -$lang->mail->placeholder->password = 'Some mail needs to fill in the auth code, specific to the mailbox related settings query.'; diff --git a/module/my/lang/en.php.bak b/module/my/lang/en.php.bak deleted file mode 100644 index d63d4bb009..0000000000 --- a/module/my/lang/en.php.bak +++ /dev/null @@ -1,47 +0,0 @@ -my->common = 'My Zone'; - -/* Method List。*/ -$lang->my->index = 'Homepage'; -$lang->my->todo = 'My To-Dos'; -$lang->my->task = 'My Task'; -$lang->my->bug = 'My Bug'; -$lang->my->testTask = 'My Version'; -$lang->my->testCase = 'My Case'; -$lang->my->story = 'My Story'; -$lang->my->myProject = "My {$lang->projectCommon}"; -$lang->my->profile = 'My Profile'; -$lang->my->dynamic = 'My Dynamic'; -$lang->my->editProfile = 'Edi Profile'; -$lang->my->changePassword = 'Edit Password'; -$lang->my->unbind = 'Unbind Ranger'; -$lang->my->manageContacts = 'Maintain Contact'; -$lang->my->deleteContacts = 'Delete Contact'; - -$lang->my->taskMenu = new stdclass(); -$lang->my->taskMenu->assignedToMe = 'Assigned to Me'; -$lang->my->taskMenu->openedByMe = 'Created by Me'; -$lang->my->taskMenu->finishedByMe = 'Finished by Me'; -$lang->my->taskMenu->closedByMe = 'Closed by Me'; -$lang->my->taskMenu->canceledByMe = 'Cancelled by Me'; - -$lang->my->storyMenu = new stdclass(); -$lang->my->storyMenu->assignedToMe = 'Assigned to Me'; -$lang->my->storyMenu->openedByMe = 'Created by Me'; -$lang->my->storyMenu->reviewedByMe = 'Reviewed by Me'; -$lang->my->storyMenu->closedByMe = 'Closed by Me'; - -$lang->my->home = new stdclass(); -$lang->my->home->latest = 'Latest Dynamic'; -$lang->my->home->action = "%s, %s %s %s %s."; -$lang->my->home->projects = $lang->projectCommon; -$lang->my->home->products = $lang->productCommon; -$lang->my->home->createProject = "Create {$lang->projectCommon}"; -$lang->my->home->createProduct = "Create {$lang->productCommon}"; -$lang->my->home->help = "Help"; -$lang->my->home->noProductsTip = "No {$lang->productCommon} found here."; - -$lang->my->form = new stdclass(); -$lang->my->form->lblBasic = 'Basic Info'; -$lang->my->form->lblContact = 'Contact Info'; -$lang->my->form->lblAccount = 'Account Info'; diff --git a/module/product/lang/en.php.bak b/module/product/lang/en.php.bak deleted file mode 100644 index 820d63a261..0000000000 --- a/module/product/lang/en.php.bak +++ /dev/null @@ -1,108 +0,0 @@ - - * @package product - * @version $Id: en.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $ - * @link http://www.zentao.net - */ -$lang->product->common = $lang->productCommon . 'View'; -$lang->product->index = $lang->productCommon . "Homepage"; -$lang->product->browse = "View{$lang->productCommon}"; -$lang->product->dynamic = "Dynamic"; -$lang->product->view = "{$lang->productCommon}Overview"; -$lang->product->edit = "Edit {$lang->productCommon}"; -$lang->product->batchEdit = "Batch Edit"; -$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->mine = 'My responsibility:'; -$lang->product->other = 'Other:'; -$lang->product->closed = 'Closed'; -$lang->product->updateOrder = 'Sort'; -$lang->product->all = "All {$lang->productCommon}"; - -$lang->product->basicInfo = 'Basic Info'; -$lang->product->otherInfo = 'Other Info'; - -$lang->product->plans = 'Planning Count'; -$lang->product->releases = 'Release Count'; -$lang->product->docs = 'Document Count'; -$lang->product->bugs = 'Linked Bug'; -$lang->product->projects = "Linked {$lang->projectCommon} Count"; -$lang->product->cases = 'Case Count'; -$lang->product->builds = 'Build Count'; -$lang->product->roadmap = 'Roadmap'; -$lang->product->doc = 'Document List'; -$lang->product->project = $lang->projectCommon . 'List'; - -$lang->product->confirmDelete = " Do you want to delete {$lang->productCommon}?"; - -$lang->product->errorNoProduct = "{$lang->productCommon} is not created yet!"; -$lang->product->accessDenied = "You have no access to {$lang->productCommon}."; - -$lang->product->name = "{$lang->productCommon} Name"; -$lang->product->code = "{$lang->productCommon} Code"; -$lang->product->order = 'Sort'; -$lang->product->type = "{$lang->productCommon} Type"; -$lang->product->status = 'Status'; -$lang->product->desc = 'Desc'; -$lang->product->PO = "{$lang->productCommon} owner"; -$lang->product->QD = 'Quality director'; -$lang->product->RD = 'Release director'; -$lang->product->acl = 'Access limitation'; -$lang->product->whitelist = 'Whitelist'; -$lang->product->branch = '%s'; - -$lang->product->searchStory = 'Search'; -$lang->product->assignedToMe = 'Assigned to Me'; -$lang->product->openedByMe = 'Created by Me'; -$lang->product->reviewedByMe = 'Reviewed by Me'; -$lang->product->closedByMe = 'Closed by Me'; -$lang->product->draftStory = 'Draft'; -$lang->product->activeStory = 'Activate'; -$lang->product->changedStory = 'Changed'; -$lang->product->willClose = 'To be Closed'; -$lang->product->closedStory = 'Closed'; -$lang->product->unclosed = 'Open'; - -$lang->product->allStory = 'AllStory'; -$lang->product->allProduct = 'All' . $lang->productCommon; -$lang->product->allProductsOfProject = 'All related' . $lang->productCommon; - -$lang->product->typeList[''] = ''; -$lang->product->typeList['normal'] = 'Normal'; -$lang->product->typeList['branch'] = 'Multi Branch'; -$lang->product->typeList['platform'] = 'Multi Platform'; - -$lang->product->branchName['normal'] = ''; -$lang->product->branchName['branch'] = 'Branch'; -$lang->product->branchName['platform'] = 'Platform'; - -$lang->product->statusList[''] = ''; -$lang->product->statusList['normal'] = 'Normal'; -$lang->product->statusList['closed'] = 'Closed'; - -$lang->product->aclList['open'] = "Default({$lang->productCommon} with View permission can access to it)"; -$lang->product->aclList['private'] = "Private {$lang->productCommon}({$lang->productCommon} of pesponsible person and {$lang->projectCommon} team members only)"; -$lang->product->aclList['custom'] = 'Custom(Team members and Whitelisr members have access to it.)'; - -$lang->product->storySummary = " %s Story in total on this page, %s man-hour estimated. Case coverage is %s."; -$lang->product->noMatched = '"%s" cannot be found.' . $lang->productCommon; - -$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed; -$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory; -$lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe; -$lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe; -$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe; -$lang->product->featureBar['browse']['closedbyme'] = $lang->product->closedByMe; -$lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory; -$lang->product->featureBar['browse']['activestory'] = $lang->product->activeStory; -$lang->product->featureBar['browse']['changedstory'] = $lang->product->changedStory; -$lang->product->featureBar['browse']['willclose'] = $lang->product->willClose; -$lang->product->featureBar['browse']['closedstory'] = $lang->product->closedStory; diff --git a/module/productplan/lang/en.php.bak b/module/productplan/lang/en.php.bak deleted file mode 100644 index 3aed6ac071..0000000000 --- a/module/productplan/lang/en.php.bak +++ /dev/null @@ -1,62 +0,0 @@ - - * @package productplan - * @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->browse = "View"; -$lang->productplan->index = "List"; -$lang->productplan->create = "Create"; -$lang->productplan->edit = "Edit"; -$lang->productplan->delete = "Delete"; -$lang->productplan->view = "Details"; -$lang->productplan->bugSummary = "%s Bugs in total on this page."; -$lang->productplan->basicInfo = 'Basic Info'; -$lang->productplan->batchEdit = 'Batch Edit'; - -$lang->productplan->batchUnlink = "Batch Remove"; -$lang->productplan->linkStory = "Link Story"; -$lang->productplan->unlinkStory = "Remove Story"; -$lang->productplan->batchUnlinkStory = "Batch Remove Story"; -$lang->productplan->linkedStories = 'Linked Story'; -$lang->productplan->unlinkedStories = 'Unlinked Story'; - -$lang->productplan->linkBug = "Link Bug"; -$lang->productplan->unlinkBug = "Remove Bug"; -$lang->productplan->batchUnlinkBug = "Batch Remove Bug"; -$lang->productplan->linkedBugs = 'Linked Bug'; -$lang->productplan->unlinkedBugs = 'Unlinked Bug'; - -$lang->productplan->confirmDelete = "Do you want to delete this Planning?"; -$lang->productplan->confirmUnlinkStory = "Do you want to remove this Story?"; -$lang->productplan->confirmUnlinkBug = "Do you want to remove this Bug?"; - -$lang->productplan->id = 'ID'; -$lang->productplan->product = $lang->productCommon; -$lang->productplan->title = 'Title'; -$lang->productplan->desc = 'Desc'; -$lang->productplan->begin = 'Begin'; -$lang->productplan->end = 'End'; - -$lang->productplan->endList[7] = 'One Week'; -$lang->productplan->endList[14] = 'Two Weeks'; -$lang->productplan->endList[31] = 'One Month'; -$lang->productplan->endList[62] = '2 Months'; -$lang->productplan->endList[93] = '3 Months'; -$lang->productplan->endList[186] = '6 Months'; -$lang->productplan->endList[365] = 'One Year'; - -$lang->productplan->errorNoTitle = 'ID %s title should not be empty.'; -$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']['all'] = 'All'; -$lang->productplan->featureBar['browse']['overdue'] = 'Overdue'; diff --git a/module/qa/lang/en.php.bak b/module/qa/lang/en.php.bak deleted file mode 100644 index 84750a49e9..0000000000 --- a/module/qa/lang/en.php.bak +++ /dev/null @@ -1,13 +0,0 @@ - - * @package company - * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ - * @link http://www.zentao.net - */ -$lang->qa->common = 'Testing View'; -$lang->qa->index = 'Testing Home'; diff --git a/module/release/lang/en.php.bak b/module/release/lang/en.php.bak deleted file mode 100644 index 8fc86e526e..0000000000 --- a/module/release/lang/en.php.bak +++ /dev/null @@ -1,66 +0,0 @@ - - * @package release - * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ - * @link http://www.zentao.net - */ -$lang->release->common = 'Release'; -$lang->release->create = "Create"; -$lang->release->edit = "Edit"; -$lang->release->linkStory = "Link Story"; -$lang->release->linkBug = "Link Bug"; -$lang->release->delete = "Delete"; -$lang->release->deleted = 'Deleted'; -$lang->release->view = "Info"; -$lang->release->browse = "Browse"; -$lang->release->changeStatus = "Change Status"; -$lang->release->batchUnlink = "Batch Unlink"; -$lang->release->batchUnlinkStory = "Batch Unlink Story"; -$lang->release->batchUnlinkBug = "Batch unlink Bug"; - -$lang->release->confirmDelete = "Do you want to delete this Release?"; -$lang->release->confirmUnlinkStory = "Do you want to remove this Story?"; -$lang->release->confirmUnlinkBug = "Do you want to remove this Bug?"; - -$lang->release->basicInfo = 'Basic Info'; - -$lang->release->id = 'ID'; -$lang->release->product = $lang->productCommon; -$lang->release->build = 'Build'; -$lang->release->name = 'Name'; -$lang->release->date = 'Date'; -$lang->release->desc = 'Desc'; -$lang->release->status = 'Status'; -$lang->release->last = 'Last Release'; -$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->finishStories = 'Finished %s Story'; -$lang->release->resolvedBugs = 'Solved %s Bug'; -$lang->release->createdBugs = 'Generated %s Bug'; -$lang->release->export = 'Export as HTML'; - -$lang->release->filePath = 'Download : '; -$lang->release->scmPath = 'SCM Path : '; - -$lang->release->exportTypeList['all'] = 'All'; -$lang->release->exportTypeList['story'] = 'Resolved Story'; -$lang->release->exportTypeList['bug'] = 'Resolved Bug'; -$lang->release->exportTypeList['leftbug'] = 'Generated Bug'; - -$lang->release->statusList[''] = ''; -$lang->release->statusList['normal'] = 'Normal'; -$lang->release->statusList['terminate'] = 'Terminate'; - -$lang->release->changeStatusList['normal'] = 'Activate'; -$lang->release->changeStatusList['terminate'] = 'Terminate'; - -$lang->release->action = new stdclass(); -$lang->release->action->changestatus = array('main' => '$date, 由 $actor $extra。', 'extra' => 'changeStatusList'); diff --git a/module/report/lang/en.php.bak b/module/report/lang/en.php.bak deleted file mode 100644 index 99b61768af..0000000000 --- a/module/report/lang/en.php.bak +++ /dev/null @@ -1,91 +0,0 @@ - - * @package report - * @version $Id: en.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $ - * @link http://www.zentao.net - */ -$lang->report->common = 'Report'; -$lang->report->index = 'Home'; -$lang->report->list = 'List'; -$lang->report->item = 'Item'; -$lang->report->value = 'Value'; -$lang->report->percent = 'Percentage'; -$lang->report->undefined = 'Undefined'; - -$lang->report->colors[] = 'AFD8F8'; -$lang->report->colors[] = 'F6BD0F'; -$lang->report->colors[] = '8BBA00'; -$lang->report->colors[] = 'FF8E46'; -$lang->report->colors[] = '008E8E'; -$lang->report->colors[] = 'D64646'; -$lang->report->colors[] = '8E468E'; -$lang->report->colors[] = '588526'; -$lang->report->colors[] = 'B3AA00'; -$lang->report->colors[] = '008ED6'; -$lang->report->colors[] = '9D080D'; -$lang->report->colors[] = 'A186BE'; - -$lang->report->singleColor[] = 'F6BD0F'; - -$lang->report->projectDeviation = $lang->projectCommon . ' Deviation'; -$lang->report->productSummary = $lang->productCommon . ' Summary'; -$lang->report->bugCreate = 'Bug Summary'; -$lang->report->bugAssign = 'Bug Assignment'; -$lang->report->workload = 'Workload'; -$lang->report->workloadAB = 'Workload'; -$lang->report->bugOpenedDate = 'Bug Opened Date'; -$lang->report->taskAssignedDate = 'Time Frame'; -$lang->report->beginAndEnd = 'Date'; -$lang->report->dept = 'Dept'; - -$lang->reportList->project->lists[10] = $lang->projectCommon . ' deviation|report|projectdeviation'; -$lang->reportList->product->lists[10] = $lang->productCommon . ' summary|report|productsummary'; -$lang->reportList->test->lists[10] = 'Bug Summary|report|bugcreate'; -$lang->reportList->test->lists[13] = 'Bug Assignment|report|bugassign'; -$lang->reportList->staff->lists[10] = 'Workload|report|workload'; - -$lang->report->id = 'ID'; -$lang->report->project = $lang->projectCommon; -$lang->report->product = $lang->productCommon; -$lang->report->user = 'Username'; -$lang->report->bug = 'Bug'; -$lang->report->task = 'Tasks'; -$lang->report->estimate = 'Estimation'; -$lang->report->consumed = 'Consumed'; -$lang->report->remain = 'Remained'; -$lang->report->deviation = 'Deviation'; -$lang->report->deviationRate = 'Deviation Rate'; -$lang->report->total = 'Total'; -$lang->report->to = 'to'; -$lang->report->taskTotal = "Total Tasks"; -$lang->report->manhourTotal = "Total Man-Hour"; -$lang->report->validRate = "Efficiency"; -$lang->report->validRateTips = "Solution is fixed/postponed or status is resolved/closed."; -$lang->report->unplanned = 'Unplanned'; -$lang->report->workday = 'Man-Hour per Day'; -$lang->report->diffDays = 'Work Days'; - -$lang->report->conditions = 'Conditions:'; -$lang->report->closedProduct = 'Closed ' . $lang->productCommon; -$lang->report->overduePlan = 'Overdue Plan'; - -/* daily reminder. */ -$lang->report->idAB = 'ID'; -$lang->report->bugTitle = 'Bug Title'; -$lang->report->taskName = 'Task Name'; -$lang->report->todoName = 'To-Do Name'; -$lang->report->testTaskName = 'Test Task Name'; - -$lang->report->mailTitle = new stdclass(); -$lang->report->mailTitle->begin = 'Notice: You have'; -$lang->report->mailTitle->bug = " Bug(%s),"; -$lang->report->mailTitle->task = " Task(%s),"; -$lang->report->mailTitle->todo = " To-Do(%s),"; -$lang->report->mailTitle->testTask = " Test Task(%s),"; - -$lang->report->proVersion = 'Try ZenTao Pro for more!'; diff --git a/module/search/lang/en.php.bak b/module/search/lang/en.php.bak deleted file mode 100644 index b466a7337f..0000000000 --- a/module/search/lang/en.php.bak +++ /dev/null @@ -1,42 +0,0 @@ - - * @package search - * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ - * @link http://www.zentao.net - */ -$lang->search->common = 'Search'; -$lang->search->reset = 'Reset'; -$lang->search->saveQuery = 'Save'; -$lang->search->myQuery = 'My Queries'; -$lang->search->group1 = '1'; -$lang->search->group2 = '2'; -$lang->search->buildForm = 'Search Form'; -$lang->search->buildQuery = 'Execute Query'; -$lang->search->saveQuery = 'Save Query'; -$lang->search->deleteQuery = 'Delete Query'; -$lang->search->setQueryTitle = 'Please enter the title( Please save before searching.):'; -$lang->search->select = 'Stories/Tasks Filter'; -$lang->search->me = 'Me'; -$lang->search->noQuery = 'No query saved!'; -$lang->search->onMenuBar = 'Show in Menu'; - -$lang->search->operators['='] = '='; -$lang->search->operators['!='] = '!='; -$lang->search->operators['>'] = '>'; -$lang->search->operators['>='] = '>='; -$lang->search->operators['<'] = '<'; -$lang->search->operators['<='] = '<='; -$lang->search->operators['include'] = 'including'; -$lang->search->operators['between'] = 'between'; -$lang->search->operators['notinclude'] = 'excluding'; -$lang->search->operators['belong'] = 'belong to'; - -$lang->search->andor['and'] = 'And'; -$lang->search->andor['or'] = 'Or'; - -$lang->search->null = 'Null'; diff --git a/module/sso/lang/en.php.bak b/module/sso/lang/en.php.bak deleted file mode 100644 index f121ce9638..0000000000 --- a/module/sso/lang/en.php.bak +++ /dev/null @@ -1,38 +0,0 @@ - - * @package sso - * @version $Id$ - * @link http://www.zentao.net - */ -$lang->sso = new stdclass(); -$lang->sso->settings = 'Settings'; -$lang->sso->turnon = 'Turn On'; -$lang->sso->code = 'Code'; -$lang->sso->key = 'Key'; -$lang->sso->addr = 'Address'; -$lang->sso->bind = 'User Binding'; -$lang->sso->addrNotice = 'Example http://www.ranzhi.com/sys/sso-check.html'; - -$lang->sso->turnonList = array(); -$lang->sso->turnonList[1] = 'On'; -$lang->sso->turnonList[0] = 'Off'; - -$lang->sso->bindType = 'Binding Type'; -$lang->sso->bindUser = 'User Binding'; - -$lang->sso->bindTypeList['bind'] = 'Bind to existing User'; -$lang->sso->bindTypeList['add'] = 'Add User'; - -$lang->sso->help = <<1. Interface address is required. If use PATH_INFO, it is http://YOUR RANGER ADDRESS/sys/sso-check.html If GET, it is http://YOUR RANGER ADDRESS/sys/index.php?m=sso&f=check

-

2. Code and Key must be the same as set in Ranger.

-EOD; -$lang->sso->bindNotice = 'User just added has no rivilege. You have to ask ZenTao Admin to grant permissions to the User.'; -$lang->sso->bindNoPassword = 'Password should not be blank.'; -$lang->sso->bindNoUser = 'Password is wrong, or this User cannot be found!'; -$lang->sso->bindHasAccount = 'This username already exists. Change your username or bind to it.'; diff --git a/module/story/lang/en.php.bak b/module/story/lang/en.php.bak deleted file mode 100644 index bf0b13c752..0000000000 --- a/module/story/lang/en.php.bak +++ /dev/null @@ -1,290 +0,0 @@ - - * @package story - * @version $Id: en.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $ - * @link http://www.zentao.net - */ -$lang->story->create = "Create"; -$lang->story->batchCreate = "Batch Create"; -$lang->story->change = "Change"; -$lang->story->changed = 'Changed Story'; -$lang->story->review = 'Review'; -$lang->story->batchReview = 'Batch Review'; -$lang->story->edit = "Edit"; -$lang->story->batchEdit = "Batch Edit"; -$lang->story->subdivide = 'Subdivide'; -$lang->story->close = 'Close'; -$lang->story->batchClose = 'Batch Close'; -$lang->story->activate = 'Activate'; -$lang->story->delete = "Delete"; -$lang->story->view = "Story Details"; -$lang->story->tasks = "Linked Task"; -$lang->story->taskCount = 'Tasks'; -$lang->story->bugCount = 'Bugs'; -$lang->story->caseCount = 'Testcases'; -$lang->story->taskCountAB = 'Tasks'; -$lang->story->bugCountAB = 'Bugs'; -$lang->story->caseCountAB = 'Cases'; -$lang->story->linkStory = 'Link Story'; -$lang->story->unlinkStory = 'Unlink Story'; -$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->batchAssignTo = "Batch Assign"; -$lang->story->batchChangeModule = "Batch Change Module"; - -$lang->story->common = 'Story'; -$lang->story->id = 'ID'; -$lang->story->product = $lang->productCommon; -$lang->story->module = 'Module'; -$lang->story->moduleAB = 'Module'; -$lang->story->source = 'Source'; -$lang->story->sourceNote = 'Source Note'; -$lang->story->fromBug = 'From Bug'; -$lang->story->title = 'Title'; -$lang->story->spec = 'Description'; -$lang->story->verify = 'Verify'; -$lang->story->pri = 'Priority'; -$lang->story->estimate = 'Estimated Man-Hour'; -$lang->story->estimateAB = 'Estimation'; -$lang->story->hour = 'Hour'; -$lang->story->status = 'Status'; -$lang->story->stage = 'Stage'; -$lang->story->stageAB = 'Stage'; -$lang->story->mailto = 'Mailto'; -$lang->story->openedBy = 'Opened By'; -$lang->story->openedDate = 'Opened Date'; -$lang->story->assignedTo = 'Assigned To'; -$lang->story->assignedDate = 'Assigned Date'; -$lang->story->lastEditedBy = 'Last Edited By'; -$lang->story->lastEditedDate = 'Last Edited Date'; -$lang->story->closedBy = 'Closed By'; -$lang->story->closedDate = 'Closed Date'; -$lang->story->closedReason = 'Closed Reason'; -$lang->story->rejectedReason = 'RejectED Reason'; -$lang->story->reviewedBy = 'Reviewed By'; -$lang->story->reviewedDate = 'Reviewed Date'; -$lang->story->version = 'Version'; -$lang->story->plan = 'Planning'; -$lang->story->planAB = 'Plan'; -$lang->story->comment = 'Comment'; -$lang->story->linkStories = 'Linke Story'; -$lang->story->childStories = 'Subdivide Story'; -$lang->story->duplicateStory = 'Duplicate Story'; -$lang->story->reviewResult = 'Review Result'; -$lang->story->preVersion = 'Previous Version'; -$lang->story->keywords = 'Keyword'; -$lang->story->newStory = 'Continue Add Story.'; -$lang->story->colorTag = 'Color Tag'; -$lang->story->files = 'Files'; - -$lang->story->ditto = 'Ditto'; -$lang->story->dittoNotice = 'This Story does not belong to the same Product as the last Story does!'; - -$lang->story->useList[0] = 'Yes'; -$lang->story->useList[1] = 'No'; - -$lang->story->statusList[''] = ''; -$lang->story->statusList['draft'] = 'Draft'; -$lang->story->statusList['active'] = 'Active'; -$lang->story->statusList['closed'] = 'Closed'; -$lang->story->statusList['changed'] = 'Changed'; - -$lang->story->stageList[''] = ''; -$lang->story->stageList['wait'] = 'Pending'; -$lang->story->stageList['planned'] = 'Planned'; -$lang->story->stageList['projected'] = 'Projected'; -$lang->story->stageList['developing'] = 'Developing'; -$lang->story->stageList['developed'] = 'Developed'; -$lang->story->stageList['testing'] = 'Testing'; -$lang->story->stageList['tested'] = 'Tested'; -$lang->story->stageList['verified'] = 'Accepted'; -$lang->story->stageList['released'] = 'Released'; - -$lang->story->reasonList[''] = ''; -$lang->story->reasonList['done'] = 'Done'; -$lang->story->reasonList['subdivided'] = 'Subdivided'; -$lang->story->reasonList['duplicate'] = 'Duplicate'; -$lang->story->reasonList['postponed'] = 'Postponed'; -$lang->story->reasonList['willnotdo'] = "Won't do"; -$lang->story->reasonList['cancel'] = 'Cancelled'; -$lang->story->reasonList['bydesign'] = 'Default Design'; -//$lang->story->reasonList['isbug'] = 'Bug!'; - -$lang->story->reviewResultList[''] = ''; -$lang->story->reviewResultList['pass'] = 'Pass'; -$lang->story->reviewResultList['revert'] = 'Revert'; -$lang->story->reviewResultList['clarify'] = 'Clarify'; -$lang->story->reviewResultList['reject'] = 'Reject'; - -$lang->story->reviewList[0] = 'No'; -$lang->story->reviewList[1] = 'Yes'; - -$lang->story->sourceList[''] = ''; -$lang->story->sourceList['customer'] = 'Customer'; -$lang->story->sourceList['user'] = 'User'; -$lang->story->sourceList['po'] = $lang->productCommon . ' Owner'; -$lang->story->sourceList['market'] = 'Market'; -$lang->story->sourceList['service'] = 'Customer service'; -$lang->story->sourceList['operation'] = 'Operations'; -$lang->story->sourceList['support'] = 'Technical support'; -$lang->story->sourceList['competitor'] = 'Competitor'; -$lang->story->sourceList['partner'] = 'Partner'; -$lang->story->sourceList['dev'] = 'Developer'; -$lang->story->sourceList['tester'] = 'Tester'; -$lang->story->sourceList['bug'] = 'Bug'; -$lang->story->sourceList['other'] = 'Other'; - -$lang->story->priList[] = ''; -$lang->story->priList[3] = '3'; -$lang->story->priList[1] = '1'; -$lang->story->priList[2] = '2'; -$lang->story->priList[4] = '4'; - -$lang->story->legendBasicInfo = 'Basic Info'; -$lang->story->legendLifeTime = 'Story Life '; -$lang->story->legendRelated = 'Related Info'; -$lang->story->legendMailto = 'Mail To'; -$lang->story->legendAttatch = 'Files'; -$lang->story->legendProjectAndTask = $lang->projectCommon . 'Task'; -$lang->story->legendBugs = 'Linked Bug'; -$lang->story->legendFromBug = 'From Bug'; -$lang->story->legendCases = 'Linked Case'; -$lang->story->legendLinkStories = 'Linked Story'; -$lang->story->legendChildStories = 'Subdivide Story'; -$lang->story->legendSpec = 'Story Desc'; -$lang->story->legendVerify = 'Acceptance Criteria'; -$lang->story->legendMisc = 'Misc '; - -$lang->story->lblChange = 'Change'; -$lang->story->lblReview = 'Review'; -$lang->story->lblActivate = 'Activate'; -$lang->story->lblClose = 'Close'; - -$lang->story->checkAffection = 'Check Impact'; -$lang->story->affectedProjects = 'Affected' . $lang->projectCommon; -$lang->story->affectedBugs = 'Affected Bug'; -$lang->story->affectedCases = 'Affected Case'; - -$lang->story->specTemplate = "Please refer to Template. As < User>, I hope that < can accomplish something. >So it will < the value of development>."; -$lang->story->needNotReview = 'No Review'; -$lang->story->successSaved = "Story saved!"; -$lang->story->confirmDelete = "Do you want to delete this Story?"; -$lang->story->errorEmptyChildStory = '『Subdivide Story』canot be blank.'; -$lang->story->mustChooseResult = 'Please select a result.'; -$lang->story->mustChoosePreVersion = 'Please select a Version to revert.'; - -$lang->story->form = new stdclass(); -$lang->story->form->area = 'Story Affiliation'; -$lang->story->form->desc = 'Description and criteria. What Story is it? How to accept it?'; -$lang->story->form->resource = 'Resource allocation. How finished it? How long does it take?'; -$lang->story->form->file = 'Files. If there are Story related files, please click Here to upload.'; - -$lang->story->action = new stdclass(); -$lang->story->action->reviewed = array('main' => '$date, recorded by $actor. Review result is $extra.', 'extra' => 'reviewResultList'); -$lang->story->action->closed = array('main' => '$date, closed by $actor. The reasion is $extra $appendLink.', 'extra' => 'reasonList'); -$lang->story->action->linked2plan = array('main' => '$date, linked by $actor to Planning $extra'); -$lang->story->action->unlinkedfromplan = array('main' => '$date, removed by $actor from Planning $extra.'); -$lang->story->action->linked2project = array('main' => '$date, linked by $actor to ' . $lang->projectCommon . ' $extra.'); -$lang->story->action->unlinkedfromproject = array('main' => '$date, removed by $actor from ' . $lang->projectCommon . ' $extra.'); -$lang->story->action->linked2build = array('main' => '$date, linked by $actor to Build $extra'); -$lang->story->action->unlinkedfrombuild = array('main' => '$date, removed by $actor from Build $extra.'); -$lang->story->action->linked2release = array('main' => '$date, linked by $actor to Release $extra'); -$lang->story->action->unlinkedfromrelease = array('main' => '$date, removed by $actor from Release $extra.'); -$lang->story->action->linkrelatedstory = array('main' => '$date, linked by $actor to Story $extra.'); -$lang->story->action->subdividestory = array('main' => '$date, subdivided by $actor to Story $extra.'); -$lang->story->action->unlinkrelatedstory = array('main' => '$date, removed by $actor from Story $extra.'); -$lang->story->action->unlinkchildstory = array('main' => '$date, removed by $actor Subdivided Story $extra.'); - -/* 统计报表。*/ -$lang->story->report = new stdclass(); -$lang->story->report->common = 'Report'; -$lang->story->report->select = 'Please select the type of 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 Planning'; -$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->options = new stdclass(); -$lang->story->report->options->graph = new stdclass(); -$lang->story->report->options->type = 'pie'; -$lang->story->report->options->width = 500; -$lang->story->report->options->height = 140; - -$lang->story->report->storysPerProduct = new stdclass(); -$lang->story->report->storysPerModule = new stdclass(); -$lang->story->report->storysPerSource = new stdclass(); -$lang->story->report->storysPerPlan = new stdclass(); -$lang->story->report->storysPerStatus = new stdclass(); -$lang->story->report->storysPerStage = new stdclass(); -$lang->story->report->storysPerPri = new stdclass(); -$lang->story->report->storysPerOpenedBy = new stdclass(); -$lang->story->report->storysPerAssignedTo = new stdclass(); -$lang->story->report->storysPerClosedReason = new stdclass(); -$lang->story->report->storysPerEstimate = new stdclass(); -$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->storysPerStatus->item = 'Status'; -$lang->story->report->storysPerStage->item = 'Stage'; -$lang->story->report->storysPerPri->item = 'Priority'; -$lang->story->report->storysPerOpenedBy->item = 'Account'; -$lang->story->report->storysPerAssignedTo->item = 'User'; -$lang->story->report->storysPerClosedReason->item = 'Reason'; -$lang->story->report->storysPerEstimate->item = 'Estimated Man-Hour'; -$lang->story->report->storysPerChange->item = 'Change'; - -$lang->story->report->storysPerProduct->graph = new stdclass(); -$lang->story->report->storysPerModule->graph = new stdclass(); -$lang->story->report->storysPerSource->graph = new stdclass(); -$lang->story->report->storysPerPlan->graph = new stdclass(); -$lang->story->report->storysPerStatus->graph = new stdclass(); -$lang->story->report->storysPerStage->graph = new stdclass(); -$lang->story->report->storysPerPri->graph = new stdclass(); -$lang->story->report->storysPerOpenedBy->graph = new stdclass(); -$lang->story->report->storysPerAssignedTo->graph = new stdclass(); -$lang->story->report->storysPerClosedReason->graph = new stdclass(); -$lang->story->report->storysPerEstimate->graph = new stdclass(); -$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->storysPerStatus->graph->xAxisName = 'Status'; -$lang->story->report->storysPerStage->graph->xAxisName = 'Stage'; -$lang->story->report->storysPerPri->graph->xAxisName = 'Priority'; -$lang->story->report->storysPerOpenedBy->graph->xAxisName = 'Created By'; -$lang->story->report->storysPerAssignedTo->graph->xAxisName = 'Assigned To'; -$lang->story->report->storysPerClosedReason->graph->xAxisName = 'Closed Reason'; -$lang->story->report->storysPerEstimate->graph->xAxisName = 'Estimated Time '; -$lang->story->report->storysPerChange->graph->xAxisName = 'Change'; - -$lang->story->placeholder = new stdclass(); -$lang->story->placeholder->estimate = $lang->story->hour; - -$lang->story->chosen = new stdClass(); -$lang->story->chosen->reviewedBy = 'Choose Reviewer'; diff --git a/module/task/lang/en.php.bak b/module/task/lang/en.php.bak deleted file mode 100644 index 12da8a751b..0000000000 --- a/module/task/lang/en.php.bak +++ /dev/null @@ -1,248 +0,0 @@ - - * @package task - * @version $Id: en.php 5040 2013-07-06 06:22:18Z zhujinyonging@gmail.com $ - * @link http://www.zentao.net - */ -$lang->task->index = "Index"; -$lang->task->create = "Create"; -$lang->task->batchCreate = "Batch Create"; -$lang->task->batchEdit = "Batch Edit"; -$lang->task->batchChangeModule = "Batch Change Module"; -$lang->task->edit = "Update"; -$lang->task->delete = "Delete"; -$lang->task->deleted = "Deleted"; -$lang->task->view = "Info"; -$lang->task->logEfforts = "Man-Hour Log"; -$lang->task->record = "Estimate"; -$lang->task->start = "Start"; -$lang->task->restart = "Continue"; -$lang->task->finish = "Finish"; -$lang->task->pause = "Pause"; -$lang->task->close = "Close"; -$lang->task->batchClose = "Batch Close"; -$lang->task->cancel = "Cancel"; -$lang->task->activate = "Activate"; -$lang->task->export = "Export Data"; -$lang->task->reportChart = "Report Chart"; -$lang->task->fromBug = 'From Bug'; -$lang->task->case = 'Related Case'; -$lang->task->confirmStoryChange = "Confirm Story Change"; -$lang->task->progess = 'Progess'; - -$lang->task->common = 'Task'; -$lang->task->id = 'ID'; -$lang->task->project = $lang->projectCommon; -$lang->task->module = 'Module'; -$lang->task->moduleAB = 'Module'; -$lang->task->story = 'Story'; -$lang->task->storySpec = 'Description'; -$lang->task->storyVerify = 'Acceptance Criteria'; -$lang->task->name = 'Name'; -$lang->task->type = 'Type'; -$lang->task->pri = 'Priority'; -$lang->task->mailto = 'Mailto'; -$lang->task->estimate = 'Estimation'; -$lang->task->estimateAB = 'Estimated'; -$lang->task->left = 'Estimated Left'; -$lang->task->leftAB = 'Left'; -$lang->task->consumed = 'Total Consumed'; -$lang->task->consumedAB = 'Consume'; -$lang->task->hour = 'Hour'; -$lang->task->consumedThisTime = 'Man-Hour'; -$lang->task->leftThisTime = 'Left'; -$lang->task->datePlan = 'Schedule'; -$lang->task->estStarted = 'Estimated Start Time'; -$lang->task->realStarted = 'Actual Start Time'; -$lang->task->date = 'Date'; -$lang->task->deadline = 'Deadline'; -$lang->task->deadlineAB = 'Deadline'; -$lang->task->status = 'Status'; -$lang->task->desc = 'Description'; -$lang->task->assign = 'Assign'; -$lang->task->assignTo = $lang->task->assign; -$lang->task->batchAssignTo = 'Batch Assign'; -$lang->task->assignedTo = 'Assigned To'; -$lang->task->assignedToAB = 'Assigned To'; -$lang->task->assignedDate = 'Assigned Date'; -$lang->task->openedBy = 'Created By'; -$lang->task->openedDate = 'Created Date'; -$lang->task->openedDateAB = 'Add'; -$lang->task->finishedBy = 'Finished By'; -$lang->task->finishedByAB = 'Finish'; -$lang->task->finishedDate = 'Finish Date'; -$lang->task->finishedDateAB = 'Date'; -$lang->task->canceledBy = 'Cancelled By'; -$lang->task->canceledDate = 'Cancel Date'; -$lang->task->closedBy = 'Closed By'; -$lang->task->closedDate = 'Close Date'; -$lang->task->closedReason = 'Cancel Reason'; -$lang->task->lastEditedBy = 'Last Edited By'; -$lang->task->lastEditedDate = 'Last Edit Date'; -$lang->task->lastEdited = 'Last Edit'; -$lang->task->recordEstimate = 'Man-Hour'; -$lang->task->editEstimate = 'Edit Man-Hour'; -$lang->task->deleteEstimate = 'Delete Man-Hour'; -$lang->task->colorTag = 'Color Tag'; -$lang->task->files = 'Files'; -$lang->task->hasConsumed = 'Has Consumed'; -$lang->task->thisConsume = 'This Consumption'; - -$lang->task->ditto = 'Ditto'; -$lang->task->dittoNotice = "This Task does not belong to the Project as the previous one does!"; -$lang->task->selectAllUser = 'All'; -$lang->task->noStory = 'No Story'; -$lang->task->noAssigned = 'Unassigned'; -$lang->task->noFinished = 'Unfinished'; -$lang->task->noClosed = 'Unclosed'; - -$lang->task->statusList[''] = ''; -$lang->task->statusList['wait'] = 'Pending'; -$lang->task->statusList['doing'] = 'Ongoing'; -$lang->task->statusList['done'] = 'Done'; -$lang->task->statusList['pause'] = 'Paused'; -$lang->task->statusList['cancel'] = 'Cancelled'; -$lang->task->statusList['closed'] = 'Closed'; - -$lang->task->typeList[''] = ''; -$lang->task->typeList['design'] = 'Design'; -$lang->task->typeList['devel'] = 'Develop'; -$lang->task->typeList['test'] = 'Testing'; -$lang->task->typeList['study'] = 'Study'; -$lang->task->typeList['discuss'] = 'Discuss'; -$lang->task->typeList['ui'] = 'UI'; -$lang->task->typeList['affair'] = 'Work'; -$lang->task->typeList['misc'] = 'Misc'; - -$lang->task->priList[0] = ''; -$lang->task->priList[3] = '3'; -$lang->task->priList[1] = '1'; -$lang->task->priList[2] = '2'; -$lang->task->priList[4] = '4'; - -$lang->task->reasonList[''] = ''; -$lang->task->reasonList['done'] = 'Done'; -$lang->task->reasonList['cancel'] = 'Cancelled'; - -$lang->task->afterChoices['continueAdding'] = 'Continue adding Tasks'; -$lang->task->afterChoices['toTaskList'] = 'Back to Task List'; -$lang->task->afterChoices['toStoryList'] = 'Back to Story List'; - -$lang->task->legendBasic = 'Basic Info'; -$lang->task->legendEffort = 'Man-Hour'; -$lang->task->legendLife = 'Task Life'; -$lang->task->legendDesc = 'Task Desc'; - -$lang->task->confirmDelete = "Do you want to delete this Task?"; -$lang->task->confirmDeleteEstimate = "Do you want to delete it?"; -$lang->task->copyStoryTitle = "Same Story"; -$lang->task->afterSubmit = "After Created,"; -$lang->task->successSaved = "Created!"; -$lang->task->delayWarning = " Delay %s days "; -$lang->task->remindBug = "This Task is converted from a Bug. Do you want to update te Bug:%s?"; -$lang->task->confirmChangeProject = "If you change {$lang->projectCommon}, the related Module, Story and Assignor will be changed. Do you want to do it?"; -$lang->task->confirmFinish = '"Estimated reamin hour" is 0. Do you want to change the Status to "Done"?'; -$lang->task->confirmRecord = '"Remain hour" is 0. Do you want to set Task as "Done"?'; -$lang->task->noticeLinkStory = "No story to be linked, you can %s for this project, then %s"; -$lang->task->noticeSaveRecord = 'Your man-hour is not saved. Please save it first.'; -$lang->task->commentActions = '%s. %s, commented by %s.'; - -$lang->task->error = new stdclass(); -$lang->task->error->consumedNumber = '"Consumed" must be numbers.'; -$lang->task->error->estimateNumber = '"Estimated" must be numbers.'; -$lang->task->error->consumedSmall = '"Consumed" must larger than before.'; -$lang->task->error->consumedThisTime = 'Please enter "Man-Hour"'; -$lang->task->error->left = 'Please enter "Left"'; -$lang->task->error->work = '"Remark" must be less than 255 characteres.'; -$lang->task->error->skipClose = 'Task: %s is not“Done”or “Cancelled”. Confirm to close them?'; -$lang->task->error->consumed = 'Task: %s man-hour must be more than 0. Ignore changes to this Task.'; - -/* 统计报表。*/ -$lang->task->report = new stdclass(); -$lang->task->report->common = 'Report'; -$lang->task->report->select = 'Please select the type of the Task'; -$lang->task->report->create = 'Create'; -$lang->task->report->value = 'Task Count'; - -$lang->task->report->charts['tasksPerProject'] = $lang->projectCommon . ' Tasks'; -$lang->task->report->charts['tasksPerModule'] = 'Module Tasks'; -$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'] = 'Estimated Time'; -$lang->task->report->charts['tasksPerLeft'] = 'Time Left'; -$lang->task->report->charts['tasksPerConsumed'] = 'Time Consumed'; -$lang->task->report->charts['tasksPerFinishedBy'] = 'Finished By'; -$lang->task->report->charts['tasksPerClosedReason'] = 'Close Reason'; -$lang->task->report->charts['finishedTasksPerDay'] = 'Tasks Finished per Day'; - -$lang->task->report->options = new stdclass(); -$lang->task->report->options->graph = new stdclass(); -$lang->task->report->options->type = 'pie'; -$lang->task->report->options->width = 500; -$lang->task->report->options->height = 140; - -$lang->task->report->tasksPerProject = new stdclass(); -$lang->task->report->tasksPerModule = new stdclass(); -$lang->task->report->tasksPerAssignedTo = new stdclass(); -$lang->task->report->tasksPerType = new stdclass(); -$lang->task->report->tasksPerPri = new stdclass(); -$lang->task->report->tasksPerStatus = new stdclass(); -$lang->task->report->tasksPerDeadline = new stdclass(); -$lang->task->report->tasksPerEstimate = new stdclass(); -$lang->task->report->tasksPerLeft = new stdclass(); -$lang->task->report->tasksPerConsumed = new stdclass(); -$lang->task->report->tasksPerFinishedBy = new stdclass(); -$lang->task->report->tasksPerClosedReason = new stdclass(); -$lang->task->report->finishedTasksPerDay = new stdclass(); - -$lang->task->report->tasksPerProject->item = $lang->projectCommon; -$lang->task->report->tasksPerModule->item = 'Module'; -$lang->task->report->tasksPerAssignedTo->item = 'Account'; -$lang->task->report->tasksPerType->item = 'Type'; -$lang->task->report->tasksPerPri->item = 'Priority'; -$lang->task->report->tasksPerStatus->item = 'Status'; -$lang->task->report->tasksPerDeadline->item = 'Date'; -$lang->task->report->tasksPerEstimate->item = 'Est.'; -$lang->task->report->tasksPerLeft->item = 'Reamin'; -$lang->task->report->tasksPerConsumed->item = 'Consume'; -$lang->task->report->tasksPerFinishedBy->item = 'User'; -$lang->task->report->tasksPerClosedReason->item = 'Reason'; -$lang->task->report->finishedTasksPerDay->item = 'Date'; - -$lang->task->report->tasksPerProject->graph = new stdclass(); -$lang->task->report->tasksPerModule->graph = new stdclass(); -$lang->task->report->tasksPerAssignedTo->graph = new stdclass(); -$lang->task->report->tasksPerType->graph = new stdclass(); -$lang->task->report->tasksPerPri->graph = new stdclass(); -$lang->task->report->tasksPerStatus->graph = new stdclass(); -$lang->task->report->tasksPerDeadline->graph = new stdclass(); -$lang->task->report->tasksPerEstimate->graph = new stdclass(); -$lang->task->report->tasksPerLeft->graph = new stdclass(); -$lang->task->report->tasksPerConsumed->graph = new stdclass(); -$lang->task->report->tasksPerFinishedBy->graph = new stdclass(); -$lang->task->report->tasksPerClosedReason->graph = new stdclass(); -$lang->task->report->finishedTasksPerDay->graph = new stdclass(); - -$lang->task->report->tasksPerProject->graph->xAxisName = $lang->projectCommon; -$lang->task->report->tasksPerModule->graph->xAxisName = 'Module'; -$lang->task->report->tasksPerAssignedTo->graph->xAxisName = 'User'; -$lang->task->report->tasksPerType->graph->xAxisName = 'Type'; -$lang->task->report->tasksPerPri->graph->xAxisName = 'Priority'; -$lang->task->report->tasksPerStatus->graph->xAxisName = 'Status'; -$lang->task->report->tasksPerDeadline->graph->xAxisName = 'Date'; -$lang->task->report->tasksPerEstimate->graph->xAxisName = 'Time'; -$lang->task->report->tasksPerLeft->graph->xAxisName = 'Time'; -$lang->task->report->tasksPerConsumed->graph->xAxisName = 'Time'; -$lang->task->report->tasksPerFinishedBy->graph->xAxisName = 'User'; -$lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Close Reason'; - -$lang->task->report->finishedTasksPerDay->type = 'bar'; -$lang->task->report->finishedTasksPerDay->graph->xAxisName = 'Date'; diff --git a/module/testcase/lang/en.php.bak b/module/testcase/lang/en.php.bak deleted file mode 100644 index ee5a912b15..0000000000 --- a/module/testcase/lang/en.php.bak +++ /dev/null @@ -1,154 +0,0 @@ - - * @package testcase - * @version $Id: en.php 4966 2013-07-02 02:59:25Z wyd621@gmail.com $ - * @link http://www.zentao.net - */ -$lang->testcase->id = 'ID'; -$lang->testcase->product = $lang->productCommon; -$lang->testcase->module = 'Module'; -$lang->testcase->moduleAB = 'Module'; -$lang->testcase->story = 'Story'; -$lang->testcase->title = 'Title'; -$lang->testcase->precondition = 'Prerequisite'; -$lang->testcase->pri = 'Priority'; -$lang->testcase->type = 'Type'; -$lang->testcase->status = 'Status'; -$lang->testcase->steps = 'Steps'; -$lang->testcase->openedBy = 'Opened By'; -$lang->testcase->openedDate = 'Opened Date'; -$lang->testcase->lastEditedBy = 'Last Edited by'; -$lang->testcase->result = 'Result'; -$lang->testcase->real = 'Real'; -$lang->testcase->keywords = 'Keywords'; -$lang->testcase->files = 'Files'; -$lang->testcase->linkCase = 'Linked Cases'; -$lang->testcase->linkCases = 'Link Cases'; -$lang->testcase->unlinkCase = 'Unlink Case'; -$lang->testcase->stage = 'Stage'; -$lang->testcase->lastEditedByAB = 'Last Edited By'; -$lang->testcase->lastEditedDateAB = 'Last Edited Date'; -$lang->testcase->lastEditedDate = 'Last Edited Date'; -$lang->testcase->version = 'Case Version'; -$lang->testcase->lastRunner = 'Last Run By'; -$lang->testcase->lastRunDate = 'Run Date'; -$lang->testcase->assignedTo = 'Assigned To'; -$lang->testcase->colorTag = 'Color Tag'; -$lang->testcase->lastRunResult = 'Result'; -$lang->testcase->allProduct = "All {$lang->productCommon}"; -$lang->testcase->fromBug = 'From Bug'; -$lang->testcase->toBug = 'To Bug'; -$lang->testcase->changed = 'Changed'; -$lang->testcase->createBug = 'Transfer Bug'; -$lang->case = $lang->testcase; // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case. - -$lang->testcase->stepID = 'ID'; -$lang->testcase->stepDesc = 'Step'; -$lang->testcase->stepExpect = 'Expect'; - -$lang->testcase->common = 'Case'; -$lang->testcase->index = "Index"; -$lang->testcase->create = "Create Case"; -$lang->testcase->batchCreate = "Batch Create"; -$lang->testcase->delete = "Delete"; -$lang->testcase->view = "Info"; -$lang->testcase->edit = "Edit"; -$lang->testcase->batchEdit = "Batch Edit "; -$lang->testcase->batchChangeModule = "Batch Change Module"; -$lang->testcase->delete = "Delete"; -$lang->testcase->batchDelete = "Batch Delete "; -$lang->testcase->browse = "Case List"; -$lang->testcase->groupCase = "Group View"; -$lang->testcase->import = "Import"; -$lang->testcase->showImport = "Show Import"; -$lang->testcase->exportTemplet = "Export Template"; -$lang->testcase->export = "Export Data"; -$lang->testcase->confirmChange = 'Confirm Case Change'; -$lang->testcase->confirmStoryChange = 'Confirm Story Change'; -$lang->testcase->copy = 'Duplicate Case'; - -$lang->testcase->new = 'New'; - -$lang->testcase->num = 'Case Count:'; - -$lang->testcase->deleteStep = 'Delete'; -$lang->testcase->insertBefore = 'Inserted Before'; -$lang->testcase->insertAfter = 'Inserted After'; - -$lang->testcase->assignToMe = 'Assigned to Me'; -$lang->testcase->openedByMe = 'Created by Me'; -$lang->testcase->allCases = 'All'; -$lang->testcase->needConfirm = 'Story Change'; -$lang->testcase->bySearch = 'Search'; - -$lang->testcase->lblStory = 'Story'; -$lang->testcase->lblLastEdited = 'Last Edit'; -$lang->testcase->lblTypeValue = 'Type List'; -$lang->testcase->lblStageValue = 'Stage List'; -$lang->testcase->lblStatusValue = 'Status List'; - -$lang->testcase->legendBasicInfo = 'Basic Info'; -$lang->testcase->legendAttatch = 'File'; -$lang->testcase->legendLinkBugs = 'Bug'; -$lang->testcase->legendOpenAndEdit = 'Create/Edit'; -$lang->testcase->legendComment = 'Remark'; - -$lang->testcase->confirmDelete = 'Do you want to delete this Test Case?'; -$lang->testcase->confirmBatchDelete = 'Do you want to batch delete thess Test Cases?'; -$lang->testcase->ditto = 'Ditto'; -$lang->testcase->dittoNotice = 'This Case does not belong to the Product as the previous one!'; - -$lang->testcase->priList[3] = 3; -$lang->testcase->priList[1] = 1; -$lang->testcase->priList[2] = 2; -$lang->testcase->priList[4] = 4; - -/* Define the types. */ -$lang->testcase->typeList[''] = ''; -$lang->testcase->typeList['feature'] = 'Feature'; -$lang->testcase->typeList['performance'] = 'Performance'; -$lang->testcase->typeList['config'] = 'Config'; -$lang->testcase->typeList['install'] = 'Install'; -$lang->testcase->typeList['security'] = 'Security'; -$lang->testcase->typeList['interface'] = 'Interface'; -$lang->testcase->typeList['other'] = 'Other'; - -$lang->testcase->stageList[''] = ''; -$lang->testcase->stageList['unittest'] = 'Unit Testing'; -$lang->testcase->stageList['feature'] = 'Feature Testing'; -$lang->testcase->stageList['intergrate'] = 'Integration Testing'; -$lang->testcase->stageList['system'] = 'System Testing'; -$lang->testcase->stageList['smoke'] = 'Smoking Testing'; -$lang->testcase->stageList['bvt'] = 'BVT Testing'; - -$lang->testcase->groups[''] = 'Group '; -$lang->testcase->groups['story'] = 'Story Group'; - -$lang->testcase->statusList[''] = ''; -$lang->testcase->statusList['normal'] = 'Normal'; -$lang->testcase->statusList['blocked'] = 'Blocked'; -$lang->testcase->statusList['investigate'] = 'Investigating'; - -$lang->testcase->resultList['n/a'] = 'N/A'; -$lang->testcase->resultList['pass'] = 'Pass'; -$lang->testcase->resultList['fail'] = 'Fail'; -$lang->testcase->resultList['blocked'] = 'Blocked'; - -$lang->testcase->buttonToList = 'Back'; - -$lang->testcase->errorEncode = 'No Data. Please select right encoding and upload again!'; -$lang->testcase->noFunction = 'Iconv and mb_convert_encoding is not found. You cannot convert the data into the desired one!'; -$lang->testcase->noRequire = "Row %s has“%s”which is a required field and it should not be blank."; - -$lang->testcase->searchStories = 'Enter to searcu Story'; - -$lang->testcase->featureBar['browse']['all'] = $lang->testcase->allCases; -$lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm; -$lang->testcase->featureBar['browse']['group'] = ''; -$lang->testcase->featureBar['browse']['zerocase'] = ''; -$lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse']; diff --git a/module/testtask/lang/en.php.bak b/module/testtask/lang/en.php.bak deleted file mode 100644 index a8080c6a8e..0000000000 --- a/module/testtask/lang/en.php.bak +++ /dev/null @@ -1,105 +0,0 @@ - - * @package testtask - * @version $Id: en.php 4490 2013-02-27 03:27:05Z wyd621@gmail.com $ - * @link http://www.zentao.net - */ -$lang->testtask->index = "Index"; -$lang->testtask->create = "Create"; -$lang->testtask->delete = "Delete"; -$lang->testtask->view = "Info"; -$lang->testtask->edit = "Edit"; -$lang->testtask->browse = "Browse"; -$lang->testtask->linkCase = "Link Case"; -$lang->testtask->unlinkCase = "Unlink Case"; -$lang->testtask->batchAssign = "Batch Assign"; -$lang->testtask->runCase = "Run"; -$lang->testtask->batchRun = "Batch Run"; -$lang->testtask->results = "Result"; -$lang->testtask->createBug = "Bug(+)"; -$lang->testtask->assign = 'Assign'; -$lang->testtask->cases = 'Cases'; -$lang->testtask->groupCase = "View by Group"; -$lang->testtask->pre = 'Previous'; -$lang->testtask->next = 'Next'; -$lang->testtask->start = "Start"; -$lang->testtask->close = "Close"; -$lang->testtask->wait = "Build to be Tested"; -$lang->testtask->done = "Tested Build"; - -$lang->testtask->common = 'Test build'; -$lang->testtask->product = $lang->productCommon; -$lang->testtask->project = $lang->projectCommon; -$lang->testtask->build = 'Build'; -$lang->testtask->owner = 'Owner'; -$lang->testtask->pri = 'Priority'; -$lang->testtask->name = 'Name'; -$lang->testtask->begin = 'Begin Date'; -$lang->testtask->end = 'End Date'; -$lang->testtask->desc = 'Desc'; -$lang->testtask->mailto = 'Mailto'; -$lang->testtask->status = 'Status'; -$lang->testtask->assignedTo = 'Assign'; -$lang->testtask->linkVersion = 'Version'; -$lang->testtask->lastRunAccount = "Run"; -$lang->testtask->lastRunTime = 'Time'; -$lang->testtask->lastRunResult = 'Result'; -$lang->testtask->report = 'Report'; -$lang->testtask->files = 'Upload Files'; - -$lang->testtask->legendDesc = 'Desc'; -$lang->testtask->legendReport = 'Report'; -$lang->testtask->legendBasicInfo = 'Basic Info'; - -$lang->testtask->statusList['wait'] = 'Pending'; -$lang->testtask->statusList['doing'] = 'Ongoing'; -$lang->testtask->statusList['done'] = 'Done'; -$lang->testtask->statusList['blocked'] = 'Blocked'; - -$lang->testtask->priList[0] = ''; -$lang->testtask->priList[3] = '3'; -$lang->testtask->priList[1] = '1'; -$lang->testtask->priList[2] = '2'; -$lang->testtask->priList[4] = '4'; - -$lang->testtask->unlinkedCases = 'Unlinked'; -$lang->testtask->linkByStory = 'Link by Story'; -$lang->testtask->linkByBug = 'Link by Bug'; -$lang->testtask->passAll = 'All Pass'; -$lang->testtask->pass = 'Pass'; -$lang->testtask->fail = 'Failed'; -$lang->testtask->showResult = 'Executed %s times'; -$lang->testtask->showFail = 'Failed %s times'; - -$lang->testtask->confirmDelete = 'Do you want to delete this test build?'; -$lang->testtask->confirmUnlinkCase = 'Do you want to remove this Case?'; - -$lang->testtask->assignedToMe = 'Assigned to Me'; -$lang->testtask->allCases = 'All Cases'; - -$lang->testtask->lblCases = 'Case List'; -$lang->testtask->lblUnlinkCase = 'Remove Case'; -$lang->testtask->lblRunCase = 'Run Case'; -$lang->testtask->lblResults = 'Result'; - -$lang->testtask->placeholder = new stdclass(); -$lang->testtask->placeholder->begin = 'Begin Date'; -$lang->testtask->placeholder->end = 'End Date'; - -$lang->testtask->mail = new stdclass(); -$lang->testtask->mail->create = new stdclass(); -$lang->testtask->mail->edit = new stdclass(); -$lang->testtask->mail->close = new stdclass(); -$lang->testtask->mail->create->title = "%s created test task #%s:%s"; -$lang->testtask->mail->edit->title = "%s finished test task #%s:%s"; -$lang->testtask->mail->close->title = "%s closed test task #%s:%s"; - -$lang->testtask->action = new stdclass(); -$lang->testtask->action->testtaskopened = '$date, $actor opened test task $extra.' . "\n"; -$lang->testtask->action->testtaskstarted = '$date, $actor started test task $extra.' . "\n"; -$lang->testtask->action->testtaskclosed = '$date, $actor finished test task$extra.' . "\n"; diff --git a/module/todo/lang/en.php.bak b/module/todo/lang/en.php.bak deleted file mode 100644 index aefa610724..0000000000 --- a/module/todo/lang/en.php.bak +++ /dev/null @@ -1,75 +0,0 @@ - - * @package todo - * @version $Id: en.php 4676 2013-04-26 06:08:23Z chencongzhi520@gmail.com $ - * @link http://www.zentao.net - */ -$lang->todo->common = 'To-Dos'; -$lang->todo->index = "Home"; -$lang->todo->create = "Create"; -$lang->todo->batchCreate = "Batch Create"; -$lang->todo->edit = "Edit"; -$lang->todo->batchEdit = "Batch Edit"; -$lang->todo->view = "Info"; -$lang->todo->finish = "Finish"; -$lang->todo->batchFinish = "Batch Finish"; -$lang->todo->export = "Export"; -$lang->todo->delete = "Delete"; -$lang->todo->import2Today = "Import to Today"; -$lang->todo->import = "Import"; -$lang->todo->legendBasic = "Basic Info"; - -$lang->todo->account = 'Owner'; -$lang->todo->date = 'Date'; -$lang->todo->beginAB = 'Begin'; -$lang->todo->endAB = 'End'; -$lang->todo->beginAndEnd = 'Time Frame'; -$lang->todo->type = 'Type'; -$lang->todo->pri = 'Priority'; -$lang->todo->name = 'Name'; -$lang->todo->status = 'Status'; -$lang->todo->desc = 'Description'; -$lang->todo->private = 'Private'; - -$lang->todo->confirmBug = 'This To-Do is linked to Bug #%s. Do you want to edit it?'; -$lang->todo->confirmTask = 'This To-Do is linked to Task #%s，Do you want to edit it?'; - -$lang->todo->statusList['wait'] = 'Pending'; -$lang->todo->statusList['doing'] = 'Ongoing'; -$lang->todo->statusList['done'] = 'Done'; -//$lang->todo->statusList['cancel'] = 'Cancelled'; -//$lang->todo->statusList['postpone'] = 'Delayed'; - -$lang->todo->priList[3] = '3'; -$lang->todo->priList[1] = '1'; -$lang->todo->priList[2] = '2'; -$lang->todo->priList[4] = '4'; - -$lang->todo->typeList['custom'] = 'Custom'; -$lang->todo->typeList['bug'] = 'Bug'; -$lang->todo->typeList['task'] = $lang->projectCommon . 'Task'; - -$lang->todo->confirmDelete = "Are you sure to delete this todo?"; -$lang->todo->thisIsPrivate = 'This is a private todo。:)'; -$lang->todo->lblDisableDate = 'Set time lately'; - -$lang->todo->periods['today'] = 'Today'; -$lang->todo->periods['yesterday'] = 'Yesterday'; -$lang->todo->periods['thisWeek'] = 'This Week'; -$lang->todo->periods['lastWeek'] = 'Last Week'; -$lang->todo->periods['thisMonth'] = 'This Month'; -$lang->todo->periods['lastmonth'] = 'Last Month'; -$lang->todo->periods['thisSeason'] = 'This Season'; -$lang->todo->periods['thisYear'] = 'This Year'; -$lang->todo->periods['future'] = 'Future'; -$lang->todo->periods['before'] = 'Undone'; -$lang->todo->periods['all'] = 'All'; - -$lang->todo->action = new stdclass(); -$lang->todo->action->finished = array('main' => '$date, is finished by $actor.'); -$lang->todo->action->marked = array('main' => '$date, is marked by $actor as $extra.', 'extra' => 'statusList'); diff --git a/module/tree/lang/en.php.bak b/module/tree/lang/en.php.bak deleted file mode 100644 index c404dd1d86..0000000000 --- a/module/tree/lang/en.php.bak +++ /dev/null @@ -1,50 +0,0 @@ - - * @package tree - * @version $Id: en.php 5045 2013-07-06 07:04:40Z zhujinyonging@gmail.com $ - * @link http://www.zentao.net - */ -$lang->tree = new stdclass(); -$lang->tree->common = 'Module'; -$lang->tree->edit = 'Edit'; -$lang->tree->delete = 'Delete'; -$lang->tree->browse = 'General Module'; -$lang->tree->browseTask = 'Task Module'; -$lang->tree->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->updateOrder = 'Update Order'; -$lang->tree->manageChild = 'Manage Child Module'; -$lang->tree->manageStoryChild = 'Manage Child Story'; -$lang->tree->manageBugChild = 'Manage Child Bug'; -$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 = "Sort"; -$lang->tree->addChild = "Add Child Module"; - -$lang->tree->confirmDelete = 'Do you want to delete this Module and its Child?'; -$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?"; -$lang->tree->successSave = 'Saved.'; -$lang->tree->successFixed = 'Fixed.'; -$lang->tree->repeatName = 'The name "%s" has existed!'; - -$lang->tree->name = 'Name'; -$lang->tree->parent = 'Parent'; -$lang->tree->child = 'Child'; -$lang->tree->owner = 'Owner'; -$lang->tree->order = 'Order'; -$lang->tree->short = 'Short'; -$lang->tree->all = 'All Modules'; -$lang->tree->projectDoc = "{$lang->projectCommon} Doc"; -$lang->tree->product = $lang->productCommon; diff --git a/module/upgrade/lang/en.php.bak b/module/upgrade/lang/en.php.bak deleted file mode 100644 index d6de5e2b37..0000000000 --- a/module/upgrade/lang/en.php.bak +++ /dev/null @@ -1,113 +0,0 @@ - - * @package upgrade - * @version $Id: en.php 5119 2013-07-12 08:06:42Z wyd621@gmail.com $ - * @link http://www.zentao.net - */ -$lang->upgrade->common = 'Upgrade'; -$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->warnning= 'Warning!'; -$lang->upgrade->checkExtension = 'Check Extension'; -$lang->upgrade->warnningContent = <<Please backup your database before upgrading ZenTao!

-
-1. Use phpMyAdmin to backup.
-2. Use mysqlCommand to backup.
-   $> mysqldump -u username -p dbname > filename 
-   Change the red text into corresponding Username and Database name.
-   e.g. mysqldump -u root -p zentao >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

-
    -
  • %s
    • -
  • Or delete "%s" and create ok.txt and leave it blank.
    • -
-

I have read and done as instructed above. Continue update.

'; -$lang->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->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 = 'Need to update the attachment information.'; - -$lang->upgrade->fromVersions['0_3beta'] = '0.3 BETA'; -$lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA'; -$lang->upgrade->fromVersions['0_5beta'] = '0.5 BETA'; -$lang->upgrade->fromVersions['0_6beta'] = '0.6 BETA'; -$lang->upgrade->fromVersions['1_0beta'] = '1.0 BETA'; -$lang->upgrade->fromVersions['1_0rc1'] = '1.0 RC1'; -$lang->upgrade->fromVersions['1_0rc2'] = '1.0 RC2'; -$lang->upgrade->fromVersions['1_0'] = '1.0 STABLE'; -$lang->upgrade->fromVersions['1_0_1'] = '1.0.1'; -$lang->upgrade->fromVersions['1_1'] = '1.1'; -$lang->upgrade->fromVersions['1_2'] = '1.2'; -$lang->upgrade->fromVersions['1_3'] = '1.3'; -$lang->upgrade->fromVersions['1_4'] = '1.4'; -$lang->upgrade->fromVersions['1_5'] = '1.5'; -$lang->upgrade->fromVersions['2_0'] = '2.0'; -$lang->upgrade->fromVersions['2_1'] = '2.1'; -$lang->upgrade->fromVersions['2_2'] = '2.2'; -$lang->upgrade->fromVersions['2_3'] = '2.3'; -$lang->upgrade->fromVersions['2_4'] = '2.4'; -$lang->upgrade->fromVersions['3_0_beta1'] = '3.0 BETA1'; -$lang->upgrade->fromVersions['3_0_beta2'] = '3.0 BETA2'; -$lang->upgrade->fromVersions['3_0'] = '3.0 STABLE'; -$lang->upgrade->fromVersions['3_1'] = '3.1'; -$lang->upgrade->fromVersions['3_2'] = '3.2'; -$lang->upgrade->fromVersions['3_2_1'] = '3.2.1'; -$lang->upgrade->fromVersions['3_3'] = '3.3'; -$lang->upgrade->fromVersions['4_0_beta1'] = '4.0 BETA1'; -$lang->upgrade->fromVersions['4_0_beta2'] = '4.0 BETA2'; -$lang->upgrade->fromVersions['4_0'] = '4.0'; -$lang->upgrade->fromVersions['4_0_1'] = '4.0.1'; -$lang->upgrade->fromVersions['4_1'] = '4.1'; -$lang->upgrade->fromVersions['4_2_beta'] = '4.2.beta'; -$lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; -$lang->upgrade->fromVersions['5_0_beta1'] = '5.0.beta1'; -$lang->upgrade->fromVersions['5_0_beta2'] = '5.0.beta2'; -$lang->upgrade->fromVersions['5_0'] = '5.0'; -$lang->upgrade->fromVersions['5_1'] = '5.1'; -$lang->upgrade->fromVersions['5_2'] = '5.2'; -$lang->upgrade->fromVersions['5_2_1'] = '5.2.1'; -$lang->upgrade->fromVersions['5_3'] = '5.3'; -$lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1'; -$lang->upgrade->fromVersions['6_0'] = '6.0'; -$lang->upgrade->fromVersions['6_1'] = '6.1'; -$lang->upgrade->fromVersions['6_2'] = '6.2'; -$lang->upgrade->fromVersions['6_3'] = '6.3'; -$lang->upgrade->fromVersions['6_4'] = '6.4'; -$lang->upgrade->fromVersions['7_0'] = '7.0'; -$lang->upgrade->fromVersions['7_1'] = '7.1'; -$lang->upgrade->fromVersions['7_2'] = '7.2'; -$lang->upgrade->fromVersions['7_2_4'] = '7.2.4'; -$lang->upgrade->fromVersions['7_2_5'] = '7.2.5'; -$lang->upgrade->fromVersions['7_3'] = '7.3'; -$lang->upgrade->fromVersions['7_4_beta'] = '7.4.beta'; -$lang->upgrade->fromVersions['8_0'] = '8.0'; -$lang->upgrade->fromVersions['8_0_1'] = '8.0.1'; -$lang->upgrade->fromVersions['8_1'] = '8.1'; -$lang->upgrade->fromVersions['8_1_3'] = '8.1.3'; -$lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta'; -$lang->upgrade->fromVersions['8_2'] = '8.2'; -$lang->upgrade->fromVersions['8_2_1'] = '8.2.1'; -$lang->upgrade->fromVersions['8_2_2'] = '8.2.2'; -$lang->upgrade->fromVersions['8_2_3'] = '8.2.3'; -$lang->upgrade->fromVersions['8_2_4'] = '8.2.4'; -$lang->upgrade->fromVersions['8_2_5'] = '8.2.5'; -$lang->upgrade->fromVersions['8_2_6'] = '8.2.6'; -$lang->upgrade->fromVersions['8_3'] = '8.3'; diff --git a/module/user/lang/en.php.bak b/module/user/lang/en.php.bak deleted file mode 100644 index ddbf64e33a..0000000000 --- a/module/user/lang/en.php.bak +++ /dev/null @@ -1,167 +0,0 @@ - - * @package user - * @version $Id: en.php 5053 2013-07-06 08:17:37Z wyd621@gmail.com $ - * @link http://www.zentao.net - */ -$lang->user->common = 'User'; -$lang->user->id = 'ID'; -$lang->user->company = 'Company'; -$lang->user->dept = 'Department'; -$lang->user->account = 'Account'; -$lang->user->password = 'Password'; -$lang->user->password2 = 'Repeat password'; -$lang->user->role = 'Role'; -$lang->user->group = 'Group'; -$lang->user->realname = 'Real Name'; -$lang->user->nickname = 'Nickname'; -$lang->user->commiter = 'Commit Account'; -$lang->user->birthyear = 'Birth Year'; -$lang->user->gender = 'Gender'; -$lang->user->email = 'Email'; -$lang->user->basicInfo = 'Basic Info'; -$lang->user->accountInfo = 'Account'; -$lang->user->verify = 'Acceptance'; -$lang->user->contactInfo = 'Contact'; -$lang->user->skype = 'Skype'; -$lang->user->qq = 'QQ'; -$lang->user->yahoo = 'Yahoo!'; -$lang->user->gtalk = 'GTalk'; -$lang->user->wangwang = '旺旺'; -$lang->user->mobile = 'Mobile'; -$lang->user->phone = 'Phone'; -$lang->user->address = 'Address'; -$lang->user->zipcode = 'Zip Code'; -$lang->user->join = 'Join Date'; -$lang->user->visits = 'Visit Count'; -$lang->user->ip = 'Last IP'; -$lang->user->last = 'Last Login'; -$lang->user->ranzhi = 'Ranger account'; -$lang->user->ditto = 'Ditto'; -$lang->user->originalPassword = 'Old Password'; -$lang->user->verifyPassword = 'Please enter your password'; -$lang->user->resetPassword = 'Forgot Password?'; - -$lang->user->index = "Home"; -$lang->user->view = "Info"; -$lang->user->create = "Add"; -$lang->user->batchCreate = "Batch Add User"; -$lang->user->edit = "Edit"; -$lang->user->batchEdit = "Batch Edit"; -$lang->user->unlock = "Unlock"; -$lang->user->delete = "Delete"; -$lang->user->unbind = "Unbind Ranger"; -$lang->user->login = "Login"; -$lang->user->mobileLogin = "Mobile"; -$lang->user->editProfile = "Edit Profile"; -$lang->user->deny = "Access 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 Ranger?"; -$lang->user->relogin = "Login Again"; -$lang->user->asGuest = "Guest"; -$lang->user->goback = "Back"; -$lang->user->deleted = '(Deleted)'; - -$lang->user->profile = 'Profile'; -$lang->user->project = $lang->projectCommon; -$lang->user->task = 'Task'; -$lang->user->bug = 'Bug'; -$lang->user->test = 'Testing'; -$lang->user->testTask = 'Test Task'; -$lang->user->testCase = 'Test Case'; -$lang->user->todo = 'To-Do'; -$lang->user->story = 'Story'; -$lang->user->dynamic = 'Dynamic'; - -$lang->user->openedBy = 'Opened by him'; -$lang->user->assignedTo = 'Assigned to him'; -$lang->user->finishedBy = 'Finished by him'; -$lang->user->resolvedBy = 'Resolved by him'; -$lang->user->closedBy = 'Closed by him'; -$lang->user->reviewedBy = 'Reviewed by him'; -$lang->user->canceledBy = 'Cancelled by him'; - -$lang->user->testTask2Him = 'His Build'; -$lang->user->case2Him = 'His Case'; -$lang->user->caseByHim = 'Case Opened by Him'; - -$lang->user->errorDeny = "Sorry, your access to %s Module %s Feature has been denied. Please contact Admin to get permission. 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 meet the setting requirements."; - -$lang->user->roleList[''] = ''; -$lang->user->roleList['dev'] = 'Developer'; -$lang->user->roleList['qa'] = 'Tester'; -$lang->user->roleList['pm'] = 'Project Manager'; -$lang->user->roleList['po'] = 'Product Owner'; -$lang->user->roleList['td'] = 'Technical Supervisor'; -$lang->user->roleList['pd'] = 'Product Supervisor'; -$lang->user->roleList['qd'] = 'QA Supervisor'; -$lang->user->roleList['top'] = 'Senior Manager'; -$lang->user->roleList['others'] = 'Other'; - -$lang->user->genderList['m'] = 'Male'; -$lang->user->genderList['f'] = 'Female'; - -$lang->user->passwordStrengthList[0] = "Weak"; -$lang->user->passwordStrengthList[1] = "Good"; -$lang->user->passwordStrengthList[2] = "Strong"; - -$lang->user->statusList['active'] = 'Activate'; -$lang->user->statusList['delete'] = 'Deleted'; - -$lang->user->keepLogin['on'] = 'Keep login'; -$lang->user->loginWithDemoUser = 'Login as Demo User:'; - -$lang->user->placeholder = new stdclass(); -$lang->user->placeholder->account = 'must be contain letters, underline, and numbers,at lease three characters'; -$lang->user->placeholder->password1 = 'must be at lease six characters'; -$lang->user->placeholder->role = "Role affects content and user's order."; -$lang->user->placeholder->group = "Group decides user's privilege."; -$lang->user->placeholder->commiter = 'Subversion Account'; -$lang->user->placeholder->verify = 'Password is required to verify.'; - -$lang->user->placeholder->passwordStrength[1] = 'must be contain letters and numbers,at lease six characters'; -$lang->user->placeholder->passwordStrength[2] = 'must be contain letters, numbers and special characters ,at lease 10 characters'; - -$lang->user->error = new stdclass(); -$lang->user->error->account = "ID %s，must be contain letters, underline, and numbers,at lease three characters"; -$lang->user->error->accountDupl = "ID %s，account has been used"; -$lang->user->error->realname = "ID %s，must be real name"; -$lang->user->error->password = "ID %s，password must be 6 characters at least."; -$lang->user->error->mail = "ID %s，please enter valid Email address"; -$lang->user->error->role = "ID %s，role cannot be null."; - -$lang->user->error->verifyPassword = "Wrong password. Please enter your Login Password."; -$lang->user->error->originalPassword = "Old password is incorrect."; - -$lang->user->contacts = new stdclass(); -$lang->user->contacts->common = 'Contact'; -$lang->user->contacts->listName = 'List Name'; - -$lang->user->contacts->manage = 'Manage List'; -$lang->user->contacts->contactsList = 'List'; -$lang->user->contacts->selectedUsers = 'Select User'; -$lang->user->contacts->selectList = 'Select List'; -$lang->user->contacts->createList = 'Create a List'; -$lang->user->contacts->noListYet = 'No contacts list exist. Please create a list first.'; -$lang->user->contacts->confirmDelete = 'Do you want to delete this list?'; -$lang->user->contacts->or = ' or '; - -$lang->user->resetFail = "Reset failed. Please check the account"; -$lang->user->resetSuccess = "Password reset! Please use your new password to login."; -$lang->user->noticeResetFile = "
If you are not Administrator, please contact Administrator to reset your password.
-
If you are, please login into your Zentao host and create the %s file.
-

Note:

-
    -
  1. Keep the ok.txt empty.
    2. -
  2. If ok.txt exists, remove it and create one again.
    3. -
";