diff --git a/! b/! new file mode 100644 index 0000000000..ef7e673ca3 --- /dev/null +++ b/! @@ -0,0 +1,18 @@ + *Adjust minor! +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# On branch master +# Your branch is up-to-date with 'origin/master'. +# +# Changes to be committed: +# modified: action/lang/en.php +# modified: build/lang/en.php +# modified: common/lang/en.php +# modified: datatable/lang/en.php +# modified: doc/lang/en.php +# modified: install/lang/en.php +# modified: productplan/lang/en.php +# modified: release/lang/en.php +# modified: story/lang/en.php +# modified: tree/lang/en.php +# diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php index 8683a494d1..56bb00e264 100755 --- a/module/mail/lang/en.php +++ b/module/mail/lang/en.php @@ -6,7 +6,7 @@ $lang->mail->edit = 'Edit Settings'; $lang->mail->save = 'Saved'; $lang->mail->test = 'Email Testing'; $lang->mail->reset = 'Reset'; -$lang->mail->resend = '重发失败邮件'; +$lang->mail->resend = 'Send it again.'; $lang->mail->browse = 'Email List'; $lang->mail->delete = 'Delete Email'; $lang->mail->ztCloud = 'ZenTao CloudMail'; @@ -70,7 +70,7 @@ $lang->mail->secureList['ssl'] = 'ssl'; $lang->mail->secureList['tls'] = 'tls'; $lang->mail->more = 'More'; -$lang->mail->noticeResend = '已经重新发信!'; +$lang->mail->noticeResend = 'Sent it again!'; $lang->mail->inputFromEmail = 'Enter Email Address'; $lang->mail->nextStep = 'Next'; $lang->mail->successSaved = 'Configuration has been saved.'; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index cad6c04f91..a14320e611 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -35,7 +35,7 @@ $lang->misc->zentao->support['vip'] = "VIP Technical Support"; $lang->misc->zentao->support['manual'] = "User Manual"; $lang->misc->zentao->support['faq'] = "FAQ"; $lang->misc->zentao->support['ask'] = "Q&A"; -$lang->misc->zentao->support['qqgroup'] = "官方QQ群"; +$lang->misc->zentao->support['qqgroup'] = "Official QQ Group"; $lang->misc->zentao->cowin['donate'] = "Donate"; $lang->misc->zentao->cowin['reportbug'] = "Report Bug "; @@ -63,30 +63,30 @@ $lang->misc->novice = "First time to ZenTao? Do you want to start rookie mo $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Latest Version'; -$lang->misc->feature->detailed = '详情'; +$lang->misc->feature->detailed = 'Details'; -$lang->misc->feature->all['9.0.beta'][] = array('title'=>'增加禅道云发信功能', 'desc' => '
禅道云发信是禅道联合SendCloud推出的一项免费发信服务,只有用户绑定禅道,并通过验证即可使用。
'); -$lang->misc->feature->all['9.0.beta'][] = array('title'=>'优化富文本编辑器和markdown编辑器', 'desc' => ''); +$lang->misc->feature->all['9.0.beta'][] = array('title'=>'ZenTao CloudMail has been added.', 'desc' => 'ZenTao CloudMail is a free Email service launched jointly with SendCloud. Once binded with ZenTao and passed verification, users can use this service.
'); +$lang->misc->feature->all['9.0.beta'][] = array('title'=>'Optimized Rich Text Editor and Markdown Editor.', 'desc' => ''); -$lang->misc->feature->all['8.3.stable'][] = array('title'=>'调整文档功能', 'desc' => '增加文档模块首页,重新组织文档库结构,增加权限
多种文件浏览方式,文档支持Markdown,增加文档权限管理,增加文件版本管理。
'); +$lang->misc->feature->all['8.3.stable'][] = array('title'=>'Improved Documentation.', 'desc' => 'Added Document Home, restructured document library, and added privileges.
Markdown Editor is supported,and privilege and version managment is added.
'); $lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => 'You can add blocks to Dashboard and arrange the layout.
My Zone, Product, Project, and Testing all support home custom mentioned before.
'); $lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Navigation', 'desc' => 'You can decide which project show in navigation bar and the order of projects shown in the bar.
Hover on the navigation bar and a sign will show to its right. Click the sign and a dialog box "Custom Navigation" will show. Drag the block name to switch its order on navigation bar.
'); $lang->misc->feature->all['8.2.stable'][] = array('title'=>'Batch Add/Edit Custom', 'desc' => 'You can batch add and edit fields on custom pages.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Add Custom Story/Task/Bug/Case', 'desc' => 'You can custom fileds when add a Story/Task/Bug/Case.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Export', 'desc' => 'You can custom fileds when export a Story/Task/Bug/Case pages. You can save it as template for next export.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Story/Task/Bug/Case Combinatorial Search ', 'desc' => 'On Story/Task/Bug/Case List page, you can do combinatorial search on Modules and Tabs.
'); -$lang->misc->feature->all['8.2.stable'][] = array('title'=>"Rookie's Tutorial", 'desc' => 'Tutorial for Rookies is added for users to know how to use ZenTao.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Story/Task/Bug/Case', 'desc' => 'You can custom fileds when add a Story/Task/Bug/Case.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Export', 'desc' => 'You can custom fileds when export a Story/Task/Bug/Case pages. You can also save it as template for next export.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Story/Task/Bug/Case Search ', 'desc' => 'On Story/Task/Bug/Case List page, you can do a combined search on Modules and Tabs.
'); +$lang->misc->feature->all['8.2.stable'][] = array('title'=>"Rookie's Tutorial", 'desc' => 'Tutorial for Rookies is added for first-time users to know how to use ZenTao.
'); -$lang->misc->feature->all['7.4.beta'][] = array('title'=>'产品实现分支功能', 'desc' => '产品增加分支/平台类型,相应的需求、计划、Bug、用例、模块等都增加分支。
'); -$lang->misc->feature->all['7.4.beta'][] = array('title'=>'调整发布模块', 'desc' => '发布增加停止维护操作,当发布停止维护时,创建Bug将不显示这个发布。
发布中遗留的bug改为手工关联。
'); -$lang->misc->feature->all['7.4.beta'][] = array('title'=>'调整需求和Bug的创建页面', 'desc' => ''); +$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Product branch feature is added.', 'desc' => 'Product branch/platform is added, and its related Story/Plan/Bug/Case/Module has Branch added too.
'); +$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Release Module is improved.', 'desc' => 'Stop action has been added. If Stop to manage it, the Release will not show when Report Bug.
Bugs that have been omitted in the Release will be related manually.
'); +$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Create pages of Story and Bug are improved.', 'desc' => ''); -$lang->misc->feature->all['7.2.stable'][] = array('title'=>'增强安全', 'desc' => '加强对管理员弱口令的检查。
写插件,上传插件的时候需要创建ok文件。
敏感操作增加管理员口令的检查
对输入内容做striptags, specialchars处理。
'); -$lang->misc->feature->all['7.2.stable'][] = array('title'=>'完善细节', 'desc' => ''); +$lang->misc->feature->all['7.2.stable'][] = array('title'=>'Security Enhanced', 'desc' => 'Admin weak passwork check is enhanced.
ok file is required when code/upload an extension.
Sensitive action requires Admin password.
Do striptags, specialchars to content entered in ZenTao.
'); +$lang->misc->feature->all['7.2.stable'][] = array('title'=>'Details Improved', 'desc' => ''); -$lang->misc->feature->all['7.1.stable'][] = array('title'=>'提供计划任务框架', 'desc' => '增加计划任务框架,加入每日提醒、更新燃尽图、备份、发信等重要任务。'); -$lang->misc->feature->all['7.1.stable'][] = array('title'=>'提供rpm和deb包', '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'=>'rpm and deb packages are provided.', 'desc' => ''); -$lang->misc->feature->all['6.3.stable'][] = array('title'=>'增加数据表格功能', 'desc' => '可配置数据表格中可显示的字段,按照配置字段显示想看的数据
'); -$lang->misc->feature->all['6.3.stable'][] = array('title'=>'继续完善细节', 'desc' => ''); +$lang->misc->feature->all['6.3.stable'][] = array('title'=>'Data table is added.', 'desc' => 'Fields can be customized in data table and data will be displayed according to customized fields.
'); +$lang->misc->feature->all['6.3.stable'][] = array('title'=>'Continue improving details', 'desc' => ''); diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index d974669684..905e20f5d8 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -44,10 +44,10 @@ $lang->testcase->allProduct = "All {$lang->productCommon}"; $lang->testcase->fromBug = 'From Bug'; $lang->testcase->toBug = 'To Bug'; $lang->testcase->changed = 'Changed'; -$lang->testcase->bugs = '产生Bug数'; +$lang->testcase->bugs = 'Bugs Generated'; $lang->testcase->bugsAB = 'B'; -$lang->testcase->results = '执行数'; -$lang->testcase->createBug = 'Transfer Bug'; +$lang->testcase->results = 'Results'; +$lang->testcase->createBug = 'Convert to Bug'; $lang->case = $lang->testcase; // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case. $lang->testcase->stepID = 'ID'; diff --git a/www/ok.txt b/www/ok.txt index b5754e2037..e69de29bb2 100644 --- a/www/ok.txt +++ b/www/ok.txt @@ -1 +0,0 @@ -ok \ No newline at end of file