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

doc/CHANGELOG

@@ -1,3 +1,38 @@
+2016-12-06 8.4.stable
+2150  优化富文本编辑器和markdown编辑器
+2154  调整项目的导入bug页面
+2155  优化需求相关任务弹窗页面的排版
+2156  调整计划需求列表页面的排版
+2158  需求列表的高级表格默认没有列TBC。
+2159  需求列表普通表格下面默认将来源去掉。
+2165  优化左下角导航条里面的间距
+1724  异步发信可以合并发信。
+3441  禅道开源版本在原来社区绑定的基础上增加社区验证功能
+3442  禅道网站增加企业认证的审核功能
+3445  对邮件的发信内容进行签名
+
+修复的Bug
+868  开源版导出需求验收标准中会显示转译字符
+878  搜索指派中会列出closed
+894  当服务器无法联网时sendcloud提示结果不准确
+895  csv格式用例模版文件导入关键词字段无效
+898  用户反馈测试-版本关联用例数量太多的话加载时间很长
+904  试用插件时，联系电话栏做必填项标识。
+913  影响版本为空提示错误的样式需要调整
+931  创建任务描述中粘帖图片回车会重复粘帖
+932  项目-任务按照需求分组左侧的需求太长的话无法完全显示
+933  xampp中的svn客户端会报错连接失败
+934  事务类型的任务只能上传一个附件
+936  无组织权限的情况下可以点击查看别的用户的待办
+939  搜索重置无效
+940  用例导入会执行步骤中的js脚本
+942  后台自定义优先级键值应只限定数字
+945  在1366分辨率下日期框显示不全
+946  项目-需求-分解任务列表ID被遮挡
+947  如果没有网络，添加Markdown类型的文档时，Markdown编辑器无法正常渲染。
+948  升级完成对广告，将亿斗替换zdoo。
+950  组织-用户 搜索显示数据不对
+
 2016-12-06 8.4.stable
 完成的需求
 2138    目录方式浏览的时候，增加一个返回按钮，返回上一级目录。

module/admin/lang/en.php

@@ -11,14 +11,14 @@
  */
 $lang->admin->common        = 'Administration';
 $lang->admin->index         = 'Admin Home';
-$lang->admin->checkDB       = 'Check Database Library';
+$lang->admin->checkDB       = 'Check Database';
 $lang->admin->sso           = 'RangerTeam';
 $lang->admin->safeIndex     = 'Security';
 $lang->admin->checkWeak     = 'Weak Password Check';
-$lang->admin->certifyMobile = '认证手机';
-$lang->admin->certifyEmail  = '认证邮箱';
-$lang->admin->captcha       = '验证码';
-$lang->admin->getCaptcha    = '获取验证码';
+$lang->admin->certifyMobile = 'Verify your mobilephone';
+$lang->admin->certifyEmail  = 'Verifu your Email';
+$lang->admin->captcha       = 'Verification Code';
+$lang->admin->getCaptcha    = 'Get Verification Code';
 
 $lang->admin->info = new stdclass();
 $lang->admin->info->version = 'Current Version is %s,';
@@ -30,7 +30,7 @@ $lang->admin->notice->register = "Note: You haven't registered in ZenTao(www.zen
 $lang->admin->notice->ignore   = "Ignore";
 
 $lang->admin->register = new stdclass();
-$lang->admin->register->common     = '注册新帐号绑定';
+$lang->admin->register->common     = 'Account Binding';
 $lang->admin->register->caption    = 'Register';
 $lang->admin->register->click      = 'Click Here';
 $lang->admin->register->lblAccount = 'must be 3 characters combination of letters and numbers at least.';
@@ -47,7 +47,7 @@ $lang->admin->safe = new stdclass();
 $lang->admin->safe->common    = 'Security';
 $lang->admin->safe->set       = 'Password Security Settings';
 $lang->admin->safe->password  = 'Password Security';
-$lang->admin->safe->weak      = 'Common Weak Password';
+$lang->admin->safe->weak      = 'Weak Password';
 $lang->admin->safe->reason    = 'Type';
 $lang->admin->safe->checkWeak = 'Weak Password Check';
 $lang->admin->safe->modifyPasswordFirstLogin = 'Modify password when login for the first time.';

module/mail/lang/en.php

@@ -8,12 +8,12 @@ $lang->mail->test   = 'Email Testing';
 $lang->mail->reset  = 'Reset';
 $lang->mail->browse = 'Email List';
 $lang->mail->delete = 'Delete Email';
-$lang->mail->ztCloud       = '禅道云发信';
+$lang->mail->ztCloud       = 'ZenTao CloudMail';
 $lang->mail->sendCloud     = 'Notice SendCloud';
 $lang->mail->batchDelete   = 'Batch Delete';
 $lang->mail->sendcloudUser = 'Sync Contact';
-$lang->mail->agreeLicense  = '同意';
-$lang->mail->disagree      = '不同意';
+$lang->mail->agreeLicense  = 'Yes';
+$lang->mail->disagree      = 'No';
 
 $lang->mail->turnon      = 'Turn On';
 $lang->mail->async       = 'Asynchronous';
@@ -30,7 +30,7 @@ $lang->mail->debug       = 'Debug';
 $lang->mail->charset     = 'Charset';
 $lang->mail->accessKey   = 'Access Key';
 $lang->mail->secretKey   = 'Secret Key';
-$lang->mail->license     = '禅道云发信使用须知';
+$lang->mail->license     = 'ZenTao Cloud Notice';
 
 $lang->mail->selectMTA = 'Select MTA';
 $lang->mail->smtp      = 'SMTP';
@@ -68,7 +68,7 @@ $lang->mail->secureList['']    = 'Plain';
 $lang->mail->secureList['ssl'] = 'ssl';
 $lang->mail->secureList['tls'] = 'tls';
 
-$lang->mail->more           = '更多...';
+$lang->mail->more           = 'More';
 $lang->mail->inputFromEmail = 'Enter Email Address';
 $lang->mail->nextStep       = 'Next';
 $lang->mail->successSaved   = 'Configuration has been saved.';
@@ -78,8 +78,8 @@ $lang->mail->successSended  = 'Sent!';
 $lang->mail->confirmDelete  = 'Do you want to delete it?';
 $lang->mail->sendmailTips   = 'Note: Email author will not receive this email.';
 $lang->mail->needConfigure  = 'Email configuration is not found. Please cinfigure the Email first.';
-$lang->mail->connectFail    = '无法连接禅道网站。';
-$lang->mail->centifyFail    = '验证失败，可能密钥已经修改。请重新绑定！';
+$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. Mails cannot send 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.';