From 78db39b7dc75a009d05800ddb3cba99dfa480c14 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 7 Nov 2016 11:14:35 +0800 Subject: [PATCH] * change for en lang. --- module/action/lang/en.php | 284 +++++++++++++-------------- module/admin/lang/en.php | 66 +++---- module/api/lang/en.php | 22 +-- module/backup/lang/en.php | 28 +-- module/block/lang/en.php | 184 +++++++++--------- module/branch/lang/en.php | 10 +- module/bug/lang/en.php | 296 ++++++++++++++-------------- module/build/lang/en.php | 64 +++--- module/common/lang/en.php | 342 ++++++++++++++++----------------- module/company/lang/en.php | 20 +- module/convert/lang/en.php | 118 ++++++------ module/cron/lang/en.php | 48 ++--- module/custom/lang/en.php | 52 ++--- module/datatable/lang/en.php | 12 +- module/dept/lang/en.php | 30 +-- module/dev/lang/en.php | 84 ++++---- module/doc/lang/en.php | 129 ++++++------- module/doc/lang/zh-cn.php | 1 - module/editor/lang/en.php | 81 ++++---- module/extension/lang/en.php | 116 +++++------ module/file/lang/en.php | 48 ++--- module/git/lang/en.php | 6 +- module/group/lang/en.php | 127 ++++++------ module/group/lang/resource.php | 12 +- module/group/lang/zh-cn.php | 1 + module/index/lang/en.php | 4 +- module/install/lang/en.php | 204 ++++++++++---------- module/mail/lang/en.php | 108 +++++------ module/misc/lang/en.php | 80 ++++---- module/my/lang/en.php | 68 +++---- module/product/lang/en.php | 94 ++++----- module/productplan/lang/en.php | 52 ++--- module/project/lang/en.php | 248 ++++++++++++------------ module/qa/lang/en.php | 4 +- module/release/lang/en.php | 44 ++--- module/report/lang/en.php | 58 +++--- module/search/lang/en.php | 24 +-- module/sso/lang/en.php | 30 +-- module/story/lang/en.php | 234 +++++++++++----------- module/svn/lang/en.php | 6 +- module/task/lang/en.php | 184 +++++++++--------- module/testcase/lang/en.php | 128 ++++++------ module/testtask/lang/en.php | 56 +++--- module/todo/lang/en.php | 48 ++--- module/tree/lang/en.php | 42 ++-- module/tutorial/lang/en.php | 67 ++++--- module/tutorial/lang/zh-cn.php | 1 - module/upgrade/lang/en.php | 52 ++--- module/user/lang/en.php | 150 +++++++-------- 49 files changed, 2084 insertions(+), 2083 deletions(-) diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 85adb1d7ce..6184ed3743 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -9,43 +9,43 @@ * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->action->common = 'Logs'; +$lang->action->common = 'Log'; $lang->action->product = $lang->productCommon; $lang->action->project = $lang->projectCommon; $lang->action->objectType = 'Object'; $lang->action->objectID = 'ID'; $lang->action->objectName = 'Name'; -$lang->action->actor = 'Actor'; +$lang->action->actor = 'Operated by'; $lang->action->action = 'Action'; $lang->action->date = 'Date'; -$lang->action->trash = 'Trash'; -$lang->action->undelete = 'Undelete'; +$lang->action->trash = 'Recycle'; +$lang->action->undelete = 'Restore'; $lang->action->hideOne = 'Hide'; -$lang->action->hideAll = 'Hide all'; -$lang->action->editComment = 'Edit comment'; +$lang->action->hideAll = 'Hide All'; +$lang->action->editComment = 'Edit Note'; -$lang->action->trashTips = "Tips:The deleting actions in zentao are all logic"; -$lang->action->textDiff = 'Text mode'; -$lang->action->original = 'Original content'; -$lang->action->confirmHideAll = 'Are you sure you hide these records?'; -$lang->action->needEdit = 'To restore the %s name or code already exists, please change the editor.'; +$lang->action->trashTips = 'Note: The action of Delete in ZenTao is logic.'; +$lang->action->textDiff = 'Text Format'; +$lang->action->original = 'Original Format'; +$lang->action->confirmHideAll = 'Do you want to hide all the records?'; +$lang->action->needEdit = '%s you want to restore has already existed. Please edit it.'; $lang->action->dynamic = new stdclass(); $lang->action->dynamic->today = 'Today'; $lang->action->dynamic->yesterday = 'Yesterday'; -$lang->action->dynamic->twoDaysAgo = 'Two days ago'; -$lang->action->dynamic->thisWeek = 'This week'; -$lang->action->dynamic->lastWeek = 'Last week'; -$lang->action->dynamic->thisMonth = 'This month'; -$lang->action->dynamic->lastMonth = 'Last month'; +$lang->action->dynamic->twoDaysAgo = 'Two Days Ago'; +$lang->action->dynamic->thisWeek = 'This Week'; +$lang->action->dynamic->lastWeek = 'Last Week'; +$lang->action->dynamic->thisMonth = 'This Month'; +$lang->action->dynamic->lastMonth = 'Last Month'; $lang->action->dynamic->all = 'All'; $lang->action->dynamic->hidden = 'Hidden'; $lang->action->dynamic->search = 'Search'; $lang->action->objectTypes['product'] = $lang->productCommon; $lang->action->objectTypes['story'] = 'Story'; -$lang->action->objectTypes['productplan'] = 'Plan'; +$lang->action->objectTypes['productplan'] = 'Planning'; $lang->action->objectTypes['release'] = 'Release'; $lang->action->objectTypes['project'] = $lang->projectCommon; $lang->action->objectTypes['task'] = 'Task'; @@ -53,148 +53,148 @@ $lang->action->objectTypes['build'] = 'Build'; $lang->action->objectTypes['bug'] = 'Bug'; $lang->action->objectTypes['case'] = 'Case'; $lang->action->objectTypes['caseresult'] = 'Case Result'; -$lang->action->objectTypes['stepresult'] = 'Step Result'; +$lang->action->objectTypes['stepresult'] = 'Case Steps'; $lang->action->objectTypes['testtask'] = 'Test Task'; $lang->action->objectTypes['user'] = 'User'; -$lang->action->objectTypes['doc'] = 'Doc'; -$lang->action->objectTypes['doclib'] = 'DocLib'; -$lang->action->objectTypes['todo'] = 'Todo'; +$lang->action->objectTypes['doc'] = 'Document'; +$lang->action->objectTypes['doclib'] = 'Doc Lib'; +$lang->action->objectTypes['todo'] = 'To-Dos'; $lang->action->objectTypes['branch'] = 'Branch'; -/* The desc of actions. */ +/* 用来描述操作历史记录。*/ $lang->action->desc = new stdclass(); -$lang->action->desc->common = '$date, $action by $actor.'; -$lang->action->desc->extra = '$date, $action as $extra by $actor.'; -$lang->action->desc->opened = '$date, opened by $actor.'; -$lang->action->desc->created = '$date, created by $actor.'; -$lang->action->desc->changed = '$date, changed by $actor.'; -$lang->action->desc->edited = '$date, edited by $actor.'; -$lang->action->desc->assigned = '$date, $actor assigned task to $extra.' . "\n"; -$lang->action->desc->closed = '$date, closed by $actor.'; -$lang->action->desc->deleted = '$date, deleted by $actor.'; -$lang->action->desc->deletedfile = '$date, deleted file by $actor, the file is $extra.'; -$lang->action->desc->editfile = '$date, edit file by $actor, the file is $extra.'; -$lang->action->desc->erased = '$date, erased by $actor.'; -$lang->action->desc->undeleted = '$date, restored by $actor.'; -$lang->action->desc->hidden = '$date, hidden by $actor.'; -$lang->action->desc->commented = '$date, commented by $actor.'; -$lang->action->desc->activated = '$date, activated by $actor.'; -$lang->action->desc->moved = '$date, moved by $actor, previouse is "$extra".'; -$lang->action->desc->confirmed = '$date, confirmed by $actor, version is#$extra.'; -$lang->action->desc->caseconfirmed = '$date, confirmed by $actor, version is#$extra.'; -$lang->action->desc->bugconfirmed = '$date, confirmed by $actor.'; -$lang->action->desc->frombug = '$date, from Bug by $actor BugID:$extra.'; -$lang->action->desc->started = '$date, started by $actor.'; -$lang->action->desc->restarted = '$date, continued by $actor' . "\n"; -$lang->action->desc->delayed = '$date, delayed by $actor.'; -$lang->action->desc->suspended = '$date, suspended by $actor.'; -$lang->action->desc->recordestimate = '$date, $actor recorded $extra hours.'; -$lang->action->desc->editestimate = '$date, $actor edited working hours'; -$lang->action->desc->deleteestimate = '$date, $actor deleted working hours'; -$lang->action->desc->canceled = '$date, canceled by $actor.'; -$lang->action->desc->svncommited = '$date, $actor commited to svn，revision is #$extra.' . "\n"; -$lang->action->desc->gitcommited = '$date, $actor commited to git，revision is #$extra.' . "\n"; -$lang->action->desc->finished = '$date, finished by $actor.'; -$lang->action->desc->paused = '$date, paused by $actor.'; -$lang->action->desc->diff1 = 'changed %s, old is "%s", new is "%s".
'; -$lang->action->desc->diff2 = 'changed %s, the diff is:' . "\n" . "
%s
" . "\n"; -$lang->action->desc->diff3 = "changed file's name %s to %s."; +$lang->action->desc->common = '$date, $action by $actor.' . "\n"; +$lang->action->desc->extra = '$date, $action as $extra by $actor.' . "\n"; +$lang->action->desc->opened = '$date, created by $actor .' . "\n"; +$lang->action->desc->created = '$date, created by $actor .' . "\n"; +$lang->action->desc->changed = '$date, modified by $actor .' . "\n"; +$lang->action->desc->edited = '$date, Edited by $actor .' . "\n"; +$lang->action->desc->assigned = '$date, $actor assigned to $extra.' . "\n"; +$lang->action->desc->closed = '$date, closed by $actor .' . "\n"; +$lang->action->desc->deleted = '$date, deleted by $actor .' . "\n"; +$lang->action->desc->deletedfile = '$date, $actor deleted $extra.' . "\n"; +$lang->action->desc->editfile = '$date, $actor edited $extra.' . "\n"; +$lang->action->desc->erased = '$date, deleted by $actor .' . "\n"; +$lang->action->desc->undeleted = '$date, restored by $actor .' . "\n"; +$lang->action->desc->hidden = '$date, hidden by $actor .' . "\n"; +$lang->action->desc->commented = '$date, added by $actor.' . "\n"; +$lang->action->desc->activated = '$date, activated by $actor .' . "\n"; +$lang->action->desc->moved = '$date, moved by $actor , which was "$extra".' . "\n"; +$lang->action->desc->confirmed = '$date, $actor confirmed the change of Story. The latest version is #$extra.' . "\n"; +$lang->action->desc->caseconfirmed = '$date, $actor confirmed the change of Case. The latest version is #$extra' . "\n"; +$lang->action->desc->bugconfirmed = '$date, $actor confirmed Bug.' . "\n"; +$lang->action->desc->frombug = '$date, transformed from $actor Bug whose ID was $extra.'; +$lang->action->desc->started = '$date, started by $actor.' . "\n"; +$lang->action->desc->restarted = '$date, continued by $actor.' . "\n"; +$lang->action->desc->delayed = '$date, delayde by $actor.' . "\n"; +$lang->action->desc->suspended = '$date, suspended by $actor.' . "\n"; +$lang->action->desc->recordestimate = '$date, man-hour recorded by $actor and it consumed $extra hours.'; +$lang->action->desc->editestimate = '$date, $actor edited man-hour.'; +$lang->action->desc->deleteestimate = '$date, $actor delete man-hour.'; +$lang->action->desc->canceled = '$date, cancelled by $actor.' . "\n"; +$lang->action->desc->svncommited = '$date, submitted by $actor and the version is #$extra.' . "\n"; +$lang->action->desc->gitcommited = '$date, submitted by $actor and the version is #$extra.' . "\n"; +$lang->action->desc->finished = '$date, accomplished by $actor.' . "\n"; +$lang->action->desc->paused = '$date, paused by $actor.' . "\n"; +$lang->action->desc->diff1 = '%s has been modified. Its value was "%s" and the new value is "%s".
' . "\n"; +$lang->action->desc->diff2 = '%s has been modified. The difference is ' . "\n" . "
%s
" . "\n"; +$lang->action->desc->diff3 = 'File Name %s was changed to %s .' . "\n"; -/* The desc of actions for link and unlink related case. */ -$lang->action->desc->linkrelatedcase = '$date, linked related case $extra by $actor.' . "\n"; -$lang->action->desc->unlinkrelatedcase = '$date, unlinked related case $extra by $actor.' . "\n"; +/* 关联用例和移除用例时的历史操作记录。*/ +$lang->action->desc->linkrelatedcase = '$date, $actor linked relevant use case $extra.' . "\n"; +$lang->action->desc->unlinkrelatedcase = '$date, $actor removed relevant use case $extra.' . "\n"; -/* The action labels. */ +/* 用来显示动态信息。*/ $lang->action->label = new stdclass(); -$lang->action->label->created = 'created'; -$lang->action->label->opened = 'opened'; -$lang->action->label->changed = 'changed'; -$lang->action->label->edited = 'edited'; -$lang->action->label->assigned = 'assigned'; -$lang->action->label->closed = 'closed'; -$lang->action->label->deleted = 'deleted'; -$lang->action->label->deletedfile = 'deleted file'; -$lang->action->label->editfile = 'edit file name'; -$lang->action->label->erased = 'deleted'; -$lang->action->label->undeleted = 'restore'; -$lang->action->label->hidden = 'hidden'; -$lang->action->label->commented = 'commented'; -$lang->action->label->activated = 'activated'; -$lang->action->label->resolved = 'resolved'; -$lang->action->label->reviewed = 'reviewed'; -$lang->action->label->moved = 'moved'; -$lang->action->label->confirmed = 'confirmed,'; -$lang->action->label->bugconfirmed = 'confirmed'; -$lang->action->label->tostory = 'converted to story'; -$lang->action->label->frombug = 'converted from bug'; -$lang->action->label->totask = 'converted to task'; -$lang->action->label->svncommited = 'commited code'; -$lang->action->label->gitcommited = 'commited code'; -$lang->action->label->linked2plan = 'link to plan'; -$lang->action->label->unlinkedfromplan = 'unlink from plan'; -$lang->action->label->changestatus = 'change status'; -$lang->action->label->marked = 'edited'; -$lang->action->label->linked2project = "link to {$lang->projectCommon}"; -$lang->action->label->unlinkedfromproject = "unlik from {$lang->projectCommon}"; -$lang->action->label->linkrelatedbug = "linked related Bug"; -$lang->action->label->unlinkrelatedbug = "unlinked related Bug"; -$lang->action->label->linkrelatedcase = "linked related case"; -$lang->action->label->unlinkrelatedcase = "unlinked related case"; -$lang->action->label->linkrelatedstory = "linked related story"; -$lang->action->label->unlinkrelatedstory = "unlinked related story"; -$lang->action->label->subdividestory = "subdivided story"; -$lang->action->label->unlinkchildstory = "unlinked child story"; -$lang->action->label->started = 'started'; -$lang->action->label->restarted = 'continued'; -$lang->action->label->recordestimate = 'Hours'; -$lang->action->label->editestimate = 'edit hour'; -$lang->action->label->canceled = 'canceled'; -$lang->action->label->finished = 'finished'; -$lang->action->label->paused = 'paused'; -$lang->action->label->delayed = 'delayed'; -$lang->action->label->suspended = 'suspended'; -$lang->action->label->login = 'login'; -$lang->action->label->logout = "logout"; -$lang->action->label->deleteestimate = "delete estimate"; +$lang->action->label->created = 'Created'; +$lang->action->label->opened = 'Opened'; +$lang->action->label->changed = 'Changed'; +$lang->action->label->edited = 'Edited'; +$lang->action->label->assigned = 'Assigned'; +$lang->action->label->closed = 'Closed'; +$lang->action->label->deleted = 'Deleted'; +$lang->action->label->deletedfile = 'Deleted File'; +$lang->action->label->editfile = 'Edit File'; +$lang->action->label->erased = 'Ereased'; +$lang->action->label->undeleted = 'Restored'; +$lang->action->label->hidden = 'Hidden'; +$lang->action->label->commented = 'Commented'; +$lang->action->label->activated = 'Activated'; +$lang->action->label->resolved = 'Resolved'; +$lang->action->label->reviewed = 'Reviewed'; +$lang->action->label->moved = 'Moved'; +$lang->action->label->confirmed = 'Confirm a Story, '; +$lang->action->label->bugconfirmed = 'Confirmed'; +$lang->action->label->tostory = 'Convert to Story'; +$lang->action->label->frombug = 'Converted from Bug'; +$lang->action->label->totask = 'Convert to Task'; +$lang->action->label->svncommited = 'SVN Commit'; +$lang->action->label->gitcommited = 'Git Commit'; +$lang->action->label->linked2plan = 'Link to Planning'; +$lang->action->label->unlinkedfromplan = 'Unlink from Planning'; +$lang->action->label->changestatus = 'Change Status'; +$lang->action->label->marked = 'Marked'; +$lang->action->label->linked2project = "Link {$lang->projectCommon}"; +$lang->action->label->unlinkedfromproject = "Remove {$lang->projectCommon}"; +$lang->action->label->linkrelatedbug = "Link to Bug"; +$lang->action->label->unlinkrelatedbug = "Removed Linked Bug"; +$lang->action->label->linkrelatedcase = "Link to Case"; +$lang->action->label->unlinkrelatedcase = "Unlink from Case"; +$lang->action->label->linkrelatedstory = "Link to Story"; +$lang->action->label->unlinkrelatedstory = "Unlink from Story"; +$lang->action->label->subdividestory = "Decompose Story"; +$lang->action->label->unlinkchildstory = "Unlink decomposed Story"; +$lang->action->label->started = 'Initiated'; +$lang->action->label->restarted = 'Continued'; +$lang->action->label->recordestimate = 'Historyed Man-Hour'; +$lang->action->label->editestimate = 'Edited Man-Hour'; +$lang->action->label->canceled = 'Cancelled'; +$lang->action->label->finished = 'Finished'; +$lang->action->label->paused = 'Paused'; +$lang->action->label->delayed = 'Delayed'; +$lang->action->label->suspended = 'Suspended'; +$lang->action->label->login = 'Login'; +$lang->action->label->logout = "Logout"; +$lang->action->label->deleteestimate = "Deleted Man-Hour"; -/* Link of every action. */ +/* 用来生成相应对象的链接。*/ $lang->action->label->product = $lang->productCommon . '|product|view|productID=%s'; -$lang->action->label->productplan = 'plan|productplan|view|productID=%s'; -$lang->action->label->release = 'release|release|view|productID=%s'; -$lang->action->label->story = 'story|story|view|storyID=%s'; -$lang->action->label->project = $lang->projectCommon . '|project|view|projectID=%s'; -$lang->action->label->task = 'task|task|view|taskID=%s'; -$lang->action->label->build = 'build|build|view|buildID=%s'; -$lang->action->label->bug = 'bug|bug|view|bugID=%s'; -$lang->action->label->case = 'case|testcase|view|caseID=%s'; -$lang->action->label->testtask = 'test task|testtask|view|caseID=%s'; -$lang->action->label->todo = 'todo|todo|view|todoID=%s'; -$lang->action->label->doclib = 'doc library|doc|browse|libID=%s'; -$lang->action->label->doc = 'doc|doc|view|docID=%s'; -$lang->action->label->user = 'user'; +$lang->action->label->productplan = 'Planning|productplan|view|productID=%s'; +$lang->action->label->release = 'Release|release|view|productID=%s'; +$lang->action->label->story = 'Story|story|view|storyID=%s'; +$lang->action->label->project = "{$lang->projectCommon}|project|view|projectID=%s"; +$lang->action->label->task = 'Task|task|view|taskID=%s'; +$lang->action->label->build = 'Build|build|view|buildID=%s'; +$lang->action->label->bug = 'Bug|bug|view|bugID=%s'; +$lang->action->label->case = 'Case|testcase|view|caseID=%s'; +$lang->action->label->testtask = 'Test Task|testtask|view|caseID=%s'; +$lang->action->label->todo = 'To-Dos|todo|view|todoID=%s'; +$lang->action->label->doclib = 'Doc Lib|doc|browse|libID=%s'; +$lang->action->label->doc = 'Document|doc|view|docID=%s'; +$lang->action->label->user = 'User|user|view|account=%s'; $lang->action->label->space = ' '; /* Object type. */ $lang->action->search->objectTypeList[''] = ''; $lang->action->search->objectTypeList['product'] = $lang->productCommon; $lang->action->search->objectTypeList['project'] = $lang->projectCommon; -$lang->action->search->objectTypeList['bug'] = 'bug'; -$lang->action->search->objectTypeList['case'] = 'case'; -$lang->action->search->objectTypeList['caseresult'] = 'case result'; -$lang->action->search->objectTypeList['stepresult'] = 'step result'; -$lang->action->search->objectTypeList['story'] = 'story'; -$lang->action->search->objectTypeList['task'] = 'task'; -$lang->action->search->objectTypeList['testtask'] = 'testtask'; -$lang->action->search->objectTypeList['user'] = 'user'; -$lang->action->search->objectTypeList['doc'] = 'doc'; -$lang->action->search->objectTypeList['doclib'] = 'doclib'; -$lang->action->search->objectTypeList['todo'] = 'todo'; -$lang->action->search->objectTypeList['build'] = 'build'; -$lang->action->search->objectTypeList['release'] = 'release'; -$lang->action->search->objectTypeList['productplan'] = 'plan'; -$lang->action->search->objectTypeList['branch'] = 'branch'; +$lang->action->search->objectTypeList['bug'] = 'Bug'; +$lang->action->search->objectTypeList['case'] = 'Case'; +$lang->action->search->objectTypeList['caseresult'] = 'Case Results'; +$lang->action->search->objectTypeList['stepresult'] = 'Case Steps'; +$lang->action->search->objectTypeList['story'] = 'Story'; +$lang->action->search->objectTypeList['task'] = 'Task'; +$lang->action->search->objectTypeList['testtask'] = 'Test Task'; +$lang->action->search->objectTypeList['user'] = 'User'; +$lang->action->search->objectTypeList['doc'] = 'Document'; +$lang->action->search->objectTypeList['doclib'] = 'Doc Lib'; +$lang->action->search->objectTypeList['todo'] = 'To-Dos'; +$lang->action->search->objectTypeList['build'] = 'Build'; +$lang->action->search->objectTypeList['release'] = 'Release'; +$lang->action->search->objectTypeList['productplan'] = 'Planning'; +$lang->action->search->objectTypeList['branch'] = 'Branch'; -/* Display action for search. */ +/* 用来在动态显示中显示动作 */ $lang->action->search->label[''] = ''; $lang->action->search->label['created'] = $lang->action->label->created; $lang->action->search->label['opened'] = $lang->action->label->opened; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 76cd9caa15..1241408c59 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -9,52 +9,52 @@ * @version $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->admin->common = 'Admin'; -$lang->admin->index = 'Index'; -$lang->admin->checkDB = 'Repair data'; -$lang->admin->sso = 'Integrate RanZhi'; -$lang->admin->safeIndex = 'Safe'; -$lang->admin->checkWeak = 'Check weak'; +$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 = 'The current version of the system is %s,'; -$lang->admin->info->links = 'You can visit the following link:'; -$lang->admin->info->account = 'Your account in zentao community is %s. '; +$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 = "Tips: You have not registered in zentao community (www.zentao.net), %s to register and get the latest information about ZentaoPMS."; -$lang->admin->notice->ignore = "ignore"; +$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 zentao community'; -$lang->admin->register->click = 'click'; -$lang->admin->register->lblAccount = 'Numbers and letters, at least three'; -$lang->admin->register->lblPasswd = 'Numbers and letters, at least six'; +$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 community account, %s to bind it"; -$lang->admin->register->success = "Register success"; +$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 = 'Bind with community account'; -$lang->admin->bind->success = "Bind success"; +$lang->admin->bind->caption = 'Link an Account'; +$lang->admin->bind->success = "Account has been linked!"; $lang->admin->safe = new stdclass(); -$lang->admin->safe->common = 'Safe'; -$lang->admin->safe->set = 'Set password safe'; -$lang->admin->safe->password = 'Password safe'; -$lang->admin->safe->weak = 'weak Password'; +$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->checkWeak = 'Weak Password Check'; -$lang->admin->safe->modeList[0] = 'Do not check'; -$lang->admin->safe->modeList[1] = 'Intermediate'; +$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 account'; -$lang->admin->safe->reasonList['mobile'] = 'Same mobile'; -$lang->admin->safe->reasonList['phone'] = 'Same phone'; -$lang->admin->safe->reasonList['birthday'] = 'Same birthday'; +$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->noticeMode = 'The system will log in, create and modify the user password, check the user password.'; -$lang->admin->safe->noticeStrong = 'The longer the password length, the more the number of letters or numbers or special characters, the more secure!'; +$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/api/lang/en.php b/module/api/lang/en.php index fc1582cd33..5ec5f22ebf 100644 --- a/module/api/lang/en.php +++ b/module/api/lang/en.php @@ -12,19 +12,19 @@ $lang->api = new stdclass(); $lang->api->common = 'API'; $lang->api->getModel = 'Super Model API'; -$lang->api->sql = 'SQL Query API'; +$lang->api->sql = 'SQL Query API'; $lang->api->position = 'Position'; -$lang->api->startLine = "%s, line %s"; -$lang->api->desc = 'Desc'; +$lang->api->startLine = "%s,%s"; +$lang->api->desc = 'Description'; $lang->api->debug = 'Debug'; -$lang->api->submit = 'submit'; -$lang->api->url = 'Request url'; -$lang->api->result = 'Result'; -$lang->api->status = 'status'; -$lang->api->data = 'data'; -$lang->api->noParam = 'No params in this method'; -$lang->api->post = 'Refer to corresponding form for debugging POST.'; +$lang->api->submit = 'Submit'; +$lang->api->url = 'Request URL'; +$lang->api->result = 'Results'; +$lang->api->status = 'Status'; +$lang->api->data = 'Data'; +$lang->api->noParam = 'No parameters required if GET Debug'; +$lang->api->post = 'Refer to page list if POST Debug'; $lang->api->error = new stdclass(); -$lang->api->error->onlySelect = 'SQL query interface allows only SELECT query'; +$lang->api->error->onlySelect = 'SQL interface only allow SELECT query.'; diff --git a/module/backup/lang/en.php b/module/backup/lang/en.php index db9256eb06..c5a4f944ad 100644 --- a/module/backup/lang/en.php +++ b/module/backup/lang/en.php @@ -1,29 +1,29 @@ backup->common = 'Backup'; -$lang->backup->index = 'Index'; +$lang->backup->index = 'Homepage'; $lang->backup->history = 'History'; $lang->backup->delete = 'Delete'; $lang->backup->backup = 'Backup'; $lang->backup->restore = 'Restore'; -$lang->backup->change = 'Change hold days'; -$lang->backup->changeAB = 'change'; +$lang->backup->change = 'Save Interval'; +$lang->backup->changeAB = 'Modify'; $lang->backup->time = 'Time'; $lang->backup->files = 'Files'; $lang->backup->size = 'Size'; -$lang->backup->waitting = ' is in progress, please wait...'; -$lang->backup->confirmDelete = 'Are you sure delete this backup?'; -$lang->backup->confirmRestore = 'Are you sure restore this backup?'; -$lang->backup->holdDays = 'Keep backup copy of the recent %s days'; +$lang->backup->waitting = 'In Progree. Please wait...'; +$lang->backup->confirmDelete = 'Do you want to delete the backup？'; +$lang->backup->confirmRestore = 'Do you want to restore the backup？'; +$lang->backup->holdDays = 'Backup the latest %s days.'; $lang->backup->success = new stdclass(); -$lang->backup->success->backup = 'Success backup!'; -$lang->backup->success->restore = 'Success restore!'; +$lang->backup->success->backup = 'Backed up!'; +$lang->backup->success->restore = 'Restored!'; $lang->backup->error = new stdclass(); -$lang->backup->error->noWritable = "Cannot backup! %s do not write! Please check the directory permissions."; -$lang->backup->error->noDelete = "The file %s cannot delete, modify permissions or deleted manually."; -$lang->backup->error->restoreSQL = "The database restore failed. Error: %s"; -$lang->backup->error->restoreFile = "Attachments failed to restore. Error: %s"; -$lang->backup->error->backupFile = "Attachments failed to backup. Error: %s"; +$lang->backup->error->noWritable = "%s is not writable! Please check the permission, or back up cannot be done."; +$lang->backup->error->noDelete = "%s cannot be deleted. Please modify the permission or manually delete it."; +$lang->backup->error->restoreSQL = "Database library restoring failed. Error %s."; +$lang->backup->error->restoreFile = "File restoring failed. Error %s."; +$lang->backup->error->backupFile = "File backup failed. Error %s."; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 8f4f5f6ab3..712f6fb1b7 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -19,7 +19,7 @@ $lang->block->color = 'Color'; $lang->block->lblModule = 'Module'; $lang->block->lblBlock = 'Block'; $lang->block->lblNum = 'Number'; -$lang->block->lblHtml = 'HTML Content'; +$lang->block->lblHtml = 'HTML'; $lang->block->dynamic = 'Dynamic'; $lang->block->lblFlowchart = 'Flowchart'; @@ -27,22 +27,22 @@ $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 = 'Sort have been saved'; -$lang->block->confirmRemoveBlock = 'Are you sure remove block [{0}] ?'; +$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->refresh = 'Refresh'; -$lang->block->hidden = 'Hidden'; +$lang->block->hidden = 'Hide'; $lang->block->dynamicInfo = "%s, %s %s %s %s."; -$lang->block->default['product']['1']['title'] = $lang->productCommon . ' list'; +$lang->block->default['product']['1']['title'] = 'Open' . $lang->productCommon; $lang->block->default['product']['1']['block'] = 'list'; $lang->block->default['product']['1']['grid'] = 8; $lang->block->default['product']['1']['params']['num'] = 15; $lang->block->default['product']['1']['params']['type'] = 'noclosed'; -$lang->block->default['product']['2']['title'] = 'Story of assigned to me'; +$lang->block->default['product']['2']['title'] = 'My Stories'; $lang->block->default['product']['2']['block'] = 'story'; $lang->block->default['product']['2']['grid'] = 4; @@ -50,7 +50,7 @@ $lang->block->default['product']['2']['params']['num'] = 15; $lang->block->default['product']['2']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['2']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['1']['title'] = $lang->projectCommon . ' list'; +$lang->block->default['project']['1']['title'] = 'Doing' . $lang->projectCommon; $lang->block->default['project']['1']['block'] = 'list'; $lang->block->default['project']['1']['grid'] = 8; @@ -58,7 +58,7 @@ $lang->block->default['project']['1']['params']['num'] = 15; $lang->block->default['project']['1']['params']['orderBy'] = 'id_desc'; $lang->block->default['project']['1']['params']['type'] = 'undone'; -$lang->block->default['project']['2']['title'] = 'Task of assigned to me'; +$lang->block->default['project']['2']['title'] = 'My Tasks'; $lang->block->default['project']['2']['block'] = 'task'; $lang->block->default['project']['2']['grid'] = 4; @@ -66,7 +66,7 @@ $lang->block->default['project']['2']['params']['num'] = 15; $lang->block->default['project']['2']['params']['orderBy'] = 'id_desc'; $lang->block->default['project']['2']['params']['type'] = 'assignedTo'; -$lang->block->default['qa']['1']['title'] = 'Bug of assigned to me'; +$lang->block->default['qa']['1']['title'] = 'My Bugs'; $lang->block->default['qa']['1']['block'] = 'bug'; $lang->block->default['qa']['1']['grid'] = 4; @@ -74,7 +74,7 @@ $lang->block->default['qa']['1']['params']['num'] = 15; $lang->block->default['qa']['1']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['1']['params']['type'] = 'assignedTo'; -$lang->block->default['qa']['2']['title'] = 'Case of assigned to me'; +$lang->block->default['qa']['2']['title'] = 'My Cases'; $lang->block->default['qa']['2']['block'] = 'case'; $lang->block->default['qa']['2']['grid'] = 4; @@ -82,7 +82,7 @@ $lang->block->default['qa']['2']['params']['num'] = 15; $lang->block->default['qa']['2']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['2']['params']['type'] = 'assigntome'; -$lang->block->default['qa']['3']['title'] = 'Waiting test task'; +$lang->block->default['qa']['3']['title'] = 'Pending Versions'; $lang->block->default['qa']['3']['block'] = 'testtask'; $lang->block->default['qa']['3']['grid'] = 4; @@ -100,7 +100,7 @@ $lang->block->default['my']['2']['grid'] = 4; $lang->block->default['my']['2']['source'] = ''; $lang->block->default['my']['3'] = $lang->block->default['project']['1']; $lang->block->default['my']['3']['source'] = 'project'; -$lang->block->default['my']['4']['title'] = 'My todo'; +$lang->block->default['my']['4']['title'] = 'My To-Dos'; $lang->block->default['my']['4']['block'] = 'list'; $lang->block->default['my']['4']['grid'] = 4; $lang->block->default['my']['4']['source'] = 'todo'; @@ -118,107 +118,107 @@ $lang->block->default['my']['9']['source'] = 'qa'; $lang->block->num = 'Number'; $lang->block->type = 'Type'; -$lang->block->orderBy = 'Order'; +$lang->block->orderBy = 'Sequence'; $lang->block->availableBlocks = new stdclass(); -$lang->block->availableBlocks->todo = 'My todo'; -$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->product = $lang->productCommon; -$lang->block->availableBlocks->project = $lang->projectCommon; -$lang->block->availableBlocks->plan = 'Plan list'; -$lang->block->availableBlocks->release = 'Release list'; -$lang->block->availableBlocks->build = 'Build list'; -$lang->block->availableBlocks->testtask = 'Test build list'; +$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->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->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; -$lang->block->moduleList['qa'] = 'Test'; -$lang->block->moduleList['todo'] = 'Todo'; +$lang->block->moduleList['qa'] = 'Testing'; +$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->plan = 'Plan list'; -$lang->block->modules['product']->availableBlocks->release = 'Release list'; +$lang->block->modules['product']->availableBlocks->list = $lang->productCommon . 'List'; +$lang->block->modules['product']->availableBlocks->story = 'Story List'; +$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->list = $lang->projectCommon . 'List'; +$lang->block->modules['project']->availableBlocks->task = 'Task List'; +$lang->block->modules['project']->availableBlocks->build = 'Build List'; $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 = 'Bug List'; +$lang->block->modules['qa']->availableBlocks->case = 'Case List'; +$lang->block->modules['qa']->availableBlocks->testtask = 'Test Build List'; $lang->block->modules['todo'] = new stdclass(); $lang->block->modules['todo']->availableBlocks = new stdclass(); -$lang->block->modules['todo']->availableBlocks->list = 'Todo list'; +$lang->block->modules['todo']->availableBlocks->list = 'To-Do List'; $lang->block->orderByList = new stdclass(); $lang->block->orderByList->task = array(); -$lang->block->orderByList->task['id_asc'] = 'ID Increment'; -$lang->block->orderByList->task['id_desc'] = 'ID Decreasing'; -$lang->block->orderByList->task['pri_asc'] = 'Priority Increment'; -$lang->block->orderByList->task['pri_desc'] = 'Priority Decreasing'; -$lang->block->orderByList->task['estimate_asc'] = 'Estimate Increment'; -$lang->block->orderByList->task['estimate_desc'] = 'Estimate Decreasing'; -$lang->block->orderByList->task['status_asc'] = 'Status Increment'; -$lang->block->orderByList->task['status_desc'] = 'Status Decreasing'; -$lang->block->orderByList->task['deadline_asc'] = 'Deadline Increment'; -$lang->block->orderByList->task['deadline_desc'] = 'Deadline Decreasing'; +$lang->block->orderByList->task['id_asc'] = 'ID Ascending'; +$lang->block->orderByList->task['id_desc'] = 'ID Descending'; +$lang->block->orderByList->task['pri_asc'] = 'Priority Ascending'; +$lang->block->orderByList->task['pri_desc'] = 'Priority Descending'; +$lang->block->orderByList->task['estimate_asc'] = 'Estimated Time Ascending'; +$lang->block->orderByList->task['estimate_desc'] = 'Estimated Time Descending'; +$lang->block->orderByList->task['status_asc'] = 'Status Ascending'; +$lang->block->orderByList->task['status_desc'] = 'Status Descending'; +$lang->block->orderByList->task['deadline_asc'] = 'Deadline Ascending'; +$lang->block->orderByList->task['deadline_desc'] = 'Deadline Descending'; $lang->block->orderByList->bug = array(); -$lang->block->orderByList->bug['id_asc'] = 'ID Increment'; -$lang->block->orderByList->bug['id_desc'] = 'ID Decreasing'; -$lang->block->orderByList->bug['pri_asc'] = 'Priority Increment'; -$lang->block->orderByList->bug['pri_desc'] = 'Priority Decreasing'; -$lang->block->orderByList->bug['severity_asc'] = 'Severity Increment'; -$lang->block->orderByList->bug['severity_desc'] = 'Severity Decreasing'; +$lang->block->orderByList->bug['id_asc'] = 'ID Ascending'; +$lang->block->orderByList->bug['id_desc'] = 'ID Descending'; +$lang->block->orderByList->bug['pri_asc'] = 'Priority Ascending'; +$lang->block->orderByList->bug['pri_desc'] = 'Priority Descending'; +$lang->block->orderByList->bug['severity_asc'] = 'Level Ascending'; +$lang->block->orderByList->bug['severity_desc'] = 'Level Descending'; $lang->block->orderByList->case = array(); -$lang->block->orderByList->case['id_asc'] = 'ID Increment'; -$lang->block->orderByList->case['id_desc'] = 'ID Decreasing'; -$lang->block->orderByList->case['pri_asc'] = 'Priority Increment'; -$lang->block->orderByList->case['pri_desc'] = 'Priority Decreasing'; +$lang->block->orderByList->case['id_asc'] = 'ID Ascending'; +$lang->block->orderByList->case['id_desc'] = 'ID Descending'; +$lang->block->orderByList->case['pri_asc'] = 'PriorityAscending'; +$lang->block->orderByList->case['pri_desc'] = 'PriorityDescending'; $lang->block->orderByList->story = array(); -$lang->block->orderByList->story['id_asc'] = 'ID Increment'; -$lang->block->orderByList->story['id_desc'] = 'ID Decreasing'; -$lang->block->orderByList->story['pri_asc'] = 'Priority Increment'; -$lang->block->orderByList->story['pri_desc'] = 'Priority Decreasing'; -$lang->block->orderByList->story['status_asc'] = 'Status Increment'; -$lang->block->orderByList->story['status_desc'] = 'Status Decreasing'; -$lang->block->orderByList->story['stage_asc'] = 'Stage Increment'; -$lang->block->orderByList->story['stage_desc'] = 'Stage Decreasing'; +$lang->block->orderByList->story['id_asc'] = 'ID Ascending'; +$lang->block->orderByList->story['id_desc'] = 'ID Descending'; +$lang->block->orderByList->story['pri_asc'] = 'PriorityAscending'; +$lang->block->orderByList->story['pri_desc'] = 'PriorityDescending'; +$lang->block->orderByList->story['status_asc'] = 'Status Ascending'; +$lang->block->orderByList->story['status_desc'] = 'Status Descending'; +$lang->block->orderByList->story['stage_asc'] = 'Stage Ascending'; +$lang->block->orderByList->story['stage_desc'] = 'Stage Descending'; $lang->block->typeList = new stdclass(); -$lang->block->typeList->task['assignedTo'] = 'Assigned to'; -$lang->block->typeList->task['openedBy'] = 'Opened by'; -$lang->block->typeList->task['finishedBy'] = 'Finished by'; -$lang->block->typeList->task['closedBy'] = 'Closed by'; -$lang->block->typeList->task['canceledBy'] = 'Canceled by'; +$lang->block->typeList->task['assignedTo'] = 'Assigned to Me'; +$lang->block->typeList->task['openedBy'] = 'Created by Me'; +$lang->block->typeList->task['finishedBy'] = 'Finished by Me'; +$lang->block->typeList->task['closedBy'] = 'Closed by Me'; +$lang->block->typeList->task['canceledBy'] = 'Cancelled by Me'; -$lang->block->typeList->bug['assignedTo'] = 'Assigned to'; -$lang->block->typeList->bug['openedBy'] = 'Opened by'; -$lang->block->typeList->bug['resolvedBy'] = 'Resolved by'; -$lang->block->typeList->bug['closedBy'] = 'Closed by'; +$lang->block->typeList->bug['assignedTo'] = 'Assigned to Me'; +$lang->block->typeList->bug['openedBy'] = 'Created by Me'; +$lang->block->typeList->bug['resolvedBy'] = 'Solved by Me'; +$lang->block->typeList->bug['closedBy'] = 'Closed by Me'; -$lang->block->typeList->case['assigntome'] = 'Assign to me'; -$lang->block->typeList->case['openedbyme'] = 'Opened by me'; +$lang->block->typeList->case['assigntome'] = 'Assigned to Me'; +$lang->block->typeList->case['openedbyme'] = 'Created by Me'; -$lang->block->typeList->story['assignedTo'] = 'Assigned to'; -$lang->block->typeList->story['openedBy'] = 'Opened by'; -$lang->block->typeList->story['reviewedBy'] = 'Reviewed by'; -$lang->block->typeList->story['closedBy'] = 'Closed by'; - -$lang->block->typeList->product['noclosed'] = 'No closed'; +$lang->block->typeList->story['assignedTo'] = 'Assigned to Me'; +$lang->block->typeList->story['openedBy'] = 'Created by Me'; +$lang->block->typeList->story['reviewedBy'] = 'Reviewed by Me'; +$lang->block->typeList->story['closedBy'] = 'Closed by Me' ; + +$lang->block->typeList->product['noclosed'] = 'Open'; $lang->block->typeList->product['closed'] = 'Closed'; $lang->block->typeList->product['all'] = 'All'; @@ -226,8 +226,8 @@ $lang->block->typeList->project['undone'] = 'Undone'; $lang->block->typeList->project['isdoing'] = 'Doing'; $lang->block->typeList->project['all'] = 'All'; -$lang->block->typeList->testtask['wait'] = 'Waiting test task'; -$lang->block->typeList->testtask['done'] = 'Done test task'; +$lang->block->typeList->testtask['wait'] = 'Testing Pending'; +$lang->block->typeList->testtask['done'] = 'Tested'; $lang->block->typeList->testtask['all'] = 'All'; $lang->block->modules['product']->moreLinkList = new stdclass(); @@ -246,9 +246,9 @@ $lang->block->modules['common'] = new stdclass(); $lang->block->modules['common']->moreLinkList = new stdclass(); $lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|'; -$lang->block->flowchart = array(); -$lang->block->flowchart[] = array('Administrator', 'Manage company', 'Add user', 'Manage privilege'); -$lang->block->flowchart[] = array('Product manager', 'Create product', 'Manage odules', 'manage plans', 'manage stories', 'Create release'); -$lang->block->flowchart[] = array('Project manager', 'Create project', 'Manage team', 'Link products', 'Link stories', 'Create task'); -$lang->block->flowchart[] = array('Developer', 'Get tasks/bugs', 'Update status', 'Finish tasks/bugs'); -$lang->block->flowchart[] = array('Tester', 'Create testcase', 'Run testcases', 'Create bug', 'Confirm bug', 'Close bug'); +$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'); diff --git a/module/branch/lang/en.php b/module/branch/lang/en.php index 062fdf7d45..37a22f923c 100644 --- a/module/branch/lang/en.php +++ b/module/branch/lang/en.php @@ -1,9 +1,9 @@ branch->common = 'Branch'; -$lang->branch->manage = 'Branch manage'; -$lang->branch->delete = 'Branch delete'; +$lang->branch->manage = 'Manage a Branch'; +$lang->branch->delete = 'Delete Branch'; -$lang->branch->manageTitle = '%s Manage'; -$lang->branch->all = 'All '; +$lang->branch->manageTitle = '%s Management'; +$lang->branch->all = 'All'; -$lang->branch->confirmDelete = '@branch@ deletion, will affect the @branch@ of the demand, module, plan, release, Bug, testcase and so on, please consider carefully. Are you sure delete the @branch@?'; +$lang->branch->confirmDelete = '@branch@ Delete will affect @branch@ related Story、Module、Planning、Release、Bug、Case, etc. Please think before you delete this @branch@.'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 661cd1b618..df759a9c58 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -26,128 +26,128 @@ $lang->bug->pri = 'Priority'; $lang->bug->type = 'Type'; $lang->bug->os = 'OS'; $lang->bug->browser = 'Browser'; -$lang->bug->steps = 'Steps'; +$lang->bug->steps = 'STR'; $lang->bug->status = 'Status'; $lang->bug->statusAB = 'Status'; -$lang->bug->activatedCount = 'Activated count'; -$lang->bug->activatedCountAB = 'Activated count'; +$lang->bug->activatedCount = 'Activated Count'; +$lang->bug->activatedCountAB = 'Activated Count'; $lang->bug->confirmed = 'Confirmed'; -$lang->bug->toTask = 'To task'; -$lang->bug->toStory = 'To story'; -$lang->bug->mailto = 'Mailto'; +$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 = 'Date'; +$lang->bug->openedDate = 'Opened Date'; +$lang->bug->openedDateAB = 'Opened Date'; $lang->bug->openedBuild = 'Opened Build'; -$lang->bug->assignedTo = 'Assigned'; +$lang->bug->assignedTo = 'Assigned To'; $lang->bug->assignedDate = 'Assigned Date'; $lang->bug->resolvedBy = 'Resolved By'; -$lang->bug->resolvedByAB = 'Resolve'; +$lang->bug->resolvedByAB = 'Resolved'; $lang->bug->resolution = 'Resolution'; -$lang->bug->resolutionAB = 'Resolution'; +$lang->bug->resolutionAB = 'Solution'; $lang->bug->resolvedBuild = 'Resolved Build'; $lang->bug->resolvedDate = 'Resolved Date'; -$lang->bug->resolvedDateAB = 'Date'; +$lang->bug->resolvedDateAB = 'Resolved Date'; $lang->bug->closedBy = 'Closed By'; $lang->bug->closedDate = 'Closed Date'; $lang->bug->duplicateBug = 'Duplicate'; $lang->bug->lastEditedBy = 'Last Edited By'; -$lang->bug->linkBug = 'Related'; -$lang->bug->linkBugs = 'Link related bugs'; -$lang->bug->unlinkBug = 'Unlink related bug'; +$lang->bug->linkBug = 'Linked'; +$lang->bug->linkBugs = 'Link Bug'; +$lang->bug->unlinkBug = 'Unlink Bug'; $lang->bug->case = 'Case'; -$lang->bug->files = 'Files'; -$lang->bug->keywords = 'Keywords'; -$lang->bug->lastEditedByAB = 'Edited'; -$lang->bug->lastEditedDateAB = 'Edited Date'; -$lang->bug->lastEditedDate = 'Edited Date'; -$lang->bug->fromCase = 'From case'; -$lang->bug->toCase = 'To case'; -$lang->bug->colorTag = 'Color tag'; +$lang->bug->files = 'File'; +$lang->bug->keywords = 'Keyword'; +$lang->bug->lastEditedByAB = 'Edited By'; +$lang->bug->lastEditedDateAB = 'Edit Date'; +$lang->bug->lastEditedDate = 'Edit Date'; +$lang->bug->fromCase = 'From a Case'; +$lang->bug->toCase = 'To a Case'; +$lang->bug->colorTag = 'Color Tag'; -/* Actions. */ -$lang->bug->index = 'Index'; +/* 方法列表。*/ +$lang->bug->index = 'Homepage'; $lang->bug->create = 'Create Bug'; -$lang->bug->batchCreate = 'Batch create'; -$lang->bug->confirmBug = 'Confirm Bug'; -$lang->bug->batchConfirm = 'Batch confirm'; -$lang->bug->edit = 'Edit Bug'; -$lang->bug->batchEdit = 'Batch edit'; -$lang->bug->batchChangeModule = 'Batch change module'; -$lang->bug->batchClose = 'Batch close'; +$lang->bug->batchCreate = 'Batch Create'; +$lang->bug->confirmBug = 'Confirm'; +$lang->bug->batchConfirm = 'Batch Confirm'; +$lang->bug->edit = 'Edit'; +$lang->bug->batchEdit = 'Batch Edit'; +$lang->bug->batchChangeModule = 'Batch Modify'; +$lang->bug->batchClose = 'Batch Close'; $lang->bug->assignTo = 'Assign'; -$lang->bug->batchAssignTo = 'Batch assign'; -$lang->bug->browse = 'Browse Bug'; -$lang->bug->view = 'Bug Info'; -$lang->bug->resolve = 'Resolve'; -$lang->bug->batchResolve = 'Batch resolve'; +$lang->bug->batchAssignTo = 'Batch Assign'; +$lang->bug->browse = 'Bug List'; +$lang->bug->view = 'Bug Details'; +$lang->bug->resolve = 'Solve'; +$lang->bug->batchResolve = 'Batch Resolve'; $lang->bug->close = 'Close'; $lang->bug->activate = 'Activate'; $lang->bug->reportChart = 'Report'; -$lang->bug->export = 'Export data'; +$lang->bug->export = 'Export Data'; $lang->bug->delete = 'Delete Bug'; $lang->bug->deleted = 'Deleted'; -$lang->bug->saveTemplate = 'Save template'; -$lang->bug->setPublic = 'Set public template'; -$lang->bug->deleteTemplate = 'Delete template'; -$lang->bug->confirmStoryChange = 'Confirm Story Change'; -$lang->bug->copy = 'Copy bug'; +$lang->bug->saveTemplate = 'Save Template'; +$lang->bug->setPublic = 'Set as Public'; +$lang->bug->deleteTemplate = 'Delete Template'; +$lang->bug->confirmStoryChange = 'Story Change Confirmation'; +$lang->bug->copy = 'Duplicate a Bug'; -/* Browse tabs. */ -$lang->bug->assignToMe = 'MyBugs'; -$lang->bug->openedByMe = 'MyOpen'; -$lang->bug->resolvedByMe = 'MyResolve'; -$lang->bug->closedByMe = 'MyClose'; +/* 查询条件列表。*/ +$lang->bug->assignToMe = 'Assigned to Me'; +$lang->bug->openedByMe = 'Created by Me'; +$lang->bug->resolvedByMe = 'Resolved by Me'; +$lang->bug->closedByMe = 'Closed by Me'; $lang->bug->assignToNull = 'Unassigned'; -$lang->bug->unResolved = 'Unresolved'; -$lang->bug->toClosed = 'Closing'; -$lang->bug->unclosed = 'Unclosed'; -$lang->bug->longLifeBugs = 'Longlife'; +$lang->bug->unResolved = 'Unsolve'; +$lang->bug->toClosed = 'To Be Closed'; +$lang->bug->unclosed = 'Open'; +$lang->bug->longLifeBugs = 'Pending'; $lang->bug->postponedBugs = 'Postponed'; -$lang->bug->allBugs = 'Allbug'; +$lang->bug->allBugs = 'All'; $lang->bug->byQuery = 'Search'; -$lang->bug->needConfirm = 'StoryChanged'; -$lang->bug->allProduct = "All {$lang->productCommon}s"; +$lang->bug->needConfirm = 'Story Change'; +$lang->bug->allProduct = 'All' . $lang->productCommon; $lang->bug->ditto = 'Ditto'; -$lang->bug->dittoNotice = 'Current bug and bug above it do not belong to same product!'; +$lang->bug->dittoNotice = 'This bug does not affiliate to the same product as the last one!'; -/* Labels. */ -$lang->bug->lblAssignedTo = 'Assigned to'; -$lang->bug->lblMailto = 'Mailto'; -$lang->bug->lblLastEdited = 'Last edited'; -$lang->bug->lblResolved = 'Resolved'; -$lang->bug->allUsers = 'All users'; +/* 页面标签。*/ +$lang->bug->lblAssignedTo = 'Current Assign'; +$lang->bug->lblMailto = 'Mail To'; +$lang->bug->lblLastEdited = 'Last Edited'; +$lang->bug->lblResolved = 'Solved By'; +$lang->bug->allUsers = 'All User'; $lang->bug->allBuilds = 'All'; -/* Legends. */ -$lang->bug->legendBasicInfo = 'Basic info'; -$lang->bug->legendAttatch = 'Files'; -$lang->bug->legendPrjStoryTask = "{$lang->projectCommon}, story & task"; -$lang->bug->lblTypeAndSeverity = 'Type&Severity'; -$lang->bug->lblSystemBrowserAndHardware = 'OS&Browser'; -$lang->bug->legendSteps = 'Steps'; -$lang->bug->legendComment = 'Comment'; -$lang->bug->legendLife = 'Lifetime'; -$lang->bug->legendMisc = 'Misc'; +/* legend列表。*/ +$lang->bug->legendBasicInfo = 'Basic Info'; +$lang->bug->legendAttatch = 'Attachment'; +$lang->bug->legendPrjStoryTask = $lang->projectCommon . '/Story/Task'; +$lang->bug->lblTypeAndSeverity = 'Type/Priority Level'; +$lang->bug->lblSystemBrowserAndHardware = 'System/Browser'; +$lang->bug->legendSteps = 'STR'; +$lang->bug->legendComment = 'Note'; +$lang->bug->legendLife = 'Bug Lifecycle'; +$lang->bug->legendMisc = 'Miscellaneous'; -/* Action buttons. */ +/* 功能按钮。*/ $lang->bug->buttonConfirm = 'Confirm'; -/* Confirm messags. */ -$lang->bug->confirmChangeProduct = "Change {$lang->productCommon} will change {$lang->projectCommon}, task and story also, are you sure?"; -$lang->bug->confirmDelete = 'Are you sure to delete this bug?'; -$lang->bug->setTemplateTitle = 'Please input the template title:'; -$lang->bug->remindTask = 'This bug has been to be a task, update the task:%s or not?'; -$lang->bug->skipClose = 'The status of bug:%s are not resolved, so can not close!'; -$lang->bug->applyTemplate = 'Apply template'; +/* 交互提示。*/ +$lang->bug->confirmChangeProduct = "Modification on {$lang->productCommon} will cause related {$lang->projectCommon},Story and Task change. Do you want to do this?"; +$lang->bug->confirmDelete = 'Do you want to delete this bug?'; +$lang->bug->setTemplateTitle = 'Please enter the title of template.'; +$lang->bug->remindTask = 'This Bug has been converted to Task. Do you want to update Status of Task(ID %s)?'; +$lang->bug->skipClose = 'Bug %s is not solved. You cannot close it.'; +$lang->bug->applyTemplate = 'Apply Template'; -/* Templates. */ +/* 模板。*/ $lang->bug->tplStep = "

[Steps]

\n"; -$lang->bug->tplResult = "

[Result]

\n"; -$lang->bug->tplExpect = "

[Expect]

"; +$lang->bug->tplResult = "

[Results]

\n"; +$lang->bug->tplExpect = "

[Expectations]

"; -/* Field options lists. */ +/* 各个字段取值列表。*/ $lang->bug->severityList[3] = '3'; $lang->bug->severityList[1] = '1'; $lang->bug->severityList[2] = '2'; @@ -179,11 +179,11 @@ $lang->bug->osList['linux'] = 'Linux'; $lang->bug->osList['freebsd'] = 'FreeBSD'; $lang->bug->osList['osx'] = 'OS X'; $lang->bug->osList['unix'] = 'Unix'; -$lang->bug->osList['others'] = 'Others'; +$lang->bug->osList['others'] = 'Other'; $lang->bug->browserList[''] = ''; $lang->bug->browserList['all'] = 'All'; -$lang->bug->browserList['ie'] = 'IE'; +$lang->bug->browserList['ie'] = 'IE series'; $lang->bug->browserList['ie11'] = 'IE11'; $lang->bug->browserList['ie10'] = 'IE10'; $lang->bug->browserList['ie9'] = 'IE9'; @@ -191,78 +191,78 @@ $lang->bug->browserList['ie8'] = 'IE8'; $lang->bug->browserList['ie7'] = 'IE7'; $lang->bug->browserList['ie6'] = 'IE6'; $lang->bug->browserList['chrome'] = 'chrome'; -$lang->bug->browserList['firefox'] = 'Firefox'; +$lang->bug->browserList['firefox'] = 'Firefox series'; $lang->bug->browserList['firefox4'] = 'Firefox4'; $lang->bug->browserList['firefox3'] = 'Firefox3'; $lang->bug->browserList['firefox2'] = 'Firefox2'; -$lang->bug->browserList['opera'] = 'opera'; -$lang->bug->browserList['oprea11'] = 'opera11'; -$lang->bug->browserList['oprea10'] = 'opera10'; -$lang->bug->browserList['opera9'] = 'opera9'; -$lang->bug->browserList['safari'] = 'safari'; -$lang->bug->browserList['maxthon'] = '傲游'; +$lang->bug->browserList['opera'] = 'Opera series'; +$lang->bug->browserList['oprea11'] = 'Opera11'; +$lang->bug->browserList['oprea10'] = 'Opera10'; +$lang->bug->browserList['opera9'] = 'Opera9'; +$lang->bug->browserList['safari'] = 'Safari'; +$lang->bug->browserList['maxthon'] = 'Maxthon'; $lang->bug->browserList['uc'] = 'UC'; -$lang->bug->browserList['other'] = 'Others'; +$lang->bug->browserList['other'] = 'Other'; $lang->bug->typeList[''] = ''; -$lang->bug->typeList['codeerror'] = 'Code error'; -$lang->bug->typeList['interface'] = 'Interface'; -$lang->bug->typeList['designchange'] = 'Design change'; -$lang->bug->typeList['newfeature'] = 'New feature'; -$lang->bug->typeList['designdefect'] = 'Design defect'; +$lang->bug->typeList['codeerror'] = 'Code Error'; +$lang->bug->typeList['interface'] = 'Interface Optimization'; +$lang->bug->typeList['designchange'] = 'Design Change'; +$lang->bug->typeList['newfeature'] = 'New Feature'; +$lang->bug->typeList['designdefect'] = 'Design Defect'; $lang->bug->typeList['config'] = 'Config'; -$lang->bug->typeList['install'] = 'Install'; +$lang->bug->typeList['install'] = 'Install/Deploy'; $lang->bug->typeList['security'] = 'Security'; $lang->bug->typeList['performance'] = 'Performance'; $lang->bug->typeList['standard'] = 'Standard'; -$lang->bug->typeList['automation'] = 'Automation'; -$lang->bug->typeList['trackthings'] = 'Tracking'; -$lang->bug->typeList['others'] = 'Others'; +$lang->bug->typeList['automation'] = 'Testing Script'; +$lang->bug->typeList['trackthings'] = 'Issue Tracking'; +$lang->bug->typeList['others'] = 'Other'; $lang->bug->statusList[''] = ''; -$lang->bug->statusList['active'] = 'Active'; -$lang->bug->statusList['resolved'] = 'Resolved'; +$lang->bug->statusList['active'] = 'Activate'; +$lang->bug->statusList['resolved'] = 'Solved'; $lang->bug->statusList['closed'] = 'Closed'; $lang->bug->confirmedList[1] = 'Confirmed'; -$lang->bug->confirmedList[0] = 'Unconfirmed'; +$lang->bug->confirmedList[0] = 'Not Confirmed'; $lang->bug->resolutionList[''] = ''; -$lang->bug->resolutionList['bydesign'] = 'By design'; -$lang->bug->resolutionList['duplicate'] = 'Duplicate'; -$lang->bug->resolutionList['external'] = 'External'; -$lang->bug->resolutionList['fixed'] = 'Fixed'; -$lang->bug->resolutionList['notrepro'] = 'Not reproduce'; +$lang->bug->resolutionList['bydesign'] = 'Design Issue'; +$lang->bug->resolutionList['duplicate'] = 'Duplicate Bug'; +$lang->bug->resolutionList['external'] = 'External Reasons'; +$lang->bug->resolutionList['fixed'] = 'Solved'; +$lang->bug->resolutionList['notrepro'] = 'Irreproducible'; $lang->bug->resolutionList['postponed'] = 'Postponed'; -$lang->bug->resolutionList['willnotfix'] = "Won't fix"; -$lang->bug->resolutionList['tostory'] = 'To story'; +$lang->bug->resolutionList['willnotfix'] = "Not to Solve"; +$lang->bug->resolutionList['tostory'] = 'Transfer to Story'; -/* Report. */ +/* 统计报表。*/ $lang->bug->report = new stdclass(); $lang->bug->report->common = 'Report'; -$lang->bug->report->select = 'Select'; -$lang->bug->report->create = 'Create'; +$lang->bug->report->select = 'Select Report Type '; +$lang->bug->report->create = 'Generate a Report'; -$lang->bug->report->charts['bugsPerProject'] = $lang->projectCommon . ' bugs'; -$lang->bug->report->charts['bugsPerBuild'] = 'Build bugs'; -$lang->bug->report->charts['bugsPerModule'] = 'Module bugs'; -$lang->bug->report->charts['openedBugsPerDay'] = 'Opened bugs per day'; -$lang->bug->report->charts['resolvedBugsPerDay'] = 'Resolved bugs per day'; -$lang->bug->report->charts['closedBugsPerDay'] = 'Closed bugs per day'; -$lang->bug->report->charts['openedBugsPerUser'] = 'Opened bugs per user'; -$lang->bug->report->charts['resolvedBugsPerUser'] = 'Resolved bugs per user'; -$lang->bug->report->charts['closedBugsPerUser'] = 'Closed bugs per user'; -$lang->bug->report->charts['bugsPerSeverity'] = 'Severity'; -$lang->bug->report->charts['bugsPerResolution'] = 'Resolution'; -$lang->bug->report->charts['bugsPerStatus'] = 'Status'; -$lang->bug->report->charts['bugsPerActivatedCount'] = 'Activated count'; -$lang->bug->report->charts['bugsPerType'] = 'Type'; -$lang->bug->report->charts['bugsPerAssignedTo'] = 'AssignedTo'; -//$lang->bug->report->charts['bugLiveDays'] = 'Bug处理时间统计'; -//$lang->bug->report->charts['bugHistories'] = 'Bug处理步骤统计'; +$lang->bug->report->charts['bugsPerProject'] = $lang->projectCommon . 'Bug Count'; +$lang->bug->report->charts['bugsPerBuild'] = 'Bug Count Per Build'; +$lang->bug->report->charts['bugsPerModule'] = 'Bug Count Per Module'; +$lang->bug->report->charts['openedBugsPerDay'] = 'Bug Count Per Day'; +$lang->bug->report->charts['resolvedBugsPerDay'] = 'Solved Bug Per Day'; +$lang->bug->report->charts['closedBugsPerDay'] = 'Closed Bug Per Day'; +$lang->bug->report->charts['openedBugsPerUser'] = 'Submitted Bug Per User'; +$lang->bug->report->charts['resolvedBugsPerUser'] = 'Solved Bug Per User'; +$lang->bug->report->charts['closedBugsPerUser'] = 'Closed Bug Per User'; +$lang->bug->report->charts['bugsPerSeverity'] = 'Bug Priority Report'; +$lang->bug->report->charts['bugsPerResolution'] = 'Bug Solution Report'; +$lang->bug->report->charts['bugsPerStatus'] = 'Bug Status Report'; +$lang->bug->report->charts['bugsPerActivatedCount'] = 'Bug Activation Report'; +$lang->bug->report->charts['bugsPerType'] = 'Bug Type Report'; +$lang->bug->report->charts['bugsPerAssignedTo'] = 'Assignment Report'; +//$lang->bug->report->charts['bugLiveDays'] = 'Bug Handling Time Report'; +//$lang->bug->report->charts['bugHistories'] = 'Bug Handling Steps Report'; $lang->bug->report->options = new stdclass(); -$lang->bug->report->options->graph = new stdclass(); +$lang->bug->report->options->graph = new stdclass(); $lang->bug->report->options->type = 'pie'; $lang->bug->report->options->width = 500; $lang->bug->report->options->height = 140; @@ -320,27 +320,27 @@ $lang->bug->report->openedBugsPerUser->graph->xAxisName = 'User'; $lang->bug->report->resolvedBugsPerUser->graph->xAxisName= 'User'; $lang->bug->report->closedBugsPerUser->graph->xAxisName = 'User'; -$lang->bug->report->bugsPerSeverity->graph->xAxisName = 'Severity'; -$lang->bug->report->bugsPerResolution->graph->xAxisName = 'Resolution'; +$lang->bug->report->bugsPerSeverity->graph->xAxisName = 'Priority'; +$lang->bug->report->bugsPerResolution->graph->xAxisName = 'Solution'; $lang->bug->report->bugsPerStatus->graph->xAxisName = 'Status'; -$lang->bug->report->bugsPerActivatedCount->graph->xAxisName = 'Activated count'; +$lang->bug->report->bugsPerActivatedCount->graph->xAxisName = 'Activation Count'; $lang->bug->report->bugsPerType->graph->xAxisName = 'Type'; -$lang->bug->report->bugsPerAssignedTo->graph->xAxisName = 'AssignedTo'; -$lang->bug->report->bugLiveDays->graph->xAxisName = 'Live days'; -$lang->bug->report->bugHistories->graph->xAxisName = 'Histories'; +$lang->bug->report->bugsPerAssignedTo->graph->xAxisName = 'Assigned To'; +$lang->bug->report->bugLiveDays->graph->xAxisName = 'Handling Time'; +$lang->bug->report->bugHistories->graph->xAxisName = 'Handling Steps'; /* 操作记录。*/ $lang->bug->action = new stdclass(); -$lang->bug->action->resolved = array('main' => '$date, Resolved by $actor, resolution is $extra $appendLink.', 'extra' => 'resolutionList'); -$lang->bug->action->tostory = array('main' => '$date, To story by $actor, ID is $extra.'); -$lang->bug->action->totask = array('main' => '$date, To task by $actor, ID is $extra.'); -$lang->bug->action->linked2plan = array('main' => '$date, Link to plan by $actor,ID is $extra。'); -$lang->bug->action->unlinkedfromplan = array('main' => '$date, Unlink from plan $extra by $actor.'); -$lang->bug->action->linkrelatedbug = array('main' => '$date, link related bug $extra by $actor.'); -$lang->bug->action->unlinkrelatedbug = array('main' => '$date, unlink related bug $extra by $actor.'); +$lang->bug->action->resolved = array('main' => '$date, solved by $actor and the solution is $extra $appendLink.', 'extra' => 'resolutionList'); +$lang->bug->action->tostory = array('main' => '$date, transferred by $actor to Story with ID $extra.'); +$lang->bug->action->totask = array('main' => '$date, imported by $actor as Task with ID $extra.'); +$lang->bug->action->linked2plan = array('main' => '$date, linked by $actor to Planning $extra.'); +$lang->bug->action->unlinkedfromplan = array('main' => '$date, deleted by $actor from Planning $extra.'); +$lang->bug->action->linkrelatedbug = array('main' => '$date, related by $actor to Bug $extra.'); +$lang->bug->action->unlinkrelatedbug = array('main' => '$date, removed by $actor from Bug $extra.'); $lang->bug->placeholder = new stdclass(); -$lang->bug->placeholder->chooseBuilds = 'Choose builds...'; +$lang->bug->placeholder->chooseBuilds = 'Choose Build...'; $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed; $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; diff --git a/module/build/lang/en.php b/module/build/lang/en.php index 271053e184..9cb8582bec 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -9,48 +9,48 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->build->common = 'Build'; +$lang->build->common = "Build"; $lang->build->create = "Create"; $lang->build->edit = "Edit"; -$lang->build->linkStory = "Link story"; +$lang->build->linkStory = "Link Story"; $lang->build->linkBug = "Link Bug"; -$lang->build->delete = "Delete"; +$lang->build->delete = "Delete Build"; $lang->build->deleted = "Deleted"; -$lang->build->view = "Info"; -$lang->build->batchUnlink = 'Batch unlink'; -$lang->build->batchUnlinkStory = 'Batch unlink story'; -$lang->build->batchUnlinkBug = 'Batch unlink bug'; +$lang->build->view = "Build Details"; +$lang->build->batchUnlink = 'Batch Removal'; +$lang->build->batchUnlinkStory = 'Batch Story Removal'; +$lang->build->batchUnlinkBug = 'Batch Bug Removal'; -$lang->build->confirmDelete = "Are sure to delete this build?"; -$lang->build->confirmUnlinkStory = "Are you sure to remove this story?"; -$lang->build->confirmUnlinkBug = "Are you sure to remove this bug?"; +$lang->build->confirmDelete = "Do you want to delete this Build?"; +$lang->build->confirmUnlinkStory = "Do you want to remove this Story?"; +$lang->build->confirmUnlinkBug = "Do you want to remove this Bug?"; $lang->build->basicInfo = 'Basic Info'; -$lang->build->id = 'ID'; -$lang->build->product = $lang->productCommon; -$lang->build->name = 'Name'; -$lang->build->date = 'Build date'; -$lang->build->builder = 'Builder'; -$lang->build->scmPath = 'Source code path'; -$lang->build->filePath = 'Package file path'; -$lang->build->desc = 'Desc'; -$lang->build->files = 'Upload package'; -$lang->build->last = 'Last build'; -$lang->build->unlinkStory = 'Remove story'; -$lang->build->unlinkBug = 'Remove bug'; -$lang->build->stories = 'Finished stories'; -$lang->build->bugs = 'Resolved bugs'; -$lang->build->generatedBugs = 'Generated bug'; -$lang->build->noProduct = " The {$lang->projectCommon} isn't associated with {$lang->productCommon}, cann't create build. Please related {$lang->productCommon}"; +$lang->build->id = 'ID'; +$lang->build->product = $lang->productCommon; +$lang->build->name = 'Name'; +$lang->build->date = 'Date'; +$lang->build->builder = 'Builder'; +$lang->build->scmPath = 'SCM Path'; +$lang->build->filePath = 'File Path'; +$lang->build->desc = 'Description'; +$lang->build->files = 'Upload Files'; +$lang->build->last = 'Last Build'; +$lang->build->unlinkStory = 'Remove Story'; +$lang->build->unlinkBug = 'Remove Bug'; +$lang->build->stories = 'Finished Story'; +$lang->build->bugs = 'Solved Bug'; +$lang->build->generatedBugs = 'Generated Bug'; +$lang->build->noProduct = " This {$lang->projectCommon} has not linked to {$lang->productCommon}, so Build cannot be created. Please first link {$lang->productCommon}"; -$lang->build->finishStories = 'The total demand for a complete %s'; -$lang->build->resolvedBugs = 'The total solution of bug %s'; -$lang->build->createdBugs = 'The total generated of bug %s'; +$lang->build->finishStories = ' %s Stories have been finished.'; +$lang->build->resolvedBugs = ' %s Bugs have been solved.'; +$lang->build->createdBugs = ' %s Bugs have been created.'; $lang->build->placeholder = new stdclass(); -$lang->build->placeholder->scmPath = 'Software source code repository, such as Subversion or Git'; -$lang->build->placeholder->filePath = 'The path of this build package to download'; +$lang->build->placeholder->scmPath = ' Source code repository, e.g. Subversion/Git Library path'; +$lang->build->placeholder->filePath = ' Path of this Build package for download.'; $lang->build->action = new stdclass(); -$lang->build->action->buildopened = '$date, $actor created build. $extra。' . "\n"; +$lang->build->action->buildopened = '$date, created by $actor, Build $extra.' . "\n"; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 4cc9e48619..bf7d20e2ee 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -9,25 +9,25 @@ * @version $Id: en.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->arrow = '  '; -$lang->colon = '::'; -$lang->comma = ','; -$lang->dot = '.'; -$lang->at = ' at '; -$lang->downArrow = '↓'; -$lang->null = '空'; -$lang->ellipsis = '...'; +$lang->arrow = '  '; +$lang->colon = '::'; +$lang->comma = ','; +$lang->dot = '.'; +$lang->at = ' on '; +$lang->downArrow = '↓'; +$lang->null = 'null'; +$lang->ellipsis = '…'; -$lang->zentaoPMS = 'zentao'; +$lang->zentaoPMS = 'ZenTao'; $lang->welcome = "%s PMS"; $lang->logout = 'Logout'; $lang->login = 'Login'; $lang->help = 'Help'; -$lang->aboutZenTao = 'About'; +$lang->aboutZenTao = 'About ZenTao'; $lang->profile = 'Profile'; $lang->changePassword = 'Password'; -$lang->runInfo = "
Time: %s ms, Memory: %s KB, Queries: %s.
"; -$lang->agreement = "I Agree to the Z PUBLIC LICENSE 1.2, and promise to keep the logo, link of ZenTao."; +$lang->runInfo = "
Time %s MS, Memory %s KB, Query %s.
"; +$lang->agreement = "I have read and agreed to the terms and conditions of Z PUBLIC LICENSE 1.2 . Without authorization, I should not remove, hide, or cover any logos/links of ZenTao."; $lang->reset = 'Reset'; $lang->refresh = 'Refresh'; @@ -37,7 +37,7 @@ $lang->close = 'Close'; $lang->unlink = 'Unlink'; $lang->import = 'Import'; $lang->export = 'Export'; -$lang->setFileName = 'Filename:'; +$lang->setFileName = 'File Name'; $lang->submitting = 'Saving...'; $lang->save = 'Save'; $lang->confirm = 'Confirm'; @@ -50,147 +50,147 @@ $lang->customConfig = 'Custom'; $lang->public = 'Public'; $lang->actions = 'Actions'; -$lang->comment = 'Comment'; +$lang->comment = 'Note'; $lang->history = 'History'; -$lang->attatch = 'Attatch'; +$lang->attatch = 'Attachment'; $lang->reverse = 'Reverse'; $lang->switchDisplay = 'Toggle Show'; -$lang->addFiles = 'Add Files'; -$lang->files = 'Files '; -$lang->pasteText = 'Paste text'; -$lang->uploadImages = 'Upload images '; -$lang->timeout = 'Timed out, please check the network, or retry!'; -$lang->repairTable = 'The table may be damaged, please repair by phpmyadmin or myisamchk!'; -$lang->duplicate = '%s has the same title'; -$lang->ipLimited = "Sorry, current IP is limited by Administrator. Please contact the Administrator to lift the restrictions."; +$lang->addFiles = 'Add'; +$lang->files = 'File '; +$lang->pasteText = 'Paste'; +$lang->uploadImages = 'Upload'; +$lang->timeout = 'Timeout. Pease check your network settings, or try it again!'; +$lang->repairTable = 'Database table might be damaged. Please use phpmyadmin or myisamchk to fix it.'; +$lang->duplicate = '%s has the same title as existing file.'; +$lang->ipLimited = "Sorry, current IP Login has been restricted. PLease contact Admin to unrestrict it."; $lang->unfold = '+'; $lang->fold = '-'; -$lang->homepage = 'Set homepage'; -$lang->tutorial = 'Novice tutorial'; -$lang->changeLog = 'Change log'; +$lang->homepage = 'Set as Homepage'; +$lang->tutorial = 'Tutorial'; +$lang->changeLog = 'Change Log'; $lang->manual = 'Manual'; -$lang->customMenu = 'Custom menu'; -$lang->tutorialConfirm = 'Detected you have not quit tutorial mode, quit now?'; +$lang->customMenu = 'Custom Menu'; +$lang->tutorialConfirm = 'You are using tutorial. Do you want to exit right now？'; -$lang->preShortcutKey = '[Shortcut key:←]'; -$lang->nextShortcutKey = '[Shortcut key:→]'; +$lang->preShortcutKey = '[Shortcut:←]'; +$lang->nextShortcutKey = '[Shortcut:→]'; $lang->select = 'Select'; -$lang->selectAll = 'All'; -$lang->selectReverse = 'Inverse'; -$lang->loading = 'Wait...'; -$lang->notFound = 'Sorry, the object not found.'; -$lang->showAll = "[[Show all {$lang->projectCommon}s]]"; +$lang->selectAll = 'Select All'; +$lang->selectReverse = 'Select Reverse'; +$lang->loading = 'Loading...'; +$lang->notFound = 'Not found!'; +$lang->showAll = '[[Show All]]'; -$lang->future = 'Future'; +$lang->future = 'Coming'; $lang->year = 'Year'; -$lang->workingHour = 'Hour'; +$lang->workingHour = 'Man-Hour'; $lang->idAB = 'ID'; -$lang->priAB = 'P'; +$lang->priAB = 'Privilege'; $lang->statusAB = 'Status'; $lang->openedByAB = 'Open'; $lang->assignedToAB = 'To'; $lang->typeAB = 'Type'; $lang->common = new stdclass(); -$lang->common->common = 'Common module'; +$lang->common->common = 'Common Module'; -/* The main menu. */ +/* 主导航菜单。*/ $lang->menu = new stdclass(); -$lang->menu->my = ' Dashboard|my|index'; -$lang->menu->product = "{$lang->productCommon}|product|index"; -$lang->menu->project = "{$lang->projectCommon}|project|index"; -$lang->menu->qa = 'Test|qa|index'; -$lang->menu->doc = 'Doc|doc|index'; +$lang->menu->my = ' My Zone|my|index'; +$lang->menu->product = $lang->productCommon . '|product|index'; +$lang->menu->project = $lang->projectCommon . '|project|index'; +$lang->menu->qa = 'Testing|qa|index'; +$lang->menu->doc = 'Document|doc|index'; $lang->menu->report = 'Report|report|index'; $lang->menu->company = 'Company|company|index'; -$lang->menu->admin = 'Admin|admin|index'; +$lang->menu->admin = 'Administration|admin|index'; -/* The objects in the search box. */ +/* 查询条中可以选择的对象列表。*/ $lang->searchObjects['bug'] = 'Bug'; $lang->searchObjects['story'] = 'Story'; $lang->searchObjects['task'] = 'Task'; -$lang->searchObjects['testcase'] = 'Test Case'; +$lang->searchObjects['testcase'] = 'Case'; $lang->searchObjects['project'] = $lang->projectCommon; $lang->searchObjects['product'] = $lang->productCommon; $lang->searchObjects['user'] = 'User'; $lang->searchObjects['build'] = 'Build'; $lang->searchObjects['release'] = 'Release'; -$lang->searchObjects['productplan'] = 'Plan'; -$lang->searchObjects['testtask'] = 'Test Build'; -$lang->searchObjects['doc'] = 'Doc'; -$lang->searchTips = 'Id here(ctrl+g)'; +$lang->searchObjects['productplan'] = $lang->productCommon . 'Planning'; +$lang->searchObjects['testtask'] = 'Testing Build'; +$lang->searchObjects['doc'] = 'Document'; +$lang->searchTips = 'ID (ctrl+g)'; -/* Encode list of impot. */ +/* 导入支持的编码格式。*/ $lang->importEncodeList['gbk'] = 'GBK'; $lang->importEncodeList['big5'] = 'BIG5'; $lang->importEncodeList['utf-8'] = 'UTF-8'; -/* File type list of export. */ +/* 导出文件的类型列表。*/ $lang->exportFileTypeList['csv'] = 'csv'; $lang->exportFileTypeList['xml'] = 'xml'; $lang->exportFileTypeList['html'] = 'html'; -$lang->exportTypeList['all'] = 'All records'; -$lang->exportTypeList['selected'] = 'Only checked'; +$lang->exportTypeList['all'] = 'All'; +$lang->exportTypeList['selected'] = 'Selected'; -/* Language. */ +/* 语言 */ $lang->lang = 'Language'; -/* Themes. */ -$lang->theme = 'Theme'; -$lang->themes['default'] = 'Default'; -$lang->themes['green'] = 'Green'; -$lang->themes['red'] = 'Red'; -$lang->themes['lightblue'] = 'Light Blue'; -$lang->themes['blackberry'] = 'Blackberry'; +/* 风格列表。*/ +$lang->theme = 'Theme'; +$lang->themes['default'] = 'Default'; +$lang->themes['green'] = 'Green'; +$lang->themes['red'] = 'Red'; +$lang->themes['lightblue'] = 'Bright Blue'; +$lang->themes['blackberry'] = 'Blackberry'; -/* Index mododule menu. */ +/* 首页菜单设置。*/ $lang->index = new stdclass(); $lang->index->menu = new stdclass(); -$lang->index->menu->product = "{$lang->productCommon}s|product|browse"; -$lang->index->menu->project = "{$lang->projectCommon}s|project|browse"; +$lang->index->menu->product = "View{$lang->productCommon}|product|browse"; +$lang->index->menu->project = "View{$lang->projectCommon}|project|browse"; -/* Dashboard menu. */ +/* 我的地盘菜单设置。*/ $lang->my = new stdclass(); $lang->my->menu = new stdclass(); $lang->my->menu->account = array('link' => ' %s' . $lang->arrow . '', 'fixed' => true); -$lang->my->menu->index = 'Index|my|index'; -$lang->my->menu->todo = array('link' => 'Todo|my|todo|', 'subModule' => 'todo'); +$lang->my->menu->index = 'Homepage|my|index'; +$lang->my->menu->todo = array('link' => 'To-Do|my|todo|', 'subModule' => 'todo'); $lang->my->menu->task = array('link' => 'Task|my|task|', 'subModule' => 'task'); $lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug'); -$lang->my->menu->testtask = array('link' => 'Test|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase'); +$lang->my->menu->testtask = array('link' => 'Testing|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase'); $lang->my->menu->story = array('link' => 'Story|my|story|', 'subModule' => 'story'); $lang->my->menu->myProject = "{$lang->projectCommon}|my|project|"; $lang->my->menu->dynamic = 'Dynamic|my|dynamic|'; -$lang->my->menu->profile = array('link' => 'Profile|my|profile|', 'alias' => 'editprofile'); -$lang->my->menu->changePassword = 'Change Password|my|changepassword|'; -$lang->my->menu->manageContacts = 'Contacts|my|managecontacts|'; +$lang->my->menu->profile = array('link' => 'Profile|my|profile', 'alias' => 'editprofile'); +$lang->my->menu->changePassword = 'Password|my|changepassword'; +$lang->my->menu->manageContacts = 'Contact|my|managecontacts'; $lang->todo = new stdclass(); $lang->todo->menu = $lang->my->menu; -/* Product menu. */ +/* 产品视图设置。*/ $lang->product = new stdclass(); $lang->product->menu = new stdclass(); $lang->product->menu->list = array('link' => '%s', 'fixed' => true); $lang->product->menu->story = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->menu->dynamic = 'Dynamic|product|dynamic|productID=%s'; -$lang->product->menu->plan = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan'); +$lang->product->menu->plan = array('link' => 'Planning|productplan|browse|productID=%s', 'subModule' => 'productplan'); $lang->product->menu->release = array('link' => 'Release|release|browse|productID=%s', 'subModule' => 'release'); $lang->product->menu->roadmap = 'Roadmap|product|roadmap|productID=%s'; -$lang->product->menu->doc = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); +$lang->product->menu->doc = array('link' => 'Document|product|doc|productID=%s', 'subModule' => 'doc'); $lang->product->menu->branch = '@branch@|branch|manage|productID=%s'; -$lang->product->menu->module = 'Modules|tree|browse|productID=%s&view=story'; -$lang->product->menu->view = array('link' => 'Info|product|view|productID=%s', 'alias' => 'edit'); -$lang->product->menu->project = "{$lang->projectCommon}s|product|project|status=all&productID=%s"; -$lang->product->menu->create = array('link' => ' New|product|create', 'float' => 'right'); -$lang->product->menu->all = array('link' => ' All|product|index|locate=no&productID=%s', 'float' => 'right'); -$lang->product->menu->index = array('link' => "Homepage|product|index|locate=no", 'float' => 'right'); +$lang->product->menu->module = 'Module|tree|browse|productID=%s&view=story'; +$lang->product->menu->view = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit'); +$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; +$lang->product->menu->create = array('link' => " Add{$lang->productCommon}|product|create", 'float' => 'right'); +$lang->product->menu->all = array('link' => " All{$lang->productCommon}|product|all|productID=%s", 'float' => 'right'); +$lang->product->menu->index = array('link' => "{$lang->productCommon}Homepage|product|index|locate=no", 'float' => 'right'); $lang->story = new stdclass(); $lang->productplan = new stdclass(); @@ -202,31 +202,31 @@ $lang->story->menu = $lang->product->menu; $lang->productplan->menu = $lang->product->menu; $lang->release->menu = $lang->product->menu; -/* Project menu. */ +/* 项目视图菜单设置。*/ $lang->project = new stdclass(); $lang->project->menu = new stdclass(); $lang->project->menu->list = array('link' => '%s', 'fixed' => true); -$lang->project->menu->task = array('link' => 'Task|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,importbug,burn'); +$lang->project->menu->task = array('link' => 'Task|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug,kanban,printkanban,tree'); $lang->project->menu->story = array('link' => 'Story|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory'); $lang->project->menu->bug = 'Bug|project|bug|projectID=%s'; $lang->project->menu->dynamic = 'Dynamic|project|dynamic|projectID=%s'; $lang->project->menu->build = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'build'); -$lang->project->menu->testtask = 'Testtask|project|testtask|projectID=%s'; +$lang->project->menu->testtask = 'Testing|project|testtask|projectID=%s'; $lang->project->menu->team = array('link' => 'Team|project|team|projectID=%s', 'alias' => 'managemembers'); -$lang->project->menu->doc = array('link' => 'Doc|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc'); -$lang->project->menu->product = array('link' => "{$lang->productCommon}|project|manageproducts|projectID=%s", 'alias' => 'edit,start,suspend,delay,close'); -$lang->project->menu->view = 'Info|project|view|projectID=%s'; -$lang->project->menu->create = array('link' => ' New|project|create', 'float' => 'right'); -$lang->project->menu->all = array('link' => " {$lang->projectCommon}s|project|index|locate=no&status=undone&projectID=%s", 'float' => 'right'); -$lang->project->menu->index = array('link' => "Homepage|project|index|locate=no", 'float' => 'right'); +$lang->project->menu->doc = array('link' => 'Document|project|doc|porjectID=%s', 'subModule' => 'doc'); +$lang->project->menu->product = $lang->productCommon . '|project|manageproducts|projectID=%s'; +$lang->project->menu->view = array('link' => 'Overview|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); +$lang->project->menu->create = array('link' => " Add{$lang->projectCommon}|project|create", 'float' => 'right'); +$lang->project->menu->all = array('link' => " All{$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right'); +$lang->project->menu->index = array('link' => "{$lang->projectCommon}Homepage|project|index|locate=no", 'float' => 'right'); $lang->task = new stdclass(); $lang->build = new stdclass(); $lang->task->menu = $lang->project->menu; $lang->build->menu = $lang->project->menu; -/* QA menu. */ +/* QA视图菜单设置。*/ $lang->qa = new stdclass(); $lang->qa->menu = new stdclass(); @@ -234,7 +234,7 @@ $lang->qa->menu->product = array('link' => '%s', 'fixed' => true); $lang->qa->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); $lang->qa->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s'); $lang->qa->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s'); -$lang->qa->menu->index = array('link' => "Homepage|qa|index|locate=no&productID=%s", 'float' => 'right'); +$lang->qa->menu->index = array('link' => "TestingHomepage|qa|index|locate=no&productID=%s", 'float' => 'right'); $lang->bug = new stdclass(); $lang->bug->menu = new stdclass(); @@ -243,7 +243,7 @@ $lang->bug->menu->product = array('link' => '%s', 'fixed' => true); $lang->bug->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,confirmbug,assignto', 'subModule' => 'tree'); $lang->bug->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s'); $lang->bug->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s'); -$lang->bug->menu->index = array('link' => "Homepage|qa|index|locate=no&productID=%s", 'float' => 'right'); +$lang->bug->menu->index = array('link' => "TestingHomepage|qa|index|locate=no&productID=%s", 'float' => 'right'); $lang->testcase = new stdclass(); $lang->testcase->menu = new stdclass(); @@ -252,41 +252,41 @@ $lang->testcase->menu->product = array('link' => '%s', 'fixed' => true); $lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); $lang->testcase->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase', 'subModule' => 'tree'); $lang->testcase->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase'); -$lang->testcase->menu->index = array('link' => "Homepage|qa|index|locate=no&productID=%s", 'float' => 'right'); +$lang->testcase->menu->index = array('link' => "TestingHomepage|qa|index|locate=no&productID=%s", 'float' => 'right'); $lang->testtask = new stdclass(); $lang->testtask->menu = $lang->testcase->menu; -/* Doc menu. */ +/* 文档视图菜单设置。*/ $lang->doc = new stdclass(); $lang->doc->menu = new stdclass(); $lang->doc->menu->type = array('link' => "%s", 'fixed' => true); $lang->doc->menu->list = array('link' => '%s', 'fixed' => true); $lang->doc->menu->index = array('link' => ' Homepage|doc|index|', 'float' => 'right'); -$lang->doc->menu->create = array('link' => ' New Library|doc|createLib', 'float' => 'right'); +$lang->doc->menu->create = array('link' => ' Add Doc Lib|doc|createLib', 'float' => 'right'); -/* Report menu. */ +/* 统计视图菜单设置。*/ $lang->report = new stdclass(); $lang->report->menu = new stdclass(); -$lang->report->menu->product = array('link' => "{$lang->productCommon}|report|productsummary"); -$lang->report->menu->prj = array('link' => "{$lang->projectCommon}|report|projectdeviation"); -$lang->report->menu->test = array('link' => 'Test|report|bugcreate', 'alias' => 'bugassign'); +$lang->report->menu->product = array('link' => $lang->productCommon . '|report|productsummary'); +$lang->report->menu->prj = array('link' => $lang->projectCommon . '|report|projectdeviation'); +$lang->report->menu->test = array('link' => 'Testing|report|bugcreate', 'alias' => 'bugassign'); $lang->report->menu->staff = array('link' => 'Company|report|workload'); -/* Company menu. */ +/* 组织结构视图菜单设置。*/ $lang->company = new stdclass(); $lang->company->menu = new stdclass(); $lang->company->menu->name = array('link' => '%s' . $lang->arrow, 'fixed' => true); -$lang->company->menu->browseUser = array('link' => 'Users|company|browse', 'subModule' => 'user'); +$lang->company->menu->browseUser = array('link' => 'User|company|browse', 'subModule' => 'user'); $lang->company->menu->dept = array('link' => 'Department|dept|browse', 'subModule' => 'dept'); $lang->company->menu->browseGroup = array('link' => 'Group|group|browse', 'subModule' => 'group'); $lang->company->menu->view = array('link' => 'Company|company|view', 'alias' => 'edit'); $lang->company->menu->dynamic = 'Dynamic|company|dynamic|'; -$lang->company->menu->addGroup = array('link' => ' Add Group|group|create', 'float' => 'right'); -$lang->company->menu->batchAddUser = array('link' => ' Batch Add|user|batchCreate', 'subModule' => 'user', 'float' => 'right'); -$lang->company->menu->addUser = array('link' => ' Add User|user|create|dept=%s&from=company', 'subModule' => 'user', 'float' => 'right'); +$lang->company->menu->addGroup = array('link' => ' Add Group|group|create', 'float' => 'right'); +$lang->company->menu->batchAddUser = array('link' => ' Batch Add|user|batchCreate|dept=%s', 'subModule' => 'user', 'float' => 'right'); +$lang->company->menu->addUser = array('link' => ' Add User|user|create|dept=%s', 'subModule' => 'user', 'float' => 'right'); $lang->dept = new stdclass(); $lang->group = new stdclass(); @@ -296,20 +296,20 @@ $lang->dept->menu = $lang->company->menu; $lang->group->menu = $lang->company->menu; $lang->user->menu = $lang->company->menu; -/* Admin menu. */ +/* 后台管理菜单设置。*/ $lang->admin = new stdclass(); $lang->admin->menu = new stdclass(); -$lang->admin->menu->index = array('link' => 'Index|admin|index'); +$lang->admin->menu->index = array('link' => 'Homepage|admin|index'); $lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension'); $lang->admin->menu->custom = array('link' => 'Custom|custom|index', 'subModule' => 'custom'); $lang->admin->menu->mail = array('link' => 'Email|mail|index', 'subModule' => 'mail'); $lang->admin->menu->convert = array('link' => 'Import|convert|index', 'subModule' => 'convert'); $lang->admin->menu->backup = array('link' => 'Backup|backup|index', 'subModule' => 'backup'); -$lang->admin->menu->safe = array('link' => 'Safe|admin|safe', 'alias' => 'checkweak'); +$lang->admin->menu->safe = array('link' => 'Security|admin|safe', 'alias' => 'checkweak'); $lang->admin->menu->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron'); -$lang->admin->menu->trashes = array('link' => 'Trash|action|trash', 'subModule' => 'action'); -$lang->admin->menu->dev = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor'); -$lang->admin->menu->sso = 'Integrate RanZhi|admin|sso'; +$lang->admin->menu->trashes = array('link' => 'Recycle|action|trash', 'subModule' => 'action'); +$lang->admin->menu->dev = array('link' => 'Reproduct|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor'); +$lang->admin->menu->sso = 'RangerTeam|admin|sso'; $lang->convert = new stdclass(); $lang->upgrade = new stdclass(); @@ -334,7 +334,7 @@ $lang->editor->menu = $lang->admin->menu; $lang->mail->menu = $lang->admin->menu; $lang->dev->menu = $lang->admin->menu; -/* Groups. */ +/* 菜单分组。*/ $lang->menugroup = new stdclass(); $lang->menugroup->release = 'product'; $lang->menugroup->story = 'product'; @@ -361,62 +361,62 @@ $lang->menugroup->editor = 'admin'; $lang->menugroup->mail = 'admin'; $lang->menugroup->dev = 'admin'; -/* Error info. */ +/* 错误提示信息。*/ $lang->error = new stdclass(); -$lang->error->companyNotFound = "The domain %s does not exist."; -$lang->error->length = array("『%s』length should be『%s』", "『%s』length should between『%s』and 『%s』."); -$lang->error->reg = "『%s』should like『%s』"; -$lang->error->unique = "『%s』has『%s』already. If you are sure this record has been deleted, you can restore it in admin panel, trash page."; -$lang->error->gt = "『%s』must greater than『%s』."; -$lang->error->ge = "『%s』must greater than or equal『%s』."; -$lang->error->notempty = "『%s』can not be empty."; -$lang->error->empty = "『%s』 must be empty."; -$lang->error->equal = "『%s』must be『%s』."; -$lang->error->int = array("『%s』should be interger", "『%s』should between『%s-%s』."); -$lang->error->float = "『%s』should be a interger or float."; -$lang->error->email = "『%s』should be email."; -$lang->error->date = "『%s』should be date"; -$lang->error->account = "『%s』should be a valid account."; -$lang->error->passwordsame = "Two passwords must be the same"; -$lang->error->passwordrule = "Password should more than six letters."; -$lang->error->accessDenied = 'No purview'; -$lang->error->pasteImg = 'Your browser does not support the paste image!'; -$lang->error->noData = 'No data'; -$lang->error->editedByOther = 'The record may have been changed. Please refresh and re edit!'; -$lang->error->tutorialData = 'Novice mode will not insert data, please exit it to operation'; +$lang->error->companyNotFound = "The domain %s cannot be found!"; +$lang->error->length = array("『%s』Length Error. It should be『%s』", "『%s』length should be <=『%s』and >=『%s』."); +$lang->error->reg = "『%s』Format Error. It should be『%s』."; +$lang->error->unique = "『%s』『%s』existed. Please go to Admin->Recycle to restore it, if you are sure it has been deleted."; +$lang->error->gt = "『%s』should be >『%s』."; +$lang->error->ge = "『%s』should be >=『%s』."; +$lang->error->notempty = "『%s』should not be blank."; +$lang->error->empty = "『%s』should be null."; +$lang->error->equal = "『%s』has to be『%s』."; +$lang->error->int = array("『%s』has to be numbers", "『%s』should be 『%s-%s』."); +$lang->error->float = "『%s』should be numbers, decimals included."; +$lang->error->email = "『%s』should be valid EMAIL."; +$lang->error->date = "『%s』should be valid date."; +$lang->error->account = "『%s』should be valid account."; +$lang->error->passwordsame = "Two passwords should be consistent."; +$lang->error->passwordrule = "Password should meet requirements. It should be 6 characters at least."; +$lang->error->accessDenied = 'Access is denied.'; +$lang->error->pasteImg = 'Paste Image is not allowed in your browser!'; +$lang->error->noData = 'No Data'; +$lang->error->editedByOther = 'This record might have been modified. Please refresh and try to edit again!'; +$lang->error->tutorialData = 'No data can be imported in tutorial mode. Please exit tutorial first!'; -/* Pager. */ +/* 分页信息。*/ $lang->pager = new stdclass(); -$lang->pager->noRecord = "No records yet."; -$lang->pager->digest = "%s records, %s %s/%s   "; -$lang->pager->recPerPage= "%s per page"; -$lang->pager->first = ""; -$lang->pager->pre = ""; -$lang->pager->next = ""; -$lang->pager->last = ""; +$lang->pager->noRecord = "No History"; +$lang->pager->digest = " %s in total. %s %s/%s   "; +$lang->pager->recPerPage= " %s per page"; +$lang->pager->first = ""; +$lang->pager->pre = ""; +$lang->pager->next = ""; +$lang->pager->last = ""; $lang->pager->locate = "GO!"; -$lang->proVersion = "PRO   "; -$lang->downNotify = "Down notify"; +$lang->proVersion = "ZenTao Pro   "; +$lang->downNotify = "Download Desktop Notification"; -$lang->suhosinInfo = "Warming:data is too large! Please enlarge the setting of sohusin.post.max_vars and sohusin.request.max_vars in php.ini. Otherwise partial data can't be saved."; -$lang->pasteTextInfo = "Paste the text into a text field, each line of text as a data header."; -$lang->noticeImport = "

Import data, containing the existing system of data, please confirm these data to cover or insert

Cover Insert

"; +$lang->suhosinInfo = "Warning! Data is reaching the limit. Please change sohusin.post.max_vars and sohusin.request.max_vars (set larger value) in php.ini, then save and restart Apache, or some data will not be saved."; +$lang->pasteTextInfo = "Paste text into text field. Each line will be a header of each data record. "; +$lang->noticeImport = "

Imported data contains data that has already existed in system. Please confirm you actions on the date

Override New Insertion

"; -$lang->noResultsMatch = "No results match"; -$lang->searchMore = "Search more results with the key:"; -$lang->chooseUsersToMail = "Choose users to mail..."; -$lang->browserNotice = 'Using the browser may not be able to get the best browsing effect, it is recommended to use chrome, Firefox, IE9 +, opera, Safari browser.'; +$lang->noResultsMatch = "No results match!"; +$lang->searchMore = "More results："; +$lang->chooseUsersToMail = "Choose users you want send Email to..."; +$lang->browserNotice = 'Your current browser might not show the best effect. Please use Chrome, Firefox, IE9+, Opera or Safari.'; -/* Date times. */ +/* 时间格式设置。*/ define('DT_DATETIME1', 'Y-m-d H:i:s'); define('DT_DATETIME2', 'y-m-d H:i'); define('DT_MONTHTIME1', 'n/d H:i'); -define('DT_MONTHTIME2', 'F j, H:i'); +define('DT_MONTHTIME2', 'n月d日 H:i'); define('DT_DATE1', 'Y-m-d'); define('DT_DATE2', 'Ymd'); -define('DT_DATE3', 'F j, Y '); -define('DT_DATE4', 'M j'); +define('DT_DATE3', 'Y年m月d日'); +define('DT_DATE4', 'n月j日'); define('DT_TIME1', 'H:i:s'); define('DT_TIME2', 'H:i'); @@ -424,25 +424,25 @@ define('DT_TIME2', 'H:i'); $lang->datepicker = new stdclass(); $lang->datepicker->dpText = new stdclass(); -$lang->datepicker->dpText->TEXT_OR = 'Or '; -$lang->datepicker->dpText->TEXT_PREV_YEAR = 'Last year'; -$lang->datepicker->dpText->TEXT_PREV_MONTH = 'Last month'; -$lang->datepicker->dpText->TEXT_PREV_WEEK = 'Last week'; +$lang->datepicker->dpText->TEXT_OR = 'or '; +$lang->datepicker->dpText->TEXT_PREV_YEAR = 'Last Year'; +$lang->datepicker->dpText->TEXT_PREV_MONTH = 'Last Month'; +$lang->datepicker->dpText->TEXT_PREV_WEEK = 'Last Week'; $lang->datepicker->dpText->TEXT_YESTERDAY = 'Yesterday'; -$lang->datepicker->dpText->TEXT_THIS_MONTH = 'This month'; -$lang->datepicker->dpText->TEXT_THIS_WEEK = 'This week'; +$lang->datepicker->dpText->TEXT_THIS_MONTH = 'This Month'; +$lang->datepicker->dpText->TEXT_THIS_WEEK = 'This Week'; $lang->datepicker->dpText->TEXT_TODAY = 'Today'; -$lang->datepicker->dpText->TEXT_NEXT_YEAR = 'Next year'; -$lang->datepicker->dpText->TEXT_NEXT_MONTH = 'Next month'; +$lang->datepicker->dpText->TEXT_NEXT_YEAR = 'Next Year'; +$lang->datepicker->dpText->TEXT_NEXT_MONTH = 'Next Month'; $lang->datepicker->dpText->TEXT_CLOSE = 'Close'; -$lang->datepicker->dpText->TEXT_DATE = 'Please select date range'; -$lang->datepicker->dpText->TEXT_CHOOSE_DATE = 'Choose date'; +$lang->datepicker->dpText->TEXT_DATE = 'Choose Time'; +$lang->datepicker->dpText->TEXT_CHOOSE_DATE = 'Choose Date'; -$lang->datepicker->dayNames = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'); -$lang->datepicker->abbrDayNames = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'); -$lang->datepicker->monthNames = array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'); +$lang->datepicker->dayNames = array('Sun', 'Mon', 'Tues', 'Wed', 'Thur', 'Fri', 'Sat'); +$lang->datepicker->abbrDayNames = array('Sun', 'Mon', 'Tues', 'Wed', 'Thur', 'Fri', 'Sat'); +$lang->datepicker->monthNames = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'); -/* Common action icons */ +/* Common action icons 通用动作图标 */ $lang->icons['todo'] = 'check'; $lang->icons['product'] = 'cube'; $lang->icons['bug'] = 'bug'; diff --git a/module/company/lang/en.php b/module/company/lang/en.php index 5b3e5928ec..2e0fcaaf43 100644 --- a/module/company/lang/en.php +++ b/module/company/lang/en.php @@ -10,25 +10,25 @@ * @link http://www.zentao.net */ $lang->company->common = 'Company'; -$lang->company->index = "Index"; +$lang->company->index = "Homepage"; $lang->company->edit = "Edit"; $lang->company->view = "Info"; -$lang->company->browse = "User"; +$lang->company->browse = "User List"; $lang->company->dynamic = "Dynamic"; -$lang->company->orgView = 'Company'; +$lang->company->orgView = 'View'; -$lang->company->name = 'Name'; +$lang->company->name = 'Company Name'; $lang->company->phone = 'Phone'; $lang->company->fax = 'Fax'; -$lang->company->address = 'Address'; -$lang->company->zipcode = 'Zipcode'; -$lang->company->website = 'Website'; +$lang->company->address = 'Mailing Address'; +$lang->company->zipcode = 'Zip Code'; +$lang->company->website = 'Official Website'; $lang->company->backyard = 'Intranet'; -$lang->company->guest = 'Guest'; +$lang->company->guest = 'Guest Login'; $lang->company->product = $lang->productCommon; $lang->company->project = $lang->projectCommon; $lang->company->user = 'User'; -$lang->company->guestList[0] = 'Deny'; -$lang->company->guestList[1] = 'Allow'; +$lang->company->guestList[0] = 'On'; +$lang->company->guestList[1] = 'Off'; diff --git a/module/convert/lang/en.php b/module/convert/lang/en.php index a7c731ccbe..bfc8de170f 100644 --- a/module/convert/lang/en.php +++ b/module/convert/lang/en.php @@ -9,58 +9,58 @@ * @version $Id: en.php 4129 2013-01-18 01:58:14Z wwccss $ * @link http://www.zentao.net */ -$lang->convert->common = 'Import'; -$lang->convert->index = 'Index'; +$lang->convert->common = 'Imported'; +$lang->convert->index = 'Homepage'; -$lang->convert->start = 'Begin import'; +$lang->convert->start = 'Start'; $lang->convert->desc = <<Welcome to use this convert wizard which will help you to import other system data to ZenTaoPMS.

-Importing is dangerous. Be sure to backup your database and other data files and sure nobody is using pms when importing. +

Welcome to the System Conversion Wizard, this program will assist you to convert data to ZenTao PMS.

+There is certain risk of conversion, so it is strongly recommended that you back up your databse and relavant files before conversion, and make sure no one is operating on either systems. EOT; -$lang->convert->setConfig = 'Source config'; -$lang->convert->setBugfree = 'Bugfree config'; -$lang->convert->setRedmine = 'Redmine config'; +$lang->convert->setConfig = 'Source Config'; +$lang->convert->setBugfree = 'Bugfree Config'; +$lang->convert->setRedmine = 'Redmine Config'; $lang->convert->checkBugFree = 'Check Bugfree'; $lang->convert->checkRedmine = 'Check Redmine'; $lang->convert->convertRedmine = 'Convert Redmine'; $lang->convert->convertBugFree = 'Convert BugFree'; -$lang->convert->selectSource = 'Select source system and version'; -$lang->convert->mustSelectSource = "Must select a source system"; +$lang->convert->selectSource = 'Select source system and its version'; +$lang->convert->mustSelectSource = "You must select a source system."; -$lang->convert->direction = 'Please select the direction of issue in Redmine'; -$lang->convert->questionTypeOfRedmine = 'Types of issue in Redmine'; -$lang->convert->aimTypeOfZentao = 'Aim type in Zentao'; +$lang->convert->direction = "{$lang->projectCommon} converted to"; +$lang->convert->questionTypeOfRedmine = 'Type in Redmine'; +$lang->convert->aimTypeOfZentao = 'Convert to Type in Zentao'; $lang->convert->directionList['bug'] = 'Bug'; $lang->convert->directionList['task'] = 'Task'; $lang->convert->directionList['story'] = 'Story'; $lang->convert->sourceList['BugFree'] = array('bugfree_1' => '1.x', 'bugfree_2' => '2.x'); -$lang->convert->sourceList['Redmine'] = array('Redmine_1_1' => '1.1'); +$lang->convert->sourceList['Redmine'] = array('Redmine_1.1' => '1.1'); -$lang->convert->setting = 'Setting'; -$lang->convert->checkConfig = 'Check setting'; +$lang->convert->setting = 'Settings'; +$lang->convert->checkConfig = 'Check Settings'; -$lang->convert->ok = 'Check passed(√)'; -$lang->convert->fail = 'Check failed(×)'; +$lang->convert->ok = ' OK '; +$lang->convert->fail = ' Failed'; -$lang->convert->dbHost = 'Database server'; -$lang->convert->dbPort = 'Server port'; -$lang->convert->dbUser = 'Database user'; -$lang->convert->dbPassword = 'Database password'; -$lang->convert->dbName = '%s database'; -$lang->convert->dbCharset = '%s charset'; -$lang->convert->dbPrefix = '%s table prefix'; -$lang->convert->installPath = '%s installed path'; +$lang->convert->dbHost = 'Database Server'; +$lang->convert->dbPort = 'Server Port'; +$lang->convert->dbUser = 'Databse User Name'; +$lang->convert->dbPassword = 'Database Password'; +$lang->convert->dbName = 'Databse used in %s'; +$lang->convert->dbCharset = '%s Database Code'; +$lang->convert->dbPrefix = '%s Table Prefix'; +$lang->convert->installPath = '%s Installed path'; $lang->convert->checkDB = 'Database'; $lang->convert->checkTable = 'Table'; -$lang->convert->checkPath = 'Installed path'; +$lang->convert->checkPath = 'Installed Path'; -$lang->convert->execute = 'Execute import'; -$lang->convert->item = 'Imported items'; +$lang->convert->execute = 'Convert'; +$lang->convert->item = 'Item Converted'; $lang->convert->count = 'Count'; $lang->convert->info = 'Info'; @@ -69,48 +69,48 @@ $lang->convert->bugfree->users = 'User'; $lang->convert->bugfree->projects = $lang->projectCommon; $lang->convert->bugfree->modules = 'Module'; $lang->convert->bugfree->bugs = 'Bug'; -$lang->convert->bugfree->cases = 'Case'; +$lang->convert->bugfree->cases = 'Test Case'; $lang->convert->bugfree->results = 'Result'; $lang->convert->bugfree->actions = 'History'; $lang->convert->bugfree->files = 'File'; $lang->convert->redmine = new stdclass(); -$lang->convert->redmine->users = 'Users'; -$lang->convert->redmine->groups = 'Groups'; -$lang->convert->redmine->products = "{$lang->productCommon}s"; -$lang->convert->redmine->projects = "{$lang->projectCommon}s"; -$lang->convert->redmine->stories = 'Stories'; -$lang->convert->redmine->tasks = 'Tasks'; -$lang->convert->redmine->bugs = 'Bugs'; -$lang->convert->redmine->productPlans = 'Plans'; -$lang->convert->redmine->teams = 'Teams'; -$lang->convert->redmine->releases = 'Releases'; -$lang->convert->redmine->builds = 'Builds'; -$lang->convert->redmine->docLibs = 'DocLibs'; -$lang->convert->redmine->docs = 'Docs'; -$lang->convert->redmine->files = 'files'; +$lang->convert->redmine->users = 'User'; +$lang->convert->redmine->groups = 'Group'; +$lang->convert->redmine->products = $lang->productCommon; +$lang->convert->redmine->projects = $lang->projectCommon; +$lang->convert->redmine->stories = 'Story'; +$lang->convert->redmine->tasks = 'Task'; +$lang->convert->redmine->bugs = 'Bug'; +$lang->convert->redmine->productPlans = $lang->productCommon . 'Planning'; +$lang->convert->redmine->teams = 'Team'; +$lang->convert->redmine->releases = 'Release'; +$lang->convert->redmine->builds = 'Build'; +$lang->convert->redmine->docLibs = 'Doc Lib'; +$lang->convert->redmine->docs = 'Doc'; +$lang->convert->redmine->files = 'File'; -$lang->convert->errorFileNotExits = 'File %s not exits.'; -$lang->convert->errorUserExists = 'User %s exits already.'; -$lang->convert->errorGroupExists = 'Group %s exits already.'; -$lang->convert->errorBuildExists = 'Build %s exits already.'; -$lang->convert->errorReleaseExists = 'Release %s exits already.'; -$lang->convert->errorCopyFailed = 'file %s copy failed.'; +$lang->convert->errorFileNotExits = 'File %s is not found.'; +$lang->convert->errorUserExists = 'User %s existed.'; +$lang->convert->errorGroupExists = 'Group %s existed.'; +$lang->convert->errorBuildExists = 'Build %s existed.'; +$lang->convert->errorReleaseExists = 'Release %s existed.'; +$lang->convert->errorCopyFailed = 'File %s copy failed.'; -$lang->convert->setParam = 'Please set params'; +$lang->convert->setParam = 'Please set parameters.'; $lang->convert->statusType = new stdclass(); $lang->convert->priType = new stdclass(); -$lang->convert->aimType = 'Issue types goto'; -$lang->convert->statusType->bug = 'Status types goto(status of Bug)'; -$lang->convert->statusType->story = 'Status types goto(status of story)'; -$lang->convert->statusType->task = 'Status types goto(status of task)'; -$lang->convert->priType->bug = 'Priority types goto(priority of Bug)'; -$lang->convert->priType->story = 'Priority types goto(priority of story)'; -$lang->convert->priType->task = 'Priority types goto(priority of task)'; +$lang->convert->aimType = 'Convert Issue'; +$lang->convert->statusType->bug = 'Convert Status (Bug Status)'; +$lang->convert->statusType->story = 'Convert Status (Story Status)'; +$lang->convert->statusType->task = 'Convert Status (Task Status)'; +$lang->convert->priType->bug = 'Convert Priority (Bug Status)'; +$lang->convert->priType->story = 'Convert Priority (Story Status)'; +$lang->convert->priType->task = 'Convert Priority (Task Status)'; $lang->convert->issue = new stdclass(); $lang->convert->issue->redmine = 'Redmine'; $lang->convert->issue->zentao = 'ZenTao'; -$lang->convert->issue->goto = 'Goto'; +$lang->convert->issue->goto = 'Convert To'; diff --git a/module/cron/lang/en.php b/module/cron/lang/en.php index 6e2bc82f38..c7add39c28 100644 --- a/module/cron/lang/en.php +++ b/module/cron/lang/en.php @@ -1,15 +1,15 @@ cron->common = 'Cron'; -$lang->cron->index = 'Index'; -$lang->cron->list = 'List'; -$lang->cron->create = 'Create'; +$lang->cron->index = 'Homepage'; +$lang->cron->list = 'Task List'; +$lang->cron->create = 'Add'; $lang->cron->edit = 'Edit'; $lang->cron->delete = 'Delete'; -$lang->cron->toggle = 'Activation/Disable'; -$lang->cron->turnon = 'Open/Close'; +$lang->cron->toggle = 'Activate/Deactivate'; +$lang->cron->turnon = 'On/Off'; $lang->cron->openProcess = 'Restart'; -$lang->cron->m = 'Minute'; +$lang->cron->m = 'Min'; $lang->cron->h = 'Hour'; $lang->cron->dom = 'Day'; $lang->cron->mon = 'Month'; @@ -18,36 +18,36 @@ $lang->cron->command = 'Command'; $lang->cron->status = 'Status'; $lang->cron->type = 'Type'; $lang->cron->remark = 'Remark'; -$lang->cron->lastTime = 'Last run time'; +$lang->cron->lastTime = 'Last Executed'; -$lang->cron->turnonList['1'] = 'Open'; -$lang->cron->turnonList['0'] = 'Close'; +$lang->cron->turnonList['1'] = 'On'; +$lang->cron->turnonList['0'] = 'Off'; $lang->cron->statusList['normal'] = 'Normal'; $lang->cron->statusList['running'] = 'Running'; $lang->cron->statusList['stop'] = 'Stop'; $lang->cron->typeList['zentao'] = 'Self call'; -$lang->cron->typeList['system'] = 'System command'; +$lang->cron->typeList['system'] = 'System Command'; -$lang->cron->toggleList['start'] = 'Activation'; -$lang->cron->toggleList['stop'] = 'Disable'; +$lang->cron->toggleList['start'] = 'Activate'; +$lang->cron->toggleList['stop'] = 'Deactivate'; -$lang->cron->confirmDelete = 'Do you want to delete the task?'; -$lang->cron->confirmTurnon = 'Do you want to trunoff cron?'; +$lang->cron->confirmDelete = 'Do you want to delete the Planned Task?'; +$lang->cron->confirmTurnon = 'Do you want to truncoff the Cron?'; $lang->cron->introduction = <<Timing tasks such as compute burn , backup. Absolve themselves of layout timing task.

-

This function has yet to be perfect, so the function is turned off by default

+

Planned Task can do scheduled execution, such as update burndown chart, backup, etc.

+

This function need to be improved, so it is turned off by default.

EOD; $lang->cron->confirmOpen = <<Whether to open the function? Open timing task

+

Do you want to turn it on?Turn On Planned Task

EOD; $lang->cron->notice = new stdclass(); -$lang->cron->notice->m = 'Range : 0-59，"*" express the range of numbers, "/" express "Every", "-" express digital range.'; -$lang->cron->notice->h = 'Range : 0-23'; -$lang->cron->notice->dom = 'Range : 1-31'; -$lang->cron->notice->mon = 'Range : 1-12'; -$lang->cron->notice->dow = 'Range : 0-6'; -$lang->cron->notice->help = 'Note: if the server is restarted, or that the timing task is not normal, then the timing task has stopped. You need to click the [Open process] button or refresh page after a minute to open the scheduled tasks. If the last run time of first record is changed in cron list, then the task is turned on.'; -$lang->cron->notice->errorRule = '"%s" is not a valid value'; +$lang->cron->notice->m = 'Range:0-59，"*" means the numbers within the range, "/" means "per", "-" means ranger.'; +$lang->cron->notice->h = 'Range:0-23'; +$lang->cron->notice->dom = 'Range:1-31'; +$lang->cron->notice->mon = 'Range:1-12'; +$lang->cron->notice->dow = 'Range:0-6'; +$lang->cron->notice->help = 'Note：If the server is restarted, or Planned Task is not working, it means Planned Task has stopped working. You have to click 【Create】 or refresh the page to start the Planned Task. If the last execution time in Task List has changed, it means the Task is started.'; +$lang->cron->notice->errorRule = '"%s" is not valid'; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index dc7df47a81..dc6f9b57b1 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -1,44 +1,44 @@ custom->common = 'Custom'; -$lang->custom->index = 'Index'; -$lang->custom->set = 'Set custom'; -$lang->custom->restore = 'restore'; +$lang->custom->index = 'Homepage'; +$lang->custom->set = 'Customize'; +$lang->custom->restore = 'Reset to Default'; $lang->custom->key = 'Key'; $lang->custom->value = 'Value'; -$lang->custom->flow = 'Flow'; -$lang->custom->select = 'Select flow:'; -$lang->custom->branch = 'Multi branch'; +$lang->custom->flow = 'Process'; +$lang->custom->select = 'Select Process'; +$lang->custom->branch = 'Multi Branch'; $lang->custom->object['story'] = 'Story'; $lang->custom->object['task'] = 'Task'; $lang->custom->object['bug'] = 'Bug'; $lang->custom->object['testcase'] = 'Case'; $lang->custom->object['testtask'] = 'Build'; -$lang->custom->object['todo'] = 'Todo'; +$lang->custom->object['todo'] = 'To-Dos'; $lang->custom->object['user'] = 'User'; $lang->custom->story = new stdClass(); $lang->custom->story->fields['priList'] = 'Priority'; $lang->custom->story->fields['sourceList'] = 'Source'; -$lang->custom->story->fields['reasonList'] = 'Closed reason'; +$lang->custom->story->fields['reasonList'] = 'Reason'; $lang->custom->story->fields['stageList'] = 'Stage'; $lang->custom->story->fields['statusList'] = 'Status'; -$lang->custom->story->fields['reviewResultList'] = 'Reviewed result'; -$lang->custom->story->fields['review'] = 'Reviewed procedure'; +$lang->custom->story->fields['reviewResultList'] = 'Result'; +$lang->custom->story->fields['review'] = 'Review'; $lang->custom->task = new stdClass(); $lang->custom->task->fields['priList'] = 'Priority'; $lang->custom->task->fields['typeList'] = 'Type'; -$lang->custom->task->fields['reasonList'] = 'Closed reason'; +$lang->custom->task->fields['reasonList'] = 'Reason'; $lang->custom->task->fields['statusList'] = 'Status'; $lang->custom->bug = new stdClass(); $lang->custom->bug->fields['priList'] = 'Priority'; -$lang->custom->bug->fields['severityList'] = 'Severity'; +$lang->custom->bug->fields['severityList'] = 'Priority'; $lang->custom->bug->fields['osList'] = 'OS'; $lang->custom->bug->fields['browserList'] = 'Browser'; $lang->custom->bug->fields['typeList'] = 'Type'; -$lang->custom->bug->fields['resolutionList'] = 'Resolution'; +$lang->custom->bug->fields['resolutionList'] = 'Solution'; $lang->custom->bug->fields['statusList'] = 'Status'; $lang->custom->testcase = new stdClass(); @@ -61,27 +61,27 @@ $lang->custom->user = new stdClass(); $lang->custom->user->fields['roleList'] = 'Role'; $lang->custom->user->fields['statusList'] = 'Status'; -$lang->custom->currentLang = 'For current language'; -$lang->custom->allLang = 'For all language'; +$lang->custom->currentLang = 'Current Language'; +$lang->custom->allLang = 'All Language'; -$lang->custom->confirmRestore = 'Are you sure to restore the default setting?'; +$lang->custom->confirmRestore = 'Do you want to reset to Default?'; $lang->custom->notice = new stdclass(); -$lang->custom->notice->userRole = 'The length of key must be less than 20!'; -$lang->custom->notice->indexPage['product'] = "Add the product home page since 8.2 version, whether set it for default page?"; -$lang->custom->notice->indexPage['project'] = "Add the project home page since 8.2 version, whether set it for default page?"; -$lang->custom->notice->indexPage['qa'] = "Add the QA home page since 8.2 version, whether set it for default page?"; +$lang->custom->notice->userRole = 'Key must be no more than 20 characters!'; +$lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Homepage. Do you want to enter Product Homepage?"; +$lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Homepage. Do you want to enter Project Homepage?"; +$lang->custom->notice->indexPage['qa'] = "ZenTao 8.2+ has Testing Homepage. Do you want to enter Testing Homepage?"; -$lang->custom->storyReview = 'Reviewed procedure'; -$lang->custom->reviewList[1] = 'Open'; -$lang->custom->reviewList[0] = 'Close'; +$lang->custom->storyReview = 'Review'; +$lang->custom->reviewList[1] = 'On'; +$lang->custom->reviewList[0] = 'Off'; $lang->custom->productProject = new stdclass(); $lang->custom->productProject->relation['0_0'] = 'Product - Project'; $lang->custom->productProject->relation['0_1'] = 'Product - Sprint'; $lang->custom->productProject->relation['1_1'] = 'Project - Sprint'; -$lang->custom->productProject->notice = 'You can change the name of product and project, and the corresponding name display'; +$lang->custom->productProject->notice = 'Please select according to your team.'; -$lang->custom->menuTip = 'Click menu item to toggle display status, drag and drop to change display order.'; -$lang->custom->saveFail = 'Save failed.'; +$lang->custom->menuTip = 'Click to show/hide navigation bar. Drag to swtich display order.'; +$lang->custom->saveFail = 'Failed to save!'; diff --git a/module/datatable/lang/en.php b/module/datatable/lang/en.php index f254a3f853..cc2330c5a1 100644 --- a/module/datatable/lang/en.php +++ b/module/datatable/lang/en.php @@ -1,20 +1,20 @@ datatable = new stdclass(); -$lang->datatable->common = 'Data table'; +$lang->datatable->common = 'Data Table'; $lang->datatable->width = 'Width'; $lang->datatable->show = 'Show'; $lang->datatable->hide = 'Hide'; -$lang->datatable->custom = 'Custom columns'; -$lang->datatable->customTip = 'Check columns to display'; -$lang->datatable->switchToTable = 'Switch to table'; -$lang->datatable->switchToDatatable = 'Switch to datatable'; +$lang->datatable->custom = 'Custom Columns'; +$lang->datatable->customTip = 'Check Columns to Display'; +$lang->datatable->switchToTable = 'Switch to Table'; +$lang->datatable->switchToDatatable = 'Switch to Datatable'; $lang->datatable->required = 'Required'; $lang->datatable->branch = 'Branch'; $lang->datatable->platform = 'Platform'; $lang->datatable->showModule = 'Show module in title'; -$lang->datatable->showModuleList[] = 'Not show'; +$lang->datatable->showModuleList[] = 'N/A'; $lang->datatable->showModuleList['base'] = 'Base node'; $lang->datatable->showModuleList['end'] = 'End node'; diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php index c4cdee47d2..0dafeb84f5 100644 --- a/module/dept/lang/en.php +++ b/module/dept/lang/en.php @@ -10,21 +10,21 @@ * @link http://www.zentao.net */ $lang->dept->common = 'Department'; -$lang->dept->manageChild = "Child department"; -$lang->dept->edit = "Edit"; -$lang->dept->delete = "Delete"; -$lang->dept->parent = "Parent"; -$lang->dept->manager = "Manger"; -$lang->dept->name = "Name"; -$lang->dept->browse = "Manage"; -$lang->dept->manage = "Manage"; -$lang->dept->updateOrder = "Update order"; -$lang->dept->add = "Add department"; -$lang->dept->dragAndSort = "Drag and sort"; +$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 = "Are you sure to delete this department?"; -$lang->dept->successSave = "Success save."; +$lang->dept->confirmDelete = " Do you want to delete this Dept?"; +$lang->dept->successSave = " Saved!"; $lang->dept->error = new stdclass(); -$lang->dept->error->hasSons = "Can't delete this dept, because that has child."; -$lang->dept->error->hasUsers = "Can't delete this dept, because that has users."; +$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/dev/lang/en.php b/module/dev/lang/en.php index 268bdb5d69..9f38cd86c2 100644 --- a/module/dev/lang/en.php +++ b/module/dev/lang/en.php @@ -1,99 +1,99 @@ dev->common = 'Develop'; +$lang->dev->common = 'Reproduct'; $lang->dev->api = 'API'; $lang->dev->db = 'Database'; $lang->dev->editor = 'Editor'; $lang->dev->dbList = 'Database'; -$lang->dev->moduleList = 'Module list'; -$lang->dev->params = 'Params'; +$lang->dev->moduleList = 'ModuleList'; +$lang->dev->params = 'Parameters'; $lang->dev->type = 'Type'; -$lang->dev->desc = 'Desc'; -$lang->dev->noParams = 'No param'; +$lang->dev->desc = 'Description'; +$lang->dev->noParams = 'No Parameters'; $lang->dev->fields = array(); $lang->dev->fields['id'] = 'ID'; -$lang->dev->fields['name'] = 'Name'; -$lang->dev->fields['desc'] = 'Desc'; +$lang->dev->fields['name'] = 'Feild'; +$lang->dev->fields['desc'] = 'Description'; $lang->dev->fields['type'] = 'Type'; $lang->dev->fields['length'] = 'Length'; $lang->dev->fields['null'] = 'Null'; $lang->dev->tableList = array(); -$lang->dev->tableList['action'] = 'Action'; +$lang->dev->tableList['action'] = 'System Log'; $lang->dev->tableList['bug'] = 'Bug'; $lang->dev->tableList['build'] = 'Build'; -$lang->dev->tableList['burn'] = 'Burn'; -$lang->dev->tableList['case'] = 'Testcase'; -$lang->dev->tableList['casestep'] = 'Case step'; +$lang->dev->tableList['burn'] = 'Burndown Chart'; +$lang->dev->tableList['case'] = 'Test Case'; +$lang->dev->tableList['casestep'] = 'Case Steps'; $lang->dev->tableList['company'] = 'Company'; $lang->dev->tableList['config'] = 'Config'; $lang->dev->tableList['custom'] = 'Custom'; $lang->dev->tableList['dept'] = 'Dept'; $lang->dev->tableList['doc'] = 'Doc'; -$lang->dev->tableList['doclib'] = 'Doclib'; +$lang->dev->tableList['doclib'] = 'Doc Lib'; $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 priv'; +$lang->dev->tableList['grouppriv'] = 'Group Privilege'; $lang->dev->tableList['history'] = 'History'; $lang->dev->tableList['lang'] = 'Language'; $lang->dev->tableList['module'] = 'Module'; $lang->dev->tableList['product'] = $lang->productCommon; -$lang->dev->tableList['productplan'] = "{$lang->productCommon} plan"; +$lang->dev->tableList['productplan'] = $lang->productCommon . 'Planning'; $lang->dev->tableList['project'] = $lang->projectCommon; -$lang->dev->tableList['projectproduct'] = "{$lang->projectCommon} {$lang->productCommon}"; -$lang->dev->tableList['projectstory'] = "{$lang->projectCommon} story"; +$lang->dev->tableList['projectproduct'] = $lang->projectCommon . $lang->productCommon; +$lang->dev->tableList['projectstory'] = $lang->projectCommon . 'Story'; $lang->dev->tableList['release'] = 'Release'; $lang->dev->tableList['story'] = 'Story'; -$lang->dev->tableList['storyspec'] = 'Story spec'; +$lang->dev->tableList['storyspec'] = 'StoryDescription'; $lang->dev->tableList['task'] = 'Task'; -$lang->dev->tableList['taskestimate'] = 'Task estimate'; +$lang->dev->tableList['taskestimate'] = 'Estimated Task'; $lang->dev->tableList['team'] = 'Team'; -$lang->dev->tableList['testresult'] = 'Test result'; -$lang->dev->tableList['testrun'] = 'Testrun'; -$lang->dev->tableList['testtask'] = 'Testtask'; -$lang->dev->tableList['todo'] = 'Todo'; +$lang->dev->tableList['testresult'] = 'Testing Result'; +$lang->dev->tableList['testrun'] = 'Run Testing '; +$lang->dev->tableList['testtask'] = 'Test Task'; +$lang->dev->tableList['todo'] = 'To-Dos'; $lang->dev->tableList['user'] = 'User'; -$lang->dev->tableList['usercontact'] = 'User contact'; -$lang->dev->tableList['usergroup'] = 'User group'; -$lang->dev->tableList['userquery'] = 'User query'; -$lang->dev->tableList['usertpl'] = 'User template'; +$lang->dev->tableList['usercontact'] = 'User Contact'; +$lang->dev->tableList['usergroup'] = 'User Group'; +$lang->dev->tableList['userquery'] = 'User Query'; +$lang->dev->tableList['usertpl'] = 'User Template'; $lang->dev->tableList['admin'] = 'Admin'; $lang->dev->tableList['api'] = 'API'; $lang->dev->tableList['backup'] = 'Backup'; $lang->dev->tableList['common'] = 'Common'; $lang->dev->tableList['convert'] = 'Convert'; -$lang->dev->tableList['dev'] = 'Dev'; +$lang->dev->tableList['dev'] = 'Reproduct'; $lang->dev->tableList['git'] = 'GIT'; -$lang->dev->tableList['index'] = 'Index'; +$lang->dev->tableList['index'] = 'Homepage'; $lang->dev->tableList['install'] = 'Install'; -$lang->dev->tableList['mail'] = 'Mail'; +$lang->dev->tableList['mail'] = 'Email'; $lang->dev->tableList['misc'] = 'Misc'; -$lang->dev->tableList['my'] = 'My'; +$lang->dev->tableList['my'] = 'My Zone'; $lang->dev->tableList['qa'] = 'QA'; $lang->dev->tableList['report'] = 'Report'; $lang->dev->tableList['search'] = 'Search'; $lang->dev->tableList['sso'] = 'SSO'; $lang->dev->tableList['svn'] = 'SVN'; -$lang->dev->tableList['testcase'] = 'Testcase'; -$lang->dev->tableList['tree'] = 'Tree'; -$lang->dev->tableList['upgrade'] = 'Upgrade'; -$lang->dev->tableList['cron'] = 'Cron'; -$lang->dev->tableList['mailqueue'] = 'Mail queue'; -$lang->dev->tableList['datatable'] = 'Data table'; +$lang->dev->tableList['testcase'] = 'Test Case'; +$lang->dev->tableList['tree'] = 'Module Tree'; +$lang->dev->tableList['upgrade'] = 'Update'; +$lang->dev->tableList['cron'] = 'Scheduled Task'; +$lang->dev->tableList['mailqueue'] = 'Mail Queue'; +$lang->dev->tableList['datatable'] = 'Data Table'; $lang->dev->tableList['block'] = 'Block'; $lang->dev->tableList['branch'] = 'Branch'; -$lang->dev->tableList['doccontent'] = 'Doc content'; -$lang->dev->tableList['storystage'] = 'Story stage'; +$lang->dev->tableList['doccontent'] = 'Doc Content'; +$lang->dev->tableList['storystage'] = 'Story Stage'; $lang->dev->tableList['tutorial'] = 'Tutorial'; -$lang->dev->groupList['my'] = 'Dashboard'; +$lang->dev->groupList['my'] = 'My Zone'; $lang->dev->groupList['product'] = $lang->productCommon; $lang->dev->groupList['project'] = $lang->projectCommon; -$lang->dev->groupList['qa'] = 'QA'; +$lang->dev->groupList['qa'] = 'Testing'; $lang->dev->groupList['doc'] = 'Document'; $lang->dev->groupList['report'] = 'Report'; $lang->dev->groupList['company'] = 'Company'; -$lang->dev->groupList['admin'] = 'Admin'; -$lang->dev->groupList['other'] = 'Others'; +$lang->dev->groupList['admin'] = 'Administration'; +$lang->dev->groupList['other'] = 'Other Module'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index eed0fbf104..15a3def223 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -17,101 +17,100 @@ $lang->doc->project = $lang->projectCommon; $lang->doc->lib = 'Library'; $lang->doc->module = 'Module'; $lang->doc->title = 'Title'; -$lang->doc->digest = 'Digest'; -$lang->doc->comment = 'Comment'; +$lang->doc->digest = 'Summary'; +$lang->doc->comment = 'Remark'; $lang->doc->type = 'Type'; -$lang->doc->content = 'Content'; -$lang->doc->keywords = 'Keywords'; +$lang->doc->content = 'Text'; +$lang->doc->keywords = 'Keyword'; $lang->doc->url = 'URL'; $lang->doc->files = 'File'; -$lang->doc->addedBy = 'Added by'; -$lang->doc->addedDate = 'Added date'; -$lang->doc->editedBy = 'Edited by'; -$lang->doc->editedDate = 'Edited date'; +$lang->doc->addedBy = 'Added By'; +$lang->doc->addedDate = 'Added Date'; +$lang->doc->editedBy = 'Edited By'; +$lang->doc->editedDate = 'Edited Date'; $lang->doc->version = 'Version'; $lang->doc->basicInfo = 'Basic Info'; $lang->doc->deleted = 'Deleted'; -$lang->doc->fileObject = 'File object'; -$lang->doc->whiteList = 'White list'; -$lang->doc->contentType = 'Doc type'; +$lang->doc->fileObject = 'The Object'; +$lang->doc->whiteList = 'White List'; +$lang->doc->contentType = 'Document Format'; -$lang->doc->moduleDoc = 'By module'; -$lang->doc->searchDoc = 'By search'; -$lang->doc->allDoc = 'All doc'; -$lang->doc->openedByMe = 'Added by me'; -$lang->doc->orderByOpen = 'Last added'; -$lang->doc->orderByEdit = 'Last edited'; +$lang->doc->moduleDoc = 'By Module'; +$lang->doc->searchDoc = 'By Search'; +$lang->doc->allDoc = 'All Document'; +$lang->doc->openedByMe = 'Opened By Me'; +$lang->doc->orderByOpen = 'Recently Added'; +$lang->doc->orderByEdit = 'Recently Modifie'; -/* Actions. */ -$lang->doc->index = 'Index'; -$lang->doc->create = 'Create doc'; -$lang->doc->edit = 'Edit doc'; -$lang->doc->delete = 'Delete doc'; -$lang->doc->browse = 'Browse doc'; -$lang->doc->view = 'View doc'; +/* 方法列表。*/ +$lang->doc->index = 'Homepage'; +$lang->doc->create = 'Create'; +$lang->doc->edit = 'Edit'; +$lang->doc->delete = 'Delete'; +$lang->doc->browse = 'List'; +$lang->doc->view = 'Details'; $lang->doc->diff = 'Diff'; -$lang->doc->manageType = 'Manage type'; -$lang->doc->editType = 'Edit type'; -$lang->doc->deleteType = 'Delete type'; -$lang->doc->addType = 'Add type'; +$lang->doc->manageType = 'Type'; +$lang->doc->editType = 'Edit Type'; +$lang->doc->deleteType = 'Delete Type'; +$lang->doc->addType = 'Add Type'; -$lang->doc->libName = 'Library name'; -$lang->doc->libType = 'Library type'; -$lang->doc->custom = 'Custom library'; -$lang->doc->createLib = 'Create library'; -$lang->doc->allLibs = 'Browse library'; -$lang->doc->objectLibs = "Browse {$lang->productCommon}/{$lang->projectCommon} library"; -$lang->doc->showFiles = 'File library'; -$lang->doc->editLib = 'Edit library'; -$lang->doc->deleteLib = 'Delete library'; -$lang->doc->fixedMenu = 'Fixed in Menu'; -$lang->doc->removeMenu = 'Move from menu'; +$lang->doc->libName = 'Library Name'; +$lang->doc->libType = 'Library Type'; +$lang->doc->custom = 'Custom Library'; +$lang->doc->createLib = 'Create Library'; +$lang->doc->allLibs = 'Library List'; +$lang->doc->objectLibs = "{$lang->productCommon}/{$lang->projectCommon} Library List"; +$lang->doc->showFiles = 'Files Library'; +$lang->doc->editLib = 'Edit Library'; +$lang->doc->deleteLib = 'Delete Library'; +$lang->doc->fixedMenu = 'Fixed In Menu'; +$lang->doc->removeMenu = 'Remove From Menu'; -/* Browse tabs. */ -$lang->doc->allProduct = "All {$lang->productCommon}s"; -$lang->doc->allProject = "All {$lang->projectCommon}s"; +/* 查询条件列表 */ +$lang->doc->allProduct = 'All' . $lang->productCommon; +$lang->doc->allProject = 'All' . $lang->projectCommon; -$lang->doc->libTypeList['product'] = "{$lang->productCommon} doc"; -$lang->doc->libTypeList['project'] = "{$lang->projectCommon} doc"; -$lang->doc->libTypeList['custom'] = 'Custom library'; +$lang->doc->libTypeList['product'] = $lang->productCommon . ' Library'; +$lang->doc->libTypeList['project'] = $lang->projectCommon . ' Library'; +$lang->doc->libTypeList['custom'] = 'Custom Library'; -$lang->doc->systemLibs['product'] = "{$lang->productCommon} doc"; -$lang->doc->systemLibs['project'] = "{$lang->projectCommon} doc"; +$lang->doc->systemLibs['product'] = $lang->productCommon . 'DocumentLibrary'; +$lang->doc->systemLibs['project'] = $lang->projectCommon . 'DocumentLibrary'; $lang->doc->aclList['open'] = 'Public'; $lang->doc->aclList['custom'] = 'Custom'; $lang->doc->aclList['private'] = 'Private'; -$lang->doc->types['text'] = 'Text'; -$lang->doc->types['url'] = 'Url'; +$lang->doc->types['text'] = 'Html'; +$lang->doc->types['url'] = 'Link'; $lang->doc->contentTypeList['html'] = 'HTML'; $lang->doc->contentTypeList['markdown'] = 'MarkDown'; -$lang->doc->browseType = 'Browse type'; +$lang->doc->browseType = 'Browse Type'; $lang->doc->browseTypeList['list'] = 'List'; $lang->doc->browseTypeList['menu'] = 'Menu'; $lang->doc->browseTypeList['tree'] = 'Tree'; -$lang->doc->confirmDelete = "Are you sure to delete this doc?"; -$lang->doc->confirmDeleteLib = " Are you sure to delete this doc library?"; -$lang->doc->errorEditSystemDoc = "System doc library needn't edit"; -$lang->doc->errorEmptyProduct = "{$lang->productCommon} is empty, can not create doc."; -$lang->doc->errorEmptyProject = "{$lang->projectCommon} is empty, can not create doc."; -$lang->doc->errorMainSysLib = "Do not delete this library in system library"; -$lang->doc->accessDenied = "Access to this library denied."; -$lang->doc->noMatched = "No matched library including '%s'"; -$lang->doc->versionNotFount = 'Do not found doc in this version'; +$lang->doc->confirmDelete = "Do you want to delete this document?"; +$lang->doc->confirmDeleteLib = "Do you want to delete this Doc Lib?"; +$lang->doc->errorEditSystemDoc = "System Doc Lib needs no modifications."; +$lang->doc->errorEmptyProduct = "No {$lang->productCommon}. Document cannot be created."; +$lang->doc->errorEmptyProject = "No {$lang->projectCommon}. Document cannot be created."; +$lang->doc->errorMainSysLib = "Can not delete this library."; +$lang->doc->accessDenied = "Access to library denied!"; +$lang->doc->noMatched = "No library including '%s' can be found."; +$lang->doc->versionNotFount = 'The document is not exist in this version.'; $lang->doc->placeholder = new stdclass(); -$lang->doc->placeholder->url = 'url'; +$lang->doc->placeholder->url = 'Url'; $lang->doclib = new stdclass(); -$lang->doclib->name = 'Library Name'; -$lang->doclib->control = 'Control'; -$lang->doclib->acl = 'Power'; +$lang->doclib->name = 'Library Name'; +$lang->doclib->control = 'Access Control'; $lang->doclib->group = 'Group'; $lang->doclib->user = 'User'; $lang->doclib->files = 'Files'; -$lang->doclib->all = 'All library'; -$lang->doclib->select = 'Select library'; +$lang->doclib->all = 'All Libraries'; +$lang->doclib->select = 'Select Library'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 2310453545..e189d668a4 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -109,7 +109,6 @@ $lang->doc->placeholder->url = '相应的链接地址'; $lang->doclib = new stdclass(); $lang->doclib->name = '文档库名称'; $lang->doclib->control = '访问控制'; -$lang->doclib->acl = '权限'; $lang->doclib->group = '分组'; $lang->doclib->user = '用户'; $lang->doclib->files = '附件库'; diff --git a/module/editor/lang/en.php b/module/editor/lang/en.php index 5e7729b5ae..216db309fd 100644 --- a/module/editor/lang/en.php +++ b/module/editor/lang/en.php @@ -1,75 +1,74 @@ editor->common = 'Editor'; $lang->editor->api = 'API'; -$lang->editor->index = 'Index'; -$lang->editor->newMethod = 'New method'; -$lang->editor->extend = 'Extend'; +$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 extend'; -$lang->editor->newPage = 'New page'; -$lang->editor->override = 'override'; -$lang->editor->edit = 'Edit extend'; -$lang->editor->save = 'Save page'; -$lang->editor->delete = 'Delete page'; +$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 = "Extend:"; -$lang->editor->sourceFile = 'Source file:'; -$lang->editor->fileName = "File name:"; -$lang->editor->isOverride = "Override repeat file"; -$lang->editor->exampleHook = "(For example:***.html.hook.php)"; -$lang->editor->exampleJs = "(For example:***.js)"; -$lang->editor->exampleCss = "(For example:***.css)"; -$lang->editor->examplePHP = "(For example:***.php)"; +$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 = 'Are you sure?'; -$lang->editor->extendConfirm = 'Would you reuse the code.'; -$lang->editor->repeatFile = 'File name repeat'; -$lang->editor->repeatPage = 'This page has extisted. Is override?'; -$lang->editor->noticeOkFile = 'For security reason, system need to confirm you\'re administrator of zentao system.\n Please login into the zentao host and create the %s file.\n Note:\n 1. Keep the ok.txt content empty.\n 2. If the file exists already, remove and recreate it again.'; +$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 = "Can not writable, maybe no power. please try chmod 777 -R "; -$lang->editor->notDelete = "Can not delete, please check power!"; -$lang->editor->emptyFileName = 'Please write file name'; +$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['control.php'] = 'control'; $lang->editor->translate['model.php'] = 'model'; -$lang->editor->modules['action'] = 'Logs'; +$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 module'; +$lang->editor->modules['common'] = 'Common Modules'; $lang->editor->modules['company'] = 'Company'; -$lang->editor->modules['convert'] = 'Import'; +$lang->editor->modules['convert'] = 'Convert'; $lang->editor->modules['dept'] = 'Department'; -$lang->editor->modules['doc'] = 'Doc'; -$lang->editor->modules['extension'] = 'Extension'; +$lang->editor->modules['doc'] = 'Document'; +$lang->editor->modules['extension'] = 'Extensiona'; $lang->editor->modules['file'] = 'File'; $lang->editor->modules['group'] = 'Group'; -$lang->editor->modules['index'] = 'Index'; +$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'] = 'Test'; +$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'] = 'TODO'; -$lang->editor->modules['tree'] = 'Module manage'; +$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 5ffee3f61d..dc067d8b3b 100644 --- a/module/extension/lang/en.php +++ b/module/extension/lang/en.php @@ -12,18 +12,18 @@ $lang->extension->common = 'Extension'; $lang->extension->browse = 'Browse'; $lang->extension->install = 'Install'; -$lang->extension->installAuto = 'AutoInstall'; -$lang->extension->installForce = 'ForceInstall'; +$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 = 'Obtain'; -$lang->extension->view = 'Info'; -$lang->extension->downloadAB = 'Down'; -$lang->extension->upload = 'Upload and install'; +$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 = 'Upgrade Extension'; -$lang->extension->agreeLicense = 'I agree the license'; +$lang->extension->upgrade = 'Extension Upgrade'; +$lang->extension->agreeLicense = 'License'; $lang->extension->structure = 'Structure'; $lang->extension->installed = 'Installed'; @@ -35,72 +35,72 @@ $lang->extension->compatible = 'Compatible'; $lang->extension->latest = 'Latest:%s，need zentao %s'; $lang->extension->author = 'Author'; $lang->extension->license = 'License'; -$lang->extension->site = 'Site'; +$lang->extension->site = 'Official Website'; $lang->extension->downloads = 'Downloads'; -$lang->extension->compatible = 'Compatible'; -$lang->extension->grade = 'Grade'; -$lang->extension->depends = 'Depends'; +$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] = 'Unknow'; +$lang->extension->compatibleList[0] = 'Unknown'; $lang->extension->compatibleList[1] = 'Compatible'; $lang->extension->byDownloads = 'Downloads'; -$lang->extension->byAddedTime = 'New added'; -$lang->extension->byUpdatedTime = 'Last updated'; +$lang->extension->byAddedTime = 'Latest Added'; +$lang->extension->byUpdatedTime = 'Latest Update'; $lang->extension->bySearch = 'Search'; -$lang->extension->byCategory = 'By Category'; +$lang->extension->byCategory = 'Category'; -$lang->extension->installFailed = '%s failed, the reason is:'; -$lang->extension->uninstallFailed = 'Uninstall failed, the reason is:'; -$lang->extension->confirmUninstall = 'Uninstall will delete or modify database, whether to uninstall?'; -$lang->extension->installFinished = 'Good, the extension has been %s successfully.'; +$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 successfully uninstalled.'; -$lang->extension->deactivateFinished = 'Extension has been successfully deactivated.'; -$lang->extension->activateFinished = 'Extension has been successfully activated.'; -$lang->extension->eraseFinished = 'Extension has been successfully erased.'; -$lang->extension->unremovedFiles = 'There are some unremoved files, you need remove them manually'; -$lang->extension->executeCommands = '

Execute the following commands to fix them:

'; -$lang->extension->successDownloadedPackage = 'Successfully downloaded the package file.'; -$lang->extension->successCopiedFiles = 'Successfully copied files. '; -$lang->extension->successInstallDB = 'Successfully installed database.'; -$lang->extension->viewInstalled = 'View installed extensions.'; -$lang->extension->viewAvailable = 'View available extensions'; -$lang->extension->viewDeactivated = 'View deactivated extensions'; -$lang->extension->backDBFile = 'Plug-related data has been backed up to %s file!'; -$lang->extension->noticeOkFile = "
For security reason, system need to confirm you're administrator of zentao system.
-
Please login into the zentao host and create the %s file.
+$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. Keep the ok.txt content empty.
    2. -
  2. If the file exists already, remove and recreate it again.
    3. -
"; +
  • File is blank.
    • +
  • If the old file exists, please delete it before create one.
    • + '; $lang->extension->upgradeExt = 'Upgrade'; $lang->extension->installExt = 'Install'; -$lang->extension->upgradeVersion = '(Upgrade from %s to %s)'; +$lang->extension->upgradeVersion = '(Upgrade %s to %s.)'; -$lang->extension->waring = 'Waring'; +$lang->extension->waring = 'Warning!'; $lang->extension->errorOccurs = 'Error:'; -$lang->extension->errorGetModules = "Get extensions' categories data from the www.zentao.net failed. "; -$lang->extension->errorGetExtensions = 'Get extensions from www.zentao.net failed. You can visit     www.zentao.net to find your extensions, download it manually and then upload to zentaopms to install it.'; -$lang->extension->errorDownloadPathNotFound = 'The save path of package file %sdoes not exists.
    For linux users, can execute mkdir -p %s to fix it.'; -$lang->extension->errorDownloadPathNotWritable = 'The save path of package file %sis not writable.
    For linux users, can execute sudo chmod 777 %s to fix it.'; -$lang->extension->errorPackageFileExists = 'There is already a file with the same name %s.
    If you want to %s again, please click this link.
    '; -$lang->extension->errorDownloadFailed = 'Download failed, please try again. Or you can download it manually and upload it to install.'; -$lang->extension->errorMd5Checking = 'The downloawd files checking failed, Please download it manually and upload it to install'; -$lang->extension->errorExtracted = 'The package file %s extracted failed. The error is:
    %s'; -$lang->extension->errorCheckIncompatible = 'This extenion is not compatible with current version. %s may be not use.

    You can Force %s or Cancel

    .'; -$lang->extension->errorFileConflicted = 'There are some files conflicted:
    %s

    You can Overide them or Cancel

    .'; -$lang->extension->errorPackageNotFound = 'The package file %s not found, perhaps download failed, try again.'; -$lang->extension->errorTargetPathNotWritable = 'Target path %s not writable.'; -$lang->extension->errorTargetPathNotExists = 'Target path %s not exists'; -$lang->extension->errorInstallDB = 'Execute database sql failed, the error is: %s'; -$lang->extension->errorConflicts = 'With plug-in "%s" Conflict!'; -$lang->extension->errorDepends = 'The following dependency plugin is not installed or the version is incorrect:

    %s'; -$lang->extension->errorIncompatible = 'The plug-in with your ZenTao incompatible version'; -$lang->extension->errorUninstallDepends = 'Plugin "%s" relying on the plug-in, can not uninstall'; +$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 b0aea92a7a..db8639f128 100644 --- a/module/file/lang/en.php +++ b/module/file/lang/en.php @@ -10,31 +10,31 @@ * @link http://www.zentao.net */ $lang->file = new stdclass(); -$lang->file->common = 'File'; -$lang->file->uploadImages = 'Upload images'; -$lang->file->download = 'Download'; -$lang->file->edit = 'Edit file name'; -$lang->file->inputFileName = 'Input file name'; -$lang->file->delete = 'Delete'; -$lang->file->label = 'Title: '; +$lang->file->common = 'Attachment'; +$lang->file->uploadImages = 'Batch Upload Images'; +$lang->file->download = 'Download Files'; +$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"; -$lang->file->tplTitle = "Title"; -$lang->file->setPublic = "Set public template"; -$lang->file->exportFields = "To export fields"; -$lang->file->defaultTPL = "Default template"; -$lang->file->setExportTPL = "Setting"; +$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 = "The directory '%s' is no exist"; -$lang->file->errorCanNotWrite = "The directory '%s' is unwritable, please change it's permission. Command in linux:sudo -R chmod 777 '%s'"; -$lang->file->confirmDelete = " Are you sure to delete this file?"; -$lang->file->errorFileSize = " The file size exceeds the limit, might not be able to upload!"; -$lang->file->errorFileUpload = " Failed to upload files, file size may exceed the limit!"; -$lang->file->dangerFile = " The file exists security risk, will be canceled upload!"; -$lang->file->errorSuffix = 'Compressed packet format error, can only upload zip!'; -$lang->file->errorExtract = 'Decompression failure! The file may have been damaged'; +$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. Upload file to contain pictures of zip package, the program will take the file name as a title, as content with pictures

    -

    2. The file name at the beginning contains 'digital+underline', generation of title will they ignore.

    -

    3、Image format : jpg|jpeg|gif|png.

    +

    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/git/lang/en.php b/module/git/lang/en.php index 13518f1b6c..fb1becaa0d 100644 --- a/module/git/lang/en.php +++ b/module/git/lang/en.php @@ -12,6 +12,6 @@ /* Methods. */ $lang->git = new stdclass(); $lang->git->common = 'Git'; -$lang->git->cat = 'View code'; -$lang->git->diff = 'Diff code'; -$lang->git->apiSync = 'API: sync git log'; +$lang->git->cat = 'View Code'; +$lang->git->diff = 'Diff Code'; +$lang->git->apiSync = 'API: Sync Git Log'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index a85f8371e0..1b5b98179e 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -9,81 +9,82 @@ * @version $Id: en.php 4719 2013-05-03 02:20:28Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->group->common = 'Group'; -$lang->group->browse = 'Browse'; -$lang->group->create = 'Create'; -$lang->group->edit = 'Edit'; -$lang->group->copy = 'Copy'; -$lang->group->delete = 'Delete'; -$lang->group->manageView = 'Manage view'; -$lang->group->managePriv = 'Privilege'; -$lang->group->managePrivByGroup = 'Privilege'; -$lang->group->managePrivByModule = 'Manage privilege by module'; -$lang->group->byModuleTips = ' (Press shift or control to multiple select)'; +$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 = 'Are you sure to delete this group?'; -$lang->group->successSaved = 'Success saved.'; -$lang->group->errorNotSaved = 'Not saved, please make sure you have selected some actions and groups.'; -$lang->group->viewList = 'Allow access view'; -$lang->group->productList = "Allow access {$lang->productCommon}"; -$lang->group->projectList = "Allow access {$lang->projectCommon}"; -$lang->group->noticeVisit = 'The empty access has no access restrictions'; +$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->id = 'ID'; $lang->group->name = 'Name'; -$lang->group->desc = 'Desc'; -$lang->group->users = 'Users'; +$lang->group->desc = 'Description'; +$lang->group->users = 'User List'; $lang->group->module = 'Module'; $lang->group->method = 'Method'; -$lang->group->priv = 'Priviledge'; +$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 priviledge'; -$lang->group->copyOptions['copyUser'] = 'Copy user'; +$lang->group->copyOptions['copyPriv'] = 'Copy Privilege'; +$lang->group->copyOptions['copyUser'] = 'Copy User'; $lang->group->versions[''] = 'History'; -$lang->group->versions['8_2_beta'] = 'Zentao 8.2.beta'; -$lang->group->versions['8_0_1'] = 'Zentao 8.0.1'; -$lang->group->versions['8_0'] = 'Zentao 8.0'; -$lang->group->versions['7_4_beta'] = 'Zentao 7.4.beta'; -$lang->group->versions['7_3'] = 'Zentao 7.3'; -$lang->group->versions['7_2'] = 'Zentao 7.2'; -$lang->group->versions['7_1'] = 'Zentao 7.1'; -$lang->group->versions['6_4'] = 'Zentao 6.4'; -$lang->group->versions['6_3'] = 'Zentao 6.3'; -$lang->group->versions['6_2'] = 'Zentao 6.2'; -$lang->group->versions['6_1'] = 'Zentao 6.1'; -$lang->group->versions['5_3'] = 'Zentao 5.3'; -$lang->group->versions['5_1'] = 'Zentao 5.1'; -$lang->group->versions['5_0_beta2'] = 'Zentao 5.0.beta2'; -$lang->group->versions['5_0_beta1'] = 'Zentao 5.0.beta1'; -$lang->group->versions['4_3_beta'] = 'Zentao 4.3.beta'; -$lang->group->versions['4_2_beta'] = 'Zentao 4.2.beta'; -$lang->group->versions['4_1'] = 'Zentao 4.1'; -$lang->group->versions['4_0_1'] = 'Zentao 4.0.1'; -$lang->group->versions['4_0'] = 'Zentao 4.0'; -$lang->group->versions['4_0_beta2'] = 'Zentao 4.0.beta2'; -$lang->group->versions['4_0_beta1'] = 'Zentao 4.0.beta1'; -$lang->group->versions['3_3'] = 'Zentao 3.3'; -$lang->group->versions['3_2_1'] = 'Zentao 3.2.1'; -$lang->group->versions['3_2'] = 'Zentao 3.2'; -$lang->group->versions['3_1'] = 'Zentao 3.1'; -$lang->group->versions['3_0_beta2'] = 'Zentao 3.0.beta2'; -$lang->group->versions['3_0_beta1'] = 'Zentao 3.0.beta1'; -$lang->group->versions['2_4'] = 'Zentao 2.4'; -$lang->group->versions['2_3'] = 'Zentao 2.3'; -$lang->group->versions['2_2'] = 'Zentao 2.2'; -$lang->group->versions['2_1'] = 'Zentao 2.1'; -$lang->group->versions['2_0'] = 'Zentao 2.0'; -$lang->group->versions['1_5'] = 'Zentao 1.5'; -$lang->group->versions['1_4'] = 'Zentao 1.4'; -$lang->group->versions['1_3'] = 'Zentao 1.3'; -$lang->group->versions['1_2'] = 'Zentao 1.2'; -$lang->group->versions['1_1'] = 'Zentao 1.1'; -$lang->group->versions['1_0_1'] = 'Zentao 1.0.1'; +$lang->group->versions['8_2'] = '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/group/lang/resource.php b/module/group/lang/resource.php index 8f2c52763e..7c357a2936 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -130,7 +130,7 @@ $lang->resource->product->edit = 'edit'; $lang->resource->product->batchEdit = 'batchEdit'; $lang->resource->product->delete = 'delete'; $lang->resource->product->roadmap = 'roadmap'; -$lang->resource->product->doc = 'doc'; +//$lang->resource->product->doc = 'doc'; $lang->resource->product->dynamic = 'dynamic'; $lang->resource->product->project = 'project'; $lang->resource->product->close = 'close'; @@ -145,7 +145,7 @@ $lang->product->methodOrder[20] = 'edit'; $lang->product->methodOrder[25] = 'batchEdit'; $lang->product->methodOrder[35] = 'delete'; $lang->product->methodOrder[40] = 'roadmap'; -$lang->product->methodOrder[45] = 'doc'; +//$lang->product->methodOrder[45] = 'doc'; $lang->product->methodOrder[50] = 'dynamic'; $lang->product->methodOrder[55] = 'project'; $lang->product->methodOrder[60] = 'close'; @@ -294,7 +294,7 @@ $lang->resource->project->computeBurn = 'computeBurn'; $lang->resource->project->fixFirst = 'fixFirst'; $lang->resource->project->burnData = 'burnData'; $lang->resource->project->team = 'team'; -$lang->resource->project->doc = 'doc'; +//$lang->resource->project->doc = 'doc'; $lang->resource->project->dynamic = 'dynamic'; $lang->resource->project->manageProducts = 'manageProducts'; //$lang->resource->project->manageChilds = 'manageChilds'; @@ -334,7 +334,7 @@ $lang->project->methodOrder[110] = 'computeBurn'; $lang->project->methodOrder[115] = 'fixFirst'; $lang->project->methodOrder[120] = 'burnData'; $lang->project->methodOrder[125] = 'team'; -$lang->project->methodOrder[130] = 'doc'; +//$lang->project->methodOrder[130] = 'doc'; $lang->project->methodOrder[135] = 'dynamic'; $lang->project->methodOrder[140] = 'manageProducts'; $lang->project->methodOrder[145] = 'manageMembers'; @@ -1176,3 +1176,7 @@ $lang->changelog['8.2.beta'][] = 'project-tree'; $lang->changelog['8.2.beta'][] = 'project-all'; $lang->changelog['8.2.beta'][] = 'project-kanban'; $lang->changelog['8.2.beta'][] = 'project-tree'; + +$lang->changelog['8.3'][] = 'doc-allLibs'; +$lang->changelog['8.3'][] = 'doc-objectLibs'; +$lang->changelog['8.3'][] = 'doc-showFiles'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index a3248d8d9f..2c339e38ea 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -46,6 +46,7 @@ $lang->group->copyOptions['copyPriv'] = '复制权限'; $lang->group->copyOptions['copyUser'] = '复制用户'; $lang->group->versions[''] = '修改历史'; +$lang->group->versions['8_3'] = '禅道8.3'; $lang->group->versions['8_2_beta'] = '禅道8.2.beta'; $lang->group->versions['8_0_1'] = '禅道8.0.1'; $lang->group->versions['8_0'] = '禅道8.0'; diff --git a/module/index/lang/en.php b/module/index/lang/en.php index 67330d486f..68ebd01f43 100644 --- a/module/index/lang/en.php +++ b/module/index/lang/en.php @@ -1,3 +1,3 @@ index->common = 'Index'; -$lang->index->index = 'Index'; +$lang->index->common = 'Homepage'; +$lang->index->index = 'Homepage'; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 16f2c7b6f5..7e4d3aa5a8 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -17,146 +17,146 @@ $lang->install->pre = 'Back'; $lang->install->reload = 'Reload'; $lang->install->error = 'Error '; -$lang->install->start = 'Start install'; -$lang->install->keepInstalling = 'Keep install this version'; -$lang->install->seeLatestRelease = 'See the latest release.'; -$lang->install->welcome = 'Welcome to use ZenTaoPMS.'; -$lang->install->license = 'ZentaoPMS use license of Z PUBLIC LICENSE(ZPL) 1.2'; +$lang->install->start = 'Start to Install'; +$lang->install->keepInstalling = 'Continue installing this version.'; +$lang->install->seeLatestRelease = 'View Latest Version'; +$lang->install->welcome = 'Welcome to ZenTao Project Management Software!'; +$lang->install->license = 'ZenTao PMS is under Z PUBLIC LICENSE(ZPL) 1.2'; $lang->install->desc = <<ZPL. It has product manage, project mange, testing mange features, also with organization manage and affair manage. +ZenTao Project Management Software (ZenTao PMS) is originated in China and under ZPL. It us an open source and free project management software, integrated with Product Management、Project Management、Testing Management, as weel as To-Dos Management, Company Managementetc, which is the best choice for small and medium organizations to manage projects. -ZenTaoPMS is developped by PHH and mysql under the zentaophp framework developped by the same team. Through the framework, ZenTaoPMS can be customed and extended very easily. +ZenTao PMS uses PHP + MySQL as programming langugages and is based on ZenTaoPHP, an independent framwork developed by our team. Third party developers/organizations can develop extensions or customization tailored to their needs. EOT; $lang->install->links = <<Nature EasySoft Network Tecnology Co.ltd, QingDao, China。 -The official website of ZenTaoPMS is http://en.zentao.net -twitter:zentaopms +ZenTao PMS is developed by Qingdao Nature Easy Soft Co., LTD. +Officila Wensite http://www.zentao.net +Technical Support http://www.zentao.net/ask/ +新浪微博：http://weibo.com/easysoft - -The version of current release is %s。 +You are installing ZenTao %s Version. EOT; -$lang->install->newReleased= "Notice：There is a new version %s, released on %s。"; -$lang->install->or = 'or'; -$lang->install->checking = 'System checking'; -$lang->install->ok = 'OK(√)'; +$lang->install->newReleased= "Notice：Official Website has the latest version%s, released on %s."; +$lang->install->or = 'Or'; +$lang->install->checking = 'System Checking'; +$lang->install->ok = 'Passed(√)'; $lang->install->fail = 'Failed(×)'; $lang->install->loaded = 'Loaded'; -$lang->install->unloaded = 'Not loaded'; -$lang->install->exists = 'Exists '; -$lang->install->notExists = 'Not exists '; +$lang->install->unloaded = 'Not Loaded'; +$lang->install->exists = 'Found '; +$lang->install->notExists = 'Not found '; $lang->install->writable = 'Writable '; -$lang->install->notWritable= 'Not writable '; -$lang->install->phpINI = 'PHP ini file'; -$lang->install->checkItem = 'Items'; -$lang->install->current = 'Current'; -$lang->install->result = 'Result'; -$lang->install->action = 'How to fix'; +$lang->install->notWritable= 'Not Writable '; +$lang->install->phpINI = 'PHP ini File'; +$lang->install->checkItem = 'Item'; +$lang->install->current = 'Current Settings'; +$lang->install->result = 'Results'; +$lang->install->action = 'Actions'; -$lang->install->phpVersion = 'PHP version'; -$lang->install->phpFail = 'Must > 5.2.0'; +$lang->install->phpVersion = 'PHP Version'; +$lang->install->phpFail = 'PHP Version has to be 5.2.0+'; -$lang->install->pdo = 'PDO extension'; -$lang->install->pdoFail = 'Edit the php.ini file to load PDO extsion.'; -$lang->install->pdoMySQL = 'PDO_MySQL extension'; -$lang->install->pdoMySQLFail = 'Edit the php.ini file to load PDO_MySQL extsion.'; -$lang->install->json = 'JSON extension'; -$lang->install->jsonFail = 'Edit the php.ini file to load JSON extension'; -$lang->install->tmpRoot = 'Temp directory'; -$lang->install->dataRoot = 'Upload directory.'; -$lang->install->session = 'Session save path'; -$lang->install->sessionFail = 'Edit the php.ini file to set session.save_path'; -$lang->install->mkdir = '

    Should creat the directory %s。
    Under linux, can try
    mkdir -p %s

    '; -$lang->install->chmod = 'Should change the permission of "%s".
    Under linux, can try
    chmod o=rwx -R %s'; +$lang->install->pdo = 'PDO'; +$lang->install->pdoFail = 'Edit PHP ini file to load PDO extsion.'; +$lang->install->pdoMySQL = 'PDO_MySQL'; +$lang->install->pdoMySQLFail = 'Edit PHP ini file to load PDO_MySQL extsion.'; +$lang->install->json = 'JSON Extension'; +$lang->install->jsonFail = 'Edit the php.ini file to load JSON extension.'; +$lang->install->tmpRoot = 'Temp File Directory'; +$lang->install->dataRoot = 'Uploaded File Directory'; +$lang->install->session = 'Session Save Path'; +$lang->install->sessionFail = 'Edit the php.ini file to set session.save_path.'; +$lang->install->mkdir = '

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

    in Linux.'; +$lang->install->chmod = ' "%s" privilege has to be modified.
    Run
    chmod o=rwx -R %s in Linux.'; -$lang->install->defaultLang = 'Default Language'; -$lang->install->dbHost = 'Database host'; -$lang->install->dbHostNote = 'If 127.0.0.1 can not connect, try localhost'; -$lang->install->dbPort = 'Host port'; -$lang->install->dbUser = 'Database user'; -$lang->install->dbPassword = 'Database password'; -$lang->install->dbName = 'Database name'; -$lang->install->dbPrefix = 'Table prefix'; -$lang->install->clearDB = 'Clear data if database exists.'; -$lang->install->importDemoData = 'Import demo data if database exists.'; +$lang->install->defaultLang = 'Default Lang'; +$lang->install->dbHost = 'Database Host'; +$lang->install->dbHostNote = 'If 127.0.0.1 is not accessible, try localhost.'; +$lang->install->dbPort = 'host Port'; +$lang->install->dbUser = 'Database User'; +$lang->install->dbPassword = 'Database Password'; +$lang->install->dbName = 'Database Library'; +$lang->install->dbPrefix = 'Database Table Prefix'; +$lang->install->clearDB = 'Clear Database'; +$lang->install->importDemoData = 'Import Demo Data'; $lang->install->requestTypes['GET'] = 'GET'; $lang->install->requestTypes['PATH_INFO'] = 'PATH_INFO'; -$lang->install->errorConnectDB = 'Database connect failed.'; -$lang->install->errorDBName = 'The database name cannot contain "."'; -$lang->install->errorCreateDB = 'Database create failed.'; -$lang->install->errorTableExists = 'The same tables alread exists, to continue install, go back and check the clear db box.'; -$lang->install->errorCreateTable = 'Table create failed.'; -$lang->install->errorImportDemoData = 'Import demo data.'; +$lang->install->errorConnectDB = 'Connection to database Failed. '; +$lang->install->errorDBName = 'Database name should exclude “.” '; +$lang->install->errorCreateDB = 'Database creation failed.'; +$lang->install->errorTableExists = 'Data table has existed. If ZenTao has been installed before, please go back to clear data and continue installation.'; +$lang->install->errorCreateTable = 'Table creation failed.'; +$lang->install->errorImportDemoData = 'Import demo data failed.'; -$lang->install->setConfig = 'Create config file'; +$lang->install->setConfig = 'Create Config File'; $lang->install->key = 'Item'; $lang->install->value = 'Value'; -$lang->install->saveConfig = 'Save config'; -$lang->install->save2File = '
    Copy the text of the textareaand save to " %s ".
    '; -$lang->install->saved2File = 'The config file has saved to "%s ".'; -$lang->install->errorNotSaveConfig = "Hasn't save the config file. "; +$lang->install->saveConfig = 'Save Config'; +$lang->install->save2File = '
    Copy content in the text box above and save it to " %s ". You can change this config file later.
    '; +$lang->install->saved2File = 'Config file has been saved to " %s ". You can change this file later.'; +$lang->install->errorNotSaveConfig = 'Config file is not saved.'; -$lang->install->getPriv = 'Set admin'; -$lang->install->company = 'Company name'; -$lang->install->account = 'Administrator'; -$lang->install->password = 'Admin password'; -$lang->install->errorEmptyPassword = "Can't be empty"; +$lang->install->getPriv = 'Set Admin'; +$lang->install->company = 'Company Name'; +$lang->install->account = 'Admin Account'; +$lang->install->password = 'Admin Password'; +$lang->install->errorEmptyPassword = 'Password should not be blank.'; -$lang->install->groupList['ADMIN']['name'] = 'Administrator'; -$lang->install->groupList['ADMIN']['desc'] = 'for administrator'; -$lang->install->groupList['DEV']['name'] = 'Developer'; -$lang->install->groupList['DEV']['desc'] = 'for developers'; -$lang->install->groupList['QA']['name'] = 'tester'; -$lang->install->groupList['QA']['desc'] = 'for testers'; -$lang->install->groupList['PM']['name'] = 'Project manager'; -$lang->install->groupList['PM']['desc'] = 'for project managers'; -$lang->install->groupList['PO']['name'] = 'Product manager'; -$lang->install->groupList['PO']['desc'] = 'for product managers'; -$lang->install->groupList['TD']['name'] = 'Technical director'; -$lang->install->groupList['TD']['desc'] = 'for technical director'; -$lang->install->groupList['PD']['name'] = 'Product director'; -$lang->install->groupList['PD']['desc'] = 'for product director'; -$lang->install->groupList['QD']['name'] = 'Quality director'; -$lang->install->groupList['QD']['desc'] = 'for quality director'; -$lang->install->groupList['TOP']['name'] = 'Top manager'; -$lang->install->groupList['TOP']['desc'] = 'for top manager'; -$lang->install->groupList['OTHERS']['name'] = 'Others'; -$lang->install->groupList['OTHERS']['desc'] = 'for others'; +$lang->install->groupList['ADMIN']['name'] = 'Admin'; +$lang->install->groupList['ADMIN']['desc'] = 'System Admin'; +$lang->install->groupList['DEV']['name'] = 'R&D'; +$lang->install->groupList['DEV']['desc'] = 'R&D Team'; +$lang->install->groupList['QA']['name'] = 'Testing'; +$lang->install->groupList['QA']['desc'] = 'Testing Team'; +$lang->install->groupList['PM']['name'] = 'Project Manager'; +$lang->install->groupList['PM']['desc'] = 'for Project Manager'; +$lang->install->groupList['PO']['name'] = 'Product Owner'; +$lang->install->groupList['PO']['desc'] = 'for Product Owner'; +$lang->install->groupList['TD']['name'] = 'R&D Supervisor'; +$lang->install->groupList['TD']['desc'] = 'for R&D Supervisor'; +$lang->install->groupList['PD']['name'] = 'Product Supervisor'; +$lang->install->groupList['PD']['desc'] = 'for Product Supervisor'; +$lang->install->groupList['QD']['name'] = 'Testing Supervisor'; +$lang->install->groupList['QD']['desc'] = 'for Testing Supervisor'; +$lang->install->groupList['TOP']['name'] = 'Senior Manager'; +$lang->install->groupList['TOP']['desc'] = 'for Senior Manager'; +$lang->install->groupList['OTHERS']['name'] = 'Other'; +$lang->install->groupList['OTHERS']['desc'] = 'for Other'; -$lang->install->success = "Success installed"; -$lang->install->login = 'Sign into ZentaoPMS'; -$lang->install->register = 'Register Zentao community website'; +$lang->install->success = "Installed!"; +$lang->install->login = 'Login ZenTao'; +$lang->install->register = 'Register in ZenTao'; $lang->install->joinZentao = <<You have installed ZentaoPMS %s successfully. Please remove install.php in time.

    -Tips: For you get zentao news in time, please register Zetao community(www.zentao.net). +

    Tou have installed ZenTao %s. Please delete install.php asap.

    Note: In order to get the latest news of ZenTao, please register in ZenTao(www.zentao.net).

    + EOT; -$lang->install->promotion = "Other products of Nature EasySoft: "; +$lang->install->promotion = "Products of Nature Easy Soft:"; $lang->install->chanzhi = new stdclass(); -$lang->install->chanzhi->name = '蝉知企业门户系统'; +$lang->install->chanzhi->name = 'Changer CMS'; $lang->install->chanzhi->desc = << -
  • 专业的企业营销门户系统
    • -
  • 功能丰富，操作简洁方便
    • -
  • 大量细节针对SEO优化
    • -
  • 开源免费，不限商用！
    • +
  • Professional Content Management Sysytem
    • +
  • Rich functionality and simple to operate
    • +
  • Aims at detaild for SEO
    • +
  • Open source and free
    • EOD; $lang->install->ranzhi = new stdclass(); -$lang->install->ranzhi->name = '然之协同管理系统'; +$lang->install->ranzhi->name = 'Ranger Collaborative System'; $lang->install->ranzhi->desc = << -
  • 客户管理，订单跟踪
    • -
  • 项目任务，公告文档
    • -
  • 收入支出，出帐入账
    • -
  • 论坛博客，动态消息
    • +
  • Customer Management and Order Tracking
    • +
  • Project/Task and Announcement/Document
    • +
  • Income/Expenditur and Account In/Out
    • +
  • Forum/Blog and Dynamic/News
    • EOD; $lang->install->yidou = new stdclass(); -$lang->install->yidou->name = '亿斗进销存管理运营系统'; +$lang->install->yidou->name = '亿斗进销存Management运营系统'; $lang->install->yidou->desc = <<
  • 销售订单处理，信息及时反馈
    • diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php index 8f093beefa..2508e0daaa 100755 --- a/module/mail/lang/en.php +++ b/module/mail/lang/en.php @@ -1,84 +1,84 @@ mail->common = 'Email setting'; -$lang->mail->index = 'Index'; -$lang->mail->detect = 'Detect'; -$lang->mail->edit = 'Configure'; -$lang->mail->save = 'Successfully saved'; -$lang->mail->test = 'Testing'; +$lang->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 = 'Mail list'; -$lang->mail->delete = 'Delete mail'; -$lang->mail->sendCloud = 'SendCloud'; -$lang->mail->batchDelete = 'Batch delete'; -$lang->mail->sendcloudUser = 'SendCloud Contact'; +$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 = 'Turnon'; +$lang->mail->turnon = 'Turn On'; $lang->mail->async = 'Asynchronous'; -$lang->mail->fromAddress = 'From email'; -$lang->mail->fromName = 'From title'; -$lang->mail->host = 'SMTP host'; -$lang->mail->port = 'SMTP port'; -$lang->mail->auth = 'Authentication'; -$lang->mail->username = 'SMTP account'; -$lang->mail->password = 'SMTP password'; +$lang->mail->fromAddress = 'Email Address'; +$lang->mail->fromName = 'Sender'; +$lang->mail->host = 'SMTP Server'; +$lang->mail->port = 'SMTP Port'; +$lang->mail->auth = 'Verification 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 = 'accessKey'; -$lang->mail->secretKey = 'secretKey'; +$lang->mail->accessKey = 'Access Key'; +$lang->mail->secretKey = 'Secret Key'; -$lang->mail->selectMTA = 'Select MTA'; -$lang->mail->smtp = 'SMTP'; +$lang->mail->selectMTA = 'Email MTA'; +$lang->mail->smtp = 'SMTP Email'; -$lang->mail->syncedUser = 'Synced user'; -$lang->mail->unsyncUser = 'Unsync user'; -$lang->mail->sync = 'Sync'; +$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 time'; +$lang->mail->addedDate = 'Added Date'; +$lang->mail->sendTime = 'Send Date'; $lang->mail->status = 'Status'; $lang->mail->failReason = 'Fail Reason'; -$lang->mail->statusList['send'] = 'Success'; -$lang->mail->statusList['fail'] = 'Fail'; +$lang->mail->statusList['send'] = 'Sent'; +$lang->mail->statusList['fail'] = 'Failed'; -$lang->mail->turnonList[1] = 'on'; -$lang->mail->turnonList[0] = 'off'; +$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->debugList[0] = 'Off'; +$lang->mail->debugList[1] = 'Normal'; +$lang->mail->debugList[2] = 'High'; -$lang->mail->authList[1] = 'necessary'; -$lang->mail->authList[0] = 'unnecessary'; +$lang->mail->authList[1] = 'Required'; +$lang->mail->authList[0] = 'Not Required'; -$lang->mail->secureList[''] = 'plain'; +$lang->mail->secureList[''] = 'Plain'; $lang->mail->secureList['ssl'] = 'ssl'; $lang->mail->secureList['tls'] = 'tls'; -$lang->mail->inputFromEmail = 'Please input the from email:'; +$lang->mail->inputFromEmail = 'Enter Email Address'; $lang->mail->nextStep = 'Next'; -$lang->mail->successSaved = 'The configuration has been successfully saved.'; -$lang->mail->subject = "It's a testing email from zentao."; -$lang->mail->content = 'If you can see this, the email notification feature can work now!'; -$lang->mail->successSended = 'Successfully sended!'; -$lang->mail->confirmDelete = 'Confirm delete mail?'; -$lang->mail->sendmailTips = 'Tips: system will not send mail to current user.'; -$lang->mail->needConfigure = "I can not find the configuration, please configure it first."; -$lang->mail->nofsocket = 'The fsocket correlation function is disabled, not letter! Please enlarge the setting of allow_url_fopen to On in php.ini and open the extension of openssl. Restart apache.'; -$lang->mail->noOpenssl = 'Please open the extension of openssl when use tls. Restart apache.'; -$lang->mail->sendCloudFail = 'Fail. Reason:'; +$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->sendCloudFail = 'Failed. Reason:'; $lang->mail->sendCloudHelp = <<SendCloud Notice is SendCloud's team notification service. Can view to notice.sendcloud.net

    -

    accessKey and secretKey can go to the "Settings" page view after login. The sender name and address is also provided in the "Settings" page.

    -

    Letter, The nickname of Notice SendCloud contact must to be consistent with the email. You may not succeed in sending.

    +

    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 = '操作成功'; +$lang->mail->closeSendCloud = '关闭发送'; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 74b4527fba..fae00bd16c 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -11,64 +11,64 @@ */ $lang->misc = new stdclass(); $lang->misc->common = 'Misc'; -$lang->misc->ping = 'Keep session'; +$lang->misc->ping = 'Ping'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = 'Version %s'; -$lang->misc->zentao->labels['about'] = 'About'; -$lang->misc->zentao->labels['support'] = 'Support'; -$lang->misc->zentao->labels['cowin'] = 'Help us'; -$lang->misc->zentao->labels['service'] = 'Services'; +$lang->misc->zentao->labels['about'] = 'About ZenTao'; +$lang->misc->zentao->labels['support'] = 'Technical Support'; +$lang->misc->zentao->labels['cowin'] = 'Help Us'; +$lang->misc->zentao->labels['service'] = 'Service List'; $lang->misc->zentao->icons['about'] = 'group'; $lang->misc->zentao->icons['support'] = 'question-sign'; $lang->misc->zentao->icons['cowin'] = 'hand-right'; $lang->misc->zentao->icons['service'] = 'heart'; -$lang->misc->zentao->about['proversion'] = 'Try zentaopro!'; -$lang->misc->zentao->about['official'] = "Official site"; -$lang->misc->zentao->about['changelog'] = "Change log"; +$lang->misc->zentao->about['proversion'] = 'ZenTao Pro'; +$lang->misc->zentao->about['official'] = "Official Website"; +$lang->misc->zentao->about['changelog'] = "Version Log"; $lang->misc->zentao->about['license'] = "License"; -$lang->misc->zentao->about['extension'] = "Extensions"; +$lang->misc->zentao->about['extension'] = "Extension Platform"; -$lang->misc->zentao->support['vip'] = "Business"; -$lang->misc->zentao->support['manual'] = "Manual"; +$lang->misc->zentao->support['vip'] = "VIP Technical Support"; +$lang->misc->zentao->support['manual'] = "User Manual"; $lang->misc->zentao->support['faq'] = "FAQ"; -$lang->misc->zentao->support['ask'] = "Ask"; -$lang->misc->zentao->support['qqgroup'] = "QQ Group"; +$lang->misc->zentao->support['ask'] = "Q&A"; +$lang->misc->zentao->support['qqgroup'] = "官方QQ群"; $lang->misc->zentao->cowin['donate'] = "Donate"; -$lang->misc->zentao->cowin['reportbug'] = "Report bug"; -$lang->misc->zentao->cowin['feedback'] = "Feedback feature"; -$lang->misc->zentao->cowin['recommend'] = "Recommend"; -$lang->misc->zentao->cowin['cowinmore'] = "More..."; +$lang->misc->zentao->cowin['reportbug'] = "Report Bug "; +$lang->misc->zentao->cowin['feedback'] = "Feedback"; +$lang->misc->zentao->cowin['recommend'] = "Refer a Friend"; +$lang->misc->zentao->cowin['cowinmore'] = "More"; -$lang->misc->zentao->service['zentaotrain']= 'ZenTao training'; -$lang->misc->zentao->service['scrumtrain'] = 'Agile training'; -$lang->misc->zentao->service['idc'] = 'ZenTao online'; -$lang->misc->zentao->service['custom'] = 'custom develop'; -$lang->misc->zentao->service['install'] = 'Install service'; -$lang->misc->zentao->service['fixissue'] = 'Issue support'; -$lang->misc->zentao->service['servicemore']= 'More...'; +$lang->misc->zentao->service['zentaotrain']= 'ZenTao Training'; +$lang->misc->zentao->service['scrumtrain'] = 'Agile Development Training'; +$lang->misc->zentao->service['idc'] = 'ZenTao Online Hosting'; +$lang->misc->zentao->service['custom'] = 'ZenTao Customized Development'; +$lang->misc->zentao->service['install'] = 'ZenTao Installation Service'; +$lang->misc->zentao->service['fixissue'] = 'ZenTao Trouble Shooting'; +$lang->misc->zentao->service['servicemore']= 'More'; -$lang->misc->mobile = "Mobile access"; -$lang->misc->noGDLib = "Please visit：%s."; -$lang->misc->copyright = "© 2009-2016 Nature EasySoft Network Tecnology Co.ltd, QingDao, China 4006-8899-23 co@zentao.net"; -$lang->misc->checkTable = "Check and repair table"; +$lang->misc->mobile = "Mobile Access"; +$lang->misc->noGDLib = "Please use the browser on your phone to visit %s"; +$lang->misc->copyright = "© 2009 - 2016 Qingdao Nature Easy Soft Co., Ltd Tel 4006-8899-23 Email co@zentao.net"; +$lang->misc->checkTable = "Check Data Table"; $lang->misc->needRepair = "Repair Table"; -$lang->misc->repairTable = "The database table can cause of damage because of power failure, need to check and repair!!"; -$lang->misc->tableName = "Table name"; -$lang->misc->tableStatus = "Table status"; -$lang->misc->novice = "You may use the ZenTao first, whether to enter the novice mode?"; +$lang->misc->repairTable = "Database table is damaged due to power outage. Please chech and repair!"; +$lang->misc->tableName = "Table Name"; +$lang->misc->tableStatus = "Status"; +$lang->misc->novice = "First time to ZenTao? Do you want to start rookie mode?"; $lang->misc->feature = new stdclass(); -$lang->misc->feature->lastest = 'Latest'; +$lang->misc->feature->lastest = 'Latest Version'; $lang->misc->feature->all = array(); $lang->misc->feature->all['latest'] = array(); -$lang->misc->feature->all['latest'][] = array('title'=>'首页自定义', 'desc' => '

    我的地盘由我做主。现在开始，你可以向首页添加多种多样的内容区块，而且还可以决定如何排列和显示他们。

    我的地盘、产品、项目、测试模块下均支持首页自定义功能。

    '); -$lang->misc->feature->all['latest'][] = array('title'=>'导航定制', 'desc' => '

    导航上显示的项目现在完全由你来决定，不仅仅可以决定在导航上展示哪些内容，还可以决定展示的顺序。

    将鼠标悬浮在导航上稍后会在右侧显示定制按钮，点击打开定制对话框，通过点击切换是否显示，拖放操作来更改显示顺序。

    '); -$lang->misc->feature->all['latest'][] = array('title'=>'批量添加、编辑自定义', 'desc' => '

    可以在批量添加和批量编辑页面自定义操作的字段。

    '); -$lang->misc->feature->all['latest'][] = array('title'=>'添加需求、任务、Bug、用例自定义', 'desc' => '

    可以在添加需求、任务、Bug、用例页面，自定义部分字段是否显示。

    '); -$lang->misc->feature->all['latest'][] = array('title'=>'导出自定义', 'desc' => '

    在导出需求、任务、Bug、用例的时候，用户可以自定义导出的字段，也可以保存模板方便每次导出。

    '); -$lang->misc->feature->all['latest'][] = array('title'=>'需求、任务、Bug、用例组合检索功能', 'desc' => '

    在需求、任务、Bug、用例列表页面，可以实现模块和标签的组合检索。

    '); -$lang->misc->feature->all['latest'][] = array('title'=>'增加新手教程', 'desc' => '

    增加新手教程，方便新用户了解禅道使用。

    '); +$lang->misc->feature->all['latest'][] = array('title'=>'Custom Homepage', 'desc' => '

    You can add blocks to Homepage of My Zone and arrange the layout.

    My Zone, Product, Project, and Testing all support home custom mentioned before.

    '); +$lang->misc->feature->all['latest'][] = array('title'=>'Custom Navigation', 'desc' => '

    You can decide which project show in navigation bar and the order of projects shown in the bar.

    Hover on the navigation bar and a sign will show to its right. Click the sign and a dialog box "Custom Navigation" will show. Drag the block name to switch its order on navigation bar.

    '); +$lang->misc->feature->all['latest'][] = array('title'=>'Batch Add/Edit Custom', 'desc' => '

    You can batch add and edit fields on custom pages.

    '); +$lang->misc->feature->all['latest'][] = array('title'=>'Add Custom Story/Task/Bug/Case', 'desc' => '

    You can custom fileds when add a Story/Task/Bug/Case.

    '); +$lang->misc->feature->all['latest'][] = array('title'=>'Custom Export', 'desc' => '

    You can custom fileds when export a Story/Task/Bug/Case pages. You can save it as template for next export.

    '); +$lang->misc->feature->all['latest'][] = array('title'=>'Story/Task/Bug/Case Combinatorial Search ', 'desc' => '

    On Story/Task/Bug/Case List page, you can do combinatorial search on Modules and Tabs.

    '); +$lang->misc->feature->all['latest'][] = array('title'=>"Rookie's Tutorial", 'desc' => '

    Tutorial for Rookies is added for users to know how to use ZenTao.

    '); diff --git a/module/my/lang/en.php b/module/my/lang/en.php index fc92dd960b..d63d4bb009 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -1,47 +1,47 @@ my->common = 'Dashboard'; +$lang->my->common = 'My Zone'; -/* Methods. */ -$lang->my->index = 'Index'; -$lang->my->todo = 'Todo'; -$lang->my->task = 'Task'; -$lang->my->bug = 'Bug'; -$lang->my->testTask = 'Build'; -$lang->my->testCase = 'Test case'; -$lang->my->story = 'Story'; -$lang->my->myProject = $lang->projectCommon; -$lang->my->profile = 'Profile'; -$lang->my->dynamic = 'Dynamic'; -$lang->my->editProfile = 'Edit profile'; -$lang->my->changePassword = 'Change password'; -$lang->my->unbind = 'Unbind ranzhi'; -$lang->my->manageContacts = 'Manage contacts'; -$lang->my->deleteContacts = 'Delete contacts'; +/* 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 = 'To me'; -$lang->my->taskMenu->openedByMe = 'My opened'; -$lang->my->taskMenu->finishedByMe = 'My finished'; -$lang->my->taskMenu->closedByMe = 'My closed'; -$lang->my->taskMenu->canceledByMe = 'My canceled'; +$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 = 'To me'; -$lang->my->storyMenu->openedByMe = 'My opened'; -$lang->my->storyMenu->reviewedByMe = 'My reviewed'; -$lang->my->storyMenu->closedByMe = 'My closed'; +$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 = 'Dynamic'; +$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 a {$lang->projectCommon}?"; -$lang->my->home->createProduct = "create a {$lang->productCommon}?"; -$lang->my->home->help = "Help Book"; -$lang->my->home->noProductsTip = "There is no {$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'; +$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 b580173209..b154cac572 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -9,47 +9,47 @@ * @version $Id: en.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->product->common = $lang->productCommon; -$lang->product->index = "Index"; -$lang->product->browse = "Browse"; +$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 = "Info"; -$lang->product->edit = "Edit"; +$lang->product->view = "{$lang->productCommon}Overview"; +$lang->product->edit = "Edit {$lang->productCommon}"; $lang->product->batchEdit = "Batch Edit"; -$lang->product->create = "Create"; -$lang->product->delete = "Delete"; +$lang->product->create = "Create {$lang->productCommon}"; +$lang->product->delete = "Delete {$lang->productCommon}"; $lang->product->deleted = "Deleted"; $lang->product->close = "Close"; -$lang->product->select = "select {$lang->productCommon}"; -$lang->product->mine = 'I charge : '; -$lang->product->other = 'Other : '; +$lang->product->select = "Please select {$lang->productCommon}"; +$lang->product->mine = 'My responsibility:'; +$lang->product->other = 'Other:'; $lang->product->closed = 'Closed'; -$lang->product->updateOrder = 'Order'; +$lang->product->updateOrder = 'Sort'; $lang->product->all = "All {$lang->productCommon}"; -$lang->product->basicInfo = 'Basic info'; -$lang->product->otherInfo = 'Other info'; +$lang->product->basicInfo = 'Basic Info'; +$lang->product->otherInfo = 'Other Info'; -$lang->product->plans = 'Plans'; -$lang->product->releases = 'Releases'; -$lang->product->docs = 'Documents'; -$lang->product->bugs = 'Bugs'; -$lang->product->projects = "{$lang->projectCommon}s"; -$lang->product->cases = 'Cases'; -$lang->product->builds = 'Builds'; +$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 = 'Doc'; -$lang->product->project = "{$lang->projectCommon}s"; +$lang->product->doc = 'Document List'; +$lang->product->project = $lang->projectCommon . 'List'; -$lang->product->confirmDelete = " Are you sure to delete this {$lang->productCommon}?"; +$lang->product->confirmDelete = " Do you want to delete {$lang->productCommon}?"; -$lang->product->errorNoProduct = "No {$lang->productCommon} in system yet."; -$lang->product->accessDenied = "Access to this {$lang->productCommon} denined."; +$lang->product->errorNoProduct = "{$lang->productCommon} is not created yet!"; +$lang->product->accessDenied = "You have no access to {$lang->productCommon}."; -$lang->product->name = 'Name'; -$lang->product->code = 'Code'; -$lang->product->order = 'Order'; -$lang->product->type = "Type"; +$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"; @@ -60,25 +60,25 @@ $lang->product->whitelist = 'Whitelist'; $lang->product->branch = '%s'; $lang->product->searchStory = 'Search'; -$lang->product->assignedToMe = 'To me'; -$lang->product->openedByMe = 'My opened'; -$lang->product->reviewedByMe = 'My reviewed'; -$lang->product->closedByMe = 'My closed'; +$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 = 'Active'; +$lang->product->activeStory = 'Activate'; $lang->product->changedStory = 'Changed'; -$lang->product->willClose = 'Closing'; +$lang->product->willClose = 'To be Closed'; $lang->product->closedStory = 'Closed'; -$lang->product->unclosed = 'Unclosed'; +$lang->product->unclosed = 'Open'; -$lang->product->allStory = 'All'; -$lang->product->allProduct = "All {$lang->productCommon}s"; -$lang->product->allProductsOfProject = "All related {$lang->productCommon}s"; +$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->typeList['branch'] = 'Multi Branch'; +$lang->product->typeList['platform'] = 'Multi Platform'; $lang->product->branchName['normal'] = ''; $lang->product->branchName['branch'] = 'Branch'; @@ -88,12 +88,12 @@ $lang->product->statusList[''] = ''; $lang->product->statusList['normal'] = 'Normal'; $lang->product->statusList['closed'] = 'Closed'; -$lang->product->aclList['open'] = "Default(Having {$lang->productCommon} module prividge, can visit this {$lang->productCommon})"; -$lang->product->aclList['private'] = "Private(Only {$lang->projectCommon} team members can visit)"; -$lang->product->aclList['custom'] = "Whitelist({$lang->projectCommon} team members and who belongs to the whilelist groups can visit)"; +$lang->product->aclList['open'] = "Default({$lang->productCommon} with View permission can access to it)"; +$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 = "Total %s stories in this page, estimate %s hours, case coverage is %s "; -$lang->product->noMatched = "No matched {$lang->productCommon} including '%s'"; +$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; @@ -104,5 +104,5 @@ $lang->product->featureBar['browse']['closedbyme'] = $lang->product->closedByM $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']['willclose'] = $lang->product->willOff; $lang->product->featureBar['browse']['closedstory'] = $lang->product->closedStory; diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index 511d894c7c..f93d1cb88b 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -9,33 +9,33 @@ * @version $Id: en.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->productplan->common = 'Plan'; -$lang->productplan->browse = "Browse"; -$lang->productplan->index = "Index"; +$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 = "Info"; -$lang->productplan->bugSummary = "Total %s bugs in this page"; +$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->batchEdit = 'Batch Edit'; $lang->productplan->batchUnlink = "Batch Remove"; -$lang->productplan->linkStory = "Link story"; -$lang->productplan->unlinkStory = "Remove story"; -$lang->productplan->batchUnlinkStory = "Batch Remove Stories"; -$lang->productplan->linkedStories = 'Stories linked'; -$lang->productplan->unlinkedStories = 'Stories unlinked'; +$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 Bugs"; -$lang->productplan->linkedBugs = 'Bugs linked'; -$lang->productplan->unlinkedBugs = 'Bugs unlinked'; +$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 = "Are you sure to delete this plan?"; -$lang->productplan->confirmUnlinkStory = "Are you sure to remove this story?"; -$lang->productplan->confirmUnlinkBug = "Are you sure to remove this 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; @@ -47,12 +47,12 @@ $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] = 'Two Months'; -$lang->productplan->endList[93] = 'Three Months'; -$lang->productplan->endList[186] = 'Half Of Year'; +$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 = 'Title of ID %s can not empty'; -$lang->productplan->errorNoBegin = 'Begin of ID %s can not empty'; -$lang->productplan->errorNoEnd = 'End of ID %s can not empty'; -$lang->productplan->beginGeEnd = 'Begin of ID %s can not more than end.'; +$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.'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 3a504629db..46bc5fe121 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -17,37 +17,37 @@ $lang->project->name = 'Name'; $lang->project->code = 'Code'; $lang->project->begin = 'Begin'; $lang->project->end = 'End'; -$lang->project->dateRange = 'Range'; +$lang->project->dateRange = 'Time Frame'; $lang->project->to = 'To'; -$lang->project->days = 'Workdays'; +$lang->project->days = 'Work Days'; $lang->project->day = 'day'; $lang->project->status = 'Status'; $lang->project->desc = 'Desc'; $lang->project->owner = 'Owner'; -$lang->project->PO = $lang->productCommon . ' owner'; -$lang->project->PM = $lang->projectCommon . ' manager'; +$lang->project->PO = $lang->productCommon . ' Owner'; +$lang->project->PM = $lang->projectCommon . ' Manager'; $lang->project->QD = 'Quality director'; $lang->project->RD = 'Release director'; -$lang->project->acl = 'Access limitation'; -$lang->project->teamname = 'Team name'; -$lang->project->order = "{$lang->projectCommon} order"; -$lang->project->products = "{$lang->productCommon}s"; +$lang->project->acl = 'Access Control'; +$lang->project->teamname = 'Team Name'; +$lang->project->order = "Sort {$lang->projectCommon}"; +$lang->project->products = "Link {$lang->productCommon}"; $lang->project->whitelist = 'Whitelist'; -$lang->project->totalEstimate = 'Est'; -$lang->project->totalConsumed = 'Done'; -$lang->project->totalLeft = 'Left'; +$lang->project->totalEstimate = 'Estimation'; +$lang->project->totalConsumed = 'Consumed'; +$lang->project->totalLeft = 'Total Left'; $lang->project->Left = 'Left'; $lang->project->progess = 'Progess'; -$lang->project->hours = 'Estimate %s Consumed %s Left %s'; -$lang->project->viewBug = 'View bug'; +$lang->project->hours = 'Estimate %s, Consumed %s, Left %s'; +$lang->project->viewBug = 'View Bug'; $lang->project->noProduct = "No {$lang->productCommon}"; -$lang->project->createStory = "Create story"; +$lang->project->createStory = "Add Story"; $lang->project->all = 'All'; $lang->project->undone = 'Undone'; $lang->project->unclosed = 'Unclosed'; $lang->project->typeDesc = 'No burndown and story in OPS'; -$lang->project->mine = 'I charge : '; -$lang->project->other = 'Other : '; +$lang->project->mine = 'My Responsibility: '; +$lang->project->other = 'Other:'; $lang->project->deleted = 'Deleted'; $lang->project->delayed = 'Delayed'; @@ -61,161 +61,161 @@ $lang->project->typeList['sprint'] = 'Sprint'; $lang->project->typeList['waterfall'] = 'Waterfall'; $lang->project->typeList['ops'] = 'OPS'; -$lang->project->endList[7] = 'One Weeks'; -$lang->project->endList[14] = 'Two Weeks'; +$lang->project->endList[7] = 'One Week'; +$lang->project->endList[14] = '2 Weeks'; $lang->project->endList[31] = 'One Month'; -$lang->project->endList[62] = 'Two Months'; -$lang->project->endList[93] = 'Three Months'; -$lang->project->endList[186] = 'Half Of Year'; +$lang->project->endList[62] = '2 Months'; +$lang->project->endList[93] = '3 Months'; +$lang->project->endList[186] = '6 Months'; $lang->project->endList[365] = 'One Year'; $lang->team = new stdclass(); $lang->team->account = 'Account'; $lang->team->role = 'Role'; -$lang->team->join = 'Join date'; +$lang->team->join = 'Joined Date'; $lang->team->hours = 'Hour/Day'; $lang->team->days = 'Workdays'; $lang->team->totalHours = 'Total'; -$lang->project->basicInfo = 'Basic info'; -$lang->project->otherInfo = 'Other info'; +$lang->project->basicInfo = 'Basic Info'; +$lang->project->otherInfo = 'Other Info'; -/* Lists. */ +/* 字段取值列表。*/ $lang->project->statusList['wait'] = 'Pending'; -$lang->project->statusList['doing'] = 'Progressing'; +$lang->project->statusList['doing'] = 'In Progress'; $lang->project->statusList['suspended'] = 'Suspended'; $lang->project->statusList['done'] = 'Done'; -$lang->project->aclList['open'] = "Default(Having the priviledge of {$lang->projectCommon} module can visit this {$lang->projectCommon})"; -$lang->project->aclList['private'] = 'Private(Only team members can visit)'; -$lang->project->aclList['custom'] = 'Whitelist(Team members and who belongs to the whitelist grups can visit)'; +$lang->project->aclList['open'] = "Default(With View permission of {$lang->projectCommon}, you will have access to {$lang->projectCommon}.)"; +$lang->project->aclList['private'] = 'Private(Only team members can access to it.)'; +$lang->project->aclList['custom'] = 'Whitelist(Team members and the whitelist members can access to it.)'; -/* Methods.*/ -$lang->project->index = "Index"; +/* 方法列表。*/ +$lang->project->index = "Home"; $lang->project->task = 'Task'; -$lang->project->groupTask = 'View task by group'; +$lang->project->groupTask = 'View Task by Group'; $lang->project->story = 'Story'; $lang->project->bug = 'Bug'; $lang->project->dynamic = 'Dynamic'; $lang->project->build = 'Build'; -$lang->project->testtask = 'Testtask'; -$lang->project->burn = 'Burndown'; +$lang->project->testtask = 'Test Task'; +$lang->project->burn = 'Burndown Chart'; $lang->project->baseline = 'Base Line'; $lang->project->computeBurn = 'Update'; -$lang->project->burnData = 'Burndown data'; -$lang->project->fixFirst = 'Fix first data'; -$lang->project->team = 'Team'; +$lang->project->burnData = 'Burndown Chart Data'; +$lang->project->fixFirst = 'Edit First Day Data'; +$lang->project->team = 'Team Member'; $lang->project->doc = 'Doc'; $lang->project->manageProducts = 'Link ' . $lang->productCommon; -$lang->project->linkStory = 'Link story'; -$lang->project->unlinkStoryTasks = 'Tasks of unlink story'; +$lang->project->linkStory = 'Link Story'; +$lang->project->unlinkStoryTasks = 'Unlinked Task'; $lang->project->view = "Info"; $lang->project->create = "Add"; -$lang->project->copy = "Copy a {$lang->projectCommon}"; +$lang->project->copy = "Copy {$lang->projectCommon}"; $lang->project->delete = "Delete"; $lang->project->browse = "Browse"; $lang->project->edit = "Edit"; $lang->project->batchEdit = "Batch Edit"; -$lang->project->manageMembers = 'Manage team members'; -$lang->project->unlinkMember = 'Remove member'; -$lang->project->unlinkStory = 'Remove story'; -$lang->project->batchUnlinkStory = 'Batch remove story'; -$lang->project->importTask = 'Transfer task'; -$lang->project->importBug = 'Import bug'; +$lang->project->manageMembers = 'Team Management'; +$lang->project->unlinkMember = 'Remove Member'; +$lang->project->unlinkStory = 'Remove Story'; +$lang->project->batchUnlinkStory = 'Batch Remove Story'; +$lang->project->importTask = 'Import Task'; +$lang->project->importBug = 'Import Bug'; $lang->project->updateOrder = 'Order'; -$lang->project->tree = 'Tree'; +$lang->project->tree = 'Tree Diagram'; -/* Browse. */ +/* 分组浏览。*/ $lang->project->allTasks = 'All'; -$lang->project->assignedToMe = 'To me'; +$lang->project->assignedToMe = 'Assigned to Me'; $lang->project->statusSelects[''] = 'More'; -$lang->project->statusSelects['wait'] = 'Wait'; -$lang->project->statusSelects['doing'] = 'Doing'; -$lang->project->statusSelects['finishedbyme'] = 'Finished by me'; -$lang->project->statusSelects['done'] = 'Done'; +$lang->project->statusSelects['wait'] = 'Pending'; +$lang->project->statusSelects['doing'] = 'Ongoing'; +$lang->project->statusSelects['finishedbyme'] = 'Finished by Me'; +$lang->project->statusSelects['done'] = 'Done'; $lang->project->statusSelects['closed'] = 'Closed'; -$lang->project->statusSelects['cancel'] = 'Cancel'; +$lang->project->statusSelects['cancel'] = 'Cancelled'; $lang->project->groups[''] = 'Group View'; -$lang->project->groups['story'] = 'Group by story'; -$lang->project->groups['status'] = 'Group by status'; -$lang->project->groups['pri'] = 'Group by priority'; -$lang->project->groups['assignedTo'] = 'Group by assignedTo'; -$lang->project->groups['finishedBy'] = 'Group by finishedBy'; -$lang->project->groups['closedBy'] = 'Group by closedBy'; -$lang->project->groups['type'] = 'Group by type'; -$lang->project->groups['deadline'] = 'Group by deadline'; +$lang->project->groups['story'] = 'By Story'; +$lang->project->groups['status'] = 'By Status'; +$lang->project->groups['pri'] = 'By Priority'; +$lang->project->groups['assignedTo'] = 'By AssignedTo'; +$lang->project->groups['finishedBy'] = 'By FinishedBy'; +$lang->project->groups['closedBy'] = 'By ClosedBy'; +$lang->project->groups['type'] = 'By Type'; +$lang->project->groups['deadline'] = 'By Deadline'; $lang->project->groupFilter['story']['all'] = $lang->project->all; -$lang->project->groupFilter['story']['linked'] = 'Task of linked story'; +$lang->project->groupFilter['story']['linked'] = 'Task Linked to Story'; $lang->project->groupFilter['pri']['all'] = $lang->project->all; -$lang->project->groupFilter['pri']['setted'] = 'Setted'; -$lang->project->groupFilter['assignedTo']['undone'] = 'Undone'; +$lang->project->groupFilter['pri']['setted'] = 'Congfigured'; +$lang->project->groupFilter['assignedTo']['undone'] = 'Pending'; $lang->project->groupFilter['assignedTo']['all'] = $lang->project->all; $lang->project->groupFilter['finishedBy']['done'] = 'Done'; $lang->project->groupFilter['finishedBy']['all'] = $lang->project->all; $lang->project->groupFilter['closedBy']['closed'] = 'Closed'; $lang->project->groupFilter['closedBy']['all'] = $lang->project->all; $lang->project->groupFilter['deadline']['all'] = $lang->project->all; -$lang->project->groupFilter['deadline']['setted'] = '已设置'; +$lang->project->groupFilter['deadline']['setted'] = 'Configured'; $lang->project->byQuery = 'Search'; -/* Browse tabs. */ -$lang->project->allProject = "All {$lang->projectCommon}s"; -$lang->project->aboveAllProduct = "Above all {$lang->productCommon}s"; -$lang->project->aboveAllProject = "Above all {$lang->projectCommon}s"; +/* 查询条件列表。*/ +$lang->project->allProject = "All{$lang->projectCommon}"; +$lang->project->aboveAllProduct = "All the Above {$lang->productCommon}"; +$lang->project->aboveAllProject = "All the Above {$lang->projectCommon}"; -/* Notcie. */ +/* 页面提示。*/ $lang->project->selectProject = "Select {$lang->projectCommon}"; -$lang->project->beginAndEnd = 'Begin and end'; -$lang->project->lblStats = 'Stats'; -$lang->project->stats = 'Total work hours is 『%s』hours,
    Total estimate is『%s』hours,
    Total confused is『%s』hours
    Total left is『%s』hours'; -$lang->project->taskSummary = "%s tasks in this page. Pending: %s. doing: %s. Est: %s h. Consumed: %s h. Left: %s."; -$lang->project->memberHours = "%s has %s workhours, "; -$lang->project->groupSummary = "%s tasks in this group, wait:%s, doing:%s, estimate %s, consumed %s, left %s hours."; -$lang->project->noTimeSummary = "%s tasks in this group, wait:%s, doing:%s"; -$lang->project->wbs = "WBS"; -$lang->project->batchWBS = "Batch WBS"; -$lang->project->howToUpdateBurn = "Help"; -$lang->project->whyNoStories = "There no active stories to added to this {$lang->projectCommon}. Please check the linked {$lang->productCommon}."; +$lang->project->beginAndEnd = 'Time Frame'; +$lang->project->lblStats = 'Man-Hour Report'; +$lang->project->stats = 'Available %s man-hour
    Estimated total %s man-hour
    Consumed %s man-hour
    Estimated left %s man-hour'; +$lang->project->taskSummary = " %s Tasks on this page Pending %s Ongoing %s Total estimated %s man-hour Consumed %s man-hour Left %s man-hour"; +$lang->project->memberHours = "%s has %s man-hour available "; +$lang->project->groupSummary = "%s Tasks in this group Pending %s Ongoing %s Total estimated %s man-hour Consumed %s man-hour Left %s man-hour"; +$lang->project->noTimeSummary = " %s Tasks in this group Pending %s Ongoing %s"; +$lang->project->wbs = "Decompose Task"; +$lang->project->batchWBS = "Batch Decompose"; +$lang->project->howToUpdateBurn = "Help"; +$lang->project->whyNoStories = "No Story can be linked. Please check whether there is Story in {$lang->projectCommon} related {$lang->productCommon} and make sure it has been reviewed."; $lang->project->doneProjects = 'Done'; -$lang->project->selectDept = 'Please select a dept'; -$lang->project->copyTeam = 'Copy a team'; -$lang->project->copyFromTeam = 'Copy form team: %s'; -$lang->project->noMatched = "No matched {$lang->projectCommon} including '%s'"; -$lang->project->copyTitle = "Choose A {$lang->projectCommon} To Copy"; -$lang->project->copyTeamTitle = 'Choose A Team To Copy'; -$lang->project->copyNoProject = "No {$lang->projectCommon} To Copy"; -$lang->project->copyFromProject = 'Copy from: %s'; -$lang->project->cancelCopy = 'cancel copy'; -$lang->project->byPeriod = 'By period'; -$lang->project->byUser = 'By user'; +$lang->project->selectDept = 'Select Dept'; +$lang->project->copyTeam = 'Duplicate Team'; +$lang->project->copyFromTeam = "Duplicated from {$lang->projectCommon} Team: %s"; +$lang->project->noMatched = "No $lang->projectCommon including '%s'can be found."; +$lang->project->copyTitle = "Choose a {$lang->projectCommon} to duplicate."; +$lang->project->copyTeamTitle = "Choose {$lang->projectCommon}Team to duplicate."; +$lang->project->copyNoProject = "No {$lang->projectCommon} can be duplicated."; +$lang->project->copyFromProject = "Duplicate from {$lang->projectCommon} %s"; +$lang->project->cancelCopy = 'Cancel Duplication'; +$lang->project->byPeriod = 'By Time'; +$lang->project->byUser = 'By User'; -/* Confirm. */ -$lang->project->confirmDelete = "Are you sure to delete {$lang->projectCommon} [%s]?"; -$lang->project->confirmUnlinkMember = "Are you sure to remove this user from this {$lang->projectCommon}?"; -$lang->project->confirmUnlinkStory = "Are you sure to remove the story from this {$lang->projectCommon}?"; -$lang->project->errorNoLinkedProducts = "There is no linked {$lang->productCommon}s, go to the link page."; -$lang->project->accessDenied = "Access to this {$lang->projectCommon} denied."; -$lang->project->tips = 'Tips'; -$lang->project->afterInfo = 'Successful and you can do:'; -$lang->project->setTeam = 'Set team'; -$lang->project->linkStory = 'Link story'; -$lang->project->createTask = 'Create task'; -$lang->project->goback = 'Go back'; -$lang->project->noweekend = 'No weekend'; -$lang->project->withweekend = 'With weekend'; -$lang->project->interval = 'Interval'; +/* 交互提示。*/ +$lang->project->confirmDelete = "Do you want to delete {$lang->projectCommon}[%s]?"; +$lang->project->confirmUnlinkMember = "Do you want to remove this User from {$lang->projectCommon}中?"; +$lang->project->confirmUnlinkStory = "Do you want to remove this Story from {$lang->projectCommon}?"; +$lang->project->errorNoLinkedProducts = "No linked {$lang->productCommon} found in {$lang->projectCommon}. You will be directed to {$lang->productCommon}linked page."; +$lang->project->accessDenied = "Access to {$lang->projectCommon} denied!"; +$lang->project->tips = 'Note'; +$lang->project->afterInfo = "{$lang->projectCommon} created. You can do: "; +$lang->project->setTeam = 'Team Settings'; +$lang->project->linkStory = 'Link Story'; +$lang->project->createTask = 'Creat Task'; +$lang->project->goback = "Back"; +$lang->project->noweekend = 'Without Weekend'; +$lang->project->withweekend = 'With Weekend'; +$lang->project->interval = 'Intervals'; -/* Report. */ +/* 统计。*/ $lang->project->charts = new stdclass(); $lang->project->charts->burn = new stdclass(); $lang->project->charts->burn->graph = new stdclass(); -$lang->project->charts->burn->graph->caption = "Burndown chart"; +$lang->project->charts->burn->graph->caption = "Burndown Chart"; $lang->project->charts->burn->graph->xAxisName = "Date"; -$lang->project->charts->burn->graph->yAxisName = "HOUR"; +$lang->project->charts->burn->graph->yAxisName = "Hour"; $lang->project->charts->burn->graph->baseFontSize = 12; $lang->project->charts->burn->graph->formatNumber = 0; $lang->project->charts->burn->graph->animation = 0; @@ -223,20 +223,20 @@ $lang->project->charts->burn->graph->rotateNames = 1; $lang->project->charts->burn->graph->showValues = 0; $lang->project->placeholder = new stdclass(); -$lang->project->placeholder->code = "{$lang->projectCommon} code"; -$lang->project->placeholder->totalLeft = 'Total left when start project'; +$lang->project->placeholder->code = "{$lang->projectCommon} Code"; +$lang->project->placeholder->totalLeft = 'Total man-hour left when start Project'; $lang->project->selectGroup = new stdclass(); -$lang->project->selectGroup->done = '(done)'; +$lang->project->selectGroup->done = '(Done)'; -$lang->project->orderList['pri_asc'] = "Stroy Pri Asc"; -$lang->project->orderList['pri_desc'] = "Stroy Pri Desc"; -$lang->project->orderList['id_asc'] = "Stroy ID Asc"; -$lang->project->orderList['id_desc'] = "Stroy ID Desc"; -$lang->project->orderList['stage_asc'] = "Stroy Stage Asc"; -$lang->project->orderList['stage_desc'] = "Stroy Starg Desc"; +$lang->project->orderList['pri_asc'] = "Priority Asc"; +$lang->project->orderList['pri_desc'] = "Priority Desc"; +$lang->project->orderList['id_asc'] = "ID Asc"; +$lang->project->orderList['id_desc'] = "ID Desc"; +$lang->project->orderList['stage_asc'] = "Stage Asc"; +$lang->project->orderList['stage_desc'] = "Stage Desc"; -$lang->project->kanban = "kanban"; +$lang->project->kanban = "Kanban"; $lang->project->printKanban = "Print Kanban"; $lang->project->bugList = "Bug List"; @@ -253,9 +253,9 @@ $lang->printKanban->typeList['increment'] = 'Increment'; $lang->project->featureBar['task']['unclosed'] = $lang->project->unclosed; $lang->project->featureBar['task']['all'] = $lang->project->allTasks; $lang->project->featureBar['task']['delayed'] = 'Delayed'; -$lang->project->featureBar['task']['needconfirm'] = 'Story changed'; +$lang->project->featureBar['task']['needconfirm'] = 'Story Changed'; $lang->project->featureBar['task']['status'] = $lang->project->statusSelects['']; $lang->project->treeLevel = array(); -$lang->project->treeLevel['story'] = 'Show stories'; -$lang->project->treeLevel['task'] = 'Show Tasks'; +$lang->project->treeLevel['story'] = 'Show Story'; +$lang->project->treeLevel['task'] = 'Show Task'; diff --git a/module/qa/lang/en.php b/module/qa/lang/en.php index b5d17add15..84750a49e9 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 = 'Test'; -$lang->qa->index = "Index"; +$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 059bcbf3f9..8fc86e526e 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -12,20 +12,20 @@ $lang->release->common = 'Release'; $lang->release->create = "Create"; $lang->release->edit = "Edit"; -$lang->release->linkStory = "Link story"; -$lang->release->linkBug = "Link bug"; +$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->changeStatus = "Change Status"; +$lang->release->batchUnlink = "Batch Unlink"; +$lang->release->batchUnlinkStory = "Batch Unlink Story"; +$lang->release->batchUnlinkBug = "Batch unlink Bug"; -$lang->release->confirmDelete = "Are sure to delete this release?"; -$lang->release->confirmUnlinkStory = "Are you sure to remove this story?"; -$lang->release->confirmUnlinkBug = "Are you sure to remove this 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'; @@ -36,24 +36,24 @@ $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 stories'; -$lang->release->bugs = 'Resolved bugs'; -$lang->release->generatedBugs = 'Generated bug'; -$lang->release->finishStories = 'The total demand for a complete %s'; -$lang->release->resolvedBugs = 'The total solution of bug %s'; -$lang->release->createdBugs = 'The total generated of bug %s'; +$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 Stories'; -$lang->release->exportTypeList['bug'] = 'Resolved bugs'; -$lang->release->exportTypeList['leftbug'] = 'Generated bugs'; +$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'; @@ -63,4 +63,4 @@ $lang->release->changeStatusList['normal'] = 'Activate'; $lang->release->changeStatusList['terminate'] = 'Terminate'; $lang->release->action = new stdclass(); -$lang->release->action->changestatus = array('main' => '$date, $extra By $actor.', 'extra' => 'changeStatusList'); +$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 c0f054e99c..99b61768af 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -10,11 +10,11 @@ * @link http://www.zentao.net */ $lang->report->common = 'Report'; -$lang->report->index = 'Report index'; -$lang->report->list = 'Report list'; +$lang->report->index = 'Home'; +$lang->report->list = 'List'; $lang->report->item = 'Item'; $lang->report->value = 'Value'; -$lang->report->percent = 'Percent'; +$lang->report->percent = 'Percentage'; $lang->report->undefined = 'Undefined'; $lang->report->colors[] = 'AFD8F8'; @@ -32,21 +32,21 @@ $lang->report->colors[] = 'A186BE'; $lang->report->singleColor[] = 'F6BD0F'; -$lang->report->projectDeviation = $lang->projectCommon . ' deviation'; -$lang->report->productSummary = $lang->productCommon . ' summary'; -$lang->report->bugCreate = 'Bug create'; -$lang->report->bugAssign = 'Bug assign'; +$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 = 'Date'; +$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 assign|report|bugassign'; +$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'; @@ -55,37 +55,37 @@ $lang->report->product = $lang->productCommon; $lang->report->user = 'Username'; $lang->report->bug = 'Bug'; $lang->report->task = 'Tasks'; -$lang->report->estimate = 'Estimate'; +$lang->report->estimate = 'Estimation'; $lang->report->consumed = 'Consumed'; -$lang->report->remain = 'Remain'; +$lang->report->remain = 'Remained'; $lang->report->deviation = 'Deviation'; -$lang->report->deviationRate = 'Deviation rate'; +$lang->report->deviationRate = 'Deviation Rate'; $lang->report->total = 'Total'; $lang->report->to = 'to'; -$lang->report->taskTotal = "Task Total"; -$lang->report->manhourTotal = "Manhour Total"; -$lang->report->validRate = "Valid Rate"; -$lang->report->validRateTips = "Resolution is fixed or postponed/status is resolved or closed"; -$lang->report->unplanned = 'unplanned'; -$lang->report->workday = 'Working per day'; -$lang->report->diffDays = 'Work days'; +$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'; +$lang->report->overduePlan = 'Overdue Plan'; /* daily reminder. */ $lang->report->idAB = 'ID'; $lang->report->bugTitle = 'Bug Title'; $lang->report->taskName = 'Task Name'; -$lang->report->todoName = 'Todo Name'; -$lang->report->testTaskName = 'Testtask Name'; +$lang->report->todoName = 'To-Do Name'; +$lang->report->testTaskName = 'Test Task Name'; $lang->report->mailTitle = new stdclass(); -$lang->report->mailTitle->begin = 'Notice : Your'; +$lang->report->mailTitle->begin = 'Notice: You have'; $lang->report->mailTitle->bug = " Bug(%s),"; -$lang->report->mailTitle->task = " Tasks(%s),"; -$lang->report->mailTitle->todo = " Todos(%s),"; -$lang->report->mailTitle->testTask = " Testtask(%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 pro version for more!'; +$lang->report->proVersion = 'Try ZenTao Pro for more!'; diff --git a/module/search/lang/en.php b/module/search/lang/en.php index 5a464f0fb4..b466a7337f 100644 --- a/module/search/lang/en.php +++ b/module/search/lang/en.php @@ -12,18 +12,18 @@ $lang->search->common = 'Search'; $lang->search->reset = 'Reset'; $lang->search->saveQuery = 'Save'; -$lang->search->myQuery = 'My queries'; +$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 input the title（execute searching before save）：'; -$lang->search->select = 'Stories/Tasks filter'; +$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 = 'Save no query!'; -$lang->search->onMenuBar = 'Show on menu bar'; +$lang->search->noQuery = 'No query saved!'; +$lang->search->onMenuBar = 'Show in Menu'; $lang->search->operators['='] = '='; $lang->search->operators['!='] = '!='; @@ -31,10 +31,10 @@ $lang->search->operators['>'] = '>'; $lang->search->operators['>='] = '>='; $lang->search->operators['<'] = '<'; $lang->search->operators['<='] = '<='; -$lang->search->operators['include'] = 'include'; +$lang->search->operators['include'] = 'including'; $lang->search->operators['between'] = 'between'; -$lang->search->operators['notinclude'] = 'not include'; -$lang->search->operators['belong'] = 'belongs to'; +$lang->search->operators['notinclude'] = 'excluding'; +$lang->search->operators['belong'] = 'belong to'; $lang->search->andor['and'] = 'And'; $lang->search->andor['or'] = 'Or'; diff --git a/module/sso/lang/en.php b/module/sso/lang/en.php index 81e8be4b3f..f121ce9638 100644 --- a/module/sso/lang/en.php +++ b/module/sso/lang/en.php @@ -11,28 +11,28 @@ */ $lang->sso = new stdclass(); $lang->sso->settings = 'Settings'; -$lang->sso->turnon = 'Turnon'; +$lang->sso->turnon = 'Turn On'; $lang->sso->code = 'Code'; $lang->sso->key = 'Key'; $lang->sso->addr = 'Address'; -$lang->sso->bind = 'Bind user'; -$lang->sso->addrNotice = 'Example: http://www.ranzhi.com/sys/sso-check.html'; +$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->turnonList[1] = 'On'; +$lang->sso->turnonList[0] = 'Off'; -$lang->sso->bindType = 'Bind type'; -$lang->sso->bindUser = 'Bind user'; +$lang->sso->bindType = 'Binding Type'; +$lang->sso->bindUser = 'User Binding'; -$lang->sso->bindTypeList['bind'] = 'Binding existing user'; -$lang->sso->bindTypeList['add'] = 'Add new user'; +$lang->sso->bindTypeList['bind'] = 'Bind to existing User'; +$lang->sso->bindTypeList['add'] = 'Add User'; $lang->sso->help = <<1. Fill in Address, PATH_INFO ：http://ranzhi site/sys/sso-check.html, GET：http://ranzhi site/sys/index.php?m=sso&f=check

    -

    2. Code and Key must be the same of setting of RanZhi.

    +

    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 = 'Add new user do not have power. Contact the ZenTao administrator, to the user assigned authority.'; -$lang->sso->bindNoPassword = 'Password can not empty'; -$lang->sso->bindNoUser = "The user's login password error, or the user does not exist!"; -$lang->sso->bindHasAccount = 'The user name already exists, please change the user name, or bind to the user.'; +$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 ea84988035..af5515ba9d 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -10,30 +10,30 @@ * @link http://www.zentao.net */ $lang->story->create = "Create"; -$lang->story->batchCreate = "Batch"; +$lang->story->batchCreate = "Batch Create"; $lang->story->change = "Change"; -$lang->story->changed = 'Changed'; +$lang->story->changed = 'Changed Story'; $lang->story->review = 'Review'; -$lang->story->batchReview = 'Batch review'; +$lang->story->batchReview = 'Batch Review'; $lang->story->edit = "Edit"; -$lang->story->batchEdit = "Batch edit"; +$lang->story->batchEdit = "Batch Edit"; $lang->story->close = 'Close'; -$lang->story->batchClose = 'Batch close'; +$lang->story->batchClose = 'Batch Close'; $lang->story->activate = 'Activate'; $lang->story->delete = "Delete"; -$lang->story->view = "Info"; -$lang->story->tasks = "Tasks"; -$lang->story->taskCount = 'Tasks count'; -$lang->story->linkStory = 'Related story'; -$lang->story->unlinkStory = 'Unlink related story'; -$lang->story->export = "Export data"; -$lang->story->zeroCase = "Story of zero case"; +$lang->story->view = "Story Details"; +$lang->story->tasks = "Linked Task"; +$lang->story->taskCount = 'Tasks'; +$lang->story->linkStory = 'Link Story'; +$lang->story->unlinkStory = 'Unlink Story'; +$lang->story->export = "Export Data"; +$lang->story->zeroCase = "Zero Case"; $lang->story->reportChart = "Report"; -$lang->story->batchChangePlan = "Batch change plan"; -$lang->story->batchChangeBranch = "Batch change branch"; -$lang->story->batchChangeStage = "Batch change stage"; -$lang->story->batchAssignTo = "Batch assignto"; -$lang->story->batchChangeModule = "Batch change module"; +$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'; @@ -41,50 +41,50 @@ $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->sourceNote = 'Source Note'; +$lang->story->fromBug = 'From Bug'; $lang->story->title = 'Title'; -$lang->story->spec = 'Spec'; +$lang->story->spec = 'Description'; $lang->story->verify = 'Verify'; $lang->story->pri = 'Priority'; -$lang->story->estimate = 'Estimate'; -$lang->story->estimateAB = 'Estimate'; +$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 = 'Reject reason'; -$lang->story->reviewedBy = 'Reviewed by'; -$lang->story->reviewedDate = 'Reviewed date'; +$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 = 'Plan'; +$lang->story->plan = 'Planning'; $lang->story->planAB = 'Plan'; $lang->story->comment = 'Comment'; -$lang->story->linkStories = 'Related story'; -$lang->story->childStories = 'Child story'; -$lang->story->duplicateStory = 'Duplicate story'; -$lang->story->reviewResult = 'Reviewed result'; -$lang->story->preVersion = 'Pre version'; +$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 to add story.'; -$lang->story->colorTag = 'Color tag'; +$lang->story->newStory = 'Continue Add Story.'; +$lang->story->colorTag = 'Color Tag'; $lang->story->files = 'Files'; $lang->story->ditto = 'Ditto'; -$lang->story->dittoNotice = 'Current story and story above it do not belong to same product!'; +$lang->story->dittoNotice = 'This Story does not belong to the same Product as the last Story does!'; -$lang->story->useList[0] = 'No use'; -$lang->story->useList[1] = 'Use'; +$lang->story->useList[0] = 'Yes'; +$lang->story->useList[1] = 'No'; $lang->story->statusList[''] = ''; $lang->story->statusList['draft'] = 'Draft'; @@ -93,14 +93,14 @@ $lang->story->statusList['closed'] = 'Closed'; $lang->story->statusList['changed'] = 'Changed'; $lang->story->stageList[''] = ''; -$lang->story->stageList['wait'] = 'Waitting'; +$lang->story->stageList['wait'] = 'Pending'; $lang->story->stageList['planned'] = 'Planned'; -$lang->story->stageList['projected'] = "{$lang->projectCommon}ed"; +$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'] = 'Verified'; +$lang->story->stageList['verified'] = 'Accepted'; $lang->story->stageList['released'] = 'Released'; $lang->story->reasonList[''] = ''; @@ -109,9 +109,9 @@ $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'] = 'Canceled'; -$lang->story->reasonList['bydesign'] = 'By design'; -//$lang->story->reasonList['isbug'] = '是个Bug'; +$lang->story->reasonList['cancel'] = 'Cancelled'; +$lang->story->reasonList['bydesign'] = 'Default Design'; +//$lang->story->reasonList['isbug'] = 'Bug!'; $lang->story->reviewResultList[''] = ''; $lang->story->reviewResultList['pass'] = 'Pass'; @@ -128,7 +128,7 @@ $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'] = 'Operation'; +$lang->story->sourceList['operation'] = 'Operations'; $lang->story->sourceList['support'] = 'Technical support'; $lang->story->sourceList['competitor'] = 'Competitor'; $lang->story->sourceList['partner'] = 'Partner'; @@ -143,76 +143,76 @@ $lang->story->priList[1] = '1'; $lang->story->priList[2] = '2'; $lang->story->priList[4] = '4'; -$lang->story->legendBasicInfo = 'Basic info'; -$lang->story->legendLifeTime = 'Life time'; -$lang->story->legendRelated = 'Related info'; -$lang->story->legendMailto = 'Maitto'; +$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 = 'Related Bug'; +$lang->story->legendProjectAndTask = $lang->projectCommon . 'Task'; +$lang->story->legendBugs = 'Linked Bug'; $lang->story->legendFromBug = 'From Bug'; -$lang->story->legendCases = 'Related Case'; -$lang->story->legendLinkStories = 'Related story'; -$lang->story->legendChildStories = 'Child story'; -$lang->story->legendSpec = 'Spec'; -$lang->story->legendVerify = 'Verify standard'; -$lang->story->legendMisc = 'Misc'; +$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 Affection'; -$lang->story->affectedProjects = "Affected {$lang->projectCommon}s"; -$lang->story->affectedBugs = 'Affected bugs'; -$lang->story->affectedCases = 'Affected cases'; +$lang->story->checkAffection = 'Check Impact'; +$lang->story->affectedProjects = 'Affected' . $lang->projectCommon; +$lang->story->affectedBugs = 'Affected Bug'; +$lang->story->affectedCases = 'Affected Case'; -$lang->story->specTemplate = "Recommend template:：As <a type of user>,I want <some goals>,so that <some reason>."; -$lang->story->needNotReview = "needn't review"; -$lang->story->successSaved = "Successfully saved"; -$lang->story->confirmDelete = "Are you sure to delete this story?"; -$lang->story->errorEmptyChildStory = '『Child story』can not be empty.'; -$lang->story->mustChooseResult = 'Must choose s result'; -$lang->story->mustChoosePreVersion = 'Must select an version to revert'; +$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 = 'The story of their respective range'; -$lang->story->form->desc = 'Description and standards, what stories? How to acceptance?'; -$lang->story->form->resource = 'Allocation of resources, who completed? How long does it take?'; -$lang->story->form->file = 'Attachments, if the demand for related documents, please click here to upload.'; +$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, reviewed by $actor, result is $extra.', 'extra' => 'reviewResultList'); -$lang->story->action->closed = array('main' => '$date, closed by $actor, reason is $extra $appendLink.', 'extra' => 'reasonList'); -$lang->story->action->linked2plan = array('main' => '$date, linked to plan $extra by $actor.'); -$lang->story->action->unlinkedfromplan = array('main' => '$date, removed from $extra> by $actor'); -$lang->story->action->linked2project = array('main' => '$date, linked to ' . $lang->projectCommon . ' $extra by $actor.'); -$lang->story->action->unlinkedfromproject = array('main' => '$date, removed from ' . $lang->projectCommon . ' $extra by $actor.'); -$lang->story->action->linkrelatedstory = array('main' => '$date, link related story $extra by $actor.'); -$lang->story->action->subdividestory = array('main' => '$date, subdivide to $extra by $actor.'); -$lang->story->action->unlinkrelatedstory = array('main' => '$date, unlink related story $extra by $actor.'); -$lang->story->action->unlinkchildstory = array('main' => '$date, unlink child story $extra by $actor.'); +$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->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.'); -/* Report*/ +/* 统计报表。*/ $lang->story->report = new stdclass(); $lang->story->report->common = 'Report'; -$lang->story->report->select = 'Select'; -$lang->story->report->create = 'Create'; -$lang->story->report->value = 'Stories'; +$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} storys"; -$lang->story->report->charts['storysPerModule'] = 'Module storys'; -$lang->story->report->charts['storysPerSource'] = 'Source storys'; -$lang->story->report->charts['storysPerPlan'] = 'Plan storys'; -$lang->story->report->charts['storysPerStatus'] = 'Sotrys of status'; -$lang->story->report->charts['storysPerStage'] = 'Storys of stage'; -$lang->story->report->charts['storysPerPri'] = 'Storys of priority'; -$lang->story->report->charts['storysPerEstimate'] = 'Storys of Estimate'; -$lang->story->report->charts['storysPerOpenedBy'] = 'Opened by user'; -$lang->story->report->charts['storysPerAssignedTo'] = 'Assigned to user'; -$lang->story->report->charts['storysPerClosedReason'] = 'Storys for reason'; -$lang->story->report->charts['storysPerChange'] = 'Story version'; +$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(); @@ -220,7 +220,7 @@ $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->storysPerProduct = new stdclass(); $lang->story->report->storysPerModule = new stdclass(); $lang->story->report->storysPerSource = new stdclass(); $lang->story->report->storysPerPlan = new stdclass(); @@ -236,17 +236,17 @@ $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 = 'Plan'; +$lang->story->report->storysPerPlan->item = 'Planning'; $lang->story->report->storysPerStatus->item = 'Status'; $lang->story->report->storysPerStage->item = 'Stage'; -$lang->story->report->storysPerPri->item = 'Pri'; +$lang->story->report->storysPerPri->item = 'Priority'; $lang->story->report->storysPerOpenedBy->item = 'Account'; -$lang->story->report->storysPerAssignedTo->item = 'Account'; +$lang->story->report->storysPerAssignedTo->item = 'User'; $lang->story->report->storysPerClosedReason->item = 'Reason'; -$lang->story->report->storysPerEstimate->item = 'Estimate'; +$lang->story->report->storysPerEstimate->item = 'Estimated Man-Hour'; $lang->story->report->storysPerChange->item = 'Change'; -$lang->story->report->storysPerProduct->graph = new stdclass(); +$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(); @@ -262,18 +262,18 @@ $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 = 'Plan'; +$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 = 'Opened by'; -$lang->story->report->storysPerAssignedTo->graph->xAxisName = 'Assigned to'; -$lang->story->report->storysPerClosedReason->graph->xAxisName = 'Closed reason'; -$lang->story->report->storysPerEstimate->graph->xAxisName = 'Estimate'; +$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 users who review...'; +$lang->story->chosen->reviewedBy = 'Choose Reviewer'; diff --git a/module/svn/lang/en.php b/module/svn/lang/en.php index 42c80c4329..8031ede3e0 100644 --- a/module/svn/lang/en.php +++ b/module/svn/lang/en.php @@ -12,6 +12,6 @@ /* Methods. */ $lang->svn = new stdclass(); $lang->svn->common = 'Subversion'; -$lang->svn->cat = 'View code'; -$lang->svn->diff = 'Diff code'; -$lang->svn->apiSync = 'API: sync svn log'; +$lang->svn->cat = 'View Code'; +$lang->svn->diff = 'Diff Code'; +$lang->svn->apiSync = 'API: Sync svn log'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index cd0ba62daa..3c9dd822c2 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -11,27 +11,27 @@ */ $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->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 = "Log working hours"; +$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->batchClose = "Batch Close"; $lang->task->cancel = "Cancel"; $lang->task->activate = "Activate"; -$lang->task->export = "Export data"; -$lang->task->reportChart = "Report chart"; +$lang->task->export = "Export Data"; +$lang->task->reportChart = "Report Chart"; $lang->task->fromBug = 'From Bug'; -$lang->task->confirmStoryChange = "Confirm story change"; +$lang->task->confirmStoryChange = "Confirm Story Change"; $lang->task->common = 'Task'; $lang->task->id = 'ID'; @@ -39,80 +39,80 @@ $lang->task->project = $lang->projectCommon; $lang->task->module = 'Module'; $lang->task->moduleAB = 'Module'; $lang->task->story = 'Story'; -$lang->task->storySpec = 'Story desc'; -$lang->task->storyVerify = 'Story Verify'; +$lang->task->storySpec = 'Description'; +$lang->task->storyVerify = 'Acceptance Criteria'; $lang->task->name = 'Name'; $lang->task->type = 'Type'; -$lang->task->pri = 'Pri'; +$lang->task->pri = 'Priority'; $lang->task->mailto = 'Mailto'; -$lang->task->estimate = 'Estimate'; -$lang->task->estimateAB = 'Est'; -$lang->task->left = 'Left'; +$lang->task->estimate = 'Estimation'; +$lang->task->estimateAB = 'Estimated'; +$lang->task->left = 'Estimated Left'; $lang->task->leftAB = 'Left'; -$lang->task->consumed = 'Consumed'; -$lang->task->consumedAB = 'Use'; +$lang->task->consumed = 'Total Consumed'; +$lang->task->consumedAB = 'Consume'; $lang->task->hour = 'Hour'; -$lang->task->consumedThisTime = 'Hours'; +$lang->task->consumedThisTime = 'Man-Hour'; $lang->task->leftThisTime = 'Left'; -$lang->task->datePlan = 'Date plan'; -$lang->task->estStarted = 'Estimate start'; -$lang->task->realStarted = 'Real start'; +$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 = 'Desc'; +$lang->task->desc = 'Description'; $lang->task->assign = 'Assign'; $lang->task->assignTo = $lang->task->assign; -$lang->task->batchAssignTo = 'Batch assign'; +$lang->task->batchAssignTo = 'Batch Assign'; $lang->task->assignedTo = 'Assigned To'; -$lang->task->assignedToAB = 'Assign'; +$lang->task->assignedToAB = 'Assigned To'; $lang->task->assignedDate = 'Assigned Date'; -$lang->task->openedBy = 'Opened By'; -$lang->task->openedDate = 'Opened Date'; -$lang->task->openedDateAB = 'Open'; +$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 = 'Finished Date'; +$lang->task->finishedDate = 'Finish Date'; $lang->task->finishedDateAB = 'Date'; -$lang->task->canceledBy = 'Canceled By'; -$lang->task->canceledDate = 'Canceled Date'; +$lang->task->canceledBy = 'Cancelled By'; +$lang->task->canceledDate = 'Cancel Date'; $lang->task->closedBy = 'Closed By'; -$lang->task->closedDate = 'Closed Date'; -$lang->task->closedReason = 'Closed Reason'; +$lang->task->closedDate = 'Close Date'; +$lang->task->closedReason = 'Cancel Reason'; $lang->task->lastEditedBy = 'Last Edited By'; -$lang->task->lastEditedDate = 'Last Edited Date'; -$lang->task->lastEdited = 'Last Edited'; -$lang->task->recordEstimate = 'Hours'; -$lang->task->editEstimate = 'Edit Hour'; -$lang->task->deleteEstimate = 'Delete Hour'; -$lang->task->colorTag = 'Color tag'; +$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->ditto = 'Ditto'; -$lang->task->dittoNotice = "Current task and task above it do not belong to same project!"; +$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 = 'No assigned'; -$lang->task->noFinished = 'No finished'; -$lang->task->noClosed = 'No closed'; +$lang->task->noAssigned = 'Unassigned'; +$lang->task->noFinished = 'Unfinished'; +$lang->task->noClosed = 'Unclosed'; $lang->task->statusList[''] = ''; $lang->task->statusList['wait'] = 'Pending'; -$lang->task->statusList['doing'] = 'Doing'; +$lang->task->statusList['doing'] = 'Ongoing'; $lang->task->statusList['done'] = 'Done'; $lang->task->statusList['pause'] = 'Paused'; -$lang->task->statusList['cancel'] = 'Canceled'; +$lang->task->statusList['cancel'] = 'Cancelled'; $lang->task->statusList['closed'] = 'Closed'; $lang->task->typeList[''] = ''; $lang->task->typeList['design'] = 'Design'; -$lang->task->typeList['devel'] = 'Devel'; -$lang->task->typeList['test'] = 'Test'; +$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'] = 'Affair'; +$lang->task->typeList['affair'] = 'Work'; $lang->task->typeList['misc'] = 'Misc'; $lang->task->priList[0] = ''; @@ -123,60 +123,60 @@ $lang->task->priList[4] = '4'; $lang->task->reasonList[''] = ''; $lang->task->reasonList['done'] = 'Done'; -$lang->task->reasonList['cancel'] = 'Canceled'; +$lang->task->reasonList['cancel'] = 'Cancelled'; -$lang->task->afterChoices['continueAdding'] = 'Continue to add task for this story. '; -$lang->task->afterChoices['toTaskList'] = 'To task list. '; -$lang->task->afterChoices['toStoryList'] = 'To story list. '; +$lang->task->afterChoices['continueAdding'] = 'Contine Add Task'; +$lang->task->afterChoices['toTaskList'] = 'Back to Task List'; +$lang->task->afterChoices['toStoryList'] = 'Back to Story List'; -$lang->task->legendBasic = 'Basic info'; -$lang->task->legendEffort = 'Effort'; -$lang->task->legendLife = 'Lifetime'; -$lang->task->legendDesc = 'Desc'; +$lang->task->legendBasic = 'Basic Info'; +$lang->task->legendEffort = 'Man-Hour'; +$lang->task->legendLife = 'Task Life'; +$lang->task->legendDesc = 'Task Desn'; -$lang->task->confirmDelete = "Are you sure you want to delete this task?"; -$lang->task->confirmDeleteEstimate = "Are you sure you want to delete this hour?"; -$lang->task->copyStoryTitle = "Same as story"; -$lang->task->afterSubmit = "After created"; -$lang->task->successSaved = "Successfully saved"; -$lang->task->delayWarning = " Postponed %s days "; -$lang->task->remindBug = "This task from Bug, update the Bug:%s or not?"; -$lang->task->confirmChangeProject = "Change {$lang->projectCommon} will change module, story and assignedTo also, are you sure?"; -$lang->task->confirmFinish = '"Left" is zero, this task will be done. Are you sure?'; -$lang->task->confirmRecord = '"Left" is zero, this task will be done. Are you sure?'; -$lang->task->noticeSaveRecord = 'Please save the estimate record which has not been saved.'; -$lang->task->commentActions = '%s. %s, commented by%s.'; +$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 Left" is 0. Do you want to change the Status to "Done"?'; +$lang->task->confirmRecord = '"Left" is 0. Do you want to set Task as "Done"?'; +$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 number'; -$lang->task->error->estimateNumber = '"Estimate" must be number'; -$lang->task->error->consumedSmall = '"Consumed" must be more than consumed before'; -$lang->task->error->consumedThisTime = 'Please input "hours"'; -$lang->task->error->left = 'Please input "left"'; -$lang->task->error->work = '"Comment" must be less than 255 characters'; -$lang->task->error->skipClose = 'The status of Tasks : %s are not finished or canceled, can not close.'; -$lang->task->error->consumed = 'The estimate of task %s is less than zero, ignore it.'; +$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”或“Cancelled”. You cannot close it!'; +$lang->task->error->consumed = 'Task: %s man-hour must be more than 0. Ignore changes to this Task.'; -/* Report. */ +/* 统计报表。*/ $lang->task->report = new stdclass(); $lang->task->report->common = 'Report'; -$lang->task->report->select = 'Select'; +$lang->task->report->select = 'Please select the type of the Task'; $lang->task->report->create = 'Create'; -$lang->task->report->value = 'Tasks'; +$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['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'] = 'Estimate time'; -$lang->task->report->charts['tasksPerLeft'] = 'Left time'; -$lang->task->report->charts['tasksPerConsumed'] = 'Consumed time'; +$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'] = 'Closed reason'; -$lang->task->report->charts['finishedTasksPerDay'] = 'Finished tasks per day'; +$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(); @@ -202,14 +202,14 @@ $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 = 'Pri'; +$lang->task->report->tasksPerPri->item = 'Priority'; $lang->task->report->tasksPerStatus->item = 'Status'; $lang->task->report->tasksPerDeadline->item = 'Date'; -$lang->task->report->tasksPerEstimate->item = 'Estimate'; -$lang->task->report->tasksPerLeft->item = 'Left'; -$lang->task->report->tasksPerConsumed->item = 'Consumed'; -$lang->task->report->tasksPerFinishedBy->item = 'Account'; -$lang->task->report->tasksPerClosedReason->item = 'Reason'; +$lang->task->report->tasksPerEstimate->item = '预计'; +$lang->task->report->tasksPerLeft->item = '剩余'; +$lang->task->report->tasksPerConsumed->item = '消耗'; +$lang->task->report->tasksPerFinishedBy->item = 'User'; +$lang->task->report->tasksPerClosedReason->item = '原因'; $lang->task->report->finishedTasksPerDay->item = 'Date'; $lang->task->report->tasksPerProject->graph = new stdclass(); @@ -230,14 +230,14 @@ $lang->task->report->tasksPerProject->graph->xAxisName = $lang->projectComm $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 = 'Pri'; +$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 = 'Closed Reason'; +$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 1936a59fa1..ee5a912b15 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -15,36 +15,36 @@ $lang->testcase->module = 'Module'; $lang->testcase->moduleAB = 'Module'; $lang->testcase->story = 'Story'; $lang->testcase->title = 'Title'; -$lang->testcase->precondition = 'precondition'; +$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->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 = 'Related cases'; -$lang->testcase->linkCases = 'Link related cases'; -$lang->testcase->unlinkCase = 'unlink related case'; +$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 = 'Runner'; -$lang->testcase->lastRunDate = 'Run date'; -$lang->testcase->assignedTo = 'Assigned to'; -$lang->testcase->colorTag = 'Color tag'; +$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->fromBug = 'From Bug'; +$lang->testcase->toBug = 'To Bug'; $lang->testcase->changed = 'Changed'; -$lang->testcase->createBug = 'Transform bug'; +$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'; @@ -53,55 +53,55 @@ $lang->testcase->stepExpect = 'Expect'; $lang->testcase->common = 'Case'; $lang->testcase->index = "Index"; -$lang->testcase->create = "Create case"; -$lang->testcase->batchCreate = "Batch create"; +$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->batchEdit = "Batch Edit "; +$lang->testcase->batchChangeModule = "Batch Change Module"; $lang->testcase->delete = "Delete"; -$lang->testcase->batchDelete = "Batch delete "; -$lang->testcase->browse = "Browse"; -$lang->testcase->groupCase = "View case by group"; +$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 templet"; -$lang->testcase->export = "Export data"; -$lang->testcase->confirmChange = 'Confirm case change'; -$lang->testcase->confirmStoryChange = 'Confirm story change'; -$lang->testcase->copy = 'Copy case'; +$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 = 'The number of cases'; + +$lang->testcase->num = 'Case Count:'; $lang->testcase->deleteStep = 'Delete'; -$lang->testcase->insertBefore = 'Insert before'; -$lang->testcase->insertAfter = 'Insert after'; +$lang->testcase->insertBefore = 'Inserted Before'; +$lang->testcase->insertAfter = 'Inserted After'; -$lang->testcase->assignToMe = 'Cases to me'; -$lang->testcase->openedByMe = 'My Opened cases'; -$lang->testcase->allCases = 'All case'; -$lang->testcase->needConfirm = 'Story changed'; -$lang->testcase->bySearch = 'By search'; +$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 edited'; -$lang->testcase->lblTypeValue = 'List of type'; -$lang->testcase->lblStageValue = 'List of stage'; -$lang->testcase->lblStatusValue = 'List of status'; +$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 = 'Files'; +$lang->testcase->legendBasicInfo = 'Basic Info'; +$lang->testcase->legendAttatch = 'File'; $lang->testcase->legendLinkBugs = 'Bug'; -$lang->testcase->legendOpenAndEdit = 'Open & edit'; -$lang->testcase->legendComment = 'Comment'; +$lang->testcase->legendOpenAndEdit = 'Create/Edit'; +$lang->testcase->legendComment = 'Remark'; -$lang->testcase->confirmDelete = 'Are you sure to delete this case?'; -$lang->testcase->confirmBatchDelete = 'Are you sure to batch delete there cases?'; +$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 = 'Current case and case above it do not belong to same product!'; +$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; @@ -119,20 +119,20 @@ $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'] = 'Integrate testing'; -$lang->testcase->stageList['system'] = 'System testing'; -$lang->testcase->stageList['smoke'] = 'Smoking testing'; -$lang->testcase->stageList['bvt'] = 'BVT testing'; +$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 view'; -$lang->testcase->groups['story'] = 'Group by story'; +$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'] = 'Investigate'; +$lang->testcase->statusList['investigate'] = 'Investigating'; $lang->testcase->resultList['n/a'] = 'N/A'; $lang->testcase->resultList['pass'] = 'Pass'; @@ -141,11 +141,11 @@ $lang->testcase->resultList['blocked'] = 'Blocked'; $lang->testcase->buttonToList = 'Back'; -$lang->testcase->errorEncode = 'No data, please select right encode and upload again!'; -$lang->testcase->noFunction = 'Iconv and mb_convert_encoding does not exist, you can not turn the data into the desired coding!'; -$lang->testcase->noRequire = "In the row of %s, the %s is a required field"; +$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 = 'Type to search stories'; +$lang->testcase->searchStories = 'Enter to searcu Story'; $lang->testcase->featureBar['browse']['all'] = $lang->testcase->allCases; $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index e0f4557527..a8080c6a8e 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -15,8 +15,8 @@ $lang->testtask->delete = "Delete"; $lang->testtask->view = "Info"; $lang->testtask->edit = "Edit"; $lang->testtask->browse = "Browse"; -$lang->testtask->linkCase = "Link case"; -$lang->testtask->unlinkCase = "Del"; +$lang->testtask->linkCase = "Link Case"; +$lang->testtask->unlinkCase = "Unlink Case"; $lang->testtask->batchAssign = "Batch Assign"; $lang->testtask->runCase = "Run"; $lang->testtask->batchRun = "Batch Run"; @@ -24,13 +24,13 @@ $lang->testtask->results = "Result"; $lang->testtask->createBug = "Bug(+)"; $lang->testtask->assign = 'Assign'; $lang->testtask->cases = 'Cases'; -$lang->testtask->groupCase = "View case by group"; +$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 = "Testing build"; -$lang->testtask->done = "Tested build"; +$lang->testtask->wait = "Build to be Tested"; +$lang->testtask->done = "Tested Build"; $lang->testtask->common = 'Test build'; $lang->testtask->product = $lang->productCommon; @@ -39,8 +39,8 @@ $lang->testtask->build = 'Build'; $lang->testtask->owner = 'Owner'; $lang->testtask->pri = 'Priority'; $lang->testtask->name = 'Name'; -$lang->testtask->begin = 'Begin'; -$lang->testtask->end = 'End'; +$lang->testtask->begin = 'Begin Date'; +$lang->testtask->end = 'End Date'; $lang->testtask->desc = 'Desc'; $lang->testtask->mailto = 'Mailto'; $lang->testtask->status = 'Status'; @@ -54,10 +54,10 @@ $lang->testtask->files = 'Upload Files'; $lang->testtask->legendDesc = 'Desc'; $lang->testtask->legendReport = 'Report'; -$lang->testtask->legendBasicInfo = 'Basic info'; +$lang->testtask->legendBasicInfo = 'Basic Info'; $lang->testtask->statusList['wait'] = 'Pending'; -$lang->testtask->statusList['doing'] = 'In progress'; +$lang->testtask->statusList['doing'] = 'Ongoing'; $lang->testtask->statusList['done'] = 'Done'; $lang->testtask->statusList['blocked'] = 'Blocked'; @@ -68,38 +68,38 @@ $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 = 'Pass all'; +$lang->testtask->linkByStory = 'Link by Story'; +$lang->testtask->linkByBug = 'Link by Bug'; +$lang->testtask->passAll = 'All Pass'; $lang->testtask->pass = 'Pass'; -$lang->testtask->fail = 'Fail'; +$lang->testtask->fail = 'Failed'; $lang->testtask->showResult = 'Executed %s times'; -$lang->testtask->showFail = 'Failed %stesttask->showFail = 'Failed %s times'; -$lang->testtask->confirmDelete = 'Are you sure to delete this test build?'; -$lang->testtask->confirmUnlinkCase = 'Are you sure to unlink this case?'; +$lang->testtask->confirmDelete = 'Do you want to delete this test build?'; +$lang->testtask->confirmUnlinkCase = 'Do you want to remove this Case?'; -$lang->testtask->assignedToMe = 'Assgined to me'; +$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'; +$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->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 testtask #%s:%s"; -$lang->testtask->mail->edit->title = "%s finished testtask #%s:%s"; -$lang->testtask->mail->close->title = "%s closed testtask #%s:%s"; +$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"; +$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 d410a4847a..aefa610724 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -9,41 +9,41 @@ * @version $Id: en.php 4676 2013-04-26 06:08:23Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->todo->common = 'TODO'; -$lang->todo->index = "Index"; +$lang->todo->common = 'To-Dos'; +$lang->todo->index = "Home"; $lang->todo->create = "Create"; -$lang->todo->batchCreate = "Batch create"; +$lang->todo->batchCreate = "Batch Create"; $lang->todo->edit = "Edit"; -$lang->todo->batchEdit = "Batch edit"; +$lang->todo->batchEdit = "Batch Edit"; $lang->todo->view = "Info"; $lang->todo->finish = "Finish"; -$lang->todo->batchFinish = "Batch finish"; +$lang->todo->batchFinish = "Batch Finish"; $lang->todo->export = "Export"; $lang->todo->delete = "Delete"; -$lang->todo->import2Today = "Import to today"; -$lang->todo->import = "Import to"; +$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 = 'Begin and 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 = 'Desc'; +$lang->todo->desc = 'Description'; $lang->todo->private = 'Private'; -$lang->todo->confirmBug = 'This todo linked to bug #%s，chang it also?'; -$lang->todo->confirmTask = 'This todo linked to task #%s，chang it also?'; +$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'] = 'Waiting'; -$lang->todo->statusList['doing'] = 'Doing'; +$lang->todo->statusList['wait'] = 'Pending'; +$lang->todo->statusList['doing'] = 'Ongoing'; $lang->todo->statusList['done'] = 'Done'; -//$lang->todo->statusList['cancel'] = '已取消'; -//$lang->todo->statusList['postpone'] = '已延期'; +//$lang->todo->statusList['cancel'] = 'Cancelled'; +//$lang->todo->statusList['postpone'] = 'Delayed'; $lang->todo->priList[3] = '3'; $lang->todo->priList[1] = '1'; @@ -52,7 +52,7 @@ $lang->todo->priList[4] = '4'; $lang->todo->typeList['custom'] = 'Custom'; $lang->todo->typeList['bug'] = 'Bug'; -$lang->todo->typeList['task'] = 'Task'; +$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。:)'; @@ -60,16 +60,16 @@ $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['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, Finished by $actor'); -$lang->todo->action->marked = array('main' => '$date, Change status to $extra by $actor。', 'extra' => 'statusList'); +$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 bf95ed0b1f..f4ddfd98ac 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -10,29 +10,29 @@ * @link http://www.zentao.net */ $lang->tree = new stdclass(); -$lang->tree->common = 'Module manage'; +$lang->tree->common = 'Module'; $lang->tree->edit = 'Edit'; $lang->tree->delete = 'Delete'; -$lang->tree->browse = 'Manage general module'; -$lang->tree->browseTask = 'Manage task module'; -$lang->tree->manage = 'Modules'; +$lang->tree->browse = 'General Module'; +$lang->tree->browseTask = 'Task Module'; +$lang->tree->manage = 'Module'; $lang->tree->fix = 'Fix'; -$lang->tree->manageProduct = "Mange {$lang->productCommon} module"; -$lang->tree->manageProject = "Manage {$lang->projectCommon} module"; -$lang->tree->manageBug = 'Manage bug module'; -$lang->tree->manageCase = 'Manage case module'; -$lang->tree->manageCustomDoc = 'Manage doc library type'; -$lang->tree->updateOrder = 'Update order'; -$lang->tree->manageChild = 'Manage child'; -$lang->tree->manageStoryChild = 'Manage child'; -$lang->tree->manageBugChild = 'Manage bug child'; -$lang->tree->manageCaseChild = 'Manage case child'; -$lang->tree->manageTaskChild = "Manage {$lang->projectCommon} child"; +$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->addChild = "Add child module"; +$lang->tree->dragAndSort = "Drag and Sort"; +$lang->tree->addChild = "Add Child Module"; -$lang->tree->confirmDelete = 'Are you sure to delete this module and its children?'; +$lang->tree->confirmDelete = 'Do you want to delete this Module and its Child?'; $lang->tree->confirmRoot = "Modify the module {$lang->productCommon}s, modified the {$lang->productCommon}s belong to the needs of the module, bug, use case, and {$lang->projectCommon} and {$lang->productCommon} relationship. This is dangerous, please be careful. To confirm the change?"; $lang->tree->successSave = 'Successfully saved'; $lang->tree->successFixed = 'Successfully fixed.'; @@ -43,7 +43,7 @@ $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->short = 'Sort'; +$lang->tree->all = 'All Modules'; +$lang->tree->projectDoc = "{$lang->projectCommon} Doc"; $lang->tree->product = $lang->productCommon; diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php index 9a8ad6622e..d3293c9cf8 100644 --- a/module/tutorial/lang/en.php +++ b/module/tutorial/lang/en.php @@ -9,60 +9,59 @@ * @version $Id: zh-cn.php 5116 2013-07-12 06:37:48Z sunhao@cnezsoft.com $ * @link http://www.zentao.net */ - $lang->tutorial = new stdclass(); -$lang->tutorial->common = 'Novice tutorial'; -$lang->tutorial->desc = 'Learn zentao through a series of tasks. This may cost you 10 minutes, you can quit anytime.'; -$lang->tutorial->start = 'Let\'s go!'; +$lang->tutorial->common = 'Tutorial'; +$lang->tutorial->desc = 'Get to know ZenTao through finishing of tasks. It will take about 10 mins, and you can quit it anytime.'; +$lang->tutorial->start = "Let's go!"; $lang->tutorial->exit = 'Quit'; $lang->tutorial->congratulation = 'Congratulations! You have finished all tasks.'; $lang->tutorial->restart = 'Restart'; -$lang->tutorial->currentTask = 'Current task'; -$lang->tutorial->allTasks = 'All tasks'; -$lang->tutorial->previous = 'Previous one'; -$lang->tutorial->nextTask = 'Next task'; -$lang->tutorial->openTargetPage = 'Open target page'; -$lang->tutorial->atTargetPage = 'In target page'; -$lang->tutorial->reloadTargetPage = 'Reload target page'; +$lang->tutorial->currentTask = 'Current Task'; +$lang->tutorial->allTasks = 'All Tasks'; +$lang->tutorial->previous = 'Previous'; +$lang->tutorial->nextTask = 'Next'; +$lang->tutorial->openTargetPage = 'Open target'; +$lang->tutorial->atTargetPage = 'On target'; +$lang->tutorial->reloadTargetPage = 'Reload'; $lang->tutorial->target = 'Target'; -$lang->tutorial->targetPageTip = 'Open【%s】page by this instruction'; -$lang->tutorial->requiredTip = '【%s】is necessary'; -$lang->tutorial->congratulateTask = 'Congratulations! You have finished task【】!'; -$lang->tutorial->serverErrorTip = 'Some error has occurred.'; -$lang->tutorial->ajaxSetError = 'Finished task must be defined. Set empty value to reset tasks.'; -$lang->tutorial->novice = "You may use the ZenTao first, whether to enter the novice tutorial?"; -$lang->tutorial->dataNotSave = "Data is not save in the task of tutorial."; +$lang->tutorial->targetPageTip = 'Open【%s】page by following this instruction.'; +$lang->tutorial->requiredTip = '【%s】is required.'; +$lang->tutorial->congratulateTask = 'Congratulations! You have finished【】!'; +$lang->tutorial->serverErrorTip = 'Error!'; +$lang->tutorial->ajaxSetError = 'Finished task must be defined. If you want to reset the Task, please set its value as null.'; +$lang->tutorial->novice = "If you use ZenTao for the first time, do you want to start the Tutorial?"; +$lang->tutorial->dataNotSave = "Data generated in the Tutorial will not be saved!"; $lang->tutorial->tasks = array(); -$lang->tutorial->tasks['createAccount'] = array('title' => 'Create a account'); +$lang->tutorial->tasks['createAccount'] = array('title' => 'Create an Account'); $lang->tutorial->tasks['createAccount']['nav'] = array('module' => 'user', 'method' => 'create', 'menuModule' => 'company', 'menu' => 'addUser', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Add User'); -$lang->tutorial->tasks['createAccount']['desc'] = "

    Create a new account in Zentao:

    • Open Company Users Add User;
    • Fill the form with user information;
    • Save user information.
    "; +$lang->tutorial->tasks['createAccount']['desc'] = "

    Create an account:

    • Open Company Users New;
    • Fill the form with user information;
    • Save
    "; -$lang->tutorial->tasks['createProduct'] = array('title' => 'Create a product'); +$lang->tutorial->tasks['createProduct'] = array('title' => 'Create a Product'); $lang->tutorial->tasks['createProduct']['nav'] = array('module' => 'product', 'method' => 'create', 'menu' => 'create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Product'); -$lang->tutorial->tasks['createProduct']['desc'] = "

    Create a new product:

    • Open Product New;
    • Fill the form with product information;
    • Save product information.
    "; +$lang->tutorial->tasks['createProduct']['desc'] = "

    Create a new product:

    • Open Product New;
    • Fill the form with product information;
    • Save
    "; -$lang->tutorial->tasks['createStory'] = array('title' => 'Create a story'); +$lang->tutorial->tasks['createStory'] = array('title' => 'Create a Story'); $lang->tutorial->tasks['createStory']['nav'] = array('module' => 'story', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'story', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Story'); -$lang->tutorial->tasks['createStory']['desc'] = "

    Create a new story:

    • Open Product Story Create;
    • Fill the form with story information;
    • Save story information.
    "; +$lang->tutorial->tasks['createStory']['desc'] = "

    Create a new story:

    • Open Product Story Create;
    • Fill the form with story information;
    • Save
    "; -$lang->tutorial->tasks['createProject'] = array('title' => 'Create a project'); +$lang->tutorial->tasks['createProject'] = array('title' => 'Create a Project'); $lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => 'create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Project'); -$lang->tutorial->tasks['createProject']['desc'] = "

    Create a new project:

    • Open Project New Page;
    • Fill the form with project information;
    • Save project information.
    "; +$lang->tutorial->tasks['createProject']['desc'] = "

    Create a new project:

    • Open Project New Page;
    • Fill the form with project information;
    • Save
    "; -$lang->tutorial->tasks['manageTeam'] = array('title' => 'Manage project team'); +$lang->tutorial->tasks['manageTeam'] = array('title' => 'Manage Project Team'); $lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members'); -$lang->tutorial->tasks['manageTeam']['desc'] = "

    Manage project team members:

    • Open Project Team Manage team members Page；
    • Choose users for the team.
    • Save team members information.
    "; +$lang->tutorial->tasks['manageTeam']['desc'] = "

    Manage project team members:

    • Open Project Team Manage Team Members Page；
    • Choose users for the team.
    • Save
    "; -$lang->tutorial->tasks['linkStory'] = array('title' => 'Link story'); +$lang->tutorial->tasks['linkStory'] = array('title' => 'Link Story'); $lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Link Story'); -$lang->tutorial->tasks['linkStory']['desc'] = "

    Link stories to project:

    • Open Project Story Link story;
    • Select stories in story list to link;
    • Save linked stories.
    "; +$lang->tutorial->tasks['linkStory']['desc'] = "

    Link Story to Project:

    • Open Project Story Link Story;
    • Select stories from story list to link;
    • Save
    "; -$lang->tutorial->tasks['createTask'] = array('title' => 'Divide tasks'); +$lang->tutorial->tasks['createTask'] = array('title' => 'Subdivide Tasks'); $lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task'); -$lang->tutorial->tasks['createTask']['desc'] = "

    Divide tasks for story.

    • Open Project Story WBS;
    • Fill the form with task information;
    • Save task information.
    "; +$lang->tutorial->tasks['createTask']['desc'] = "

    Subdivide tasks for Story:

    • Open Project Story WBS;
    • Fill the form with task information;
    • Save
    "; -$lang->tutorial->tasks['createBug'] = array('title' => 'Create a bug'); +$lang->tutorial->tasks['createBug'] = array('title' => 'Create a Bug'); $lang->tutorial->tasks['createBug']['nav'] = array('module' => 'bug', 'method' => 'create', 'menuModule' => 'qa', 'menu' => 'bug', 'target' => '.btn-bug-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Bug'); -$lang->tutorial->tasks['createBug']['desc'] = "

    Create a new Bug:

    • Open Test Bug Create Bug；
    • Fill the form with bug information:
    • Save Bug information.
    "; +$lang->tutorial->tasks['createBug']['desc'] = "

    Create a new Bug:

    • Open Test Bug Create a Bug；
    • Fill the form with bug information:
    • Save
    "; diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php index 9281a00c92..d001e2396b 100644 --- a/module/tutorial/lang/zh-cn.php +++ b/module/tutorial/lang/zh-cn.php @@ -9,7 +9,6 @@ * @version $Id: zh-cn.php 5116 2013-07-12 06:37:48Z sunhao@cnezsoft.com $ * @link http://www.zentao.net */ - $lang->tutorial = new stdclass(); $lang->tutorial->common = '新手教程'; $lang->tutorial->desc = '通过完成一系列任务，快速了解禅道的基本使用方法。这可能会花费您10分钟，你可以随时退出任务。'; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 9f12ca27c7..5aeeb7c9a9 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -11,37 +11,37 @@ */ $lang->upgrade->common = 'Upgrade'; $lang->upgrade->result = 'Result'; -$lang->upgrade->fail = 'Fail'; -$lang->upgrade->success = 'Success'; +$lang->upgrade->fail = 'Failed'; +$lang->upgrade->success = 'Upgraded'; $lang->upgrade->tohome = 'Visit ZenTao'; -$lang->upgrade->license = 'The license of ZentaoPMS has changed to Z PUBLIC LICENSE(ZPL) 1.2.'; -$lang->upgrade->warnning= 'Warning'; -$lang->upgrade->checkExtension = 'Check extension'; +$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->setStatusFile = "

    For security reason, we will check file %s
    - But this file doesn't exist or out of date. You can use the flowing command to create(update)it
    - For linux:touch %s;
    - For windows:echo ok > %s

    - I have done this work, continue upgrade"; - - -$lang->upgrade->selectVersion = 'Select version'; +$lang->upgrade->setStatusFile = '

    Please execute the following command

    +
      +
    • Windows: Open command line and executeecho ok > %s
      • +
    • Linux: touch %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 = "Must select the correct version"; -$lang->upgrade->fromVersion = 'From version'; -$lang->upgrade->toVersion = 'To version'; -$lang->upgrade->confirm = 'Confirm the sql to executed.'; +$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 = 'Because it is incompatible with this version, the following extension automatically disabled, ：'; +$lang->upgrade->forbiddenExt = 'Extension is not compatible with the upgraded version. It has been deactivated:'; $lang->upgrade->fromVersions['0_3beta'] = '0.3 BETA'; $lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 51ef77c624..51a5fc3e4b 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -18,64 +18,64 @@ $lang->user->password = 'Password'; $lang->user->password2 = 'Repeat password'; $lang->user->role = 'Role'; $lang->user->group = 'Group'; -$lang->user->realname = 'Fullname'; +$lang->user->realname = 'Real Name'; $lang->user->nickname = 'Nickname'; -$lang->user->commiter = 'Commit account'; -$lang->user->birthyear = 'Birth year'; +$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 info'; -$lang->user->verify = 'Safety verification'; -$lang->user->contactInfo = 'Contact info'; +$lang->user->basicInfo = 'Basic Info'; +$lang->user->accountInfo = 'Account'; +$lang->user->verify = 'Verification'; +$lang->user->contactInfo = 'Contact'; $lang->user->skype = 'Skype'; $lang->user->qq = 'QQ'; $lang->user->yahoo = 'Yahoo!'; $lang->user->gtalk = 'GTalk'; -$lang->user->wangwang = 'Wangwang'; +$lang->user->wangwang = '旺旺'; $lang->user->mobile = 'Mobile'; $lang->user->phone = 'Phone'; $lang->user->address = 'Address'; -$lang->user->zipcode = 'Zipcode'; -$lang->user->join = 'Join date'; -$lang->user->visits = 'Visits'; +$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 = 'Ranzhi account'; +$lang->user->last = 'Last Login'; +$lang->user->ranzhi = 'Ranger account'; $lang->user->ditto = 'Ditto'; -$lang->user->originalPassword = 'Original password'; -$lang->user->verifyPassword = 'Enter your password'; -$lang->user->resetPassword = 'Reset password'; +$lang->user->originalPassword = 'Old Password'; +$lang->user->verifyPassword = 'Please enter your password'; +$lang->user->resetPassword = 'Forgot Password?'; -$lang->user->index = "Index"; +$lang->user->index = "Home"; $lang->user->view = "Info"; $lang->user->create = "Add"; -$lang->user->batchCreate = "Batch add user"; +$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 ranzhi"; +$lang->user->unbind = "Unbind Ranger"; $lang->user->login = "Login"; $lang->user->mobileLogin = "Mobile"; -$lang->user->editProfile = "Edit profile"; -$lang->user->deny = "Denied"; +$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 to ranzhi?"; -$lang->user->relogin = "Relogin"; +$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->deleted = '(Deleted)'; $lang->user->profile = 'Profile'; $lang->user->project = $lang->projectCommon; $lang->user->task = 'Task'; $lang->user->bug = 'Bug'; -$lang->user->test = 'Test'; -$lang->user->testTask = 'Test task'; -$lang->user->testCase = 'Test case'; -$lang->user->todo = 'Todo'; +$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'; @@ -85,28 +85,28 @@ $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 = 'Canceled by him'; +$lang->user->canceledBy = 'Cancelled by him'; -$lang->user->testTask2Him = 'His build'; -$lang->user->case2Him = 'His case'; -$lang->user->caseByHim = 'Case he opened'; +$lang->user->testTask2Him = 'His Build'; +$lang->user->case2Him = 'His Case'; +$lang->user->caseByHim = 'Case Opened by Him'; -$lang->user->errorDeny = "Sorry, you can't access the %s module's %s feature"; -$lang->user->loginFailed = "Login failed, please check your account and password."; -$lang->user->lockWarning = "You only have %s times to try."; -$lang->user->loginLocked = "You try the password too many times, please contact the administrator or try again after %s minutes."; -$lang->user->weakPassword = "Your password strength is less than the system settings."; +$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 director'; -$lang->user->roleList['pd'] = 'Product director'; -$lang->user->roleList['qd'] = 'Quality Director'; -$lang->user->roleList['top'] = 'Top manager'; -$lang->user->roleList['others'] = 'Others'; +$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'; @@ -119,49 +119,49 @@ $lang->user->statusList['active'] = 'Activate'; $lang->user->statusList['delete'] = 'Deleted'; $lang->user->keepLogin['on'] = 'Keep login'; -$lang->user->loginWithDemoUser = 'Login with demo user:'; +$lang->user->loginWithDemoUser = 'Login as Demo User:'; $lang->user->placeholder = new stdclass(); -$lang->user->placeholder->account = 'Letters/underline/numbers, three above'; -$lang->user->placeholder->password1 = 'Six above'; -$lang->user->placeholder->role = ''; -$lang->user->placeholder->group = ''; -$lang->user->placeholder->commiter = 'The account in version control systems'; -$lang->user->placeholder->verify = 'You need to enter the password to verify.'; +$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] = 'Strength must be middle, 6 or more, having letters,numbers'; -$lang->user->placeholder->passwordStrength[2] = 'Strength must be strong, 10 or more, having letters,numbers,specials'; +$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，Letters/underline/numbers, three above"; -$lang->user->error->accountDupl = "ID %s，this account has been exist"; -$lang->user->error->realname = "ID %s，please input realname"; -$lang->user->error->password = "ID %s，password must be six letters at least"; -$lang->user->error->mail = "ID %s，please input correct email address"; -$lang->user->error->role = "ID %s，please input role"; +$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 = "Password error security verification. Please enter your login password."; -$lang->user->error->originalPassword = "The original password is not correct"; +$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 = 'Contacts'; -$lang->user->contacts->listName = 'List name'; +$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 = 'Users'; -$lang->user->contacts->selectList = 'List'; -$lang->user->contacts->createList = 'Create a list'; -$lang->user->contacts->noListYet = 'No contacts list yet, please create a list first.'; -$lang->user->contacts->confirmDelete = 'Are you sure to delete this 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 fail, Check account"; -$lang->user->resetSuccess = "Reset success."; -$lang->user->noticeResetFile = "
    For security reason, system need to confirm you're administrator of zentao system.
    -
    Please login into the zentao host and create the %s file.
    +$lang->user->resetFail = "Reset failed. Please check the account"; +$lang->user->resetSuccess = "Password reset! Please use your new password to login."; +$lang->user->noticeResetFile = "
    For security reason, your Administrator account has to be verified.
    +
    Please login into your Zentao host and create the %s file.

    Note:

      -
    1. Keep the ok.txt content empty.
      2. -
    2. If the file exists already, remove and recreate it again.
      3. -
    "; +
  • Keep the ok.txt empty.
    • +
  • If ok.txt exists, remove it and create one again.
    • + ";