diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 939fb4b44a..5a83ee36fa 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -63,7 +63,7 @@ $lang->restore = 'Reset'; $lang->comment = 'Note'; $lang->history = 'History'; $lang->attatch = 'File'; -$lang->reverse = 'Reverse'; +$lang->reverse = 'Inverse'; $lang->switchDisplay = 'Toggle'; $lang->expand = 'Expand'; $lang->collapse = 'Collapse'; @@ -80,7 +80,7 @@ $lang->ipLimited = "fold = '-'; $lang->homepage = 'Set Home'; -$lang->noviceTutorial = 'Tutorial'; +$lang->noviceTutorial = 'ZenTao Tutorial'; $lang->changeLog = 'Change Log'; $lang->manual = 'User Manual'; $lang->manualUrl = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html'; @@ -99,7 +99,7 @@ $lang->selectAll = 'Select All'; $lang->selectReverse = 'Select Inverse'; $lang->loading = 'Loading...'; $lang->notFound = 'Not found!'; -$lang->notPage = 'Sorry, the features you are visiting are under development!'; +$lang->notPage = 'Sorry, the features you are visiting are in development!'; $lang->showAll = '[[Show All]]'; $lang->future = 'Pending'; @@ -143,7 +143,7 @@ $lang->searchObjects['productplan'] = $lang->productCommon . 'Plan'; $lang->searchObjects['testtask'] = 'Test'; $lang->searchObjects['doc'] = 'Doc'; $lang->searchObjects['testsuite'] = 'Case Library'; -$lang->searchObjects['testreport'] = 'Testing Report'; +$lang->searchObjects['testreport'] = 'Test Report'; $lang->searchTips = 'ID (ctrl+g)'; /* Code formats for import. */ @@ -237,7 +237,7 @@ $lang->project->menu = new stdclass(); $lang->project->menu->task = array('link' => 'Task|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'importtask,importbug'); $lang->project->menu->kanban = array('link' => 'Kanban|project|kanban|projectID=%s'); -$lang->project->menu->burn = array('link' => 'Burndown Chart|project|burn|projectID=%s'); +$lang->project->menu->burn = array('link' => 'Burndown|project|burn|projectID=%s'); $lang->project->menu->list = array('link' => 'More|project|grouptask|projectID=%s', 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover'); $lang->project->menu->story = array('link' => 'Story|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory,storykanban'); $lang->project->menu->qa = array('link' => 'Test|project|bug|projectID=%s', 'subModule' => 'bug,build,testtask', 'alias' => 'build,testtask', 'class' => 'dropdown dropdown-hover'); @@ -349,15 +349,15 @@ $lang->report->menu->test = array('link' => 'Test|report|bugcreate', 'alias' $lang->report->menu->staff = array('link' => 'Company|report|workload'); $lang->report->notice = new stdclass(); -$lang->report->notice->help = 'Note: Report is generated on search results of the list. Please search in the list before you generate a report.'; +$lang->report->notice->help = 'Note: Report is generated based on the search results of the list. Please search in the list before you generate a report.'; /* Company menu settings. */ $lang->company = new stdclass(); $lang->company->menu = new stdclass(); $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' => 'Permission|group|browse', 'subModule' => 'group'); -$lang->company->menu->dynamic = 'Dynamic|company|dynamic|'; +$lang->company->menu->browseGroup = array('link' => 'Privilege|group|browse', 'subModule' => 'group'); +$lang->company->menu->dynamic = 'Dynamics|company|dynamic|'; $lang->company->menu->view = array('link' => 'Company|company|view'); $lang->dept = new stdclass(); @@ -385,7 +385,7 @@ $lang->admin->subMenu = new stdclass(); $lang->admin->subMenu->message = new stdclass(); $lang->admin->subMenu->message->mail = array('link' => 'Mail|mail|index', 'subModule' => 'mail'); $lang->admin->subMenu->message->webhook = array('link' => 'Webhook|webhook|browse', 'subModule' => 'webhook'); -$lang->admin->subMenu->message->setting = array('link' => 'Setting|message|setting', 'subModule' => 'message'); +$lang->admin->subMenu->message->setting = array('link' => 'Settings|message|setting', 'subModule' => 'message'); $lang->admin->subMenu->sso = new stdclass(); $lang->admin->subMenu->sso->ranzhi = 'Zdoo|admin|sso'; @@ -398,7 +398,7 @@ $lang->admin->subMenu->dev->entry = array('link' => 'Entry|entry|browse', 'subM $lang->admin->subMenu->data = new stdclass(); $lang->admin->subMenu->data->backup = array('link' => 'Backup|backup|index', 'subModule' => 'backup'); -$lang->admin->subMenu->data->trash = 'Recycle Bin|action|trash'; +$lang->admin->subMenu->data->trash = 'Recycle|action|trash'; $lang->admin->subMenu->system = new stdclass(); $lang->admin->subMenu->system->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron'); @@ -756,11 +756,11 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->bug->menu = new stdclass(); $lang->bug->menu->all = 'All|bug|browse|productID=%s&branch=%s&browseType=all¶m=%s'; $lang->bug->menu->unclosed = 'Open|bug|browse|productID=%s&branch=%s&browseType=unclosed¶m=%s'; - $lang->bug->menu->openedbyme = 'CreateByMe|bug|browse|productID=%s&branch=%s&browseType=openedbyme¶m=%s'; - $lang->bug->menu->assigntome = 'AssignToMe|bug|browse|productID=%s&branch=%s&browseType=assigntome¶m=%s'; - $lang->bug->menu->resolvedbyme = 'ResolveByMe|bug|browse|productID=%s&branch=%s&browseType=resolvedbyme¶m=%s'; + $lang->bug->menu->openedbyme = 'CreatedByMe|bug|browse|productID=%s&branch=%s&browseType=openedbyme¶m=%s'; + $lang->bug->menu->assigntome = 'AssignedToMe|bug|browse|productID=%s&branch=%s&browseType=assigntome¶m=%s'; + $lang->bug->menu->resolvedbyme = 'SolvedByMe|bug|browse|productID=%s&branch=%s&browseType=resolvedbyme¶m=%s'; $lang->bug->menu->toclosed = 'ToBeClosed|bug|browse|productID=%s&branch=%s&browseType=toclosed¶m=%s'; - $lang->bug->menu->unresolved = 'Unresolved|bug|browse|productID=%s&branch=%s&browseType=unresolved¶m=%s'; + $lang->bug->menu->unresolved = 'Unsolved|bug|browse|productID=%s&branch=%s&browseType=unresolved¶m=%s'; $lang->bug->menu->more = array('link' => 'More|bug|browse|productID=%s&branch=%s&browseType=unconfirmed¶m=%s', 'class' => 'dropdown dropdown-hover'); $lang->bug->subMenu = new stdclass(); @@ -770,7 +770,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->bug->subMenu->more->longlifebugs = 'Pending|bug|browse|productID=%s&branch=%s&browseType=longlifebugs¶m=%s'; $lang->bug->subMenu->more->postponedbugs = 'Postponed|bug|browse|productID=%s&branch=%s&browseType=postponedbugs¶m=%s'; $lang->bug->subMenu->more->overduebugs = 'Overdue|bug|browse|productID=%s&branch=%s&browseType=overduebugs¶m=%s'; - $lang->bug->subMenu->more->needconfirm = 'ToConfirm|bug|browse|productID=%s&branch=%s&browseType=needconfirm¶m=%s'; + $lang->bug->subMenu->more->needconfirm = 'ToBeConfirmed|bug|browse|productID=%s&branch=%s&browseType=needconfirm¶m=%s'; $lang->bug->menuOrder[5] = 'product'; $lang->bug->menuOrder[10] = 'all'; diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php index af782c1c2e..a82507b826 100644 --- a/module/dev/lang/en.php +++ b/module/dev/lang/en.php @@ -12,8 +12,8 @@ $lang->dev->noParams = 'No Parameters'; $lang->dev->post = 'POST Parameter'; $lang->dev->paramRange = 'Parameter Range: %s'; -$lang->dev->paramDate = 'Date format: YY-mm-dd. such as 2019-01-01'; -$lang->dev->paramColor = 'Color format: #RGB. such as #3da7f5'; +$lang->dev->paramDate = 'Date format: YY-mm-dd, e.g 2019-01-01'; +$lang->dev->paramColor = 'Color format: #RGB, e.g. #3da7f5'; $lang->dev->paramMailto = "User account. Separate accounts by ','."; $lang->dev->fields = array(); @@ -41,7 +41,7 @@ $lang->dev->tableList['effort'] = 'Effort'; $lang->dev->tableList['extension'] = 'Extension'; $lang->dev->tableList['file'] = 'File'; $lang->dev->tableList['group'] = 'Group'; -$lang->dev->tableList['grouppriv'] = 'Permission'; +$lang->dev->tableList['grouppriv'] = 'Privilege'; $lang->dev->tableList['history'] = 'History'; $lang->dev->tableList['lang'] = 'Language'; $lang->dev->tableList['module'] = 'Module'; @@ -75,7 +75,7 @@ $lang->dev->tableList['git'] = 'GIT'; $lang->dev->tableList['index'] = 'Home'; $lang->dev->tableList['install'] = 'Install'; $lang->dev->tableList['mail'] = 'Email'; -$lang->dev->tableList['misc'] = 'Misc'; +$lang->dev->tableList['misc'] = 'Misc.'; $lang->dev->tableList['my'] = 'Dashboard'; $lang->dev->tableList['qa'] = 'QA'; $lang->dev->tableList['report'] = 'Report'; @@ -101,7 +101,7 @@ $lang->dev->tableList['webhook'] = 'WebHook'; $lang->dev->tableList['log'] = 'Log'; $lang->dev->tableList['message'] = 'Message'; $lang->dev->tableList['notify'] = 'Notify'; -$lang->dev->tableList['userview'] = 'User Permission'; +$lang->dev->tableList['userview'] = 'User Privilege'; $lang->dev->groupList['my'] = 'Dashboard'; $lang->dev->groupList['product'] = $lang->productCommon; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 4ed98594ef..bedb5eb397 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -9,7 +9,7 @@ * @version $Id: en.php 4719 2013-05-03 02:20:28Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->group->common = 'Permission'; +$lang->group->common = 'Privilege'; $lang->group->browse = 'Groups'; $lang->group->create = 'Add Group'; $lang->group->edit = 'Edit'; @@ -17,18 +17,18 @@ $lang->group->copy = 'Copy'; $lang->group->delete = 'Delete'; $lang->group->manageView = 'View'; $lang->group->managePriv = 'Batch Assign'; -$lang->group->managePrivByGroup = 'Permission'; -$lang->group->managePrivByModule = 'Module Permission'; +$lang->group->managePrivByGroup = 'Grooup Privilege'; +$lang->group->managePrivByModule = 'Module Privilege'; $lang->group->byModuleTips = '(Press Shift/Ctrl to Multi-select)'; $lang->group->manageMember = 'Member'; $lang->group->confirmDelete = 'Do you want to delete this User Group?'; $lang->group->successSaved = 'Saved.'; $lang->group->errorNotSaved = 'Failed. Please select actions and groups.'; -$lang->group->viewList = 'View'; -$lang->group->productList = 'Product'; -$lang->group->projectList = 'Project'; +$lang->group->viewList = 'Access View'; +$lang->group->productList = 'Access Product'; +$lang->group->projectList = 'Access Project'; $lang->group->dynamic = 'Dynamics'; -$lang->group->noticeVisit = 'Empty means no access.'; +$lang->group->noticeVisit = 'Leave it empty, then the user group have no access'; $lang->group->id = 'ID'; $lang->group->name = 'Name'; @@ -43,9 +43,9 @@ $lang->group->option = 'Option'; $lang->group->inside = 'Group Users'; $lang->group->outside = 'Other Users'; $lang->group->other = 'Others'; -$lang->group->all = 'All Permissions'; +$lang->group->all = 'All Privileges'; -$lang->group->copyOptions['copyPriv'] = 'Copy Permissions'; +$lang->group->copyOptions['copyPriv'] = 'Copy Privileges'; $lang->group->copyOptions['copyUser'] = 'Copy Users'; $lang->group->versions[''] = 'History'; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index f928ea976a..b193290c5c 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -151,14 +151,14 @@ $lang->install->groupList['TOP']['desc'] = 'Senior Manager'; $lang->install->groupList['OTHERS']['name'] = 'Other'; $lang->install->groupList['OTHERS']['desc'] = 'other users'; $lang->install->groupList['LIMITED']['name'] = 'Limited User'; -$lang->install->groupList['LIMITED']['desc'] = 'User can only edit contents related to itself'; +$lang->install->groupList['LIMITED']['desc'] = 'Users can only edit contents related to themselves.'; $lang->install->cronList[''] = 'Monitor cron'; -$lang->install->cronList['moduleName=project&methodName=computeburn'] = 'Update Burndown Charts'; -$lang->install->cronList['moduleName=report&methodName=remind'] = 'Daily task reminder'; +$lang->install->cronList['moduleName=project&methodName=computeburn'] = 'Update Burndown Chart'; +$lang->install->cronList['moduleName=report&methodName=remind'] = 'Daily Task Reminder'; $lang->install->cronList['moduleName=svn&methodName=run'] = 'Synchronize SVN'; $lang->install->cronList['moduleName=git&methodName=run'] = 'Synchronize GIT'; -$lang->install->cronList['moduleName=backup&methodName=backup'] = 'Backup data&file'; +$lang->install->cronList['moduleName=backup&methodName=backup'] = 'Backup Data'; $lang->install->cronList['moduleName=mail&methodName=asyncSend'] = 'Asynchronize sending Message'; $lang->install->cronList['moduleName=webhook&methodName=asyncSend'] = 'Asynchronize sending Webhook'; $lang->install->cronList['moduleName=admin&methodName=deleteLog'] = 'Delete overdue logs'; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index 29aa7b3c38..8bfa6e6eb7 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -19,7 +19,7 @@ $lang->my->unbind = 'Unbind Zdoo'; $lang->my->manageContacts = 'Manage Contact'; $lang->my->deleteContacts = 'Delete Contact'; $lang->my->shareContacts = 'Share the list'; -$lang->my->limited = 'Restricted actions (editing only content related to itself)'; +$lang->my->limited = 'Limited actions (only edit content related to themselves)'; $lang->my->score = 'My Point'; $lang->my->scoreRule = 'Point Rule'; $lang->my->noTodo = 'No todos. '; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index db1af2ee72..28f33b5691 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -87,7 +87,7 @@ $lang->team->hours = 'Man-hour/day'; $lang->team->days = 'Man-day'; $lang->team->totalHours = 'Total Hours'; -$lang->team->limited = 'limited User'; +$lang->team->limited = 'Limited User'; $lang->team->limitedList['no'] = 'No'; $lang->team->limitedList['yes'] = 'Yes';