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

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

Browse Source
This commit is contained in:
Yagami
2018-11-07 09:13:38 +08:00
parent 361ea2b415 4865ebe9f4
commit 32a4715fa6
29 changed files with 153 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
10.5.stable
10.5.1
config/config.php
+1 -1
View File
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* 基本设置。Basic settings. */
$config->version = '10.5'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->version = '10.5.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
$config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time.
$config->timezone = 'Asia/Shanghai'; // 时区设置。 The time zone setting, for more see http://www.php.net/manual/en/timezones.php.
module/action/lang/en.php
+7 -7
View File
@@ -28,12 +28,12 @@ $lang->action->editComment = 'Edit';
$lang->action->create = 'Add Comment';
$lang->action->comment = 'Comment';
$lang->action->trashTips = 'Note: All Deletion in ZenTao are logical.';
$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 that you want to restore exists. Please edit it.';
$lang->action->historyEdit = 'The history editor cannot be empty.';
$lang->action->historyEdit = 'The history EditBy cannot be empty.';
$lang->action->noDynamic = 'No dynamics. ';
$lang->action->history = new stdclass();
@@ -115,7 +115,7 @@ $lang->action->desc->started = '$date, started by <strong>$actor</strong>
$lang->action->desc->restarted = '$date, continued by <strong>$actor</strong>.' . "\n";
$lang->action->desc->delayed = '$date, postponed by <strong>$actor</strong>.' . "\n";
$lang->action->desc->suspended = '$date, suspended by <strong>$actor</strong>.' . "\n";
$lang->action->desc->recordestimate = '$date, recorded by <strong>$actor</strong> and it consumed <strong>$extra</strong> hours.';
$lang->action->desc->recordestimate = '$date, recorded by <strong>$actor</strong> and it cost <strong>$extra</strong> hours.';
$lang->action->desc->editestimate = '$date, <strong>$actor</strong> edited Hour.';
$lang->action->desc->deleteestimate = '$date, <strong>$actor</strong> deleted Hour.';
$lang->action->desc->canceled = '$date, cancelled by <strong>$actor</strong>.' . "\n";
@@ -124,14 +124,14 @@ $lang->action->desc->gitcommited = '$date, <strong>$actor</strong> committed
$lang->action->desc->finished = '$date, finished by <strong>$actor</strong>.' . "\n";
$lang->action->desc->paused = '$date, paused by <strong>$actor</strong>.' . "\n";
$lang->action->desc->verified = '$date, verified by <strong>$actor</strong>.' . "\n";
$lang->action->desc->diff1 = '<strong><i>%s</i></strong> has been changed. It was "%s" and it is "%s".<br />' . "\n";
$lang->action->desc->diff2 = '<strong><i>%s</i></strong> has been changed. The difference is ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
$lang->action->desc->diff1 = '<strong><i>%s</i></strong> is changed. It was "%s" and it is "%s".<br />' . "\n";
$lang->action->desc->diff2 = '<strong><i>%s</i></strong> is changed. The difference is ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
$lang->action->desc->diff3 = 'File Name %s was changed to %s .' . "\n";
$lang->action->desc->linked2bug = '$date Linked to <strong>$extra</strong> by <strong>$actor</strong>';
/* 关联用例和移除用例时的历史操作记录。*/
$lang->action->desc->linkrelatedcase = '$date, <strong>$actor</strong> linked relevant use case <strong>$extra</strong>.' . "\n";
$lang->action->desc->unlinkrelatedcase = '$date, <strong>$actor</strong> unlinked relevant use case <strong>$extra</strong>.' . "\n";
$lang->action->desc->linkrelatedcase = '$date, <strong>$actor</strong> linked to use case <strong>$extra</strong>.' . "\n";
$lang->action->desc->unlinkrelatedcase = '$date, <strong>$actor</strong> unlinked use case <strong>$extra</strong>.' . "\n";
/* 用来显示动态信息。*/
$lang->action->label = new stdclass();
module/backup/lang/en.php
+1 -1
View File
@@ -15,7 +15,7 @@ $lang->backup->size = 'Size';
$lang->backup->waitting = '<span id="backupType"></span> 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 = 'Reserve latest %s days of backups';
$lang->backup->holdDays = 'Reserve last %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();
module/bug/lang/en.php
+22 -22
View File
@@ -32,30 +32,30 @@ $lang->bug->status = 'Status';
$lang->bug->statusAB = 'Status';
$lang->bug->activatedCount = 'Active';
$lang->bug->activatedCountAB = 'Active';
$lang->bug->activatedDate = 'Active On';
$lang->bug->activatedDate = 'Activated';
$lang->bug->confirmed = 'Confirmed';
$lang->bug->toTask = 'Convert to Task';
$lang->bug->toStory = 'Convert to Story';
$lang->bug->mailto = 'Mail To';
$lang->bug->openedBy = 'Creator';
$lang->bug->openedDate = 'Created on';
$lang->bug->openedDate = 'Created';
$lang->bug->openedDateAB = 'Created';
$lang->bug->openedBuild = 'Open Build';
$lang->bug->assignedTo = 'To';
$lang->bug->assignBug = 'Assign To';
$lang->bug->assignedToAB = 'To';
$lang->bug->assignedDate = 'Assigned On';
$lang->bug->assignedDate = 'Assigned';
$lang->bug->resolvedBy = 'Resolved';
$lang->bug->resolvedByAB = 'Resolved';
$lang->bug->resolution = 'Solution';
$lang->bug->resolutionAB = 'Solution';
$lang->bug->resolution = 'Resolution';
$lang->bug->resolutionAB = 'Resolution';
$lang->bug->resolvedBuild = 'Resolved Build';
$lang->bug->resolvedDate = 'Resolved on';
$lang->bug->resolvedDate = 'Resolved';
$lang->bug->resolvedDateAB = 'Resolved';
$lang->bug->deadline = 'Deadline';
$lang->bug->plan = 'Plan';
$lang->bug->closedBy = 'Closed By';
$lang->bug->closedDate = 'Closed On';
$lang->bug->closedDate = 'Closed';
$lang->bug->duplicateBug = 'Duplicate';
$lang->bug->lastEditedBy = 'Edited By';
$lang->bug->linkBug = 'Linked Bug';
@@ -65,8 +65,8 @@ $lang->bug->case = 'Case';
$lang->bug->files = 'File';
$lang->bug->keywords = 'Tags';
$lang->bug->lastEditedByAB = 'Edited By';
$lang->bug->lastEditedDateAB = 'Edit On';
$lang->bug->lastEditedDate = 'Edit On';
$lang->bug->lastEditedDateAB = 'Edited';
$lang->bug->lastEditedDate = 'Edited';
$lang->bug->fromCase = 'From Case';
$lang->bug->toCase = 'To Case';
$lang->bug->colorTag = 'Color Tag';
@@ -117,7 +117,7 @@ $lang->bug->postponedBugs = 'Postponed';
$lang->bug->overdueBugs = 'Overdue';
$lang->bug->allBugs = 'All';
$lang->bug->byQuery = 'Search';
$lang->bug->needConfirm = 'StoryChanged';
$lang->bug->needConfirm = 'Story Changed';
$lang->bug->allProduct = 'All' . $lang->productCommon;
$lang->bug->my = 'My';
$lang->bug->yesterdayResolved = 'Resolved Yesterday ';
@@ -132,7 +132,7 @@ $lang->bug->ditto = 'Ditto';
$lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!';
$lang->bug->noAssigned = 'Assign';
$lang->bug->noBug = 'No bugs. ';
$lang->bug->noModule = '<div>You have no modules</div><div>Manage now</div>';
$lang->bug->noModule = '<div>You have no modules.</div><div>Manage now</div>';
/* 页面标签。*/
$lang->bug->lblAssignedTo = 'Assignee';
@@ -151,7 +151,7 @@ $lang->bug->lblTypeAndSeverity = 'Type/Severity';
$lang->bug->lblSystemBrowserAndHardware = 'System/Browser';
$lang->bug->legendSteps = 'Repro Steps';
$lang->bug->legendComment = 'Note';
$lang->bug->legendLife = 'About the Bug';
$lang->bug->legendLife = 'About';
$lang->bug->legendMisc = 'Misc';
$lang->bug->legendRelated = 'Related Info';
@@ -216,7 +216,7 @@ $lang->bug->browserList['ie9'] = 'IE9';
$lang->bug->browserList['ie8'] = 'IE8';
$lang->bug->browserList['ie7'] = 'IE7';
$lang->bug->browserList['ie6'] = 'IE6';
$lang->bug->browserList['chrome'] = 'chrome';
$lang->bug->browserList['chrome'] = 'Chrome';
$lang->bug->browserList['firefox'] = 'Firefox series';
$lang->bug->browserList['firefox4'] = 'Firefox4';
$lang->bug->browserList['firefox3'] = 'Firefox3';
@@ -232,18 +232,18 @@ $lang->bug->browserList['other'] = 'Other';
$lang->bug->typeList[''] = '';
$lang->bug->typeList['codeerror'] = 'Code Error';
$lang->bug->typeList['interface'] = 'UI Optimization';
$lang->bug->typeList['interface'] = 'Interface';
$lang->bug->typeList['config'] = 'Configuration';
$lang->bug->typeList['install'] = 'Install/Deploy';
$lang->bug->typeList['security'] = 'Security';
$lang->bug->typeList['performance'] = 'Performance';
$lang->bug->typeList['standard'] = 'Standard';
$lang->bug->typeList['automation'] = 'Testing Script';
$lang->bug->typeList['automation'] = 'Automation';
$lang->bug->typeList['others'] = 'Other';
$lang->bug->typeList['designchange'] = 'Design Change';
$lang->bug->typeList['newfeature'] = 'New Feature';
$lang->bug->typeList['designdefect'] = 'Design Defect';
$lang->bug->typeList['trackthings'] = 'Track Work';
$lang->bug->typeList['trackthings'] = 'Tracking';
$lang->bug->statusList[''] = '';
$lang->bug->statusList['active'] = 'Active';
@@ -266,8 +266,8 @@ $lang->bug->resolutionList['tostory'] = 'Convert to Story';
/* 统计报表。*/
$lang->bug->report = new stdclass();
$lang->bug->report->common = 'Report';
$lang->bug->report->select = 'Select Type ';
$lang->bug->report->create = 'Generate Report';
$lang->bug->report->select = 'Type ';
$lang->bug->report->create = 'Create Report';
$lang->bug->report->charts['bugsPerProject'] = $lang->projectCommon . ' Bugs';
$lang->bug->report->charts['bugsPerBuild'] = 'Bugs Per Build';
@@ -279,7 +279,7 @@ $lang->bug->report->charts['openedBugsPerUser'] = 'Reported Bugs Per User';
$lang->bug->report->charts['resolvedBugsPerUser'] = 'Resolved Bugs Per User';
$lang->bug->report->charts['closedBugsPerUser'] = 'Closed Bugs Per User';
$lang->bug->report->charts['bugsPerSeverity'] = 'Bug Severity Report';
$lang->bug->report->charts['bugsPerResolution'] = 'Bug Solution Report';
$lang->bug->report->charts['bugsPerResolution'] = 'Bug Resolution Report';
$lang->bug->report->charts['bugsPerStatus'] = 'Bug Status Report';
$lang->bug->report->charts['bugsPerActivatedCount'] = 'Bug Activation Report';
$lang->bug->report->charts['bugsPerPri'] = 'Bug Priority Report';
@@ -350,9 +350,9 @@ $lang->bug->report->resolvedBugsPerUser->graph->xAxisName = 'User';
$lang->bug->report->closedBugsPerUser->graph->xAxisName = 'User';
$lang->bug->report->bugsPerSeverity->graph->xAxisName = 'Priority';
$lang->bug->report->bugsPerResolution->graph->xAxisName = 'Solution';
$lang->bug->report->bugsPerResolution->graph->xAxisName = 'Resolution';
$lang->bug->report->bugsPerStatus->graph->xAxisName = 'Status';
$lang->bug->report->bugsPerActivatedCount->graph->xAxisName = 'Activation Count';
$lang->bug->report->bugsPerActivatedCount->graph->xAxisName = 'Activated Count';
$lang->bug->report->bugsPerPri->graph->xAxisName = 'Priority';
$lang->bug->report->bugsPerType->graph->xAxisName = 'Type';
$lang->bug->report->bugsPerAssignedTo->graph->xAxisName = 'Assigned To';
@@ -375,7 +375,7 @@ $lang->bug->action->unlinkrelatedbug = array('main' => '$date, unlinked by <s
$lang->bug->placeholder = new stdclass();
$lang->bug->placeholder->chooseBuilds = 'Choose Build...';
$lang->bug->placeholder->newBuildName = 'The name of new build';
$lang->bug->placeholder->newBuildName = 'New build Name';
$lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs;
$lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed;
module/build/lang/en.php
+3 -3
View File
@@ -48,9 +48,9 @@ $lang->build->generatedBugs = 'Left 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->noBuild = 'No builds. ';
$lang->build->finishStories = ' %s Stories have been finished.';
$lang->build->resolvedBugs = ' %s Bugs have been resolved.';
$lang->build->createdBugs = ' %s Bugs have been created.';
$lang->build->finishStories = ' %s Story is finished.';
$lang->build->resolvedBugs = ' %s Bug is resolved.';
$lang->build->createdBugs = ' %s Bug is created.';
$lang->build->placeholder = new stdclass();
$lang->build->placeholder->scmPath = ' Source code repository, e.g. Subversion/Git Library path';
module/common/lang/en.php
+4 -4
View File
@@ -63,7 +63,7 @@ $lang->history = 'History';
$lang->attatch = 'File';
$lang->reverse = 'Reverse';
$lang->switchDisplay = 'Toggle';
$lang->expand = 'Expand All';
$lang->expand = 'Expand';
$lang->collapse = 'Collapse';
$lang->saveSuccess = 'Saved';
$lang->fail = 'Fail';
@@ -93,8 +93,8 @@ $lang->nextShortcutKey = '[Shortcut:→]';
$lang->backShortcutKey = '[Shortcut:Alt+↑]';
$lang->select = 'Select';
$lang->selectAll = 'Select All';
$lang->selectReverse = 'Select Reverse';
$lang->selectAll = 'All';
$lang->selectReverse = 'Reverse';
$lang->loading = 'Loading...';
$lang->notFound = 'Not found!';
$lang->showAll = '[[Show All]]';
@@ -191,7 +191,7 @@ $lang->my->menu->dynamic = 'Dynamic|my|dynamic|';
$lang->my->menu->profile = array('link' => 'Profile|my|profile', 'alias' => 'editprofile');
$lang->my->menu->changePassword = 'Password|my|changepassword';
$lang->my->menu->manageContacts = 'Contact|my|managecontacts';
$lang->my->menu->score = 'Score|my|score';
$lang->my->menu->score = 'Point|my|score';
$lang->todo = new stdclass();
$lang->todo->menu = $lang->my->menu;
module/dept/lang/en.php
+2 -2
View File
@@ -26,5 +26,5 @@ $lang->dept->confirmDelete = " Do you want to delete this Dept?";
$lang->dept->successSave = " Saved!";
$lang->dept->error = new stdclass();
$lang->dept->error->hasSons = 'This Dept has child Dept. You cannot be deleted!';
$lang->dept->error->hasUsers = 'This Dept has staff. It cannot be deleted!';
$lang->dept->error->hasSons = 'This Dept has child Dept. You cannot delete it!';
$lang->dept->error->hasUsers = 'This Dept has users. You cannot delete it!';
module/doc/lang/en.php
+3 -3
View File
@@ -25,9 +25,9 @@ $lang->doc->keywords = 'Tags';
$lang->doc->url = 'URL';
$lang->doc->files = 'File';
$lang->doc->addedBy = 'Add By';
$lang->doc->addedDate = 'Add Date';
$lang->doc->addedDate = 'Added';
$lang->doc->editedBy = 'Edit By';
$lang->doc->editedDate = 'Edit Date';
$lang->doc->editedDate = 'Edited ';
$lang->doc->version = 'Version';
$lang->doc->basicInfo = 'Basic Info';
$lang->doc->deleted = 'Deleted';
@@ -166,7 +166,7 @@ $lang->doclib->control = 'Access Control';
$lang->doclib->group = 'Group';
$lang->doclib->user = 'User';
$lang->doclib->files = 'Files';
$lang->doclib->all = 'All Libraries';
$lang->doclib->all = 'All Library';
$lang->doclib->select = 'Select';
$lang->doclib->project = $lang->projectCommon . ' Library';
$lang->doclib->product = $lang->productCommon . ' Library';
module/group/lang/en.php
+2 -2
View File
@@ -16,13 +16,13 @@ $lang->group->edit = 'Edit';
$lang->group->copy = 'Copy';
$lang->group->delete = 'Delete';
$lang->group->manageView = 'View';
$lang->group->managePriv = 'Batch Assign Privilege';
$lang->group->managePriv = 'Batch Assign';
$lang->group->managePrivByGroup = 'Privilege';
$lang->group->managePrivByModule = 'Module Privilege';
$lang->group->byModuleTips = '<span class="tips">(Press Shift/Ctrl to Multi-select)</span>';
$lang->group->manageMember = 'Member';
$lang->group->confirmDelete = 'Do you want to delete this User Group?';
$lang->group->successSaved = 'Saved!';
$lang->group->successSaved = 'Saved.';
$lang->group->errorNotSaved = 'Failed. Please select actions and groups.';
$lang->group->viewList = 'Views can be accessed.';
$lang->group->productList = 'Products can be accessed.';
module/install/lang/en.php
+22 -22
View File
@@ -19,10 +19,10 @@ $lang->install->error = 'Error ';
$lang->install->officeDomain = 'https://www.zentao.pm';
$lang->install->start = 'Start to Install';
$lang->install->keepInstalling = 'Continue installing this version.';
$lang->install->start = 'Start';
$lang->install->keepInstalling = 'Keep installing this version.';
$lang->install->seeLatestRelease = 'View Latest Version';
$lang->install->welcome = 'Thanks for choosing ZenTao Project Management Software!';
$lang->install->welcome = 'Thanks for choosing ZenTao!';
$lang->install->license = 'ZenTao PMS is under Z PUBLIC LICENSE(ZPL) 1.2';
$lang->install->desc = <<<EOT
ZenTao Project Management Software is an Open Source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>ZPL</a> license. It integrates with Product Management, Project Management, QA Management, Document Management, Todos Management, Company Management etc. ZenTao is the best choice for software project management.
@@ -41,7 +41,7 @@ EOT;
$lang->install->newReleased= "<strong class='text-danger'>Notice</strong>：Official Website has the latest version<strong class='text-danger'>%s</strong>, released on %s.";
$lang->install->or = 'Or';
$lang->install->checking = 'System Checking';
$lang->install->checking = 'System Checkup';
$lang->install->ok = 'Passed(√)';
$lang->install->fail = 'Failed(×)';
$lang->install->loaded = 'Loaded';
@@ -52,27 +52,27 @@ $lang->install->writable = 'Writable ';
$lang->install->notWritable= 'Not Writable ';
$lang->install->phpINI = 'PHP ini File';
$lang->install->checkItem = 'Item';
$lang->install->current = 'Current Settings';
$lang->install->result = 'Results';
$lang->install->action = 'Actions';
$lang->install->current = 'Current Setting';
$lang->install->result = 'Result';
$lang->install->action = 'Action';
$lang->install->phpVersion = 'PHP Version';
$lang->install->phpFail = 'PHP Version has to be 5.2.0+';
$lang->install->pdo = 'PDO';
$lang->install->pdoFail = 'Edit PHP ini file to load PDO extsion.';
$lang->install->pdoFail = 'Edit php.ini to load PDO extsion.';
$lang->install->pdoMySQL = 'PDO_MySQL';
$lang->install->pdoMySQLFail = 'Edit PHP ini file to load PDO_MySQL extsion.';
$lang->install->pdoMySQLFail = 'Edit php.ini to load PDO_MySQL extsion.';
$lang->install->json = 'JSON Extension';
$lang->install->jsonFail = 'Edit the php.ini file to load JSON extension.';
$lang->install->jsonFail = 'Edit php.ini to load JSON extension.';
$lang->install->openssl = 'OpenSSL Extension';
$lang->install->opensslFail = 'Edit the php.ini file to load openssl extension.';
$lang->install->opensslFail = 'Edit php.ini to load openssl extension.';
$lang->install->mbstring = 'Mbstring Extension';
$lang->install->mbstringFail = 'Edit the php.ini file to load mbstring extension.';
$lang->install->mbstringFail = 'Edit php.ini to load mbstring extension.';
$lang->install->zlib = 'Zlib Extension';
$lang->install->zlibFail = 'Edit the php.ini file to load zlib extension.';
$lang->install->zlibFail = 'Edit php.ini to load zlib extension.';
$lang->install->curl = 'Curl Extension';
$lang->install->curlFail = 'Edit the php.ini file to load curl extension.';
$lang->install->curlFail = 'Edit php.ini to load curl extension.';
$lang->install->filter = 'Filter Extension';
$lang->install->filterFail = 'Edit the php.ini file to load filter extension.';
$lang->install->gd = 'GD Extension';
@@ -96,14 +96,14 @@ $lang->install->dbUser = 'Database User';
$lang->install->dbPassword = 'Database Password';
$lang->install->dbName = 'Database Name';
$lang->install->dbPrefix = 'Table Prefix';
$lang->install->clearDB = 'Clean tables if already exist.';
$lang->install->clearDB = 'Clean tables if it already exists.';
$lang->install->importDemoData = 'Import Demo Data';
$lang->install->working = 'Work Mode';
$lang->install->working = 'Operation Mode';
$lang->install->requestTypes['GET'] = 'GET';
$lang->install->requestTypes['PATH_INFO'] = 'PATH_INFO';
$lang->install->workingList['full'] = 'Full Development Management';
$lang->install->workingList['full'] = 'Application Lifecycle Management';
$lang->install->workingList['onlyTest'] = 'Only Test Management';
$lang->install->workingList['onlyStory'] = 'Only Story Management';
$lang->install->workingList['onlyTask'] = 'Only Task Management';
@@ -115,10 +115,10 @@ $lang->install->errorTableExists = 'Data table has existed. If ZenTao has bee
$lang->install->errorCreateTable = 'Failed to create the table.';
$lang->install->errorImportDemoData = 'Failed to import demo data.';
$lang->install->setConfig = 'Create Config File';
$lang->install->setConfig = 'Create config file';
$lang->install->key = 'Item';
$lang->install->value = 'Value';
$lang->install->saveConfig = 'Save Config';
$lang->install->saveConfig = 'Save config';
$lang->install->save2File = '<div class="alert alert-warning">Copy the content in the text box above and save it to "<strong> %s </strong>". You can change this config file later.</div>';
$lang->install->saved2File = 'Config file has been saved to " <strong>%s</strong> ". You can change this file later.';
$lang->install->errorNotSaveConfig = 'Config file is not saved.';
@@ -130,7 +130,7 @@ $lang->install->password = 'Admin Password';
$lang->install->errorEmptyPassword = 'Password should not be blank.';
$lang->install->groupList['ADMIN']['name'] = 'Admin';
$lang->install->groupList['ADMIN']['desc'] = 'System Administrator';
$lang->install->groupList['ADMIN']['desc'] = 'System Admin';
$lang->install->groupList['DEV']['name'] = 'Dev';
$lang->install->groupList['DEV']['desc'] = 'Developer';
$lang->install->groupList['QA']['name'] = 'QA';
@@ -150,7 +150,7 @@ $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'] = 'can only edit contents related to itself';
$lang->install->groupList['LIMITED']['desc'] = 'User can only edit contents related to itself';
$lang->install->cronList[''] = 'Monitor cron';
$lang->install->cronList['moduleName=project&methodName=computeburn'] = 'Update Burndown Chart';
@@ -173,7 +173,7 @@ EOT;
$lang->install->product = array('chanzhi', 'ranzhi');
$lang->install->promotion = "Products of Nature Easy Soft:";
$lang->install->promotion = "Products from Nature Easy Soft team:";
$lang->install->chanzhi = new stdclass();
$lang->install->chanzhi->name = 'ZSITE content management system.';
$lang->install->chanzhi->logo = 'images/main/chanzhi_en.png';
module/my/lang/en.php
+4 -4
View File
@@ -16,12 +16,12 @@ $lang->my->dynamic = 'My Dynamic';
$lang->my->editProfile = 'Edit Profile';
$lang->my->changePassword = 'Edit Password';
$lang->my->unbind = 'Unbind Ranger';
$lang->my->manageContacts = 'Maintain Contact';
$lang->my->manageContacts = 'Manage Contact';
$lang->my->deleteContacts = 'Delete Contact';
$lang->my->shareContacts = 'Share the list';
$lang->my->limited = 'Restricted operation (editing only content related to itself)';
$lang->my->score = 'My Score';
$lang->my->scoreRule = 'Score Rule';
$lang->my->limited = 'Restricted actions (editing only content related to itself)';
$lang->my->score = 'My Point';
$lang->my->scoreRule = 'Point Rule';
$lang->my->noTodo = 'No todos. ';
$lang->my->taskMenu = new stdclass();
module/product/lang/en.php
+2 -2
View File
@@ -24,7 +24,7 @@ $lang->product->select = "Select {$lang->productCommon}";
$lang->product->mine = 'My responsibility:';
$lang->product->other = 'Other:';
$lang->product->closed = 'Closed';
$lang->product->updateOrder = 'Ranking';
$lang->product->updateOrder = 'Order';
$lang->product->all = "All {$lang->productCommon}";
$lang->product->export = 'Export Data';
@@ -44,7 +44,7 @@ $lang->product->project = $lang->projectCommon . 'List';
$lang->product->build = 'Build';
$lang->product->currentProject = "Current {$lang->projectCommon}";
$lang->product->activeStories = 'Activated Story';
$lang->product->activeStories = 'Active Story';
$lang->product->changedStories = 'Changed Story';
$lang->product->draftStories = 'Draft Story';
$lang->product->closedStories = 'Closed Story';
module/productplan/lang/en.php
+1 -1
View File
@@ -16,7 +16,7 @@ $lang->productplan->create = "Create Plan";
$lang->productplan->edit = "Edit";
$lang->productplan->delete = "Delete";
$lang->productplan->view = "Details";
$lang->productplan->bugSummary = "<strong>%s</strong> Bugs in total on this page.";
$lang->productplan->bugSummary = "Total <strong>%s</strong> Bugs on this page.";
$lang->productplan->basicInfo = 'Basic Info';
$lang->productplan->batchEdit = 'Batch Edit';
module/project/lang/en.php
+3 -3
View File
@@ -19,7 +19,7 @@ $lang->project->begin = 'Begin';
$lang->project->end = 'End';
$lang->project->dateRange = 'Duration';
$lang->project->to = 'To';
$lang->project->days = 'Man-Day';
$lang->project->days = 'Man Day';
$lang->project->day = 'day';
$lang->project->workHour = 'Hours';
$lang->project->totalHours = 'Work Hours';
@@ -231,13 +231,13 @@ $lang->project->confirmUnlinkMember = "Do you want to unlink this User from {$
$lang->project->confirmUnlinkStory = "Do you want to unlink this Story from {$lang->projectCommon}?";
$lang->project->errorNoLinkedProducts = "No linked {$lang->productCommon} found in {$lang->projectCommon}. You will be directed to {$lang->productCommon}linked page.";
$lang->project->errorSameProducts = "{$lang->projectCommon} cannot be linked with multiple identical {$lang->productCommon}。";
$lang->project->accessDenied = "Access to {$lang->projectCommon} is denied!";
$lang->project->accessDenied = "Your access to {$lang->projectCommon} is denied!";
$lang->project->tips = 'Note';
$lang->project->afterInfo = "{$lang->projectCommon} is created. Next you can ";
$lang->project->setTeam = 'Set Team';
$lang->project->linkStory = 'Link Story';
$lang->project->createTask = 'Create Task';
$lang->project->goback = "Return";
$lang->project->goback = "Back";
$lang->project->noweekend = 'Without Weekend';
$lang->project->withweekend = 'With Weekend';
$lang->project->interval = 'Intervals';
module/score/lang/en.php
+8 -8
View File
@@ -1,11 +1,11 @@
<?php
$lang->score->common = 'My Score';
$lang->score->record = 'Score Record';
$lang->score->current = 'Current Score';
$lang->score->level = 'Level Score';
$lang->score->common = 'My Point';
$lang->score->record = 'Point Record';
$lang->score->current = 'Current Point';
$lang->score->level = 'Level Point';
$lang->score->reset = 'Reset';
$lang->score->tips = 'Yesterday added score: <strong>%d</strong><br/>Total score: <strong>%d</strong>';
$lang->score->resetTips = 'It will take a long time. <strong>Do not close the window.</strong>';
$lang->score->tips = 'Yesterday added: <strong>%d</strong><br/> Total: <strong>%d</strong>';
$lang->score->resetTips = 'It will take a while. <strong>Do not close the window.</strong>';
$lang->score->resetStart = 'Start';
$lang->score->resetLoading = 'Processing: ';
$lang->score->resetFinish = 'Finished';
@@ -16,11 +16,11 @@ $lang->score->account = 'User';
$lang->score->module = 'Module';
$lang->score->method = 'Method';
$lang->score->before = 'Before';
$lang->score->score = 'Score';
$lang->score->score = 'Point';
$lang->score->after = 'After';
$lang->score->time = 'Time';
$lang->score->desc = 'Description';
$lang->score->noLimit = 'No limited';
$lang->score->noLimit = 'No limit';
$lang->score->times = 'Times';
$lang->score->hour = 'Hour';
module/story/lang/en.php
+6 -6
View File
@@ -68,17 +68,17 @@ $lang->story->stage = 'Phase';
$lang->story->stageAB = 'Phase';
$lang->story->mailto = 'Mail to';
$lang->story->openedBy = 'Creator';
$lang->story->openedDate = 'Create on';
$lang->story->openedDate = 'Created';
$lang->story->assignedTo = 'Assignee';
$lang->story->assignedDate = 'Assigned on';
$lang->story->assignedDate = 'Assigned';
$lang->story->lastEditedBy = 'Last Edited';
$lang->story->lastEditedDate = 'Edited on';
$lang->story->lastEditedDate = 'Edited';
$lang->story->closedBy = 'Closed by';
$lang->story->closedDate = 'Closed on';
$lang->story->closedDate = 'Closed';
$lang->story->closedReason = 'Close Reason';
$lang->story->rejectedReason = 'Reject Reason';
$lang->story->reviewedBy = 'Reviewer';
$lang->story->reviewedDate = 'Reviewed on';
$lang->story->reviewedDate = 'Reviewed';
$lang->story->version = 'Version';
$lang->story->plan = 'Plan';
$lang->story->planAB = 'Plan';
@@ -305,4 +305,4 @@ $lang->story->chosen = new stdClass();
$lang->story->chosen->reviewedBy = 'Choose Reviewer';
$lang->story->notice = new stdClass();
$lang->story->notice->closed = 'Stories you select are closed!';
$lang->story->notice->closed = 'Story that you select are closed!';
module/story/lang/zh-tw.php
+1
View File
@@ -181,6 +181,7 @@ $lang->story->lblChange = '變更需求';
$lang->story->lblReview = '評審需求';
$lang->story->lblActivate = '激活需求';
$lang->story->lblClose = '關閉需求';
$lang->story->lblTBC = '任務Bug用例';
$lang->story->checkAffection = '影響範圍';
$lang->story->affectedProjects = '影響的' . $lang->projectCommon;
module/task/lang/en.php
+12 -12
View File
@@ -12,7 +12,7 @@
$lang->task->index = "Index";
$lang->task->create = "Create Task";
$lang->task->batchCreate = "Batch Create";
$lang->task->batchCreateChildren = "Batch Create Children";
$lang->task->batchCreateChildren = "Batch Create Child";
$lang->task->batchEdit = "Batch Edit";
$lang->task->batchChangeModule = "Batch Change Module";
$lang->task->batchClose = "Batch Close";
@@ -23,7 +23,7 @@ $lang->task->deleted = "Deleted";
$lang->task->delayed = 'Delayed';
$lang->task->view = "Overview";
$lang->task->logEfforts = "Hour";
$lang->task->record = "Est.";
$lang->task->record = "Est";
$lang->task->start = "Start";
$lang->task->restart = "Continue";
$lang->task->finish = "Finish";
@@ -48,8 +48,8 @@ $lang->task->module = 'Module';
$lang->task->moduleAB = 'Module';
$lang->task->story = 'Story';
$lang->task->storyAB = 'Story';
$lang->task->storySpec = 'Story Description';
$lang->task->storyVerify = 'Acceptance Criteria';
$lang->task->storySpec = 'Description';
$lang->task->storyVerify = 'Acceptance';
$lang->task->name = 'Name';
$lang->task->type = 'Type';
$lang->task->pri = 'Priority';
@@ -77,24 +77,24 @@ $lang->task->assignTo = $lang->task->assign;
$lang->task->batchAssignTo = 'Batch Assign';
$lang->task->assignedTo = 'Assignee';
$lang->task->assignedToAB = 'Assignee';
$lang->task->assignedDate = 'Assign on';
$lang->task->assignedDate = 'Assigned';
$lang->task->openedBy = 'Created by';
$lang->task->openedDate = 'Created on';
$lang->task->openedDate = 'Created';
$lang->task->openedDateAB = 'Add';
$lang->task->finishedBy = 'Finished';
$lang->task->finishedByAB = 'Finished';
$lang->task->finishedDate = 'Finished on';
$lang->task->finishedDateAB = 'Finished on';
$lang->task->finishedDate = 'Finished';
$lang->task->finishedDateAB = 'Finished';
$lang->task->finishedList = 'Finished list';
$lang->task->canceledBy = 'Cancelled by';
$lang->task->canceledDate = 'Cancelled on';
$lang->task->canceledDate = 'Cancelled';
$lang->task->closedBy = 'Closed by';
$lang->task->closedDate = 'Close Date';
$lang->task->closedDate = 'Closed';
$lang->task->closedReason = 'Cancel Reason';
$lang->task->lastEditedBy = 'Edited by';
$lang->task->lastEditedDate = 'Edited on';
$lang->task->lastEditedDate = 'Edited';
$lang->task->lastEdited = 'Last Edited';
$lang->task->recordEstimate = 'Make Progress';
$lang->task->recordEstimate = 'Progress';
$lang->task->editEstimate = 'Edit Est.';
$lang->task->deleteEstimate = 'Delete Est.';
$lang->task->colorTag = 'Color Tag';
module/task/lang/zh-tw.php
+1
View File
@@ -39,6 +39,7 @@ $lang->task->confirmStoryChange = "確認需求變動";
$lang->task->progress = '進度';
$lang->task->progressTips = '已消耗/(已消耗+剩餘)';
$lang->task->copy = '複製任務';
$lang->task->waitTask = '未開始的任務';
$lang->task->common = '任務';
$lang->task->id = '編號';
module/testcase/lang/en.php
+8 -8
View File
@@ -23,7 +23,7 @@ $lang->testcase->type = 'Type';
$lang->testcase->status = 'Status';
$lang->testcase->steps = 'Steps';
$lang->testcase->openedBy = 'Created by';
$lang->testcase->openedDate = 'Created on';
$lang->testcase->openedDate = 'Created';
$lang->testcase->lastEditedBy = 'Edited by';
$lang->testcase->result = 'Result';
$lang->testcase->real = 'Details';
@@ -34,15 +34,15 @@ $lang->testcase->linkCases = 'Link Cases';
$lang->testcase->unlinkCase = 'Unlink Cases';
$lang->testcase->stage = 'Phase';
$lang->testcase->reviewedBy = 'Reviewed by';
$lang->testcase->reviewedDate = 'Reviewed on';
$lang->testcase->reviewedDate = 'Reviewed';
$lang->testcase->reviewResult = 'Review Result';
$lang->testcase->reviewedByAB = 'By';
$lang->testcase->reviewedDateAB = 'Date';
$lang->testcase->reviewResultAB = 'Result';
$lang->testcase->forceNotReview = 'No Review';
$lang->testcase->lastEditedByAB = 'Edited by';
$lang->testcase->lastEditedDateAB = 'Edited on';
$lang->testcase->lastEditedDate = 'Edited on';
$lang->testcase->lastEditedDateAB = 'Edited';
$lang->testcase->lastEditedDate = 'Edited';
$lang->testcase->version = 'Case Version';
$lang->testcase->lastRunner = 'LastRun';
$lang->testcase->lastRunDate = 'Time';
@@ -59,7 +59,7 @@ $lang->testcase->bugs = 'Bugs Generated';
$lang->testcase->bugsAB = 'B';
$lang->testcase->results = 'Results';
$lang->testcase->resultsAB = 'R';
$lang->testcase->stepNumber = 'Number of steps';
$lang->testcase->stepNumber = 'No.. of steps';
$lang->testcase->stepNumberAB = 'S';
$lang->testcase->createBug = 'Convert to Bug';
$lang->testcase->fromModule = 'Source Module';
@@ -102,7 +102,7 @@ $lang->testcase->group = 'Group';
$lang->testcase->groupName = 'Group Name';
$lang->testcase->step = 'Step';
$lang->testcase->stepChild = 'Child';
$lang->testcase->viewAll = 'View All';
$lang->testcase->viewAll = 'All';
$lang->testcase->new = 'New';
@@ -177,7 +177,7 @@ $lang->testcase->statusList[''] = '';
$lang->testcase->statusList['wait'] = 'Wait';
$lang->testcase->statusList['normal'] = 'Normal';
$lang->testcase->statusList['blocked'] = 'Blocked';
$lang->testcase->statusList['investigate'] = 'Investigating';
$lang->testcase->statusList['investigate'] = 'Studying';
$lang->testcase->resultList['n/a'] = 'Ignore';
$lang->testcase->resultList['pass'] = 'Pass';
@@ -194,7 +194,7 @@ $lang->testcase->mustChooseResult = 'Review result is required.';
$lang->testcase->noModule = '<div>You have no modules</div><div>Manage now</div>';
$lang->testcase->noCase = 'No cases. ';
$lang->testcase->searchStories = 'Enter to searcu Story';
$lang->testcase->searchStories = 'Enter to search Story';
$lang->testcase->selectLib = 'Select Library';
$lang->testcase->action = new stdclass();
module/testreport/lang/en.php
+6 -6
View File
@@ -5,7 +5,7 @@ $lang->testreport->create = 'Create Report';
$lang->testreport->edit = 'Edit Report';
$lang->testreport->delete = 'Delete';
$lang->testreport->export = 'Export';
$lang->testreport->view = 'Report Details';
$lang->testreport->view = 'Details';
$lang->testreport->recreate = 'Re-Create';
$lang->testreport->title = 'Title';
@@ -47,8 +47,8 @@ $lang->testreport->legendMore = 'More';
$lang->testreport->bugSeverityGroups = 'Bug Severity Distribution';
$lang->testreport->bugTypeGroups = 'Bug Type Distribution';
$lang->testreport->bugStatusGroups = 'Bug Status Distribution';
$lang->testreport->bugOpenedByGroups = 'Bug Creator Distribution';
$lang->testreport->bugResolvedByGroups = 'Bug Solver Distribution';
$lang->testreport->bugOpenedByGroups = 'Bug CreateBy Distribution';
$lang->testreport->bugResolvedByGroups = 'Bug ResolveBy Distribution';
$lang->testreport->bugResolutionGroups = 'Bug Resolution Distribution';
$lang->testreport->bugModuleGroups = 'Bug Module Distribution';
$lang->testreport->legacyBugs = 'Legacy Bugs';
@@ -59,13 +59,13 @@ $lang->testreport->caseSummary = ' <strong>%s</strong> cases in Total : <stro
$lang->testreport->buildSummary = 'Tested <strong>%s</strong> build.';
$lang->testreport->confirmDelete = 'Do you want to delete this report?';
$lang->testreport->moreNotice = 'More features can be extended with reference to the ZenTao extension manual, or you can contact us at renee@easysoft.ltd for customization.';
$lang->testreport->exportNotice = "Export By <a href='https://www.zentao.net' target='_blank' style='color:grey'>ZenTaoPMS</a>";
$lang->testreport->exportNotice = "Exported By <a href='https://www.zentao.net' target='_blank' style='color:grey'>ZenTaoPMS</a>";
$lang->testreport->noReport = "No report has been generated. Please check it later.";
$lang->testreport->foundBugTip = "Bugs created in this build and created in the test period.";
$lang->testreport->legacyBugTip = "Active Bugs, or the resolved beyond the test period.";
$lang->testreport->fromCaseBugTip = "Bugs created after failed cases in the test period.";
$lang->testreport->errorTrunk = "The trunk version cannot create a test report. Please modify the associated version!";
$lang->testreport->moreProduct = "You can only create test reports the same product.";
$lang->testreport->errorTrunk = "The trunk cannot create a test report for. Please modify the linked build!";
$lang->testreport->moreProduct = "You can only create test reports for the same product.";
$lang->testreport->bugSummary = <<<EOD
<strong>%s</strong> Bug(s) generated in total <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-help'></i></a>,
module/testsuite/lang/en.php
+2 -2
View File
@@ -15,7 +15,7 @@ $lang->testsuite->delete = "Delete";
$lang->testsuite->view = "Overview";
$lang->testsuite->edit = "Edit";
$lang->testsuite->browse = "Suite List";
$lang->testsuite->linkCase = "Link Cases";
$lang->testsuite->linkCase = "Link Case";
$lang->testsuite->linkVersion = "Version";
$lang->testsuite->unlinkCase = "Unlink";
$lang->testsuite->batchUnlinkCases = "Batch Unlink Case";
@@ -37,7 +37,7 @@ $lang->testsuite->addedDate = 'Date';
$lang->testsuite->legendDesc = 'Description';
$lang->testsuite->legendBasicInfo = 'Basic Info';
$lang->testsuite->unlinkedCases = 'Unlinked Cases';
$lang->testsuite->unlinkedCases = 'Unlinked Case';
$lang->testsuite->confirmDelete = 'Do you want to delete this suite?';
$lang->testsuite->libraryDelete = 'Do you want to delete this library？';
module/testtask/lang/en.php
+9 -9
View File
@@ -15,8 +15,8 @@ $lang->testtask->reportChart = 'Report';
$lang->testtask->delete = "Delete";
$lang->testtask->view = "Overview";
$lang->testtask->edit = "Edit";
$lang->testtask->browse = "Test Tasks";
$lang->testtask->linkCase = "Link Cases";
$lang->testtask->browse = "Test Task";
$lang->testtask->linkCase = "Link Case";
$lang->testtask->selectVersion = "Select Version";
$lang->testtask->unlinkCase = "Unlink";
$lang->testtask->batchUnlinkCases = "Batch unlink cases";
@@ -26,9 +26,9 @@ $lang->testtask->batchRun = "Batch Run";
$lang->testtask->results = "Result";
$lang->testtask->createBug = "Bug(+)";
$lang->testtask->assign = 'Assign';
$lang->testtask->cases = 'Cases';
$lang->testtask->cases = 'Case';
$lang->testtask->groupCase = "By Group";
$lang->testtask->pre = 'Previous';
$lang->testtask->pre = 'Prev';
$lang->testtask->next = 'Next';
$lang->testtask->start = "Start";
$lang->testtask->close = "Close";
@@ -69,7 +69,7 @@ $lang->testtask->version = 'Version';
$lang->testtask->caseResult = 'Test Result';
$lang->testtask->stepResults = 'Step Results';
$lang->testtask->lastRunner = 'Last Run By';
$lang->testtask->lastRunDate = 'Last Run Date';
$lang->testtask->lastRunDate = 'Last Run';
$lang->testtask->date = 'Date';
$lang->testtask->beginAndEnd = 'Date';
@@ -105,15 +105,15 @@ $lang->testtask->confirmDelete = 'Do you want to delete this test build?';
$lang->testtask->confirmUnlinkCase = 'Do you want to unlink this Case?';
$lang->testtask->noticeNoOther = 'There are no other test task for this product';
$lang->testtask->noTesttask = 'No test tasks. ';
$lang->testtask->checkLinked = "Please check if the testtask product is linked to project.";
$lang->testtask->checkLinked = "Please check if the testtask product is linked to a project.";
$lang->testtask->assignedToMe = 'My';
$lang->testtask->allCases = 'AllCases';
$lang->testtask->allCases = 'All Cases';
$lang->testtask->lblCases = 'Cases';
$lang->testtask->lblUnlinkCase = 'Unlink Case';
$lang->testtask->lblRunCase = 'Run Case';
$lang->testtask->lblResults = 'Results';
$lang->testtask->lblResults = 'Result';
$lang->testtask->placeholder = new stdclass();
$lang->testtask->placeholder->begin = 'Begin';
@@ -137,7 +137,7 @@ $lang->testtask->unexecuted = 'Not performed';
/* 统计报表。*/
$lang->testtask->report = new stdclass();
$lang->testtask->report->common = 'Report';
$lang->testtask->report->select = 'Select report type';
$lang->testtask->report->select = 'Type';
$lang->testtask->report->create = 'Generate';
$lang->testtask->report->charts['testTaskPerRunResult'] = 'Result Report';
module/todo/lang/en.php
+1 -1
View File
@@ -12,7 +12,7 @@
$lang->todo->common = 'Todo';
$lang->todo->index = "Home";
$lang->todo->create = "Add Todo";
$lang->todo->createCycle = "Add Recurring Todo";
$lang->todo->createCycle = "Add Recur Todo";
$lang->todo->assignTo = "Assign";
$lang->todo->activate = "Activate";
$lang->todo->batchCreate = "Batch Add";
module/upgrade/lang/en.php
+8 -8
View File
@@ -14,7 +14,7 @@ $lang->upgrade->result = 'Result';
$lang->upgrade->fail = 'Failed';
$lang->upgrade->success = 'Upgraded';
$lang->upgrade->tohome = 'Visit ZenTao';
$lang->upgrade->license = 'Zentao PMS has started using Z PUBLIC LICENSE(ZPL) 1.2.';
$lang->upgrade->license = 'Zentao is under Z PUBLIC LICENSE(ZPL) 1.2.';
$lang->upgrade->warnning= 'Warning!';
$lang->upgrade->checkExtension = 'Check Extension';
$lang->upgrade->warnningContent = <<<EOT
@@ -27,9 +27,9 @@ $lang->upgrade->warnningContent = <<<EOT
e.g. mysqldump -u root -p zentao >zentao.bak
</pre>
EOT;
$lang->upgrade->createFileWinCMD = 'Open command line, execute <strong style="color:#ed980f">echo > %s</strong>';
$lang->upgrade->createFileLinuxCMD = 'Execute in command line: <strong style="color:#ed980f">touch %s</strong>';
$lang->upgrade->setStatusFile = '<h4>Please finish the following action</h4>
$lang->upgrade->createFileWinCMD = 'Open command line and execute <strong style="color:#ed980f">echo > %s</strong>';
$lang->upgrade->createFileLinuxCMD = 'Execute command line: <strong style="color:#ed980f">touch %s</strong>';
$lang->upgrade->setStatusFile = '<h4>Please finish the following actions</h4>
<ul style="line-height:1.5;font-size:13px;">
<li>%s</li>
<li>Or delete "<strong style="color:#ed980f">%s</strong>" and create <strong style="color:#ed980f">ok.txt</strong> and leave it blank.</li>
@@ -38,11 +38,11 @@ $lang->upgrade->setStatusFile = '<h4>Please finish the following action</h4
$lang->upgrade->selectVersion = 'Select Version';
$lang->upgrade->continue = 'Continue';
$lang->upgrade->noteVersion = "Select the compatible version, or it might cause data loss.";
$lang->upgrade->fromVersion = 'From Version';
$lang->upgrade->toVersion = 'Upgrade to Version';
$lang->upgrade->fromVersion = 'From';
$lang->upgrade->toVersion = 'Upgrade to';
$lang->upgrade->confirm = 'Confirm SQL';
$lang->upgrade->sureExecute = 'Execute';
$lang->upgrade->forbiddenExt = 'Extension is not compatible with the upgraded version. It has been deactivated:';
$lang->upgrade->updateFile = 'Attachment information has to be updated.';
$lang->upgrade->forbiddenExt = 'Extension is not compatible with the version. It has been deactivated:';
$lang->upgrade->updateFile = 'File information has to be updated.';
include dirname(__FILE__) . '/version.php';
module/upgrade/lang/version.php
+1
View File
@@ -97,3 +97,4 @@ $lang->upgrade->fromVersions['10_2'] = '10.2';
$lang->upgrade->fromVersions['10_3'] = '10.3';
$lang->upgrade->fromVersions['10_3_1'] = '10.3.1';
$lang->upgrade->fromVersions['10_4'] = '10.4';
$lang->upgrade->fromVersions['10_5'] = '10.5';
module/upgrade/model.php
+2
View File
@@ -240,6 +240,7 @@ class upgradeModel extends model
case '10_4':
$this->execSQL($this->getUpgradeFile('10.4'));
$this->changeTaskParentValue();
case '10_5':
}
$this->deletePatch();
@@ -356,6 +357,7 @@ class upgradeModel extends model
case '10_3':
case '10_3_1': $confirmContent .= file_get_contents($this->getUpgradeFile('10.3.1'));
case '10_4': $confirmContent .= file_get_contents($this->getUpgradeFile('10.4'));
case '10_5':
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}
module/user/lang/en.php
+10 -10
View File
@@ -59,10 +59,10 @@ $lang->user->unbind = "Unbind Zdoo";
$lang->user->login = "Login";
$lang->user->mobileLogin = "Mobile";
$lang->user->editProfile = "Edit";
$lang->user->deny = "Access is denied.";
$lang->user->confirmDelete = "Are you sure to delete this user?";
$lang->user->confirmUnlock = "Are you sure to unlock this user?";
$lang->user->confirmUnbind = "Are you sure to unbind this user from Zdoo?";
$lang->user->deny = "Your access is denied.";
$lang->user->confirmDelete = "Do you want to delete this user?";
$lang->user->confirmUnlock = "Do you want to unlock this user?";
$lang->user->confirmUnbind = "Do you want to unbind this user from Zdoo?";
$lang->user->relogin = "Login Again";
$lang->user->asGuest = "Guest";
$lang->user->goback = "Back";
@@ -93,11 +93,11 @@ $lang->user->testTask2Him = 'Build';
$lang->user->case2Him = 'Case Assigned';
$lang->user->caseByHim = 'Case Opened';
$lang->user->errorDeny = "Sorry, your access to <b>%s</b> of <b>%s</b> has been denied. Please contact your Admin to get permissions. Click Back to return.";
$lang->user->errorDeny = "Sorry, your access to <b>%s</b> of <b>%s</b> is denied. Please contact your Admin to get permissions. Click Back to return.";
$lang->user->loginFailed = "Login failed. Please check your account and password.";
$lang->user->lockWarning = "You can try %s times.";
$lang->user->loginLocked = "Please contact the administrator to unlock your account or try %s mins later.";
$lang->user->weakPassword = "Your password does not meet the complexity requirements.";
$lang->user->weakPassword = "Your password does not meet the requirements.";
$lang->user->roleList[''] = '';
$lang->user->roleList['dev'] = 'Developer';
@@ -130,12 +130,12 @@ $lang->user->tpl->content = 'Content';
$lang->user->tpl->public = 'Public';
$lang->user->placeholder = new stdclass();
$lang->user->placeholder->account = 'Letters, Underline and Numbers, at least 3 characters';
$lang->user->placeholder->account = 'Letters, underline and numbers, 3 characters minimum';
$lang->user->placeholder->password1 = 'six characters at lease ';
$lang->user->placeholder->role = "Role affects content and user order.";
$lang->user->placeholder->group = "Group decides user privilege.";
$lang->user->placeholder->role = "Role is related to content and user order.";
$lang->user->placeholder->group = "Group is related to user privileges.";
$lang->user->placeholder->commiter = 'SVN/Git account';
$lang->user->placeholder->verify = 'Please input your login password.';
$lang->user->placeholder->verify = 'Please enter your login password.';
$lang->user->placeholder->passwordStrength[1] = 'Letters and Numbers, at least 6 characters';
$lang->user->placeholder->passwordStrength[2] = 'Letters, Numbers and special characters, at lease 10 characters';