Merge branch 'master' of github.com:easysoft/zentaopms
This commit is contained in:
@@ -3,7 +3,7 @@ $lang->backup->common = 'Backup';
|
||||
$lang->backup->index = 'Home';
|
||||
$lang->backup->history = 'History';
|
||||
$lang->backup->delete = 'Delete';
|
||||
$lang->backup->backup = 'Back Up';
|
||||
$lang->backup->backup = 'BackUp';
|
||||
$lang->backup->restore = 'Restore';
|
||||
$lang->backup->change = 'Edit Expiration';
|
||||
$lang->backup->changeAB = 'Edit';
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
<div class="col-sm-7">
|
||||
<div class="panel block-files block-sm" style="height: 290px;">
|
||||
<div class="panel-heading">
|
||||
<div class="panel-title"><?php echo $lang->project->undone . ($app->getClientLang() == 'en' ? ' ' : '') . $lang->projectCommon;?></div>
|
||||
<div class="panel-title"><?php echo $lang->project->undone . ($app->getClientLang() == 'en' ? ' ' : '') ."{$lang->projectCommon}s";?></div>
|
||||
<nav class="panel-actions nav nav-default">
|
||||
<li><?php echo html::a($this->createLink('doc', 'allLibs', 'type=project'), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
|
||||
</nav>
|
||||
|
||||
+10
-10
@@ -94,17 +94,17 @@ $lang->user->todo = 'Todo';
|
||||
$lang->user->story = 'Stories';
|
||||
$lang->user->dynamic = 'Dynamics';
|
||||
|
||||
$lang->user->openedBy = 'CreatedBy %s';
|
||||
$lang->user->assignedTo = 'AssignedTo %s';
|
||||
$lang->user->finishedBy = 'FinishedBy %s';
|
||||
$lang->user->resolvedBy = 'ResolvedBy %s';
|
||||
$lang->user->closedBy = 'ClosedBy %s';
|
||||
$lang->user->reviewedBy = 'ReviewedBy %s';
|
||||
$lang->user->canceledBy = 'CancelledBy %s';
|
||||
$lang->user->openedBy = 'CreatedBy%s';
|
||||
$lang->user->assignedTo = 'AssignedTo%s';
|
||||
$lang->user->finishedBy = 'FinishedBy%s';
|
||||
$lang->user->resolvedBy = 'ResolvedBy%s';
|
||||
$lang->user->closedBy = 'ClosedBy%s';
|
||||
$lang->user->reviewedBy = 'ReviewedBy%s';
|
||||
$lang->user->canceledBy = 'CancelledBy%s';
|
||||
|
||||
$lang->user->testTask2Him = 'BuildBy %s';
|
||||
$lang->user->case2Him = 'CaseAssignedTo %s';
|
||||
$lang->user->caseByHim = 'CaseCreatedBy %s';
|
||||
$lang->user->testTask2Him = 'AssignTo%s';
|
||||
$lang->user->case2Him = 'CaseAssignedTo%s';
|
||||
$lang->user->caseByHim = 'CaseCreatedBy%s';
|
||||
|
||||
$lang->user->errorDeny = "Sorry, your access to <b>%s</b> of <b>%s</b> is denied. Please contact your Admin to get privileges. Click Back to return.";
|
||||
$lang->user->loginFailed = "Login failed. Please check your account and password.";
|
||||
|
||||
@@ -102,7 +102,7 @@ $lang->user->closedBy = '由%s关闭';
|
||||
$lang->user->reviewedBy = '由%s评审';
|
||||
$lang->user->canceledBy = '由%s取消';
|
||||
|
||||
$lang->user->testTask2Him = '%s负责版本';
|
||||
$lang->user->testTask2Him = '%s负责的版本';
|
||||
$lang->user->case2Him = '给%s的用例';
|
||||
$lang->user->caseByHim = '%s建的用例';
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ $lang->webhook->trimWords = '';
|
||||
$lang->webhook->note = new stdClass();
|
||||
$lang->webhook->note->async = 'If the sending type is asynchronous, you have to go to Admin-System to turn on the cron.';
|
||||
$lang->webhook->note->product = "All actions will trigger the hook if {$lang->productCommon} is empty, or only actions of {$lang->productCommon} will trigger it.";
|
||||
$lang->webhook->note->project = "All actions will trigger the hook if {$lang->projectCommon} is empty, or only actions of {$lang->projectCommon} will trigger it.";
|
||||
$lang->webhook->note->project = "All actions will trigger the hook if {$lang->projectCommon} is empty, or only actions of selected {$lang->projectCommon} will trigger it.";
|
||||
|
||||
$lang->webhook->note->typeList['bearychat'] = 'Add a ZenTao bot in bearychat and get the webhook url.';
|
||||
$lang->webhook->note->typeList['dingding'] = 'Add a customized bot in dingding and get the webhook url.';
|
||||
|
||||
Reference in New Issue
Block a user