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

This commit is contained in:
wangyidong
2017-05-12 08:16:26 +08:00
3 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -83,7 +83,7 @@ $lang->product->typeList['platform'] = 'Multi Platform';
$lang->product->typeTips = array();
$lang->product->typeTips['branch'] = '(Generally used to divide the custom content of different users)';
$lang->product->typeTips['platform'] = '(Generally used to divide ios, Andrews, pc side, server and so on)';
$lang->product->typeTips['platform'] = '(Generally used to divide ios, Andrews, pc and so on)';
$lang->product->branchName['normal'] = '';
$lang->product->branchName['branch'] = 'Branch';
+2 -2
View File
@@ -82,8 +82,8 @@ $lang->product->typeList['branch'] = '多分支';
$lang->product->typeList['platform'] = '多平台';
$lang->product->typeTips = array();
$lang->product->typeTips['branch'] = '(一般用于划分不同用户的定制内容)';
$lang->product->typeTips['platform'] = '(一般用于划分ios、安卓、pc端、服务器端等)';
$lang->product->typeTips['branch'] = '(适用于客户定制场景)';
$lang->product->typeTips['platform'] = '(适用于跨平台应用开发,比如ios、安卓、pc端等)';
$lang->product->branchName['normal'] = '';
$lang->product->branchName['branch'] = '分支';
+3 -3
View File
File diff suppressed because one or more lines are too long