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

This commit is contained in:
wangyidong
2019-05-28 09:52:40 +08:00
21 changed files with 107 additions and 68 deletions
+6 -6
View File
@@ -20,7 +20,7 @@ $lang->user->role = 'Role';
$lang->user->group = 'Group';
$lang->user->realname = 'Name';
$lang->user->nickname = 'Nickname';
$lang->user->commiter = 'SCM Account';
$lang->user->commiter = 'SVN/GIT Account';
$lang->user->birthyear = 'DOB';
$lang->user->gender = 'Gender';
$lang->user->email = 'Email';
@@ -32,12 +32,12 @@ $lang->user->skype = 'Skype';
$lang->user->qq = 'QQ';
$lang->user->mobile = 'Mobile';
$lang->user->phone = 'Phone';
$lang->user->weixin = 'Wechat';
$lang->user->dingding = 'Ding Ding';
$lang->user->weixin = 'WeChat';
$lang->user->dingding = 'DingDing';
$lang->user->slack = 'Slack';
$lang->user->whatsapp = 'WhatsApp';
$lang->user->address = 'Address';
$lang->user->zipcode = 'Zip Code';
$lang->user->zipcode = 'ZipCode';
$lang->user->join = 'Joined';
$lang->user->visits = 'Visits';
$lang->user->ip = 'Last IP';
@@ -87,7 +87,7 @@ $lang->user->task = 'Task';
$lang->user->bug = 'Bug';
$lang->user->test = 'QA';
$lang->user->testTask = 'Test';
$lang->user->testCase = 'Test Case';
$lang->user->testCase = 'Case';
$lang->user->schedule = 'Schedule';
$lang->user->todo = 'Todo';
$lang->user->story = 'Story';
@@ -184,7 +184,7 @@ $lang->user->contactFieldList['phone'] = $lang->user->phone;
$lang->user->contacts = new stdclass();
$lang->user->contacts->common = 'Contacts';
$lang->user->contacts->listName = 'List Name';
$lang->user->contacts->userList = 'User Lisit';
$lang->user->contacts->userList = 'User List';
$lang->user->contacts->manage = 'Manage List';
$lang->user->contacts->contactsList = 'Contact List';