diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 31ec64619d..d833697715 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -143,71 +143,71 @@ $lang->action->desc->unlinkrelatedcase = '$date, $actor unlinke /* 用来显示动态信息。*/ $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 '; -$lang->action->label->editfile = 'Edit '; -$lang->action->label->erased = 'Erased '; -$lang->action->label->undeleted = 'Restored '; -$lang->action->label->hidden = 'Hid '; -$lang->action->label->commented = 'Commented '; -$lang->action->label->activated = 'Activated '; -$lang->action->label->blocked = 'Blocked '; -$lang->action->label->resolved = 'Solved '; -$lang->action->label->reviewed = 'Reviewed '; -$lang->action->label->moved = 'Moved '; -$lang->action->label->confirmed = 'Confirmed story'; -$lang->action->label->bugconfirmed = 'Confirmed'; -$lang->action->label->tostory = 'Converted to Story'; -$lang->action->label->frombug = 'Converted from Bug'; -$lang->action->label->fromlib = 'Imported from Library'; -$lang->action->label->totask = 'Converted to Task'; +$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 '; +$lang->action->label->editfile = 'edited '; +$lang->action->label->erased = 'erased '; +$lang->action->label->undeleted = 'restored '; +$lang->action->label->hidden = 'hid '; +$lang->action->label->commented = 'commented '; +$lang->action->label->activated = 'activated '; +$lang->action->label->blocked = 'blocked '; +$lang->action->label->resolved = 'solved '; +$lang->action->label->reviewed = 'reviewed '; +$lang->action->label->moved = 'moved '; +$lang->action->label->confirmed = 'confirmed story'; +$lang->action->label->bugconfirmed = 'confirmed'; +$lang->action->label->tostory = 'converted to Story'; +$lang->action->label->frombug = 'converted from Bug'; +$lang->action->label->fromlib = 'imported from Library'; +$lang->action->label->totask = 'converted to Task'; $lang->action->label->svncommited = 'SVN committed'; $lang->action->label->gitcommited = 'Git committed'; -$lang->action->label->linked2plan = 'Linked to Plan'; -$lang->action->label->unlinkedfromplan = 'Unlinked from'; -$lang->action->label->changestatus = 'Changed Status'; -$lang->action->label->marked = 'Marked'; -$lang->action->label->linked2project = "Link {$lang->projectCommon}"; -$lang->action->label->unlinkedfromproject = "Unlink {$lang->projectCommon}"; -$lang->action->label->unlinkedfrombuild = "Unlink Build"; -$lang->action->label->linked2release = "Link Release"; -$lang->action->label->unlinkedfromrelease = "Unlink Release"; -$lang->action->label->linkrelatedbug = "Linked Bug"; -$lang->action->label->unlinkrelatedbug = "Unlinked Bug"; -$lang->action->label->linkrelatedcase = "Linked Case"; -$lang->action->label->unlinkrelatedcase = "Unlinked Case"; -$lang->action->label->linkrelatedstory = "Linked Story"; -$lang->action->label->unlinkrelatedstory = "Unlinked Story"; -$lang->action->label->subdividestory = "Decomposed Story"; -$lang->action->label->unlinkchildstory = "Unlinked Story"; -$lang->action->label->started = 'Started '; -$lang->action->label->restarted = 'Continued '; -$lang->action->label->recordestimate = 'Recorded '; -$lang->action->label->editestimate = 'Edited '; -$lang->action->label->canceled = 'Cancelled '; -$lang->action->label->finished = 'Finished '; -$lang->action->label->paused = 'Paused '; -$lang->action->label->verified = 'Verified '; -$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 "; -$lang->action->label->linked2build = "Linked "; -$lang->action->label->linked2bug = "Linked "; -$lang->action->label->linkchildtask = "Linked a child task"; -$lang->action->label->unlinkchildrentask = "Unlinked a child task"; -$lang->action->label->linkparenttask = "Linked a parent task"; -$lang->action->label->unlinkparenttask = "Unlink from parent task"; -$lang->action->label->batchcreate = "Batch created tasks"; -$lang->action->label->createchildren = "Create children task"; -$lang->action->label->managed = "Managed"; +$lang->action->label->linked2plan = 'linked to Plan'; +$lang->action->label->unlinkedfromplan = 'unlinked from'; +$lang->action->label->changestatus = 'changed status'; +$lang->action->label->marked = 'marked'; +$lang->action->label->linked2project = "linked to {$lang->projectCommon}"; +$lang->action->label->unlinkedfromproject = "unlinked from {$lang->projectCommon}"; +$lang->action->label->unlinkedfrombuild = "unlinked Build"; +$lang->action->label->linked2release = "linked Release"; +$lang->action->label->unlinkedfromrelease = "unlinked Release"; +$lang->action->label->linkrelatedbug = "linked Bug"; +$lang->action->label->unlinkrelatedbug = "unlinked Bug"; +$lang->action->label->linkrelatedcase = "linked Case"; +$lang->action->label->unlinkrelatedcase = "unlinked Case"; +$lang->action->label->linkrelatedstory = "linked Story"; +$lang->action->label->unlinkrelatedstory = "unlinked Story"; +$lang->action->label->subdividestory = "decomposed Story"; +$lang->action->label->unlinkchildstory = "unlinked Story"; +$lang->action->label->started = 'started '; +$lang->action->label->restarted = 'continued '; +$lang->action->label->recordestimate = 'recorded '; +$lang->action->label->editestimate = 'edited '; +$lang->action->label->canceled = 'cancelled '; +$lang->action->label->finished = 'finished '; +$lang->action->label->paused = 'paused '; +$lang->action->label->verified = 'verified '; +$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 "; +$lang->action->label->linked2build = "linked "; +$lang->action->label->linked2bug = "linked "; +$lang->action->label->linkchildtask = "linked a child task"; +$lang->action->label->unlinkchildrentask = "unlinked a child task"; +$lang->action->label->linkparenttask = "linked a parent task"; +$lang->action->label->unlinkparenttask = "unlink from parent task"; +$lang->action->label->batchcreate = "batch created tasks"; +$lang->action->label->createchildren = "create child tasks"; +$lang->action->label->managed = "managed"; /* 动态信息按照对象分组 */ $lang->action->dynamicAction = new stdclass; diff --git a/module/backup/lang/en.php b/module/backup/lang/en.php index 00b73093c1..92a6375d5c 100644 --- a/module/backup/lang/en.php +++ b/module/backup/lang/en.php @@ -5,8 +5,8 @@ $lang->backup->history = 'History'; $lang->backup->delete = 'Delete'; $lang->backup->backup = 'Back Up'; $lang->backup->restore = 'Restore'; -$lang->backup->change = 'Modify Expiration'; -$lang->backup->changeAB = 'Modify'; +$lang->backup->change = 'Edit Expiration'; +$lang->backup->changeAB = 'Edit'; $lang->backup->rmPHPHeader = 'Remove PHP header'; $lang->backup->time = 'Date'; @@ -15,17 +15,17 @@ $lang->backup->size = 'Size'; $lang->backup->setting = 'Settings'; $lang->backup->settingDir = 'Backup Directory'; -$lang->backup->settingList['nofile'] = 'No backup files and codes.'; -$lang->backup->settingList['nozip'] = 'Only copy files and no zip.'; -$lang->backup->settingList['nosafe'] = 'No prevent downloading PHP file header.'; +$lang->backup->settingList['nofile'] = 'Do not back up files or codes.'; +$lang->backup->settingList['nozip'] = 'Only copy files and do not no zip it.'; +$lang->backup->settingList['nosafe'] = 'Do not prevent downloading PHP file header.'; -$lang->backup->waitting = ' In Progress. Please wait...'; -$lang->backup->progressSQL = '

SQL backup, %s is backed up.

'; -$lang->backup->progressAttach = '

SQL backup completed.

Attachment backup, %s is backed up.

'; -$lang->backup->progressCode = '

SQL backup completed.

Attachment backup completed.

Code backup, %s isbacked up.

'; +$lang->backup->waitting = ' is ongoing. Please wait...'; +$lang->backup->progressSQL = '

SQL backup: %s is backed up.

'; +$lang->backup->progressAttach = '

SQL backup is completed.

Attachment backup: %s is backed up.

'; +$lang->backup->progressCode = '

SQL backup is completed.

Attachment backup is completed.

Code backup: %s is backed up.

'; $lang->backup->confirmDelete = 'Do you want to delete the backup?'; $lang->backup->confirmRestore = 'Do you want to restore the backup?'; -$lang->backup->holdDays = 'Reserve last %s days of backup'; +$lang->backup->holdDays = 'Hold last %s days of backup'; $lang->backup->restoreTip = 'Only files and databases can be restored by clicking Restore. Code can be restored manually.'; $lang->backup->success = new stdclass(); @@ -33,10 +33,10 @@ $lang->backup->success->backup = 'Done!'; $lang->backup->success->restore = 'Restored!'; $lang->backup->error = new stdclass(); -$lang->backup->error->noCreateDir = 'Directory does not exist, and cannot be created'; +$lang->backup->error->noCreateDir = 'Directory does not exist and cannot be created'; $lang->backup->error->noWritable = "%s is not writable! Please check the privilege, or backup will not be done."; $lang->backup->error->noDelete = "%s cannot be deleted. Please modify the privilege or manually delete it."; -$lang->backup->error->restoreSQL = "Restoring database library failed. Error %s."; -$lang->backup->error->restoreFile = "File restoration failed. Error %s."; -$lang->backup->error->backupFile = "File backup failed. Error %s."; -$lang->backup->error->backupCode = "Code backup failed. Error %s."; +$lang->backup->error->restoreSQL = "Failed to restore the database library. Error %s."; +$lang->backup->error->restoreFile = "Failed to restore the file. Error %s."; +$lang->backup->error->backupFile = "Failed to back up the file. Error %s."; +$lang->backup->error->backupCode = "Failed to back up the code. Error %s."; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index de53f6095d..462d1d5075 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -41,17 +41,17 @@ $lang->bug->openedBy = 'ReportedBy'; $lang->bug->openedDate = 'ReportedDate'; $lang->bug->openedDateAB = 'Reported'; $lang->bug->openedBuild = 'Open Build'; -$lang->bug->assignedTo = 'AssignedTo'; -$lang->bug->assignBug = 'AssignTo'; +$lang->bug->assignedTo = 'AssignTo'; +$lang->bug->assignBug = 'AssignedTo'; $lang->bug->assignedToAB = 'AssignedTo'; $lang->bug->assignedDate = 'AssignedDate'; $lang->bug->resolvedBy = 'SolvedBy'; $lang->bug->resolvedByAB = 'SolvedBy'; $lang->bug->resolution = 'Solution'; $lang->bug->resolutionAB = 'Solution'; -$lang->bug->resolvedBuild = 'Solved Build'; -$lang->bug->resolvedDate = 'SolvedDate'; -$lang->bug->resolvedDateAB = 'Solved'; +$lang->bug->resolvedBuild = 'Build'; +$lang->bug->resolvedDate = 'Solved Date'; +$lang->bug->resolvedDateAB = 'SolvedDate'; $lang->bug->deadline = 'Deadline'; $lang->bug->plan = 'Plan'; $lang->bug->closedBy = 'ClosedBy'; @@ -92,7 +92,7 @@ $lang->bug->close = 'Close'; $lang->bug->activate = 'Activate'; $lang->bug->batchActivate = 'Batch Activate'; $lang->bug->reportChart = 'Report'; -$lang->bug->export = 'Export'; +$lang->bug->export = 'Export Data'; $lang->bug->delete = 'Delete'; $lang->bug->deleted = 'Deleted'; $lang->bug->confirmStoryChange = 'Confirm Story Change'; @@ -137,7 +137,7 @@ $lang->bug->lblAssignedTo = 'AssignTo'; $lang->bug->lblMailto = 'Mailto'; $lang->bug->lblLastEdited = 'ModifiedBy'; $lang->bug->lblResolved = 'SolvedBy'; -$lang->bug->allUsers = 'All Users'; +$lang->bug->allUsers = 'Load All Users'; $lang->bug->allBuilds = 'All Builds'; $lang->bug->createBuild = 'New'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 46d0c5beb0..9b86dd2346 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -371,7 +371,7 @@ $lang->user->menu = $lang->company->menu; $lang->admin = new stdclass(); $lang->admin->menu = new stdclass(); $lang->admin->menu->index = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany'); -$lang->admin->menu->message = array('link' => 'Message|message|index', 'subModule' => 'message,mail,webhook'); +$lang->admin->menu->message = array('link' => 'Notification|message|index', 'subModule' => 'message,mail,webhook'); $lang->admin->menu->custom = array('link' => 'Custom|custom|set', 'subModule' => 'custom'); $lang->admin->menu->sso = array('link' => 'Integration|admin|sso'); diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index a06fd29f2e..669396d19b 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -14,7 +14,7 @@ $lang->custom->module = 'Module'; $lang->custom->section = 'Section'; $lang->custom->lang = 'Language'; $lang->custom->setPublic = 'Set Public'; -$lang->custom->required = 'Required'; +$lang->custom->required = 'Required Fields'; $lang->custom->score = 'Point'; $lang->custom->timezone = 'Timezone'; $lang->custom->scoreReset = 'Reset Point'; diff --git a/module/editor/lang/en.php b/module/editor/lang/en.php index 3fc2221dec..8cce94f89a 100644 --- a/module/editor/lang/en.php +++ b/module/editor/lang/en.php @@ -3,23 +3,23 @@ $lang->editor->common = 'Editor'; $lang->editor->api = 'API'; $lang->editor->index = 'Home'; $lang->editor->newMethod = 'New Method'; -$lang->editor->extend = 'Plug-in'; +$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 Plug-in'; +$lang->editor->newExtend = 'New Extension'; $lang->editor->newPage = 'New Page'; $lang->editor->override = 'Overwrite'; -$lang->editor->edit = 'Edit Plug-in'; +$lang->editor->edit = 'Edit Extension'; $lang->editor->save = 'Save Page'; $lang->editor->delete = 'Delete Page'; $lang->editor->moduleList = 'Module'; -$lang->editor->filePath = "Plug-in:"; +$lang->editor->filePath = "Extension:"; $lang->editor->sourceFile = 'Source File:'; $lang->editor->fileName = "File Name:"; -$lang->editor->isOverride = "Overwrote Duplicated File"; +$lang->editor->isOverride = "Override Duplicated File"; $lang->editor->exampleHook = "(e.g. ***.html.hook.php)"; $lang->editor->exampleJs = "(e.g. ***.js)"; $lang->editor->exampleCss = "(e.g. ***.css)"; @@ -51,7 +51,7 @@ $lang->editor->modules['company'] = 'Company'; $lang->editor->modules['convert'] = 'Convert'; $lang->editor->modules['dept'] = 'Department'; $lang->editor->modules['doc'] = 'Doc'; -$lang->editor->modules['extension'] = 'Plug-in'; +$lang->editor->modules['extension'] = 'Extension'; $lang->editor->modules['file'] = 'File'; $lang->editor->modules['group'] = 'Group'; $lang->editor->modules['index'] = 'Homepage'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 7d068cec82..5e48519e37 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -87,7 +87,7 @@ $lang->story->plan = 'Linked Plans'; $lang->story->planAB = 'Plan'; $lang->story->comment = 'Comment'; $lang->story->linkStories = 'Linked Stories'; -$lang->story->childStories = 'Decomposed Story'; +$lang->story->childStories = 'Decomposed Stories'; $lang->story->duplicateStory = 'Duplicated Story'; $lang->story->reviewResult = 'Review Result'; $lang->story->preVersion = 'Last Version'; @@ -176,7 +176,7 @@ $lang->story->legendBugs = 'Linked Bugs'; $lang->story->legendFromBug = 'From Bug'; $lang->story->legendCases = 'Linked Cases'; $lang->story->legendLinkStories = 'Linked Stories'; -$lang->story->legendChildStories = 'Decomposed Story'; +$lang->story->legendChildStories = 'Decomposed Stories'; $lang->story->legendSpec = 'Description'; $lang->story->legendVerify = 'Acceptance'; $lang->story->legendMisc = 'Misc.'; @@ -196,7 +196,7 @@ $lang->story->specTemplate = "As a < type of user >, I want < some goal $lang->story->needNotReview = 'No Review Required'; $lang->story->successSaved = "Story is saved!"; $lang->story->confirmDelete = "Do you want to delete this Story?"; -$lang->story->errorEmptyChildStory = '『Decomposed Story』canot be blank.'; +$lang->story->errorEmptyChildStory = '『Decomposed Stories』canot be blank.'; $lang->story->mustChooseResult = 'Select Result'; $lang->story->mustChoosePreVersion = 'Select a version to revert to.'; $lang->story->noStory = 'No stories yet. '; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 705f4a7e50..a49052d8c0 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -117,7 +117,7 @@ $lang->task->lblTestStory = 'Story Tested'; $lang->task->ditto = 'Ditto'; $lang->task->dittoNotice = "This Task is not linked to the project as the previous one is!"; $lang->task->selectTestStory = 'Select Story Testd'; -$lang->task->selectAllUser = 'Load All Users'; +$lang->task->selectAllUser = 'All Users'; $lang->task->noStory = 'No Story Linked'; $lang->task->noAssigned = 'Unassigned'; $lang->task->noFinished = 'Unfinished'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 9650c20c81..9828f296c6 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -94,7 +94,7 @@ $lang->user->todo = 'Todo'; $lang->user->story = 'Story'; $lang->user->dynamic = 'Dynamics'; -$lang->user->openedBy = 'Openedby'; +$lang->user->openedBy = 'CreatedBy'; $lang->user->assignedTo = 'AssignedTo'; $lang->user->finishedBy = 'FinishedBy'; $lang->user->resolvedBy = 'SolvedBy'; @@ -106,7 +106,7 @@ $lang->user->testTask2Him = 'BuildBy'; $lang->user->case2Him = 'Case AssignedTo'; $lang->user->caseByHim = 'Case CreatedBy'; -$lang->user->errorDeny = "Sorry, your access to %s of %s is denied. Please contact your Admin to get permissions. Click Back to return."; +$lang->user->errorDeny = "Sorry, your access to %s of %s is denied. Please contact your Admin to get privileges. 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 minutes later."; @@ -149,10 +149,10 @@ $lang->user->tpl->content = 'Content'; $lang->user->tpl->public = 'Public'; $lang->user->placeholder = new stdclass(); -$lang->user->placeholder->account = 'Letters, underline and numbers, >= 3 characters'; +$lang->user->placeholder->account = '>= 3 letters, underline and numbers'; $lang->user->placeholder->password1 = '>= 6 characters'; -$lang->user->placeholder->role = "Role is related to content and user order."; -$lang->user->placeholder->group = "Group is related to user permissions."; +$lang->user->placeholder->role = "Role is related to content and user listing order."; +$lang->user->placeholder->group = "Group is related to user privileges."; $lang->user->placeholder->commiter = 'SVN/Git account'; $lang->user->placeholder->verify = 'Please enter your login password.';