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

module/user/lang/en.php

@@ -49,8 +49,8 @@ $lang->user->newPassword      = 'New Password';
 $lang->user->verifyPassword   = 'Password';
 $lang->user->resetPassword    = 'Forgot Password?';
 
-$lang->user->legendBasic        = '基本资料';
-$lang->user->legendContribution = '个人贡献';
+$lang->user->legendBasic        = 'Basic Info.';
+$lang->user->legendContribution = 'Contribution';
 
 $lang->user->index         = "Home";
 $lang->user->view          = "Overview";
@@ -130,18 +130,15 @@ $lang->user->passwordStrengthList[0] = "<span style='color:red'>Weak</span>";
 $lang->user->passwordStrengthList[1] = "<span style='color:#000'>Good</span>";
 $lang->user->passwordStrengthList[2] = "<span style='color:green'>Strong</span>";
 
-$lang->user->statusList['active'] = '正常';
-$lang->user->statusList['delete'] = '删除';
-
-$lang->user->personalData['createdTodo']  = '创建的待办数';
-$lang->user->personalData['createdStory'] = '创建的需求数';
-$lang->user->personalData['finishedTask'] = '完成的任务数';
-$lang->user->personalData['resolvedBug']  = '解决的Bug数';
-$lang->user->personalData['createdCase']  = '创建的用例数';
-
-$lang->user->statusList['active'] = 'Activated';
+$lang->user->statusList['active'] = 'Active';
 $lang->user->statusList['delete'] = 'Deleted';
 
+$lang->user->personalData['createdTodo']  = 'Todos Created';
+$lang->user->personalData['createdStory'] = 'Stories Created';
+$lang->user->personalData['finishedTask'] = 'Tasks Finished';
+$lang->user->personalData['resolvedBug']  = 'Bugs Solved';
+$lang->user->personalData['createdCase']  = 'Cases Created';
+
 $lang->user->keepLogin['on']      = 'Keep Login';
 $lang->user->loginWithDemoUser    = 'Login as Demo User:';
 

www/theme/default/style.css

@@ -8,11 +8,6 @@
 * @version     $Id: style.css 1454 2009-10-23 01:45:26Z wwccss $
 * @link        http://www.zentao.net
 */
-
-/* Change zentao icon on fixed footer with classic style image */
-#poweredBy .icon-zentao {background: url(images/main/icon.png) center no-repeat}
-#poweredBy .icon-zentao:before {visibility: hidden;}
-
 /* Finish task #5068*/
 .main-table .table{cursor:pointer;}
 .table-striped > tbody > tr:nth-child(2n+1) > td, .table-striped > tbody > tr:nth-child(2n+1) > th{background:none;}