Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2017-12-13 10:57:30 +08:00
parent c404eff816 8d3a733612
commit 0205849cc2
7 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+7 -7
View File
@@ -30,7 +30,7 @@ $lang->action->trashTips = 'Note: Delete in ZenTao is logic.';
$lang->action->textDiff = 'Text Format';
$lang->action->original = 'Original Format';
$lang->action->confirmHideAll = 'Do you want to hide all the records?';
$lang->action->needEdit = '%s you want to restore has already existed. Please edit it.';
$lang->action->needEdit = '%s you want to restore exists. Please edit it.';
$lang->action->historyEdit = 'The history editor cannot be empty.';
$lang->action->history = new stdclass();
@@ -133,7 +133,7 @@ $lang->action->label->closed = 'Closed';
$lang->action->label->deleted = 'Deleted';
$lang->action->label->deletedfile = 'Deleted';
$lang->action->label->editfile = 'Edit';
$lang->action->label->erased = 'Ereased';
$lang->action->label->erased = 'Erased';
$lang->action->label->undeleted = 'Restored';
$lang->action->label->hidden = 'Hidden';
$lang->action->label->commented = 'Commented';
@@ -167,10 +167,10 @@ $lang->action->label->linkrelatedstory = "Link to Story";
$lang->action->label->unlinkrelatedstory = "Unlink";
$lang->action->label->subdividestory = "Decompose Story";
$lang->action->label->unlinkchildstory = "Unlink";
$lang->action->label->started = 'Initiated';
$lang->action->label->started = 'Started';
$lang->action->label->restarted = 'Continued';
$lang->action->label->recordestimate = 'Recorded Hour';
$lang->action->label->editestimate = 'Edited Hour';
$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';
@@ -179,7 +179,7 @@ $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 Hour";
$lang->action->label->deleteestimate = "Deleted";
$lang->action->label->linked2build = "Linked";
$lang->action->label->linked2bug = "Linked";
@@ -196,7 +196,7 @@ $lang->action->label->case = 'Case|testcase|view|caseID=%s';
$lang->action->label->testtask = 'Test Task|testtask|view|caseID=%s';
$lang->action->label->testsuite = 'Test Suite|testsuite|view|suiteID=%s';
$lang->action->label->caselib = 'Case Library|testsuite|libview|libID=%s';
$lang->action->label->todo = 'To-Dos|todo|view|todoID=%s';
$lang->action->label->todo = 'To-Do|todo|view|todoID=%s';
$lang->action->label->doclib = 'Doc Lib|doc|browse|libID=%s';
$lang->action->label->doc = 'Doc|doc|view|docID=%s';
$lang->action->label->user = 'User|user|view|account=%s';
module/admin/lang/en.php
+17 -17
View File
@@ -9,32 +9,32 @@
* @version $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->admin->common = 'Administration';
$lang->admin->common = 'Admin';
$lang->admin->index = 'Admin Home';
$lang->admin->checkDB = 'Check Database';
$lang->admin->sso = 'RangerTeam';
$lang->admin->sso = 'Zdoo';
$lang->admin->safeIndex = 'Security';
$lang->admin->checkWeak = 'Weak Password Check';
$lang->admin->certifyMobile = 'Verify your mobilephone';
$lang->admin->certifyEmail = 'Verifu your Email';
$lang->admin->ztCompany = 'Verifu your company';
$lang->admin->certifyEmail = 'Verify your Email';
$lang->admin->ztCompany = 'Verify your company';
$lang->admin->captcha = 'Verification Code';
$lang->admin->getCaptcha = 'Get Verification Code';
$lang->admin->api = 'API';
$lang->admin->log = 'Log';
$lang->admin->setting = 'Setting';
$lang->admin->days = 'Log Save Days';
$lang->admin->saveSuccess = 'Save success';
$lang->admin->days = 'Valid Days';
$lang->admin->saveSuccess = 'Saved.';
$lang->admin->info = new stdclass();
$lang->admin->info->version = 'Current Version is %s. ';
$lang->admin->info->links = 'You can visit ';
$lang->admin->info->account = 'Your ZenTao account is %s.';
$lang->admin->info->log = 'The logs older than save days will be deleted, need to run cron.';
$lang->admin->info->log = 'Logs that is beyond valid days will be deleted and it has to run cron.';
$lang->admin->notice = new stdclass();
$lang->admin->notice->register = "Note: You haven't registered in ZenTao(www.zentao.pm), register %s and get the latest ZenTao news.";
$lang->admin->notice->register = "Note: You haven't registered in ZenTao(www.zentao.pm). Register %s and get the latest ZenTao news.";
$lang->admin->notice->ignore = "Ignore";
$lang->admin->notice->int = "『%s』should be a positive integer.";
@@ -42,14 +42,14 @@ $lang->admin->register = new stdclass();
$lang->admin->register->common = 'Account Binding';
$lang->admin->register->caption = 'Register';
$lang->admin->register->click = 'Click Here';
$lang->admin->register->lblAccount = 'must be 3 characters combination of letters and numbers at least.';
$lang->admin->register->lblPasswd = 'must be 6 characters combination of letters and numbers at least.';
$lang->admin->register->lblAccount = 'at least 3 characters; must contain letters and numbers.';
$lang->admin->register->lblPasswd = 'at least 6 characters; must contain letters and numbers.';
$lang->admin->register->submit = 'Register';
$lang->admin->register->bind = "If you have already registered an account, link your account %s.";
$lang->admin->register->success = "You have registered with us!";
$lang->admin->bind = new stdclass();
$lang->admin->bind->caption = 'Link an Account';
$lang->admin->bind->caption = 'Link Account';
$lang->admin->bind->success = "Account has been linked!";
$lang->admin->safe = new stdclass();
@@ -59,15 +59,15 @@ $lang->admin->safe->password = 'Password Security';
$lang->admin->safe->weak = 'Weak Password';
$lang->admin->safe->reason = 'Type';
$lang->admin->safe->checkWeak = 'Weak Password Check';
$lang->admin->safe->changeWeak = 'Modify weak password';
$lang->admin->safe->modifyPasswordFirstLogin = 'Modify password when first login';
$lang->admin->safe->changeWeak = 'Change weak password';
$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] = 'Should be contain letters and numbers, at lease six characters.';
$lang->admin->safe->modeRuleList[2] = 'Should be contain letters, numbers and special characters, at lease 10 characters.';
$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->reasonList['weak'] = 'Common Weak Password';
$lang->admin->safe->reasonList['account'] = 'Same as your account';
@@ -75,8 +75,8 @@ $lang->admin->safe->reasonList['mobile'] = 'Same as your mobile number';
$lang->admin->safe->reasonList['phone'] = 'Same as your phone number';
$lang->admin->safe->reasonList['birthday'] = 'Same as your DOB';
$lang->admin->safe->modifyPasswordList[1] = 'Must';
$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 capitalized letters and numbers a password has, the more secure it is!';
$lang->admin->safe->noticeStrong = 'The more uppercase letters and numbers a password has, the more secure it is!';
module/backup/lang/en.php
+5 -5
View File
@@ -16,16 +16,16 @@ $lang->backup->waitting = '<span id="backupType"></span>In Progree. Please
$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 attachments and databases will be restored when you click restore button, if you need to restore the code, you can restore manually.';
$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->success = new stdclass();
$lang->backup->success->backup = 'Done!';
$lang->backup->success->restore = 'Restored!';
$lang->backup->error = new stdclass();
$lang->backup->error->noWritable = "<code>%s</code> is not writable! Please check the permission, or back up cannot be done.";
$lang->backup->error->noDelete = "%s cannot be deleted. Please modify the permission or manually delete it.";
$lang->backup->error->restoreSQL = "Database library restoring failed. Error %s.";
$lang->backup->error->restoreFile = "File restoring failed. Error %s.";
$lang->backup->error->noWritable = "<code>%s</code> is not writable! Please check the privilege, or backup cannot be done.";
$lang->backup->error->noDelete = "%s cannot be deleted. Please modify the privilege or manually delete it.";
$lang->backup->error->restoreSQL = "Database library restoration 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.";
module/block/lang/en.php
+1 -1
View File
@@ -35,7 +35,7 @@ $lang->block->params = new stdclass();
$lang->block->params->name = 'Name';
$lang->block->params->value = 'Value';
$lang->block->createBlock = 'Add a Block';
$lang->block->createBlock = 'Add';
$lang->block->editBlock = 'Edit';
$lang->block->ordersSaved = 'Order is saved.';
$lang->block->confirmRemoveBlock = 'Do you want to remove Block【{0}】?';
module/bug/lang/en.php
+8 -8
View File
@@ -95,8 +95,8 @@ $lang->bug->deleted = 'Deleted';
$lang->bug->saveTemplate = 'Save as Template';
$lang->bug->setPublic = 'Set as Public';
$lang->bug->deleteTemplate = 'Delete Template';
$lang->bug->confirmStoryChange = 'Story Change Confirmation';
$lang->bug->copy = 'Duplicate';
$lang->bug->confirmStoryChange = 'Confirm Story Change';
$lang->bug->copy = 'Copy';
/* 查询条件列表。*/
$lang->bug->assignToMe = 'Assigned to Me';
@@ -117,7 +117,7 @@ $lang->bug->allProduct = 'All' . $lang->productCommon;
$lang->bug->my = 'My';
$lang->bug->ditto = 'Ditto';
$lang->bug->dittoNotice = 'This bug does not relate to the same product as the last one!';
$lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!';
/* 页面标签。*/
$lang->bug->lblAssignedTo = 'Assignee';
@@ -220,7 +220,7 @@ $lang->bug->typeList['interface'] = 'Interface Optimization';
$lang->bug->typeList['designchange'] = 'Design Change';
$lang->bug->typeList['newfeature'] = 'New Feature';
$lang->bug->typeList['designdefect'] = 'Design Defect';
$lang->bug->typeList['config'] = 'Config';
$lang->bug->typeList['config'] = 'Configuration';
$lang->bug->typeList['install'] = 'Install/Deploy';
$lang->bug->typeList['security'] = 'Security';
$lang->bug->typeList['performance'] = 'Performance';
@@ -234,8 +234,8 @@ $lang->bug->statusList['active'] = 'Active';
$lang->bug->statusList['resolved'] = 'Resolved';
$lang->bug->statusList['closed'] = 'Closed';
$lang->bug->confirmedList[1] = 'Confirmed';
$lang->bug->confirmedList[0] = 'Not Confirmed';
$lang->bug->confirmedList[1] = 'Yes';
$lang->bug->confirmedList[0] = 'No';
$lang->bug->resolutionList[''] = '';
$lang->bug->resolutionList['bydesign'] = 'Design Issue';
@@ -245,7 +245,7 @@ $lang->bug->resolutionList['fixed'] = 'Resolved';
$lang->bug->resolutionList['notrepro'] = 'Irreproducible';
$lang->bug->resolutionList['postponed'] = 'Postponed';
$lang->bug->resolutionList['willnotfix'] = "Not to Resolve";
$lang->bug->resolutionList['tostory'] = 'Transfer to Story';
$lang->bug->resolutionList['tostory'] = 'Convert to Story';
/* 统计报表。*/
$lang->bug->report = new stdclass();
@@ -346,7 +346,7 @@ $lang->bug->report->bugHistories->graph->xAxisName = 'Handling Steps';
/* 操作记录。*/
$lang->bug->action = new stdclass();
$lang->bug->action->resolved = array('main' => '$date, resolved by <strong>$actor</strong> and the solution is <strong>$extra</strong> $appendLink.', 'extra' => 'resolutionList');
$lang->bug->action->tostory = array('main' => '$date, transferred by <strong>$actor</strong> to <strong>Story</strong> with ID <strong>$extra</strong>.');
$lang->bug->action->tostory = array('main' => '$date, converted by <strong>$actor</strong> to <strong>Story</strong> with ID <strong>$extra</strong>.');
$lang->bug->action->totask = array('main' => '$date, imported by <strong>$actor</strong> as <strong>Task</strong> with ID <strong>$extra</strong>.');
$lang->bug->action->linked2plan = array('main' => '$date, linked by <strong>$actor</strong> to Plan <strong>$extra</strong>.');
$lang->bug->action->unlinkedfromplan = array('main' => '$date, deleted by <strong>$actor</strong> from Plan <strong>$extra</strong>.');
module/build/lang/en.php
+4 -4
View File
@@ -43,13 +43,13 @@ $lang->build->packageType = 'Package Type';
$lang->build->unlinkStory = 'Unlink Story';
$lang->build->unlinkBug = 'Unlink Bug';
$lang->build->stories = 'Finished Story';
$lang->build->bugs = 'Solved Bug';
$lang->build->bugs = 'Resolved Bug';
$lang->build->generatedBugs = 'Remained Bug';
$lang->build->noProduct = " <span style='color:red'>This {$lang->projectCommon} has not linked to {$lang->productCommon}, so Build cannot be created. Please first <a href='%s'> link {$lang->productCommon}</a></span>";
$lang->build->finishStories = ' %s Stories have been finished.';
$lang->build->resolvedBugs = ' %s Bugs have been solved.';
$lang->build->createdBugs = ' %s Bugs have been created.';
$lang->build->finishStories = ' %s Story(ies) have been finished.';
$lang->build->resolvedBugs = ' %s Bug(s) have been resolved.';
$lang->build->createdBugs = ' %s Bug(s) have been created.';
$lang->build->placeholder = new stdclass();
$lang->build->placeholder->scmPath = ' Source code repository, e.g. Subversion/Git Library path';
module/common/lang/en.php
+18 -18
View File
@@ -49,7 +49,7 @@ $lang->day = 'Day';
$lang->customConfig = 'Custom';
$lang->public = 'Public';
$lang->trunk = 'Trunk';
$lang->sort = 'Ranking';
$lang->sort = 'Order';
$lang->required = 'Required';
$lang->actions = 'Actions';
@@ -64,7 +64,7 @@ $lang->pasteText = 'Paste';
$lang->uploadImages = 'Upload';
$lang->timeout = 'Timeout. Pease check your network settings, or try it again!';
$lang->repairTable = 'Database table might be damaged. Please use phpmyadmin or myisamchk to fix it.';
$lang->duplicate = '%s has the same title as existing file.';
$lang->duplicate = '%s has the same title as an existing file.';
$lang->ipLimited = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /></head><body>Sorry, current IP Login has been restricted. PLease contact Admin to unrestrict it.</body></html>";
$lang->unfold = '+';
$lang->fold = '-';
@@ -109,7 +109,7 @@ $lang->menu->qa = 'QA|qa|index';
$lang->menu->doc = 'Doc|doc|index';
$lang->menu->report = 'Report|report|index';
$lang->menu->company = 'Company|company|index';
$lang->menu->admin = 'Administration|admin|index';
$lang->menu->admin = 'Admin|admin|index';
/* 查询条中可以选择的对象列表。*/
$lang->searchObjects['bug'] = 'Bug';
@@ -156,8 +156,8 @@ $lang->themes['blackberry'] = 'Blackberry';
$lang->index = new stdclass();
$lang->index->menu = new stdclass();
$lang->index->menu->product = "View{$lang->productCommon}|product|browse";
$lang->index->menu->project = "View{$lang->projectCommon}|project|browse";
$lang->index->menu->product = "{$lang->productCommon}|product|browse";
$lang->index->menu->project = "{$lang->projectCommon}|project|browse";
/* 我的地盘菜单设置。*/
$lang->my = new stdclass();
@@ -227,8 +227,8 @@ $lang->project->menu->team = array('link' => 'Team|project|team|projectID=%
$lang->project->menu->doc = array('link' => 'Doc|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc');
$lang->project->menu->product = $lang->productCommon . '|project|manageproducts|projectID=%s';
$lang->project->menu->view = array('link' => 'Overview|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close');
$lang->project->menu->create = array('link' => "<i class='icon-plus'></i>&nbsp;Add{$lang->projectCommon}|project|create", 'float' => 'right');
$lang->project->menu->all = array('link' => "<i class='icon-th-large'></i>&nbsp;All{$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right');
$lang->project->menu->create = array('link' => "<i class='icon-plus'></i>&nbsp;Add {$lang->projectCommon}|project|create", 'float' => 'right');
$lang->project->menu->all = array('link' => "<i class='icon-th-large'></i>&nbsp;All {$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right');
$lang->project->menu->index = array('link' => "<i class='icon-home'></i>{$lang->projectCommon}|project|index|locate=no", 'float' => 'right');
$lang->task = new stdclass();
@@ -413,7 +413,7 @@ $lang->error = new stdclass();
$lang->error->companyNotFound = "The domain %s cannot be found!";
$lang->error->length = array("『%s』Length Error. It should be『%s』", "『%s』length should be <=『%s』and >=『%s』.");
$lang->error->reg = "『%s』Format Error. It should be『%s』.";
$lang->error->unique = "『%s』『%s』existed. Please go to Admin->Recycle to restore it, if you are sure it has been deleted.";
$lang->error->unique = "『%s』『%s』existed. Please go to Admin->Recycle to restore it, if you are sure it is deleted.";
$lang->error->gt = "『%s』should be >『%s』.";
$lang->error->ge = "『%s』should be >=『%s』.";
$lang->error->notempty = "『%s』should not be blank.";
@@ -423,10 +423,10 @@ $lang->error->int = array("『%s』should be numbers", "『%s』shou
$lang->error->float = "『%s』should be numbers, decimals included.";
$lang->error->email = "『%s』should be valid Email.";
$lang->error->date = "『%s』should be valid date.";
$lang->error->code = "『%s』should be english or numbers.";
$lang->error->code = "『%s』should be letters or numbers.";
$lang->error->account = "『%s』should be valid account.";
$lang->error->passwordsame = "Two passwords should be consistent.";
$lang->error->passwordrule = "Password should meet requirements. It should be 6 characters at least.";
$lang->error->passwordrule = "Password should follow rules. It must be at least 6 characters.";
$lang->error->accessDenied = 'Access is denied.';
$lang->error->pasteImg = 'Image is not allowed to be pasted in your browser!';
$lang->error->noData = 'No Data';
@@ -443,14 +443,14 @@ if(!defined('SESSION_CODE_MISSING')) define('SESSION_CODE_MISSING', 341);
if(!defined('SESSION_VERIFY_FAILED')) define('SESSION_VERIFY_FAILED', 342);
$lang->error->entry = array();
$lang->error->entry['PARAM_CODE_MISSING'] = 'Param code not set.';
$lang->error->entry['PARAM_TOKEN_MISSING'] = 'Param token not set.';
$lang->error->entry['INVALID_ENTRY'] = 'Entry not exist.';
$lang->error->entry['EMPTY_KEY'] = 'Key of entry not set.';
$lang->error->entry['IP_DENIED'] = 'IP denied.';
$lang->error->entry['PARAM_CODE_MISSING'] = 'Param code is missing.';
$lang->error->entry['PARAM_TOKEN_MISSING'] = 'Param token is missing.';
$lang->error->entry['INVALID_ENTRY'] = 'Entry does not exist.';
$lang->error->entry['EMPTY_KEY'] = 'Key of entry is missing.';
$lang->error->entry['IP_DENIED'] = 'IP is denied.';
$lang->error->entry['INVALID_TOKEN'] = 'Invalid token.';
$lang->error->entry['SESSION_CODE_MISSING'] = 'Session code not set.';
$lang->error->entry['SESSION_VERIFY_FAILED'] = 'Session verify failed.';
$lang->error->entry['SESSION_CODE_MISSING'] = 'Session code is missing.';
$lang->error->entry['SESSION_VERIFY_FAILED'] = 'Session verification failed.';
/* 分页信息。*/
$lang->pager = new stdclass();
@@ -461,7 +461,7 @@ $lang->pager->first = "<i class='icon-step-backward' title='Home'></i>";
$lang->pager->pre = "<i class='icon-play icon-rotate-180' title='Previous Page'></i>";
$lang->pager->next = "<i class='icon-play' title='Next Page'></i>";
$lang->pager->last = "<i class='icon-step-forward' title='Last Page'></i>";
$lang->pager->locate = "GO!";
$lang->pager->locate = "Go!";
$lang->pager->previousPage = "Prev";
$lang->pager->nextPage = "Next";
$lang->pager->summery = "<strong>%s-%s</strong> of <strong>%s</strong>.";