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?>
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 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 @@| 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/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' => '
|---|
| project->name;?> | +project->name;?> | name;?> |
|---|---|---|
| user->verifyPassword;?> | +user->verifyPassword;?> | user->placeholder->verify}'");?> |
|---|