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
2019-04-24 13:32:07 +08:00
parent bd29dcdf7d 49a0969c0e
commit 4a6ec03672
27 changed files with 188 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/lang/en.php
+1 -10
View File
@@ -38,20 +38,11 @@ $lang->admin->notice->ignore = "Ignore";
$lang->admin->notice->int = "『%s』should be a positive integer.";
$lang->admin->register = new stdclass();
<<<<<<< HEAD
$lang->admin->register->common = 'Bind New Account';
=======
$lang->admin->register->common = 'Bind Account';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->admin->register->caption = 'Register in Zentao Community';
$lang->admin->register->caption = 'Register in ZenTao Community';
$lang->admin->register->click = 'Register here';
<<<<<<< HEAD
$lang->admin->register->lblAccount = 'at least 3 characters; contains letters and numbers.';
$lang->admin->register->lblPasswd = 'at least 6 characters; contains letters and numbers.';
=======
$lang->admin->register->lblAccount = '>= 3 characters; contains letters and numbers.';
$lang->admin->register->lblPasswd = '>= 6 characters; contains letters and numbers.';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->admin->register->submit = 'Register';
$lang->admin->register->bind = "Bind Exsit Account";
$lang->admin->register->success = "You have registered with us!";
module/bug/lang/en.php
-39
View File
@@ -32,34 +32,17 @@ $lang->bug->status = 'Status';
$lang->bug->statusAB = 'Status';
$lang->bug->activatedCount = 'Active';
$lang->bug->activatedCountAB = 'Active';
<<<<<<< HEAD
$lang->bug->activatedDate = 'Active';
=======
$lang->bug->activatedDate = 'Activated';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->bug->confirmed = 'Confirmed';
$lang->bug->toTask = 'Convert to Task';
$lang->bug->toStory = 'Convert to Story';
$lang->bug->mailto = 'Mail To';
<<<<<<< HEAD
<<<<<<< HEAD
$lang->bug->openedBy = 'Created by';
$lang->bug->openedDate = 'Created';
$lang->bug->openedDateAB = 'Created';
$lang->bug->openedBuild = 'Open Build';
$lang->bug->assignedTo = 'To';
$lang->bug->assignBug = 'Assignee';
=======
$lang->bug->openedBy = 'Creator';
=======
$lang->bug->openedBy = 'Created by';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->bug->openedDate = 'Created';
$lang->bug->openedDateAB = 'Created';
$lang->bug->openedBuild = 'Open Build';
$lang->bug->assignedTo = 'Assign To';
$lang->bug->assignBug = 'Assign To';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->bug->assignedToAB = 'To';
$lang->bug->assignedDate = 'Assigned';
$lang->bug->resolvedBy = 'Resolved';
@@ -81,15 +64,9 @@ $lang->bug->unlinkBug = 'Unlink';
$lang->bug->case = 'Case';
$lang->bug->files = 'File';
$lang->bug->keywords = 'Tags';
<<<<<<< HEAD
$lang->bug->lastEditedByAB = 'Edited by';
$lang->bug->lastEditedDateAB = 'Edit';
$lang->bug->lastEditedDate = 'Edit';
=======
$lang->bug->lastEditedByAB = 'Edited By';
$lang->bug->lastEditedDateAB = 'Edited';
$lang->bug->lastEditedDate = 'Edited';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->bug->fromCase = 'From Case';
$lang->bug->toCase = 'To Case';
$lang->bug->colorTag = 'Color Tag';
@@ -140,23 +117,12 @@ $lang->bug->postponedBugs = 'Postponed';
$lang->bug->overdueBugs = 'Overdue';
$lang->bug->allBugs = 'All';
$lang->bug->byQuery = 'Search';
<<<<<<< HEAD
$lang->bug->needConfirm = 'ChangedStory';
=======
$lang->bug->needConfirm = 'Story Changed';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->bug->allProduct = 'All' . $lang->productCommon;
<<<<<<< HEAD
$lang->bug->my = 'Mine';
$lang->bug->yesterdayResolved = 'Resolved Yesterday ';
$lang->bug->yesterdayConfirmed = 'Confirmed Yesterday ';
$lang->bug->yesterdayClosed = 'Closed Yesterday ';
=======
$lang->bug->my = 'My';
$lang->bug->yesterdayResolved = 'Bug Resolved Yesterday ';
$lang->bug->yesterdayConfirmed = 'Bug Confirmed Yesterday ';
$lang->bug->yesterdayClosed = 'Bug Closed Yesterday ';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->bug->assignToMeAB = 'AssignToMe';
$lang->bug->openedByMeAB = 'CreateByMe';
@@ -186,13 +152,8 @@ $lang->bug->lblTypeAndSeverity = 'Type/Severity';
$lang->bug->lblSystemBrowserAndHardware = 'System/Browser';
$lang->bug->legendSteps = 'Repro Steps';
$lang->bug->legendComment = 'Note';
<<<<<<< HEAD
$lang->bug->legendLife = 'About the Bug';
$lang->bug->legendMisc = 'Misc.';
=======
$lang->bug->legendLife = 'About';
$lang->bug->legendMisc = 'Misc';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->bug->legendRelated = 'Related Info';
/* 功能按钮。*/
module/common/lang/en.php
-22
View File
@@ -516,31 +516,16 @@ $lang->website = "https://www.zentao.pm";
$lang->suhosinInfo = "Warning! Data is reaching the limit. Please change <font color=red>sohusin.post.max_vars</font> and <font color=red>sohusin.request.max_vars</font> (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved.";
$lang->maxVarsInfo = "Warning! Data is reaching the limit. Please change <font color=red>max_input_vars</font> (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved.";
$lang->pasteTextInfo = "Paste text here. Each line will be the title of each record. ";
<<<<<<< HEAD
$lang->noticeImport = "Imported data contains data that has already existed in system. Please confirm you actions on the date.";
$lang->importConfirm = "Import";
=======
$lang->noticeImport = "Imported data contains something that has already existed in system. Please confirm your actions.";
$lang->importConfirm = "Confirm";
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->importAndCover = "Override";
$lang->importAndInsert = "Insert";
$lang->noResultsMatch = "No results match found!";
$lang->searchMore = "More results：";
<<<<<<< HEAD
<<<<<<< HEAD
$lang->chooseUsersToMail = "Choose users that will be notified.";
$lang->browserNotice = 'The browser you currently use might not get the best browsing results. It is recommended that you use Chrome, Firefox, IE9+, Opera or Safari.';
=======
$lang->chooseUsersToMail = "Choose users to be notified.";
$lang->browserNotice = 'Your current browser might not display the best effect. Use Chrome, Firefox, IE9+, Opera or Safari.';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
=======
$lang->chooseUsersToMail = "Choose users to be notified";
$lang->browserNotice = 'Your browser might not display the best effect. Use Chrome, Firefox, IE9+, Opera or Safari.';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->noticePasteImg = "Paste images here";
$lang->pasteImgFail = "Pasting image failed. Try again later.";
$lang->pasteImgUploading = "Uploading...";
@@ -751,17 +736,10 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest')
/* Add bug, testcase and testtask module. */
$lang->menu->bug = 'Bug|bug|index';
<<<<<<< HEAD
$lang->menu->testcase = 'Case|testcase|index';
$lang->menu->testsuite = 'Suite|testsuite|index';
$lang->menu->testtask = 'Test|testtask|index';
$lang->menu->caselib = 'Case Library|testsuite|library';
=======
$lang->menu->testcase = 'Test Case|testcase|index';
$lang->menu->testsuite = 'Test Suite|testsuite|index';
$lang->menu->testtask = 'Test|testtask|index';
$lang->menu->caselib = 'Case Lib|testsuite|library';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->menuOrder[6] = 'bug';
$lang->menuOrder[7] = 'testcase';
module/custom/lang/en.php
-4
View File
@@ -94,12 +94,8 @@ $lang->custom->notice->forceNotReview = "%s Review is NOT required for cer
$lang->custom->notice->longlife = 'Define longlife bugs.';
$lang->custom->notice->invalidNumberKey = 'The key should be =< 255.';
$lang->custom->notice->invalidStringKey = 'The key should be a combination of lowercase letters, numbers or underlines.';
<<<<<<< HEAD
$lang->custom->notice->cannotSetTimezone = 'date_default_timezone_set does not exist or is disabled. Timezone cannot be set.';
=======
$lang->custom->notice->cannotSetTimezone = 'date_default_timezone_set does not exist or is disabled. Time zone cannot be set.';
$lang->custom->notice->noClosedBlock = 'Blocks without permanent closure';
>>>>>>> 49933c0fcb7f076b5948bc4dba29468ed23927ec
$lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Home. Do you want to go to Product Home?";
$lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Home. Do you want to go to Project Home?";
module/dept/lang/en.php
+2 -11
View File
@@ -17,11 +17,7 @@ $lang->dept->parent = "Parent Dept";
$lang->dept->manager = "Manager";
$lang->dept->name = "Department Name";
$lang->dept->browse = "Manage";
<<<<<<< HEAD
$lang->dept->manage = "Maintain Department";
=======
$lang->dept->manage = "Manage Dept";
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->dept->manage = "Manage Department";
$lang->dept->updateOrder = "Sort";
$lang->dept->add = "Add Department";
$lang->dept->dragAndSort = "Drag and Sort";
@@ -30,10 +26,5 @@ $lang->dept->confirmDelete = " Do you want to delete this Department?";
$lang->dept->successSave = " Saved!";
$lang->dept->error = new stdclass();
<<<<<<< HEAD
$lang->dept->error->hasSons = 'This Department has child Department. You cannot delete it!';
$lang->dept->error->hasSons = 'This Department has child departments. You cannot delete it!';
$lang->dept->error->hasUsers = 'This Department has users. You cannot delete it!';
=======
$lang->dept->error->hasSons = 'This Dept has child departments. You cannot delete it!';
$lang->dept->error->hasUsers = 'This Dept has users. You cannot delete it!';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
module/editor/lang/en.php
+14 -14
View File
@@ -3,23 +3,23 @@ $lang->editor->common = 'Editor';
$lang->editor->api = 'API';
$lang->editor->index = 'Home';
$lang->editor->newMethod = 'New Method';
$lang->editor->extend = 'Extension';
$lang->editor->extend = 'Plug-in';
$lang->editor->api = 'API';
$lang->editor->newLang = 'New Language';
$lang->editor->newConfig = 'New Config';
$lang->editor->newHook = 'New Hook';
$lang->editor->newExtend = 'New Extension';
$lang->editor->newExtend = 'New Plug-in';
$lang->editor->newPage = 'New Page';
$lang->editor->override = 'Override';
$lang->editor->edit = 'Edit Extension';
$lang->editor->override = 'Overwrite';
$lang->editor->edit = 'Edit Plug-in';
$lang->editor->save = 'Save Page';
$lang->editor->delete = 'Delete Page';
$lang->editor->moduleList = 'Module';
$lang->editor->filePath = "Extension:";
$lang->editor->filePath = "Plug-in:";
$lang->editor->sourceFile = 'Source File:';
$lang->editor->fileName = "File Name:";
$lang->editor->isOverride = "Overridden Duplicated File";
$lang->editor->isOverride = "Overwrote Duplicated File";
$lang->editor->exampleHook = "(e.g. ***.html.hook.php)";
$lang->editor->exampleJs = "(e.g. ***.js)";
$lang->editor->exampleCss = "(e.g. ***.css)";
@@ -28,13 +28,13 @@ $lang->editor->pageName = "Page Name:";
$lang->editor->deleteConfirm = 'Do you want to delete it?';
$lang->editor->extendConfirm = 'Do you want to use original code?';
$lang->editor->repeatFile = 'File Name Dupliceted';
$lang->editor->repeatPage = 'Page existed. Do you want to override it?';
$lang->editor->repeatFile = 'File Name Duplicated';
$lang->editor->repeatPage = 'This page exists. Do you want to overwrite it?';
$lang->editor->noticeOkFile = 'For security reasons, your Admin account has to be confirmed. \n Please login ZenTao server and create %sFile.\n Note:\n 1. File is blank.\n 2. If the file existed, delete it and then create a new one.';
$lang->editor->editFileError = 'You can only modify Zentao files!';
$lang->editor->editFileError = 'You can only modify ZenTao files!';
$lang->editor->notWritable = "Not wirtable. Privilege is required. Please try chmod 777 -R ";
$lang->editor->notDelete = 'Cannot be deleted. Please check your privilege!';
$lang->editor->notWritable = "Not wirtable. Permission is required. Please try chmod 777 -R ";
$lang->editor->notDelete = 'Cannot be deleted. Please check your permissions!';
$lang->editor->emptyFileName = 'Please enter a File Name!';
$lang->editor->translate['config.php'] = 'config';
@@ -51,7 +51,7 @@ $lang->editor->modules['company'] = 'Company';
$lang->editor->modules['convert'] = 'Convert';
$lang->editor->modules['dept'] = 'Department';
$lang->editor->modules['doc'] = 'Doc';
$lang->editor->modules['extension'] = 'Extension';
$lang->editor->modules['extension'] = 'Plug-in';
$lang->editor->modules['file'] = 'File';
$lang->editor->modules['group'] = 'Group';
$lang->editor->modules['index'] = 'Homepage';
@@ -68,8 +68,8 @@ $lang->editor->modules['search'] = 'Search';
$lang->editor->modules['story'] = 'Story';
$lang->editor->modules['task'] = 'Task';
$lang->editor->modules['testcase'] = 'Case';
$lang->editor->modules['testtask'] = 'Test Task';
$lang->editor->modules['testtask'] = 'Test';
$lang->editor->modules['todo'] = 'Todo';
$lang->editor->modules['tree'] = 'Module';
$lang->editor->modules['tree'] = 'Module Maintenance';
$lang->editor->modules['upgrade'] = 'Upgrade';
$lang->editor->modules['user'] = 'User';
module/entry/lang/en.php
+12 -12
View File
@@ -4,13 +4,13 @@ $lang->entry->list = 'Entry List';
$lang->entry->api = 'API';
$lang->entry->webhook = 'Webhook';
$lang->entry->log = 'Log';
$lang->entry->setting = 'Setting';
$lang->entry->setting = 'Settings';
$lang->entry->browse = 'Browse';
$lang->entry->create = 'Add Entry';
$lang->entry->create = 'Create Entry';
$lang->entry->edit = 'Edit';
$lang->entry->delete = 'Delete';
$lang->entry->createKey = 'Create Key';
$lang->entry->createKey = 'Regenerate Secret Key';
$lang->entry->id = 'ID';
$lang->entry->name = 'Name';
@@ -23,8 +23,8 @@ $lang->entry->createdBy = 'Created By';
$lang->entry->createdDate = 'Created';
$lang->entry->editedby = 'Edited By';
$lang->entry->editedDate = 'Edited';
$lang->entry->date = 'Request Time';
$lang->entry->url = 'Request URL';
$lang->entry->date = 'Requesting Time';
$lang->entry->url = 'Requesting URL';
$lang->entry->confirmDelete = 'Do you want to delete this entry?';
$lang->entry->help = 'Help';
@@ -33,16 +33,16 @@ $lang->entry->notify = 'Notify';
$lang->entry->note = new stdClass();
$lang->entry->note->name = 'Name';
$lang->entry->note->code = 'Alias should be letters and numbers';
$lang->entry->note->ip = "Use comma to seperate IP. IP segment is supported, e.g. 192.168.1.*";
$lang->entry->note->allIP = 'All';
$lang->entry->note->account = 'Authenticated account in the entry';
$lang->entry->note->ip = "Use comma to seperate IPs. IP segment is supported, e.g. 192.168.1.*";
$lang->entry->note->allIP = 'All IPs';
$lang->entry->note->account = 'Entry Account';
$lang->entry->errmsg['PARAM_CODE_MISSING'] = 'Code is missing.';
$lang->entry->errmsg['PARAM_TOKEN_MISSING'] = 'Token is missing.';
$lang->entry->errmsg['PARAM_CODE_MISSING'] = 'Parameter code is missing.';
$lang->entry->errmsg['PARAM_TOKEN_MISSING'] = 'Parameter token is missing.';
$lang->entry->errmsg['SESSION_CODE_MISSING'] = 'Session code is missing.';
$lang->entry->errmsg['EMPTY_KEY'] = 'Key is missing.';
$lang->entry->errmsg['EMPTY_KEY'] = 'Secret key is missing.';
$lang->entry->errmsg['INVALID_TOKEN'] = 'Invalid token.';
$lang->entry->errmsg['SESSION_VERIFY_FAILED'] = 'Session verification failed.';
$lang->entry->errmsg['IP_DENIED'] = 'IP is denied.';
$lang->entry->errmsg['ACCOUNT_UNBOUND'] = 'Account is not bound.';
$lang->entry->errmsg['EMPTY_ENTRY'] = 'Key is missing.';
$lang->entry->errmsg['EMPTY_ENTRY'] = 'Entry does not exist.';
module/extension/lang/en.php
+34 -34
View File
@@ -9,33 +9,33 @@
* @version $Id$
* @link http://www.zentao.net
*/
$lang->extension->common = 'Extension';
$lang->extension->browse = 'Browse';
$lang->extension->common = 'Plug-in';
$lang->extension->browse = 'Plug-ins';
$lang->extension->install = 'Install';
$lang->extension->installAuto = 'Auto Install';
$lang->extension->installForce = 'Force Install';
$lang->extension->installAuto = 'Auto Installation';
$lang->extension->installForce = 'Force Installation';
$lang->extension->uninstall = 'Uninstall';
$lang->extension->activate = 'Activate';
$lang->extension->deactivate = 'Deactivate';
$lang->extension->obtain = 'Get Extension';
$lang->extension->obtain = 'Get Plug-in';
$lang->extension->view = 'Details';
$lang->extension->downloadAB = 'Download';
$lang->extension->upload = 'Local Install';
$lang->extension->upload = 'Local Installation';
$lang->extension->erase = 'Erase';
$lang->extension->upgrade = 'Extension Upgrade';
$lang->extension->agreeLicense = 'License';
$lang->extension->upgrade = 'Upgrade Plug-in';
$lang->extension->agreeLicense = 'I agree with the license.';
$lang->extension->structure = 'Structure';
$lang->extension->installed = 'Installed';
$lang->extension->deactivated = 'Deactivated';
$lang->extension->available = 'Downloaded';
$lang->extension->name = 'Extension Name';
$lang->extension->code = 'Code';
$lang->extension->desc = 'Describe';
$lang->extension->name = 'Plug-in Name';
$lang->extension->code = 'Alias';
$lang->extension->desc = 'Description';
$lang->extension->type = 'Type';
$lang->extension->dirs = 'Directory';
$lang->extension->files = 'Files';
$lang->extension->dirs = 'Installation Directory';
$lang->extension->files = 'Installation Files';
$lang->extension->status = 'Status';
$lang->extension->version = 'Version';
$lang->extension->latest = '<small>Latest:<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，need zentao <a href="https://api.zentao.net/goto.php?item=latest" target="_blank"><strong>%s</strong></small>';
@@ -45,18 +45,18 @@ $lang->extension->site = 'Website';
$lang->extension->downloads = 'Downloads';
$lang->extension->compatible = 'Compatibility';
$lang->extension->grade = 'Score';
$lang->extension->depends = 'Dependent';
$lang->extension->depends = 'Dependency';
$lang->extension->expireDate = 'Expire';
$lang->extension->zentaoCompatible = 'Compatible Version';
$lang->extension->installedTime = 'Installed Time';
$lang->extension->publicList[0] = 'Manually';
$lang->extension->publicList[0] = 'Manual';
$lang->extension->publicList[1] = 'Auto';
$lang->extension->compatibleList[0] = 'Unknown';
$lang->extension->compatibleList[1] = 'Compatible';
$lang->extension->obtainOfficial[0] = 'Third party';
$lang->extension->obtainOfficial[0] = 'Third-party';
$lang->extension->obtainOfficial[1] = 'Official';
$lang->extension->byDownloads = 'Downloads';
@@ -67,22 +67,22 @@ $lang->extension->byCategory = 'Category';
$lang->extension->installFailed = '%s failed. Error:';
$lang->extension->uninstallFailed = 'Uninstallation failed. Error:';
$lang->extension->confirmUninstall = 'Uninstallation will delete or change related database. Do you want to uninstall?';
$lang->extension->installFinished = 'Congrats! The extension is %sed!';
$lang->extension->confirmUninstall = 'Uninstallation will delete or change related database. Do you want to uninstall it?';
$lang->extension->installFinished = 'Congrats! The plug-in is %sed!';
$lang->extension->refreshPage = 'Refresh';
$lang->extension->uninstallFinished = 'Extension is uninstalled.';
$lang->extension->deactivateFinished = 'Extension is deactivated.';
$lang->extension->activateFinished = 'Extension is activated.';
$lang->extension->eraseFinished = 'Extension is removed.';
$lang->extension->uninstallFinished = 'This plug-in is uninstalled.';
$lang->extension->deactivateFinished = 'This plug-in is deactivated.';
$lang->extension->activateFinished = 'This plug-in is activated.';
$lang->extension->eraseFinished = 'This plug-in is removed.';
$lang->extension->unremovedFiles = 'File or direcroty cannot be deleted. You have to manually delete';
$lang->extension->executeCommands = '<h3>Execute command lines below to fix the problem:</h3>';
$lang->extension->successDownloadedPackage = 'Extension downloaded!';
$lang->extension->successCopiedFiles = 'File copied!';
$lang->extension->successDownloadedPackage = 'This plug-in is downloaded!';
$lang->extension->successCopiedFiles = 'File is copied!';
$lang->extension->successInstallDB = 'Database is installed!';
$lang->extension->viewInstalled = 'Installed';
$lang->extension->viewAvailable = 'Available';
$lang->extension->viewDeactivated = 'Deactivated';
$lang->extension->backDBFile = 'Extension data has been backed up to %s!';
$lang->extension->viewInstalled = 'Installed Plug-ins';
$lang->extension->viewAvailable = 'Available Plug-ins';
$lang->extension->viewDeactivated = 'Deactivated Plug-ins';
$lang->extension->backDBFile = 'This plug-in data has been backed up to %s!';
$lang->extension->noticeOkFile = '<h5>For security reasons, your Admin account has to be confirmed.</h5>
<h5>Plese login your ZenTao server and create %s.</h5>
<p>Note</p>
@@ -98,10 +98,10 @@ $lang->extension->upgradeVersion = '(Upgrade %s to %s.)';
$lang->extension->waring = 'Warning!';
$lang->extension->errorOccurs = 'Error:';
$lang->extension->errorGetModules = 'Get Extension Category from www.zentao.net failed. It could be network error. Plase check your network and refresh it.';
$lang->extension->errorGetExtensions = 'Get Extension from www.zentao.net failed. It could be network error. Please go to <a href="https://www.zentao.net/extension/" target="_blank" class="alert-link">www.zentao.net</a> and download the extension, and then upload it to install.';
$lang->extension->errorDownloadPathNotFound = 'Extension download path <strong>%s</strong> is not found.<br /> Please run <strong>mkdir -p %s</strong> in Linux to fix it.';
$lang->extension->errorDownloadPathNotWritable = 'Extension download path <strong>%s</strong>is not writable. <br />Please run <strong>sudo chmod 777 %s</strong> in Linux to fix it.';
$lang->extension->errorGetModules = 'Get Plug-in Category from www.zentao.net failed. It could be network error. Plase check your network and refresh it.';
$lang->extension->errorGetExtensions = 'Get Plug-in from www.zentao.net failed. It could be network error. Please go to <a href="https://www.zentao.net/extension/" target="_blank" class="alert-link">www.zentao.net</a> and download the extension, and then upload it to install.';
$lang->extension->errorDownloadPathNotFound = 'Plug-in download path <strong>%s</strong> is not found.<br /> Please run <strong>mkdir -p %s</strong> in Linux to fix it.';
$lang->extension->errorDownloadPathNotWritable = 'Plug-in download path <strong>%s</strong>is not writable. <br />Please run <strong>sudo chmod 777 %s</strong> in Linux to fix it.';
$lang->extension->errorPackageFileExists = '<strong>%s</strong> exists in the download path.<h5> Please %s it again, <a href="%s" class="alert-link">CLICK HERE</a></h5>';
$lang->extension->errorDownloadFailed = 'Download failed. Please try it again. If still not OK, try to download it manually and upload it to install.';
$lang->extension->errorMd5Checking = 'Incomplete File. Please download it again. If still not OK, try to download it manually and upload it to install.';
@@ -112,6 +112,6 @@ $lang->extension->errorTargetPathNotWritable = '<strong>%s </strong> is not wr
$lang->extension->errorTargetPathNotExists = '<strong>%s </strong> is not found.';
$lang->extension->errorInstallDB = 'Database report execution failed. Error: %s';
$lang->extension->errorConflicts = 'Conflicted with “%s”!';
$lang->extension->errorDepends = 'Dependent extension has not been installed or the version is incorrect:<br /><br /> %s';
$lang->extension->errorDepends = 'Dependent Plug-in has not been installed or the version is incorrect:<br /><br /> %s';
$lang->extension->errorIncompatible = 'Incompatible with your ZenTao.';
$lang->extension->errorUninstallDepends = '“%s” is dependent on this extension. Please do not install it.';
$lang->extension->errorUninstallDepends = '“%s” is dependent on thiPlug-in. Please do not install it.';
module/file/lang/en.php
+10 -10
View File
@@ -22,8 +22,8 @@ $lang->file->maxUploadSize = "<span class='text-red'>%s</span>";
$lang->file->applyTemplate = "Apply Template";
$lang->file->tplTitle = "Template Name";
$lang->file->setPublic = "Set Public Template";
$lang->file->exportFields = "Export Fields";
$lang->file->exportRange = "Data Range";
$lang->file->exportFields = "Field to be exported";
$lang->file->exportRange = "Data to be exported";
$lang->file->defaultTPL = "Default Template";
$lang->file->setExportTPL = "Settings";
$lang->file->preview = "Preview";
@@ -41,19 +41,19 @@ $lang->file->encoding = 'Encoding';
$lang->file->addedBy = 'Added By';
$lang->file->addedDate = 'Added';
$lang->file->downloads = 'Downloads';
$lang->file->extra = 'Extra';
$lang->file->extra = 'Comment';
$lang->file->dragFile = 'Please drag here.';
$lang->file->childTaskTips = 'It\'s child task where \'>\' before the name.';
$lang->file->dragFile = 'Drag files here';
$lang->file->childTaskTips = 'It\'s a child task if there is a \'>\' before the name.';
$lang->file->errorNotExists = "<span class='text-red'>'%s' is not found.</span>";
$lang->file->errorCanNotWrite = "<span class='text-red'>'%s' is not writable. Please change its permission. Enter <span class='code'>sudo chmod -R 777 '%s'</span></span> in Linux.";
$lang->file->confirmDelete = " Do you want to delete it?";
$lang->file->errorFileSize = " File size exceeds the limit. It cannot be uploaded!";
$lang->file->errorFileUpload = " Uploading failed. File size might exceeds the limit.";
$lang->file->errorFileFormate = " Uploading failed, file format is limited.";
$lang->file->errorFileMove = " Uploading failed, there was an error when moving file.";
$lang->file->dangerFile = " File has been rejected to upload for security issues.";
$lang->file->errorFileUpload = " Uploading failed. The file size might exceeds the limit.";
$lang->file->errorFileFormate = " Uploading failed. The file format is not in the prescribed scope.";
$lang->file->errorFileMove = " Uploading failed. An error prompts when moving file.";
$lang->file->dangerFile = " The file failed to be uploaded for security reasons.";
$lang->file->errorSuffix = 'Format is incorrect. .zip files ONLY!';
$lang->file->errorExtract = 'Extracting file failed. File might be damaged or invalid files in the zip package.';
$lang->file->errorExtract = 'Extracting files failed. Files might be damaged or there might be invalid files in the zip package.';
$lang->file->uploadImagesExplain = 'Note: upload .jpg, .jpeg, .gif, and .png images. The image name will be taken as the title of the story and the image as its content.';
$lang->file->fileNotFound = 'The file was not found, maybe the physical file has been deleted!';
module/git/lang/en.php
+3 -3
View File
@@ -11,6 +11,6 @@
*/
/* Methods. */
$lang->git->common = 'Git';
$lang->git->cat = 'View Code';
$lang->git->diff = 'Diff Code';
$lang->git->apiSync = 'API: Sync Git Log';
$lang->git->cat = 'View Source Code';
$lang->git->diff = 'Compare Source Code';
$lang->git->apiSync = 'API: Synchronize Git Log';
module/group/lang/en.php
+7 -7
View File
@@ -9,16 +9,16 @@
* @version $Id: en.php 4719 2013-05-03 02:20:28Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->group->common = 'Privilege';
$lang->group->browse = 'Group Privilge';
$lang->group->common = 'Permission';
$lang->group->browse = 'Groups';
$lang->group->create = 'Add Group';
$lang->group->edit = 'Edit';
$lang->group->copy = 'Copy';
$lang->group->delete = 'Delete';
$lang->group->manageView = 'View';
$lang->group->managePriv = 'Batch Assign';
$lang->group->managePrivByGroup = 'Privilege';
$lang->group->managePrivByModule = 'Module Privilege';
$lang->group->managePrivByGroup = 'Permission';
$lang->group->managePrivByModule = 'Module Permission';
$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?';
@@ -42,10 +42,10 @@ $lang->group->option = 'Option';
$lang->group->inside = 'Group Users';
$lang->group->outside = 'Other Users';
$lang->group->other = 'Others';
$lang->group->all = 'All';
$lang->group->all = 'All Permissions';
$lang->group->copyOptions['copyPriv'] = 'Copy Privilege';
$lang->group->copyOptions['copyUser'] = 'Copy User';
$lang->group->copyOptions['copyPriv'] = 'Copy Permissions';
$lang->group->copyOptions['copyUser'] = 'Copy Users';
$lang->group->versions[''] = 'History';
$lang->group->versions['10_6'] = 'ZenTao10.6';
module/install/lang/en.php
+30 -30
View File
@@ -14,29 +14,29 @@ $lang->install = new stdclass();
$lang->install->common = 'Install';
$lang->install->next = 'Next';
$lang->install->pre = 'Back';
$lang->install->reload = 'Reload';
$lang->install->reload = 'Refresh';
$lang->install->error = 'Error ';
$lang->install->officeDomain = 'https://www.zentao.pm';
$lang->install->start = 'Start';
$lang->install->keepInstalling = 'Keep installing this version.';
$lang->install->seeLatestRelease = 'View Latest Version';
$lang->install->keepInstalling = 'Continue installing this version';
$lang->install->seeLatestRelease = 'View latest version';
$lang->install->welcome = 'Thanks for choosing ZenTao!';
$lang->install->license = 'ZenTao PMS is under Z PUBLIC LICENSE(ZPL) 1.2';
$lang->install->license = 'ZenTao 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.
ZenTao is an Open Source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>Z Public License</a>. 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.
ZenTao PMS is built on PHP + MySQL and based on ZenTaoPHP framework, an independent framework developed by our team. Third party developers/organizations can develop extensions or customize for their requirements.
ZenTao is built on PHP + MySQL and based on ZenTaoPHP framework, an independent framework developed by our team. Third party developers/organizations can develop plug-ins or customize for their requirements.
EOT;
$lang->install->links = <<<EOT
ZenTao PMS is developed by <strong><a href='http://easysoft.ltd' target='_blank' class='text-danger'>Nature Easy Soft Co., LTD</a></strong>.
ZenTao is developed by <strong><a href='http://easysoft.ltd' target='_blank' class='text-danger'>Nature Easy Soft Co., LTD</a></strong>.
Official Website : <a href='https://www.zentao.pm' target='_blank'>https://www.zentao.pm</a>
Technical Support : <a href='https://www.zentao.pm/forum/' target='_blank'>https://www.zentao.pm/forum/</a>
WhatsApp Group : <a href='https://chat.whatsapp.com/B6pi6b3gv0S7x7jqMxwhbF' target='_blank'>https://chat.whatsapp.com/B6pi6b3gv0S7x7jqMxwhbF</a>
Twitter: <a href='https://twitter.com/cneasysoft' target='_blank'>cneasysoft</a>
You are installing ZenTao <strong class='text-danger'>%s</strong> Version.
You are installing ZenTao <strong class='text-danger'>%s</strong>.
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.";
@@ -57,12 +57,12 @@ $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->phpFail = 'PHP Version should be 5.2.0+';
$lang->install->pdo = 'PDO';
$lang->install->pdoFail = 'Edit php.ini to load PDO extsion.';
$lang->install->pdoFail = 'Edit php.ini to load PDO extension.';
$lang->install->pdoMySQL = 'PDO_MySQL';
$lang->install->pdoMySQLFail = 'Edit php.ini to load PDO_MySQL extsion.';
$lang->install->pdoMySQLFail = 'Edit php.ini to load PDO_MySQL extension.';
$lang->install->json = 'JSON Extension';
$lang->install->jsonFail = 'Edit php.ini to load JSON extension.';
$lang->install->openssl = 'OpenSSL Extension';
@@ -86,18 +86,18 @@ $lang->install->sessionFail = 'Edit the php.ini file to set session.save_path.'
$lang->install->mkdirWin = '<p>%s directory has to be created.<br /> Run <code>mkdir %s</code> to create it.</p>';
$lang->install->chmodWin = ' "%s" privilege has to be changed.';
$lang->install->mkdirLinux = '<p>%s directory has to be created.<br /> Run <code>mkdir -p %s</code> to create it.</p>';
$lang->install->chmodLinux = ' "%s" privilege has to be changed.<br /> Run <code>chmod o=rwx -R %s</code> to change it.';
$lang->install->chmodLinux = ' "%s" permison has to be changed.<br /> Run <code>chmod o=rwx -R %s</code> to change it.';
$lang->install->timezone = 'Set Timezone';
$lang->install->defaultLang = 'Default Language';
$lang->install->dbHost = 'Database Host';
$lang->install->dbHostNote = 'If 127.0.0.1 is not accessible, try localhost.';
$lang->install->dbPort = 'Host Port';
$lang->install->dbUser = 'Database User';
$lang->install->dbUser = 'Database Username';
$lang->install->dbPassword = 'Database Password';
$lang->install->dbName = 'Database Name';
$lang->install->dbPrefix = 'Table Prefix';
$lang->install->clearDB = 'Clean tables if it already exists.';
$lang->install->clearDB = 'Clean up existing data';
$lang->install->importDemoData = 'Import Demo Data';
$lang->install->working = 'Operation Mode';
@@ -109,20 +109,20 @@ $lang->install->workingList['onlyTest'] = 'Only Test Management';
$lang->install->workingList['onlyStory'] = 'Only Story Management';
$lang->install->workingList['onlyTask'] = 'Only Task Management';
$lang->install->errorConnectDB = 'Connection to database Failed. ';
$lang->install->errorConnectDB = 'Connection to the database Failed. ';
$lang->install->errorDBName = 'Database name should exclude “.” ';
$lang->install->errorCreateDB = 'Failed to create the database.';
$lang->install->errorTableExists = 'Data table has existed. If ZenTao has been installed before, please return to last step and clear data. Then continue the installation.';
$lang->install->errorTableExists = 'The data table has existed. If ZenTao has been installed before, please return to last step and clear data. Then continue the installation.';
$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 configuration file';
$lang->install->key = 'Item';
$lang->install->value = 'Value';
$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.';
$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 configuration file later.</div>';
$lang->install->saved2File = 'The configuration file has been saved to " <strong>%s</strong> ". You can change this file later.';
$lang->install->errorNotSaveConfig = 'The configuration file is not saved.';
$lang->install->getPriv = 'Set Admin';
$lang->install->company = 'Company Name';
@@ -132,7 +132,7 @@ $lang->install->errorEmptyPassword = 'Password should not be blank.';
$lang->install->groupList['ADMIN']['name'] = 'Admin';
$lang->install->groupList['ADMIN']['desc'] = 'System Admin';
$lang->install->groupList['DEV']['name'] = 'Dev';
$lang->install->groupList['DEV']['name'] = 'Dev.';
$lang->install->groupList['DEV']['desc'] = 'Developer';
$lang->install->groupList['QA']['name'] = 'QA';
$lang->install->groupList['QA']['desc'] = 'tester';
@@ -140,7 +140,7 @@ $lang->install->groupList['PM']['name'] = 'PM';
$lang->install->groupList['PM']['desc'] = 'Project Manager';
$lang->install->groupList['PO']['name'] = 'PO';
$lang->install->groupList['PO']['desc'] = 'Product Owner';
$lang->install->groupList['TD']['name'] = 'Dev Manager';
$lang->install->groupList['TD']['name'] = 'Dev. Manager';
$lang->install->groupList['TD']['desc'] = 'Development Manager';
$lang->install->groupList['PD']['name'] = 'PD';
$lang->install->groupList['PD']['desc'] = 'Product Director';
@@ -154,19 +154,19 @@ $lang->install->groupList['LIMITED']['name'] = 'Limited User';
$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';
$lang->install->cronList['moduleName=project&methodName=computeburn'] = 'Update Burndown Charts';
$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 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 repeat todos';
$lang->install->cronList['moduleName=mail&methodName=asyncSend'] = 'Asynchronize sending Message';
$lang->install->cronList['moduleName=webhook&methodName=asyncSend'] = 'Asynchronize sending Webhook';
$lang->install->cronList['moduleName=admin&methodName=deleteLog'] = 'Delete overdue logs';
$lang->install->cronList['moduleName=todo&methodName=createCycle'] = 'Create recurring todos';
$lang->install->success = "Installed!";
$lang->install->login = 'Login ZenTao';
$lang->install->register = 'Register in ZenTao';
$lang->install->register = 'Register in ZenTao Community';
$lang->install->joinZentao = <<<EOT
<p>You have installed ZenTao %s.<strong class='text-danger'> Please delete install.php asap</strong>.</p><p>Note: In order to get the latest news of ZenTao, please register in ZenTao(<a href='https://www.zentao.pm' class='alert-link' target='_blank'>www.zentao.pm</a>).</p>
@@ -174,9 +174,9 @@ EOT;
$lang->install->product = array('chanzhi', 'ranzhi');
$lang->install->promotion = "Products from Nature Easy Soft team:";
$lang->install->promotion = "Products also from Nature Easy Soft team:";
$lang->install->chanzhi = new stdclass();
$lang->install->chanzhi->name = 'ZSITE content management system.';
$lang->install->chanzhi->name = 'ZSITE Content Management System';
$lang->install->chanzhi->logo = 'images/main/chanzhi_en.png';
$lang->install->chanzhi->url = 'http://www.zsite.net';
$lang->install->chanzhi->desc = <<<EOD
module/mail/lang/en.php
+15 -15
View File
@@ -13,7 +13,7 @@ $lang->mail->ztCloud = 'ZenTao CloudMail';
$lang->mail->gmail = 'Gmail';
$lang->mail->sendCloud = 'Notice SendCloud';
$lang->mail->batchDelete = 'Batch Delete';
$lang->mail->sendcloudUser = 'Sync Contact';
$lang->mail->sendcloudUser = 'Sync. Contact';
$lang->mail->agreeLicense = 'Yes';
$lang->mail->disagree = 'No';
@@ -28,11 +28,11 @@ $lang->mail->auth = 'SMTP Validation';
$lang->mail->username = 'SMTP Account';
$lang->mail->password = 'SMTP Password';
$lang->mail->secure = 'Encryption';
$lang->mail->debug = 'Debug Level';
$lang->mail->debug = 'Debugging Level';
$lang->mail->charset = 'Charset';
$lang->mail->accessKey = 'Access Key';
$lang->mail->secretKey = 'Secret Key';
$lang->mail->license = 'ZenTao Cloud Notice';
$lang->mail->license = 'ZenTao CloudMail Notice';
$lang->mail->selectMTA = 'Select MTA (Mail Transfer Agent)';
$lang->mail->smtp = 'SMTP';
@@ -42,14 +42,14 @@ $lang->mail->unsyncUser = 'Not Synchronized';
$lang->mail->sync = 'Synchronize';
$lang->mail->remove = 'Remove';
$lang->mail->toList = 'Receiver';
$lang->mail->toList = 'Recipient';
$lang->mail->ccList = 'Copy to';
$lang->mail->subject = 'Subject';
$lang->mail->createdBy = 'Sender';
$lang->mail->createdDate = 'Added';
$lang->mail->sendTime = 'Send';
$lang->mail->createdDate = 'Created';
$lang->mail->sendTime = 'Sent';
$lang->mail->status = 'Status';
$lang->mail->failReason = 'Fail Reason';
$lang->mail->failReason = 'Reason';
$lang->mail->statusList['sended'] = 'Sent';
$lang->mail->statusList['fail'] = 'Failed';
@@ -72,19 +72,19 @@ $lang->mail->secureList['ssl'] = 'ssl';
$lang->mail->secureList['tls'] = 'tls';
$lang->mail->more = 'More';
$lang->mail->noticeResend = 'Sent it again!';
$lang->mail->noticeResend = 'The Email has been re-sent!';
$lang->mail->inputFromEmail = 'Sender Email';
$lang->mail->nextStep = 'Next';
$lang->mail->successSaved = 'Setting is saved.';
$lang->mail->successSaved = 'Email settings is saved.';
$lang->mail->testSubject = 'Testing Email';
$lang->mail->testContent = 'Email is set!';
$lang->mail->testContent = 'Email settings is done!';
$lang->mail->successSended = 'Sent!';
$lang->mail->confirmDelete = 'Do you want to delete it?';
$lang->mail->sendmailTips = 'Note: Email sender will not receive this email.';
$lang->mail->needConfigure = 'Email setting is not found. Please set up the Email first.';
$lang->mail->needConfigure = 'Email settings is not found. Please do the Email settings first.';
$lang->mail->connectFail = 'Connection to ZenTao failed.';
$lang->mail->centifyFail = 'Verification failed. Please try to bind again!';
$lang->mail->nofsocket = 'fsocket related function has been deactivated. EMails cannot send out. Please modify allow_url_fopen in php.ini to turn on Onopenssl, and restart Apache.';
$lang->mail->centifyFail = 'Verification failed. The secret key might be changed. Please try to bind again!';
$lang->mail->nofsocket = 'fsocket related functions are deactivated. so Emails cannot be sent out. Please modify allow_url_fopen in php.ini to turn on Onopenssl, and restart Apache.';
$lang->mail->noOpenssl = 'Please turn on Onopenssl, and restart Apache.';
$lang->mail->disableSecure = 'No openssl. Disable ssl and tls.';
$lang->mail->sendCloudFail = 'Failed. Reason:';
@@ -94,8 +94,8 @@ $lang->mail->sendCloudHelp = <<<EOD
EOD;
$lang->mail->sendCloudSuccess = 'Done';
$lang->mail->closeSendCloud = 'Close';
$lang->mail->addressWhiteList = 'Add email address to the whiltelist of email server to avoid being blocked';
$lang->mail->closeSendCloud = 'Close SendCloud';
$lang->mail->addressWhiteList = 'Add email addresses to the whiltelist of your email server to avoid being blocked';
$lang->mail->ztCloudNotice = <<<EOD
module/misc/lang/en.php
+11 -11
View File
@@ -18,7 +18,7 @@ $lang->misc->enApi = 'http://api.zentao.pm';
$lang->misc->zentao = new stdclass();
$lang->misc->zentao->version = 'Version %s';
$lang->misc->zentao->labels['about'] = 'About';
$lang->misc->zentao->labels['support'] = 'Support';
$lang->misc->zentao->labels['support'] = 'Technical Support';
$lang->misc->zentao->labels['cowin'] = 'Help Us';
$lang->misc->zentao->labels['service'] = 'Service';
@@ -57,15 +57,15 @@ $lang->misc->noGDLib = "Please visit <strong>%s</strong> in the browser of y
$lang->misc->copyright = "&copy; 2009 - 2019 <a href='http://easysoft.ltd' target='_blank'>Nature Easy Soft</a> Email <a href='mailto:Renee@easysoft.ltd'>Renee@easysoft.ltd</a>";
$lang->misc->checkTable = "Check Data Table";
$lang->misc->needRepair = "Repair Table";
$lang->misc->repairTable = "Database table is damaged due to power outage. Please check and repair!";
$lang->misc->repairTable = "Database table might be damaged due to power outage. Please check and repair!";
$lang->misc->repairFail = "Failed to repair. Please go to the data directory of your database, and try to execute <code>myisamchk -r -f %s.MYI</code> repair.";
$lang->misc->connectFail = "Failed to connect to the database. Error: %s，<br/> Please check the MySQL error log and troubleshoot.";
$lang->misc->tableName = "Table Name";
$lang->misc->tableStatus = "Status";
$lang->misc->novice = "New to ZenTao? Do you want to start ZenTao Tutorial?";
$lang->misc->noticeRepair = "<h5>If you are not Administrator, please contact your ZenTao Administrator to repair tables.</h5>
<h5>If you are, please login your Zentao host and create a file named <span>%s</span>.</h5>
$lang->misc->noticeRepair = "<h5>If you are not Administrator, contact your ZenTao Administrator to repair tables.</h5>
<h5>If you are the Administrator, login your ZenTao host and create a file named <span>%s</span>.</h5>
<p>Note:</p>
<ol>
<li>Keep the file empty.</li>
@@ -106,7 +106,7 @@ $lang->misc->feature->all['11.4.1'][] = array('title'=>'Optimize details an
$lang->misc->feature->all['11.4.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '<p>Enhanced test management.</p><p>Optimized the UI of Plan, Release, and Build linked stories and bugs.</p><p>Customize the feature whether to display files in child category.</p><p>Optimize details and fix bug.</p>');
$lang->misc->feature->all['11.3.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '<p>Add Child Plan to a Plan</p><p>Optimize the chosen</p><p>Add Timezone setting</p><p>Optimize Doc Lib and Doc modules</p>');
$lang->misc->feature->all['11.3.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '<p>Add Child Plan to a Plan</p><p>Optimize the chosen</p><p>Add Timezone settings</p><p>Optimize Document Library and Document modules</p>');
$lang->misc->feature->all['11.2.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '<p>Add upgrade logs and database checkup after upgrading</p><p>Fixed ZenTao client and other bugs, and optimized details.</p>');
@@ -121,7 +121,7 @@ $lang->misc->feature->all['10.5.stable'][] = array('title'=>'Adjust document lay
$lang->misc->feature->all['10.5.stable'][] = array('title'=>'Adjust the child task logic and optimize the display of parent-child task.', 'desc' => '');
$lang->misc->feature->all['10.4.stable'][] = array('title'=>'Optimize and adjust new interface', 'desc' => '<p>Detail page restore to the previous layout.</p><p>Refactore forms to add user pages</p><p>When use cases are executed, do not update the use case stause if the user manually chooses to pass and write the results.</p>');
$lang->misc->feature->all['10.4.stable'][] = array('title'=>'After the user machine hibernate and the login fails, the session will be refreshed again.', 'desc' => '');
$lang->misc->feature->all['10.4.stable'][] = array('title'=>'After the user machine hibernates and the login fails, the session will be refreshed again.', 'desc' => '');
$lang->misc->feature->all['10.4.stable'][] = array('title'=>'Upgrade existing interface mechanisms', 'desc' => '');
$lang->misc->feature->all['10.3.stable'][] = array('title'=>'Fix Bug.', 'desc' => '');
@@ -139,13 +139,13 @@ $lang->misc->feature->all['9.7.stable'][] = array('title'=>'Optimize Internation
$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Webhook Interface feature', 'desc' => 'Support communication with BearyChat, Dingding');
$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Point', 'desc' => 'More skilled application, more score');
$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added multiple user task and child tasks to Project', 'desc' => '');
$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Product line management to Product View', 'desc' => '');
$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Product line management to Product', 'desc' => '');
$lang->misc->feature->all['9.5.1'][] = array('title'=>'added Restricted Operatio', 'desc' => '');
$lang->misc->feature->all['9.5.1'][] = array('title'=>'added Restricted Operation', 'desc' => '');
$lang->misc->feature->all['9.3.beta'][] = array('title'=>'upgraded framework，Enhanced security', 'desc' => '');
$lang->misc->feature->all['9.1.stable'][] = array('title'=>'optimize Test View', 'desc' => '<p>added TestSuite,CaseLib and QA Report</p>');
$lang->misc->feature->all['9.1.stable'][] = array('title'=>'optimize Test View', 'desc' => '<p>added TestSuite, CaseLibrary and QA Report</p>');
$lang->misc->feature->all['9.1.stable'][] = array('title'=>'support Group steps of TestCase', 'desc' => '');
$lang->misc->feature->all['9.0.beta'][] = array('title'=>'ZenTao CloudMail has been added.', 'desc' => '<p>ZenTao CloudMail is a free Email service launched jointly with SendCloud. Once binded with ZenTao and passed verification, users can use this service.</p>');
@@ -159,7 +159,7 @@ $lang->misc->feature->all['8.2.stable'][] = array('title'=>'Batch Add/Edit Custo
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Story/Task/Bug/Case', 'desc' => '<p>You can custom fileds when add a Story/Task/Bug/Case.</p>');
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Export', 'desc' => '<p>You can custom fileds when export a Story/Task/Bug/Case pages. You can also save it as template for next export.</p>');
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Story/Task/Bug/Case Search ', 'desc' => '<p>On Story/Task/Bug/Case List page, you can do a combined search on Modules and Tabs.</p>');
$lang->misc->feature->all['8.2.stable'][] = array('title'=>"Rookie's Tutorial", 'desc' => '<p>Tutorial for rookies is added for first-time users to know how to use ZenTao.</p>');
$lang->misc->feature->all['8.2.stable'][] = array('title'=>"ZenTao Tutorial", 'desc' => '<p>Tutorial for rookies is added for first-time users to know how to use ZenTao.</p>');
$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Product branch feature is added.', 'desc' => '<p>Product branch/platform is added, and its related Story/Plan/Bug/Case/Module has Branch added too.</p>');
$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Release Module is improved.', 'desc' => '<p>Stop action has been added. If Stop to manage it, the Release will not show when Report Bug.</p><p>Bugs that have been omitted in the Release will be related manually.</p>');
@@ -168,7 +168,7 @@ $lang->misc->feature->all['7.4.beta'][] = array('title'=>'Create pages of Story
$lang->misc->feature->all['7.2.stable'][] = array('title'=>'Security Enhanced', 'desc' => '<p>Admin weak passwork check is enhanced.</p><p>ok file is required when code/upload an extension.</p><p>Sensitive action requires Admin password.</p><p>Do striptags, specialchars to content entered in ZenTao.</p>');
$lang->misc->feature->all['7.2.stable'][] = array('title'=>'Details Improved', 'desc' => '');
$lang->misc->feature->all['7.1.stable'][] = array('title'=>'Framework of scheduled tasks is added.', 'desc' => 'Framework of scheduled tasks is added. Daily notification, Burndown Update, Backup, Send Email and so on have been added.');
$lang->misc->feature->all['7.1.stable'][] = array('title'=>'Framework of Cron is added.', 'desc' => 'Framework of Cron is added. Daily notification, Burndown Update, Backup, Send Email and so on have been added.');
$lang->misc->feature->all['7.1.stable'][] = array('title'=>'rpm and deb packages are provided.', 'desc' => '');
$lang->misc->feature->all['6.3.stable'][] = array('title'=>'Data table is added.', 'desc' => '<p>Fields can be customized in data table and data will be displayed according to customized fields.</p>');
module/my/lang/en.php
+2 -2
View File
@@ -38,13 +38,13 @@ $lang->my->storyMenu->reviewedByMe = 'Reviewed By Me';
$lang->my->storyMenu->closedByMe = 'Closed By Me';
$lang->my->home = new stdclass();
$lang->my->home->latest = 'Dynamic';
$lang->my->home->latest = 'Dynamics';
$lang->my->home->action = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>.";
$lang->my->home->projects = $lang->projectCommon;
$lang->my->home->products = $lang->productCommon;
$lang->my->home->createProject = "Create {$lang->projectCommon}";
$lang->my->home->createProduct = "Create {$lang->productCommon}";
$lang->my->home->help = "<a href='https://www.zentao.net/help-read-79236.html' target='_blank'>Help</a>";
$lang->my->home->help = "<a href='https://www.zentao.pm/book/zentaomanual/free-open-source-project-management-software-workflow-46.html' target='_blank'>Help</a>";
$lang->my->home->noProductsTip = "No {$lang->productCommon} found here.";
$lang->my->form = new stdclass();
module/product/lang/en.php
+4 -4
View File
@@ -76,7 +76,7 @@ $lang->product->allRelease = 'All Release';
$lang->product->maintain = 'Maintaining';
$lang->product->latestDynamic = 'Dynamics';
$lang->product->plan = 'Plan';
$lang->product->iteration = 'Build Iteration';
$lang->product->iteration = 'Version Iteration';
$lang->product->iterationInfo = '%s Iteration';
$lang->product->iterationView = 'Details';
@@ -91,7 +91,7 @@ $lang->product->changedStory = 'Changed';
$lang->product->willClose = 'ToBeClosed';
$lang->product->closedStory = 'Closed';
$lang->product->unclosed = 'Open';
$lang->product->unplan = 'Wait';
$lang->product->unplan = 'Unplanned';
$lang->product->allStory = 'All';
$lang->product->allProduct = 'All' . $lang->productCommon;
@@ -114,9 +114,9 @@ $lang->product->statusList[''] = '';
$lang->product->statusList['normal'] = 'Normal';
$lang->product->statusList['closed'] = 'Closed';
$lang->product->aclList['open'] = "Default (User with privilege to {$lang->productCommon} can access to it.)";
$lang->product->aclList['open'] = "Default (Users with perssions to {$lang->productCommon} can access it.)";
$lang->product->aclList['private'] = "Private {$lang->productCommon} ({$lang->projectCommon} team members only)";
$lang->product->aclList['custom'] = 'Custom (Team members and Whitelist members have access to it.)';
$lang->product->aclList['custom'] = 'Custom (Team members and Whitelist members can access it.)';
$lang->product->storySummary = " <strong>%s</strong> Story(ies), <strong>%s</strong> hour(s) estimated, case coverage is <strong>%s</strong> on this page.";
$lang->product->checkedSummary = " <strong>%total%</strong> Checked, <strong>%estimate%</strong> hour(s) estimated, case coverage is <strong>%rate%</strong>.";
module/productplan/lang/en.php
+8 -8
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 = "Total <strong>%s</strong> Bugs on this page.";
$lang->productplan->bugSummary = "<strong>%s</strong> Bugs in total on this page.";
$lang->productplan->basicInfo = 'Basic Info';
$lang->productplan->batchEdit = 'Batch Edit';
@@ -33,7 +33,7 @@ $lang->productplan->linkBug = "Link Bug";
$lang->productplan->unlinkBug = "Unlink Bug";
$lang->productplan->batchUnlinkBug = "Batch Unlink Bug";
$lang->productplan->linkedBugs = 'Linked Bug';
$lang->productplan->unlinkedBugs = 'Unlinked';
$lang->productplan->unlinkedBugs = 'Unlinked Bug';
$lang->productplan->unexpired = 'Unexpired Plan';
$lang->productplan->all = 'All Plan';
@@ -51,12 +51,12 @@ $lang->productplan->begin = 'Begin';
$lang->productplan->end = 'End';
$lang->productplan->last = 'Last plan';
$lang->productplan->future = 'Pending';
$lang->productplan->stories = 'Stories';
$lang->productplan->bugs = 'Bugs';
$lang->productplan->hour = 'Hour';
$lang->productplan->stories = 'Story';
$lang->productplan->bugs = 'Bug';
$lang->productplan->hour = 'Man-hour';
$lang->productplan->project = $lang->projectCommon;
$lang->productplan->parent = "Father plan";
$lang->productplan->children= "Sub plan";
$lang->productplan->parent = "Parent plan";
$lang->productplan->children= "Child plan";
$lang->productplan->endList[7] = '1 Week';
$lang->productplan->endList[14] = '2 Weeks';
@@ -69,7 +69,7 @@ $lang->productplan->endList[365] = '1 Year';
$lang->productplan->errorNoTitle = 'ID %s title should not be empty.';
$lang->productplan->errorNoBegin = 'ID %s begin time should not be empty.';
$lang->productplan->errorNoEnd = 'ID %s end time should not be empty.';
$lang->productplan->beginGeEnd = 'ID %s begin time value should not be greater than t.';
$lang->productplan->beginGeEnd = 'ID %s begin time should not be greater than end time.';
$lang->productplan->featureBar['browse']['all'] = 'All';
$lang->productplan->featureBar['browse']['unexpired'] = 'Unexpired';
module/project/lang/en.php
+28 -122
View File
@@ -19,21 +19,11 @@ $lang->project->begin = 'Begin';
$lang->project->end = 'End';
$lang->project->dateRange = 'Duration';
$lang->project->to = 'To';
<<<<<<< HEAD
<<<<<<< HEAD
$lang->project->days = 'Man-Day';
$lang->project->day = 'day';
$lang->project->workHour = 'Hours';
=======
$lang->project->days = 'Man Day';
=======
$lang->project->days = 'Man-Day';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->project->days = 'Available Man-hour';
$lang->project->day = ' days';
$lang->project->workHour = ' hours';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->project->totalHours = 'Work Hours';
$lang->project->totalDays = 'Work Days';
$lang->project->totalHours = 'Man-Hour';
$lang->project->totalDays = 'Man-Day';
$lang->project->status = 'Status';
$lang->project->desc = 'Description';
$lang->project->owner = 'Owner';
@@ -59,32 +49,14 @@ $lang->project->createStory = "Create Story";
$lang->project->all = 'All';
$lang->project->undone = 'Uncompleted';
$lang->project->unclosed = 'Unclosed';
<<<<<<< HEAD
<<<<<<< HEAD
$lang->project->typeDesc = 'No story, bug, build, test task or Burndown is allowed in OPS';
$lang->project->typeDesc = 'No story, bug, build, test or burndown chart is allowed in OPS';
$lang->project->mine = 'My: ';
=======
$lang->project->typeDesc = 'No story, bug, build, test task or burndown is allowed in OPS';
=======
$lang->project->typeDesc = 'No story, bug, build, test or burndown is allowed in OPS';
<<<<<<< HEAD
$lang->project->mine = 'My: ';
=======
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->project->mine = 'Mine: ';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
>>>>>>> 1f8899a84819dad5ffe811c8eb667fd33e01136f
$lang->project->other = 'Other:';
$lang->project->deleted = 'Deleted';
$lang->project->delayed = 'Delayed';
$lang->project->product = $lang->project->products;
<<<<<<< HEAD
$lang->project->readjustTime = 'Change project duration';
$lang->project->readjustTask = 'Change task duration';
=======
$lang->project->readjustTime = "Adjust {$lang->projectCommon} begin and end time";
$lang->project->readjustTask = 'Adjust task start date and deadline';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->project->effort = 'Effort';
$lang->project->relatedMember = 'Team Member';
@@ -111,11 +83,11 @@ $lang->team = new stdclass();
$lang->team->account = 'Username';
$lang->team->role = 'Role';
$lang->team->join = 'Joined';
$lang->team->hours = 'Hour/Day';
$lang->team->days = 'Work Days';
$lang->team->hours = 'Man-hour/day';
$lang->team->days = 'Man-day';
$lang->team->totalHours = 'Total Hours';
$lang->team->limited = 'limited user';
$lang->team->limited = 'limited User';
$lang->team->limitedList['no'] = 'No';
$lang->team->limitedList['yes'] = 'Yes';
@@ -125,40 +97,24 @@ $lang->project->otherInfo = 'Other Info';
/* 字段取值列表。*/
$lang->project->statusList['wait'] = 'Pending';
$lang->project->statusList['doing'] = 'Doing';
$lang->project->statusList['suspended'] = 'Suspend';
$lang->project->statusList['suspended'] = 'Suspended';
$lang->project->statusList['closed'] = 'Closed';
$lang->project->aclList['open'] = "Default (Users who can visit {$lang->projectCommon} have access to it.)";
$lang->project->aclList['open'] = "Default (Users who can visit {$lang->projectCommon} can access it.)";
$lang->project->aclList['private'] = 'Private (For team members only.)';
$lang->project->aclList['custom'] = 'Whitelist (Team members and the whitelist members have access to it.)';
$lang->project->aclList['custom'] = 'Whitelist (Team members and the whitelist members can access it.)';
/* 方法列表。*/
$lang->project->index = "Home";
<<<<<<< HEAD
$lang->project->task = 'Tasks';
<<<<<<< HEAD
$lang->project->groupTask = 'View by Group';
=======
=======
$lang->project->task = 'Task';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->project->groupTask = 'Group View';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->project->story = 'Story';
$lang->project->bug = 'Bug';
$lang->project->dynamic = 'Dynamic';
$lang->project->latestDynamic = 'Latest Dynamic';
$lang->project->dynamic = 'Dynamics';
$lang->project->latestDynamic = 'Latest Dynamics';
$lang->project->build = 'Build';
<<<<<<< HEAD
<<<<<<< HEAD
$lang->project->testtask = 'Test';
=======
$lang->project->testtask = 'Test Task';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
=======
$lang->project->testtask = 'Test';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->project->burn = 'Burndown';
$lang->project->burn = 'Burndown Chart';
$lang->project->computeBurn = 'Update';
$lang->project->burnData = 'Burndown Data';
$lang->project->fixFirst = 'Edit estimates of 1st Day';
@@ -179,11 +135,7 @@ $lang->project->delete = "Delete";
$lang->project->browse = "Browse";
$lang->project->edit = "Edit";
$lang->project->batchEdit = "Batch Edit";
<<<<<<< HEAD
$lang->project->manageMembers = 'Manange Team';
=======
$lang->project->manageMembers = 'Manage Team';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->project->unlinkMember = 'Unlink Member';
$lang->project->unlinkStory = 'Unlink Story';
$lang->project->batchUnlinkStory = 'Batch Unlink Story';
@@ -191,11 +143,11 @@ $lang->project->importTask = 'Import Task';
$lang->project->importPlanStories = 'Link Story From Plan';
$lang->project->importBug = 'Import Bug';
$lang->project->updateOrder = 'Sort';
$lang->project->tree = 'Tree';
$lang->project->tree = 'Topology Diagram';
$lang->project->treeTask = 'Show Task';
$lang->project->treeStory = 'Show Story';
$lang->project->treeOnlyTask = 'Tree View Show Task';
$lang->project->treeOnlyStory = 'Tree View Show Story';
$lang->project->treeOnlyTask = 'Task Only';
$lang->project->treeOnlyStory = 'Story Only';
$lang->project->storyKanban = 'Story Kanban';
$lang->project->storySort = 'Sort Story';
$lang->project->importPlanStory = '' . $lang->projectCommon . ' is created!\nDo you want to import stories linked to the plan?';
@@ -214,7 +166,7 @@ $lang->project->statusSelects['doing'] = 'Doing';
$lang->project->statusSelects['finishedbyme'] = 'FinishedByMe';
$lang->project->statusSelects['done'] = 'Done';
$lang->project->statusSelects['closed'] = 'Closed';
$lang->project->statusSelects['cancel'] : = 'Canceled';
$lang->project->statusSelects['cancel'] = 'Canceled';
$lang->project->groups[''] = 'Group';
$lang->project->groups['story'] = 'By Story';
@@ -240,52 +192,12 @@ $lang->project->aboveAllProduct = "All the above {$lang->productCommon}";
$lang->project->aboveAllProject = "All the above {$lang->projectCommon}";
/* 页面提示。*/
<<<<<<< HEAD
<<<<<<< HEAD
$lang->project->selectProject = "Select {$lang->projectCommon}";
$lang->project->beginAndEnd = 'Duration';
$lang->project->begin = 'Begin';
$lang->project->end = 'End';
$lang->project->lblStats = 'Man-Hour Summary(h) : ';
$lang->project->stats = '<strong>%s</strong> Available, <strong>%s</strong> Total Estimates, <strong>%s</strong> Cost, <strong>%s</strong> Left.';
$lang->project->taskSummary = "Tasks on this page : <strong>%s</strong> Total, <strong>%s</strong> Wait, <strong>%s</strong> Doing; &nbsp;&nbsp;&nbsp; Hours : <strong>%s</strong> Est., <strong>%s</strong> Cost, <strong>%s</strong> Left.";
$lang->project->checkedSummary = " <strong>%total%</strong> Checked, <strong>%wait%</strong> Wait, <strong>%doing%</strong> Doing; Hours: <strong>%estimate%</strong> Est., <strong>%consumed%</strong> Cost, <strong>%left%</strong> Left.";
$lang->project->memberHoursAB = "%s has <strong>%s</strong> Hours";
$lang->project->memberHours = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s Working Hours</div><div class="segment-value">%s</div></div></div></div>';
$lang->project->countSummary = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">Tasks</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">Doing</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">Wait</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
$lang->project->timeSummary = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">Est.</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">Cost</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">Left</div><div class="segment-value">%s</div></div></div></div>';
$lang->project->groupSummaryAB = "<div>Tasks <strong>%s ：</strong><span class='text-muted'>Wait</span> %s &nbsp; <span class='text-muted'>Doing</span> %s</div><div>Est. <strong>%s ：</strong><span class='text-muted'>Cost</span> %s &nbsp; <span class='text-muted'>Left</span> %s</div>";
$lang->project->wbs = "Work Breakdown";
$lang->project->batchWBS = "Batch Work Breakdown";
$lang->project->howToUpdateBurn = "<a href='https://www.zentao.pm/book/zentaomanual/free-open-source-project-management-software-updateburndowncharts-98.html' target='_blank' title='How to Update the Burndown Chart?' class='btn btn-link'>Help <i class='icon icon-help'></i></a>";
$lang->project->whyNoStories = "No Story can be linked. Please check whether there is Story in {$lang->projectCommon} linked {$lang->productCommon} and make sure it has been reviewed.";
$lang->project->productStories = "{$lang->projectCommon} linked story is the subeset of {$lang->productCommon}, which can only be linked after review. Please <a href='%s'> Link Story</a>。";
$lang->project->haveDraft = "There are %s draft stories that cannot be linked.";
$lang->project->doneProjects = 'Done';
$lang->project->selectDept = 'Select Department';
$lang->project->selectDeptTitle = 'Select Department';
$lang->project->copyTeam = 'Copy Team';
$lang->project->copyFromTeam = "Copy from {$lang->projectCommon} Team: <strong>%s</strong>";
$lang->project->noMatched = "No $lang->projectCommon including '%s'can be found.";
$lang->project->copyTitle = "Choose a {$lang->projectCommon} to copy.";
$lang->project->copyTeamTitle = "Choose {$lang->projectCommon}Team to copy.";
$lang->project->copyNoProject = "No {$lang->projectCommon} can be copied.";
$lang->project->copyFromProject = "Copy from {$lang->projectCommon} <strong>%s</strong>";
$lang->project->cancelCopy = 'Cancel Copy';
$lang->project->byPeriod = 'By Time';
$lang->project->byUser = 'By User';
$lang->project->noProject = 'No projects. ';
$lang->project->noMembers = 'No members. ';
=======
$lang->project->linkStoryByPlanTips = 'It will link all stories in this plan to the project.';
=======
$lang->project->linkStoryByPlanTips = "It will link all stories in this plan to the {$lang->projectCommon}.";
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->project->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->projectCommon}.";
$lang->project->selectProject = "Select {$lang->projectCommon}";
$lang->project->beginAndEnd = 'Duration';
$lang->project->begin = 'Begin';
$lang->project->end = 'End';
$lang->project->lblStats = 'Total Effort(h) : ';
$lang->project->lblStats = 'Total Man-hour(h) : ';
$lang->project->stats = '<strong>%s</strong> Available, <strong>%s</strong> Total Estimates, <strong>%s</strong> Cost, <strong>%s</strong> Left.';
$lang->project->taskSummary = "Tasks on this page : <strong>%s</strong> Total, <strong>%s</strong> Wait, <strong>%s</strong> Doing; &nbsp;&nbsp;&nbsp; Hours : <strong>%s</strong> Est., <strong>%s</strong> Cost, <strong>%s</strong> Left.";
$lang->project->checkedSummary = " <strong>%total%</strong> Checked, <strong>%wait%</strong> Wait, <strong>%doing%</strong> Doing; Hours: <strong>%estimate%</strong> Est., <strong>%consumed%</strong> Cost, <strong>%left%</strong> Left.";
@@ -299,15 +211,15 @@ $lang->project->batchWBS = "Batch Decompose";
$lang->project->howToUpdateBurn = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='How to Update the Burndown Chart?' class='btn btn-link'>Help <i class='icon icon-help'></i></a>";
$lang->project->whyNoStories = "No Story can be linked. Please check whether there is Story in {$lang->projectCommon} linked {$lang->productCommon} and make sure it has been reviewed.";
$lang->project->productStories = "{$lang->projectCommon} linked story is the subeset of {$lang->productCommon}, which can only be linked after review. Please <a href='%s'> Link Story</a>。";
$lang->project->haveDraft = "There are %s draft stories can't be linked.";
$lang->project->haveDraft = "There are %s stories in draft that can't be linked.";
$lang->project->doneProjects = 'Done';
$lang->project->selectDept = 'Department';
$lang->project->selectDeptTitle = 'Department';
$lang->project->selectDept = 'Select Department';
$lang->project->selectDeptTitle = 'Select User';
$lang->project->copyTeam = 'Copy Team';
$lang->project->copyFromTeam = "Copy from {$lang->projectCommon} Team: <strong>%s</strong>";
$lang->project->noMatched = "No $lang->projectCommon including '%s'can be found.";
$lang->project->copyTitle = "Choose a {$lang->projectCommon} to copy.";
$lang->project->copyTeamTitle = "Choose {$lang->projectCommon}Team to copy.";
$lang->project->copyTeamTitle = "Choose a {$lang->projectCommon}Team to copy.";
$lang->project->copyNoProject = "No {$lang->projectCommon} can be copied.";
$lang->project->copyFromProject = "Copy from {$lang->projectCommon} <strong>%s</strong>";
$lang->project->cancelCopy = 'Cancel Copy';
@@ -315,10 +227,9 @@ $lang->project->byPeriod = 'By Time';
$lang->project->byUser = 'By User';
$lang->project->noProject = "No {$lang->projectCommon}. ";
$lang->project->noMembers = 'No members. ';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
/* 交互提示。*/
$lang->project->confirmDelete = "Do you want to delete {$lang->projectCommon}[%s]?";
$lang->project->confirmDelete = "Do you want to delete the {$lang->projectCommon}[%s]?";
$lang->project->confirmUnlinkMember = "Do you want to unlink this User from {$lang->projectCommon}?";
$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.";
@@ -333,7 +244,7 @@ $lang->project->goback = "Go Back";
$lang->project->noweekend = 'excl. Weekend';
$lang->project->withweekend = 'incl. Weekend';
$lang->project->interval = 'Intervals';
$lang->project->fixFirstWithLeft = 'Modify the left';
$lang->project->fixFirstWithLeft = 'Modify Man-hour left';
$lang->project->action = new stdclass();
$lang->project->action->opened = '$date, created by <strong>$actor</strong> .' . "\n";
@@ -344,7 +255,7 @@ $lang->project->action->extra = 'The linked products are %s.';
$lang->project->charts = new stdclass();
$lang->project->charts->burn = new stdclass();
$lang->project->charts->burn->graph = new stdclass();
$lang->project->charts->burn->graph->caption = "Burndown";
$lang->project->charts->burn->graph->caption = "Burndown Chart";
$lang->project->charts->burn->graph->xAxisName = "Date";
$lang->project->charts->burn->graph->yAxisName = "Hour";
$lang->project->charts->burn->graph->baseFontSize = 12;
@@ -356,13 +267,8 @@ $lang->project->charts->burn->graph->reference = 'Ideal';
$lang->project->charts->burn->graph->actuality = 'Actual';
$lang->project->placeholder = new stdclass();
<<<<<<< HEAD
$lang->project->placeholder->code = 'Alias of project name';
$lang->project->placeholder->totalLeft = 'Estimates at the beginning of the Project.';
=======
$lang->project->placeholder->code = "Abbreviation of {$lang->projectCommon} name";
$lang->project->placeholder->totalLeft = "Estimates at the beginning of the {$lang->projectCommon}.";
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->project->selectGroup = new stdclass();
$lang->project->selectGroup->done = '(Done)';
@@ -375,8 +281,8 @@ $lang->project->orderList['stage_asc'] = "Stage Ascending";
$lang->project->orderList['stage_desc'] = "Stage Descending";
$lang->project->kanban = "Kanban";
$lang->project->kanbanSetting = "Kanban Setting";
$lang->project->resetKanban = "Reset Setting";
$lang->project->kanbanSetting = "Kanban Settings";
$lang->project->resetKanban = "Reset Settings";
$lang->project->printKanban = "Print Kanban";
$lang->project->bugList = "Bugs";
module/release/lang/en.php
-4
View File
@@ -69,8 +69,4 @@ $lang->release->changeStatusList['normal'] = 'Activate';
$lang->release->changeStatusList['terminate'] = 'Terminate';
$lang->release->action = new stdclass();
<<<<<<< HEAD
$lang->release->action->changestatus = array('main' => '$date, by <strong>$actor</strong> $extra。', 'extra' => 'changeStatusList');
=======
$lang->release->action->changestatus = array('main' => '$date, $extra by <strong>$actor</strong>', 'extra' => 'changeStatusList');
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
module/story/lang/en.php
-10
View File
@@ -36,15 +36,9 @@ $lang->story->bugCountAB = 'B';
$lang->story->caseCountAB = 'C';
$lang->story->linkStory = 'Link';
$lang->story->unlinkStory = 'UnLinked';
<<<<<<< HEAD
$lang->story->export = "Export Story";
$lang->story->zeroCase = "Story w/o cases";
$lang->story->zeroTask = "Display story w/o tasks";
=======
$lang->story->export = "Export Data";
$lang->story->zeroCase = "Story w/o case";
$lang->story->zeroTask = "Story w/o task";
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->story->reportChart = "Report";
$lang->story->copyTitle = "Copy Title";
$lang->story->batchChangePlan = "Batch Change Plans";
@@ -76,11 +70,7 @@ $lang->story->stage = 'Stage';
$lang->story->stageAB = 'Stage';
$lang->story->mailto = 'Mail to';
$lang->story->openedBy = 'Creator';
<<<<<<< HEAD
$lang->story->openedDate = 'Create';
=======
$lang->story->openedDate = 'Created';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->story->assignedTo = 'Assignee';
$lang->story->assignedDate = 'Assigned';
$lang->story->lastEditedBy = 'Last Edited';
module/testcase/lang/en.php
+1 -6
View File
@@ -123,13 +123,8 @@ $lang->testcase->insertAfter = 'Inserted After';
$lang->testcase->assignToMe = 'AssignToMe';
$lang->testcase->openedByMe = 'CreateByMe';
$lang->testcase->allCases = 'All';
<<<<<<< HEAD
$lang->testcase->allTestcases = 'All Case';
$lang->testcase->needConfirm = 'Story Changed';
=======
$lang->testcase->allTestcases = 'All Cases';
$lang->testcase->needConfirm = 'Changed Story';
>>>>>>> 1f8899a84819dad5ffe811c8eb667fd33e01136f
$lang->testcase->needConfirm = 'Story Changed';
$lang->testcase->bySearch = 'Search';
$lang->testcase->unexecuted = 'Pending';
module/testreport/lang/en.php
+3 -44
View File
@@ -19,11 +19,7 @@ $lang->testreport->owner = 'Owner';
$lang->testreport->members = 'Members';
$lang->testreport->begin = 'Begin';
$lang->testreport->end = 'End';
<<<<<<< HEAD
$lang->testreport->stories = 'Story of Test';
=======
$lang->testreport->stories = 'Test Story';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->testreport->stories = 'Story';
$lang->testreport->bugs = 'Bugs';
$lang->testreport->builds = 'Build Info';
$lang->testreport->goal = 'Project Goal';
@@ -40,11 +36,7 @@ $lang->testreport->all = 'All Report';
$lang->testreport->deleted = 'Deleted';
$lang->testreport->legendBasic = 'Basic Info';
<<<<<<< HEAD
$lang->testreport->legendStoryAndBug = 'Story and Bug of Test';
=======
$lang->testreport->legendStoryAndBug = 'Story&Bug';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->testreport->legendBuild = 'Build Info';
$lang->testreport->legendCase = 'Linked Case';
$lang->testreport->legendLegacyBugs = 'Legacy Bug';
@@ -55,58 +47,25 @@ $lang->testreport->legendMore = 'More';
$lang->testreport->bugSeverityGroups = 'Bug Severity Distribution';
$lang->testreport->bugTypeGroups = 'Bug Type Distribution';
$lang->testreport->bugStatusGroups = 'Bug Status Distribution';
<<<<<<< HEAD
$lang->testreport->bugOpenedByGroups = 'Bug ReportBy Distribution';
=======
$lang->testreport->bugOpenedByGroups = 'Bug CreateBy Distribution';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->testreport->bugResolvedByGroups = 'Bug ResolveBy Distribution';
$lang->testreport->bugResolutionGroups = 'Bug Resolution Distribution';
$lang->testreport->bugModuleGroups = 'Bug Module Distribution';
<<<<<<< HEAD
$lang->testreport->legacyBugs = 'Legacy Bugs';
$lang->testreport->bugConfirmedRate = 'Confirmed Bug Rate (Resolution is fixed or postponed / status is resolved or closed)';
$lang->testreport->bugCreateByCaseRate = 'Bug Created in Case Rate (Bugs reported in cases / Newly added bugs)';
=======
$lang->testreport->legacyBugs = 'Legacy Bug';
$lang->testreport->bugConfirmedRate = 'Confirmed Bug Rate (Solution is fixed or postponed / status is resolved or closed)';
$lang->testreport->bugCreateByCaseRate = 'Bug Created in Case Rate (Bugs created in cases / Newly added bugs)';
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->testreport->caseSummary = ' <strong>%s</strong> cases in Total : <strong>%s</strong> performed, <strong>%s</strong> results, <strong>%s</strong> failed.';
$lang->testreport->buildSummary = 'Tested <strong>%s</strong> build.';
<<<<<<< HEAD
$lang->testreport->confirmDelete = 'Do you want tot delete this report?';
$lang->testreport->moreNotice = 'More features can be extended with reference to the ZenTao extension mechanism, or you can contact us for customization.';
$lang->testreport->exportNotice = "Export By <a href='https://www.zentao.pm' target='_blank' style='color:grey'>ZenTaoPMS</a>";
$lang->testreport->noReport = "No report has been generated. Please check it later.";
$lang->testreport->foundBugTip = "Bugs reported in this build and in the test period.";
$lang->testreport->legacyBugTip = "Active bugs, or bugs that are resolved beyond the test period.";
$lang->testreport->fromCaseBugTip = "Bugs reported after case-failure in the test period.";
$lang->testreport->errorTrunk = "The trunk version cannot create a test report. Please modify the related version!";
$lang->testreport->moreProduct = "A test report can only be generated for the same product.";
=======
$lang->testreport->confirmDelete = 'Do you want to delete this report?';
<<<<<<< HEAD
$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 = "Exported 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'>ZenTao</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 cannot create a QA report for. Please modify the linked build!";
$lang->testreport->moreProduct = "You can only create QA reports for the same product.";
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
=======
$lang->testreport->moreNotice = 'More features can be extended with reference to the ZenTao manual, or you can contact us at renee@easysoft.ltd for customization.';
$lang->testreport->exportNotice = "Exported By <a href='https://www.zentao.pm' target='_blank' style='color:grey'>ZenTao</a>";
$lang->testreport->noReport = "No report has been generated yet.";
$lang->testreport->foundBugTip = "Bugs reported in this build and in this test.";
$lang->testreport->legacyBugTip = "Active Bugs, or bugs that are resolved after this test is done.";
$lang->testreport->fromCaseBugTip = "Bugs reported due to failed cases in this test.";
$lang->testreport->errorTrunk = "The trunk cannot generate a QA report. Modify the linked build!";
$lang->testreport->moreProduct = "You can only generate QA reports for the same product.";
>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->testreport->moreProduct = "Test reports can only be generated for the same product.";
$lang->testreport->bugSummary = <<<EOD
<strong>%s</strong> Bug(s) reported in total <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-help'></i></a>,
module/testsuite/lang/en.php
-9
View File
@@ -18,21 +18,12 @@ $lang->testsuite->browse = "Suite List";
$lang->testsuite->linkCase = "Link Case";
$lang->testsuite->linkVersion = "Build";
$lang->testsuite->unlinkCase = "Unlink";
<<<<<<< HEAD
$lang->testsuite->batchUnlinkCases = "Batch Unlink Case";
$lang->testsuite->deleted = 'Deleted';
$lang->testsuite->exportTemplet = 'Export Template';
$lang->testsuite->batchCreateCase = 'Batch Create Case';
$lang->testsuite->import = 'Import';
$lang->testsuite->showImport = 'Imported Data';
=======
$lang->testsuite->batchUnlinkCases = "Batch Unlink Case";
$lang->testsuite->deleted = 'Deleted';
$lang->testsuite->exportTemplet = 'Export Template';
$lang->testsuite->batchCreateCase = 'Batch Create Case';
$lang->testsuite->import = 'Import';
$lang->testsuite->showImport = 'Imported Data';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->testsuite->successSaved = 'Saved';
$lang->testsuite->common = 'Test Suite';
module/todo/control.php
+1 -9
View File
@@ -42,15 +42,7 @@ class todo extends control
{
$todoID = $this->todo->create($date, $account);
if(dao::isError()) die(js::error(dao::getError()));
if($_POST['type'] != 'feedback')
{
$this->loadModel('action')->create('todo', $todoID, 'opened');
}
else
{
$this->loadModel('action')->create('todo', $todoID, 'FromFeedback', '', $_POST['idvalue']);
}
$this->loadModel('action')->create('todo', $todoID, 'opened');
$date = str_replace('-', '', $this->post->date);
if($date == '')
module/todo/lang/en.php
-1
View File
@@ -82,7 +82,6 @@ $lang->todo->typeList['cycle'] = 'Recur';
$lang->todo->typeList['bug'] = 'Bug';
$lang->todo->typeList['task'] = $lang->projectCommon . 'Task';
$lang->todo->typeList['story'] = $lang->projectCommon . 'Story';
$lang->todo->typeList['feedback'] = 'Feedback';
global $config;
if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']);
module/todo/lang/zh-cn.php
-1
View File
@@ -82,7 +82,6 @@ $lang->todo->typeList['cycle'] = '周期';
$lang->todo->typeList['bug'] = 'Bug';
$lang->todo->typeList['task'] = $lang->projectCommon . '任务';
$lang->todo->typeList['story'] = $lang->projectCommon . '需求';
$lang->todo->typeList['feedback'] = '反馈';
global $config;
if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']);
module/todo/view/create.html.php
+2 -2
View File
@@ -96,12 +96,12 @@
<th><?php echo $lang->todo->name;?></th>
<td colspan='2'>
<div id='nameBox' class='hidden'><?php echo html::input('name', '', "class='form-control'");?></div>
<div class='nameBox required'><?php echo html::input('name', '', "class='form-control'");?></div>
<div class='nameBox required'><?php echo html::input('name', isset($name) ? $name : '', "class='form-control'");?></div>
</td>
</tr>
<tr>
<th><?php echo $lang->todo->desc;?></th>
<td colspan='2'><?php echo html::textarea('desc', isset($feedback->desc) ? $feedback->desc : '', "rows='8' class='form-control'");?></td>
<td colspan='2'><?php echo html::textarea('desc', isset($desc) ? $desc : '', "rows='8' class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->todo->status;?></th>