diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 922bce1f49..fddf69a611 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -27,7 +27,7 @@ $lang->action->hideAll = 'Hide All'; $lang->action->editComment = 'Edit'; $lang->action->comment = 'Comment'; -$lang->action->trashTips = 'Note: Delete in ZenTao is logic.'; +$lang->action->trashTips = 'Note: All Deletion in ZenTao are logical.'; $lang->action->textDiff = 'Text Format'; $lang->action->original = 'Original Format'; $lang->action->confirmHideAll = 'Do you want to hide all the records?'; diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php index a4f9a569c5..b09a3818d8 100755 --- a/module/action/view/trash.html.php +++ b/module/action/view/trash.html.php @@ -23,7 +23,7 @@ recTotal}&recPerPage={$pager->recPerPage}"; ?> - action->objectType);?> + action->objectType);?> idAB);?> action->objectName;?> action->actor);?> diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 2d7b427ca2..643e542eff 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -54,20 +54,20 @@ $lang->admin->bind->success = "Account has been linked!"; $lang->admin->safe = new stdclass(); $lang->admin->safe->common = 'Security Policy'; -$lang->admin->safe->set = 'Password Security Settings'; -$lang->admin->safe->password = 'Password Security'; -$lang->admin->safe->weak = 'Weak Password'; +$lang->admin->safe->set = 'PasswordStrength'; +$lang->admin->safe->password = 'Password Strength'; +$lang->admin->safe->weak = 'Weak Passwords'; $lang->admin->safe->reason = 'Type'; -$lang->admin->safe->checkWeak = 'Weak Password Check'; -$lang->admin->safe->changeWeak = 'Change weak password'; +$lang->admin->safe->checkWeak = 'WeakPasswords'; +$lang->admin->safe->changeWeak = 'Weak password must be strengthen'; $lang->admin->safe->modifyPasswordFirstLogin = 'Change password when first login'; $lang->admin->safe->modeList[0] = 'N/A'; $lang->admin->safe->modeList[1] = 'Medium'; $lang->admin->safe->modeList[2] = 'Strong'; -$lang->admin->safe->modeRuleList[1] = 'must contain letters and numbers, at least six characters.'; -$lang->admin->safe->modeRuleList[2] = 'must contain letters, numbers and special characters, at least 10 characters.'; +$lang->admin->safe->modeRuleList[1] = 'Contains upper and lower case, numbers. Length >= 6'; +$lang->admin->safe->modeRuleList[2] = 'Contains upper and lower case, numbers and special characters. Length >= 10.'; $lang->admin->safe->reasonList['weak'] = 'Common Weak Password'; $lang->admin->safe->reasonList['account'] = 'Same as your account'; @@ -78,5 +78,5 @@ $lang->admin->safe->reasonList['birthday'] = 'Same as your DOB'; $lang->admin->safe->modifyPasswordList[1] = 'Yes'; $lang->admin->safe->modifyPasswordList[0] = 'No'; -$lang->admin->safe->noticeMode = 'User password will be checked when login, add/edit user password.'; -$lang->admin->safe->noticeStrong = 'The more uppercase letters and numbers a password has, the more secure it is!'; +$lang->admin->safe->noticeMode = 'Password will be checked when login, add/edit user.'; +$lang->admin->safe->noticeStrong = ''; diff --git a/module/backup/lang/en.php b/module/backup/lang/en.php index f197def427..d3df0e55ca 100644 --- a/module/backup/lang/en.php +++ b/module/backup/lang/en.php @@ -5,18 +5,18 @@ $lang->backup->history = 'History'; $lang->backup->delete = 'Delete'; $lang->backup->backup = 'Backup'; $lang->backup->restore = 'Restore'; -$lang->backup->change = 'Save Interval'; +$lang->backup->change = 'Modify days'; $lang->backup->changeAB = 'Modify'; -$lang->backup->time = 'Time'; +$lang->backup->time = 'Backup Time'; $lang->backup->files = 'Files'; $lang->backup->size = 'Size'; -$lang->backup->waitting = 'In Progree. Please wait...'; +$lang->backup->waitting = ' In Progress. 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->restoreTip = 'Only files and databases will be restored when you click Restore. If you want to restore the code, restore it manually.'; +$lang->backup->holdDays = 'Reserve latest %s days of backups'; +$lang->backup->restoreTip = 'Only files and databases can be restored when you click Restore. Code can be restored manually.'; $lang->backup->success = new stdclass(); $lang->backup->success->backup = 'Done!'; diff --git a/module/backup/view/index.html.php b/module/backup/view/index.html.php index 14b9f79c9e..6ab73fe450 100644 --- a/module/backup/view/index.html.php +++ b/module/backup/view/index.html.php @@ -33,7 +33,7 @@ backup->time?> backup->files?> backup->size?> - actions?> + actions?> diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index ee5abe5e14..dd89517a59 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -102,10 +102,10 @@ $lang->bug->confirmStoryChange = 'Confirm Story Change'; $lang->bug->copy = 'Copy'; /* 查询条件列表。*/ -$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->assignToMe = 'AssignedToMe'; +$lang->bug->openedByMe = 'CreatedByMe'; +$lang->bug->resolvedByMe = 'ResolvedByMe'; +$lang->bug->closedByMe = 'ClosedByMe'; $lang->bug->assignToNull = 'Unassigned'; $lang->bug->unResolved = 'Unresolved'; $lang->bug->toClosed = 'WaitForClose'; @@ -119,6 +119,10 @@ $lang->bug->needConfirm = 'StoryChanged'; $lang->bug->allProduct = 'All' . $lang->productCommon; $lang->bug->my = 'My'; +$lang->bug->assignToMeAB = 'Assigned To Me'; +$lang->bug->openedByMeAB = 'Created By Me'; +$lang->bug->resolvedByMeAB = 'Resolved By Me'; + $lang->bug->ditto = 'Ditto'; $lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!'; @@ -364,9 +368,9 @@ $lang->bug->placeholder = new stdclass(); $lang->bug->placeholder->chooseBuilds = 'Choose Build...'; $lang->bug->placeholder->newBuildName = 'The name of new build'; -$lang->bug->mySelects['assigntome'] = $lang->bug->assignToMe; -$lang->bug->mySelects['openedbyme'] = $lang->bug->openedByMe; -$lang->bug->mySelects['resolvedbyme'] = $lang->bug->resolvedByMe; +$lang->bug->mySelects['assigntome'] = $lang->bug->assignToMeAB; +$lang->bug->mySelects['openedbyme'] = $lang->bug->openedByMeAB; +$lang->bug->mySelects['resolvedbyme'] = $lang->bug->resolvedByMeAB; $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed; $lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 7312dd55f6..5d083fde46 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -118,6 +118,10 @@ $lang->bug->byQuery = '搜索'; $lang->bug->needConfirm = '需求变动'; $lang->bug->allProduct = '所有' . $lang->productCommon; +$lang->bug->assignToMeAB = '指派给我'; +$lang->bug->openedByMeAB = '由我创建'; +$lang->bug->resolvedByMeAB = '由我解决'; + $lang->bug->ditto = '同上'; $lang->bug->dittoNotice = '该bug与上一bug不属于同一产品!'; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 321d7c26d1..09cf315aa3 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -118,6 +118,10 @@ $lang->bug->byQuery = '搜索'; $lang->bug->needConfirm = '需求變動'; $lang->bug->allProduct = '所有' . $lang->productCommon; +$lang->bug->assignToMeAB = '指派給我'; +$lang->bug->openedByMeAB = '由我創建'; +$lang->bug->resolvedByMeAB = '由我解決'; + $lang->bug->ditto = '同上'; $lang->bug->dittoNotice = '該bug與上一bug不屬於同一產品!'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 9fdc6dfd93..90984425de 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -339,7 +339,7 @@ $lang->admin->menu = new stdclass(); $lang->admin->menu->index = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany'); $lang->admin->menu->custom = array('link' => 'Custom|custom|set', 'subModule' => 'custom'); -$lang->admin->menu->message = array('link' => 'Mssage|message|index', 'subModule' => 'message,mail,webhook'); +$lang->admin->menu->message = array('link' => 'Message|message|index', 'subModule' => 'message,mail,webhook'); $lang->admin->menu->backup = array('link' => 'Backup|backup|index', 'subModule' => 'backup'); $lang->admin->menu->safe = array('link' => 'Security|admin|safe', 'alias' => 'checkweak'); $lang->admin->menu->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron'); diff --git a/module/cron/lang/en.php b/module/cron/lang/en.php index 9e60f3d542..23dd843cb6 100644 --- a/module/cron/lang/en.php +++ b/module/cron/lang/en.php @@ -1,5 +1,5 @@ cron->common = 'Cron'; +$lang->cron->common = 'Scheduled Task'; $lang->cron->index = 'Home'; $lang->cron->list = 'Tasks'; $lang->cron->create = 'Add'; @@ -21,7 +21,7 @@ $lang->cron->remark = 'Remark'; $lang->cron->lastTime = 'Last Executed'; $lang->cron->turnonList['1'] = 'On'; -$lang->cron->turnonList['0'] = 'Off'; +$lang->cron->turnonList['0'] = 'Shutdown'; $lang->cron->statusList['normal'] = 'Normal'; $lang->cron->statusList['running'] = 'Running'; @@ -33,14 +33,14 @@ $lang->cron->typeList['system'] = 'System Command'; $lang->cron->toggleList['start'] = 'Activate'; $lang->cron->toggleList['stop'] = 'Deactivate'; -$lang->cron->confirmDelete = 'Do you want to delete the Planned Task?'; +$lang->cron->confirmDelete = 'Do you want to delete the Scheduled Task?'; $lang->cron->confirmTurnon = 'Do you want to truncoff the Cron?'; $lang->cron->introduction = <<Planned Task can do scheduled execution, such as update burndown chart, backup, etc.

+

Scheduled 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 = <<Do you want to turn it on?Turn On Planned Task

+

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

EOD; $lang->cron->notice = new stdclass(); @@ -49,5 +49,5 @@ $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->help = 'Note:If server restarted, or Scheduled Task is not working, it means Scheduled Task has stopped. You can restart it by clicking 【Restart】 or reload this page. If the last execution time in changed, it means the Task is running.'; $lang->cron->notice->errorRule = '"%s" is not valid'; diff --git a/module/cron/view/index.html.php b/module/cron/view/index.html.php index 901c8a0f45..88fd9a75a6 100644 --- a/module/cron/view/index.html.php +++ b/module/cron/view/index.html.php @@ -30,13 +30,13 @@ - - - - - + + + + + - + diff --git a/module/install/lang/en.php b/module/install/lang/en.php index c95bab54a1..af3bc742f9 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -147,18 +147,18 @@ $lang->install->groupList['TOP']['desc'] = 'for Senior Manager'; $lang->install->groupList['OTHERS']['name'] = 'Other'; $lang->install->groupList['OTHERS']['desc'] = 'for Other'; $lang->install->groupList['LIMITED']['name'] = 'Limited User'; -$lang->install->groupList['LIMITED']['desc'] = 'for Limited user (editing only content related to itself)'; +$lang->install->groupList['LIMITED']['desc'] = 'Only edit contents related to themselves'; $lang->install->cronList[''] = 'Monitor cron'; $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'; -$lang->install->cronList['moduleName=mail&methodName=asyncSend'] = 'Asynchronous sending'; -$lang->install->cronList['moduleName=webhook&methodName=asyncSend'] = 'Asynchronous seding Webhook'; +$lang->install->cronList['moduleName=backup&methodName=backup'] = 'Backup data&file'; +$lang->install->cronList['moduleName=mail&methodName=asyncSend'] = 'Async sending Message'; +$lang->install->cronList['moduleName=webhook&methodName=asyncSend'] = 'Async sending Webhook'; $lang->install->cronList['moduleName=admin&methodName=deleteLog'] = 'Delete overdue log'; -$lang->install->cronList['moduleName=todo&methodName=createCycle'] = 'Create cycle todos.'; +$lang->install->cronList['moduleName=todo&methodName=createCycle'] = 'Create periodic todos'; $lang->install->success = "Installed!"; $lang->install->login = 'Login ZenTao'; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 5db659c69c..e91b42e044 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -74,6 +74,11 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Latest Version'; $lang->misc->feature->detailed = 'Details'; +$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Message centralized management', 'desc' => '

Centring Mail,SMS,webhook into Message

'); +$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Add Periodic Todo function', 'desc' => ''); +$lang->misc->feature->all['9.8.stable'][] = array('title'=>"Add Block of 'Assigned to Me'", 'desc' => ''); +$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Support Generating TestStatements of TestBuilds', 'desc' => ''); + $lang->misc->feature->all['9.7.stable'][] = array('title'=>'optimize International package,Added Demo data。', 'desc' => ''); $lang->misc->feature->all['9.6.stable'][] = array('title'=>'added Webhook Interface feature', 'desc' => 'support communication with BearyChat,dingding'); diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 9e88ab4704..a9307e0581 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -71,9 +71,9 @@ $lang->product->whitelist = 'Whitelist'; $lang->product->branch = '%s'; $lang->product->searchStory = 'Search'; -$lang->product->assignedToMe = 'AssignedToMe'; -$lang->product->openedByMe = 'CreatedByMe'; -$lang->product->reviewedByMe = 'ReviewedByMe'; +$lang->product->assignedToMe = 'Assigned To Me'; +$lang->product->openedByMe = 'Created By Me'; +$lang->product->reviewedByMe = 'Reviewed By Me'; $lang->product->closedByMe = 'ClosedByMe'; $lang->product->draftStory = 'Draft'; $lang->product->activeStory = 'Activated'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 7d732b3095..0a6061e952 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -184,7 +184,7 @@ $lang->project->beginAndEnd = 'Duration'; $lang->project->lblStats = 'Man-Hour Summary(h) : '; $lang->project->stats = '%s Available, %s Total Estimated, %s Cost, %s Left.'; $lang->project->taskSummary = "Tasks on this page : %s Total, %s Wait, %s Doing;     Hours : %s Est., %s Cost, %s Left."; -$lang->project->checkedSummary = " %total% Checked, %wait% Wait, %doing% Doing, %estimate% Hour(s) Estimated, %consumed% Hour(s) Cost, %left% Hour(s) Left."; +$lang->project->checkedSummary = " %total% Checked, %wait% Wait, %doing% Doing; Hours: %estimate% Est., %consumed% Cost, %left% Left."; $lang->project->memberHours = "%s has %s Hour(s) available "; $lang->project->groupSummary = "%s Tasks in this group, Wait %s, Doing %s. %s Hour(s) Estimated , %s Hour(s) Cost, %s Hour(s) Left."; $lang->project->groupSummaryAB = "Tasks:%s Total,%s Wait, %s Doing.
Hours: %s Est., %s Cost,%s Left."; diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index e092b0fbd5..bf9b78efa8 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -74,7 +74,7 @@ project->basicInfo?>
cron->m?>cron->h?>cron->dom?>cron->mon?>cron->dow?>cron->m?>cron->h?>cron->dom?>cron->mon?>cron->dow?> cron->command?>cron->remark?>cron->remark?> cron->lastTime?> cron->status?> actions;?>
- + diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index f1d93fe75b..80a5c33c43 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -105,7 +105,7 @@
project->name;?>project->name;?> name;?>
- +
user->verify;?>
user->verifyPassword;?>user->verifyPassword;?>
user->placeholder->verify}'");?>