Merge branch 'master' of https://github.com/easysoft/zentaopms
This commit is contained in:
Yagami
@@ -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!";
|
||||
|
||||
@@ -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';
|
||||
|
||||
/* 功能按钮。*/
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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?";
|
||||
|
||||
+2
-11
@@ -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
|
||||
|
||||
+14
-14
@@ -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';
|
||||
|
||||
+12
-12
@@ -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.';
|
||||
|
||||
@@ -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.';
|
||||
|
||||
+10
-10
@@ -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!';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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.";
|
||||
|
||||
@@ -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->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';
|
||||
|
||||
@@ -134,30 +106,14 @@ $lang->project->aclList['custom'] = 'Whitelist (Team members and the whitelist
|
||||
|
||||
/* 方法列表。*/
|
||||
$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->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->computeBurn = 'Update';
|
||||
$lang->project->burnData = 'Burndown Data';
|
||||
@@ -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';
|
||||
@@ -240,47 +192,7 @@ $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; 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 <span class='text-muted'>Doing</span> %s</div><div>Est. <strong>%s ：</strong><span class='text-muted'>Cost</span> %s <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->selectProject = "Select {$lang->projectCommon}";
|
||||
$lang->project->beginAndEnd = 'Duration';
|
||||
$lang->project->begin = 'Begin';
|
||||
@@ -315,7 +227,6 @@ $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]?";
|
||||
@@ -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";
|
||||
@@ -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)';
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -1638,14 +1638,14 @@ class testcase extends control
|
||||
$this->view->users = $this->loadModel('user')->getPairs('noletter');
|
||||
$this->display();
|
||||
}
|
||||
|
||||
/**
|
||||
* Export case getModuleByStory
|
||||
*
|
||||
* @params int $storyID
|
||||
* @return void
|
||||
*/
|
||||
|
||||
public function ajaxGetStoryMoule($storyID)
|
||||
public function ajaxGetStoryModule($storyID)
|
||||
{
|
||||
$story = $this->dao->select('module')->from(TABLE_STORY)->where('id')->eq($storyID)->fetch();
|
||||
$moduleID = !empty($story) ? $story->module : 0;
|
||||
|
||||
@@ -12,7 +12,7 @@ $(document).on('change', '.storyChange', function()
|
||||
{
|
||||
var storyID = $(this).val();
|
||||
if(typeof(storyID) == 'undefined') storyID = 0;
|
||||
var link = createLink('testcase', 'ajaxGetStoryMoule', 'storyID=' + storyID);
|
||||
var link = createLink('testcase', 'ajaxGetStoryModule', 'storyID=' + storyID);
|
||||
var id = $(this).attr('id');
|
||||
var index = id.substring(5);
|
||||
$.get(link, function(json)
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -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>,
|
||||
|
||||
@@ -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';
|
||||
|
||||
Reference in New Issue
Block a user