Merge branch 'master' of github.com:easysoft/zentaopms
This commit is contained in:
@@ -118,4 +118,4 @@ $lang->extension->errorInstallDB = 'Database report execution fail
|
||||
$lang->extension->errorConflicts = 'Conflicted with “%s”!';
|
||||
$lang->extension->errorDepends = 'Dependent extension has not been installed or the version is incorrect:<br /><br /> %s';
|
||||
$lang->extension->errorIncompatible = 'Incompatible with your ZenTao.';
|
||||
$lang->extension->errorUninstallDepends = '“%s” is dependent on ts extension. Please do not install it.';
|
||||
$lang->extension->errorUninstallDepends = '“%s” is dependent on this extension. Please do not uninstall it.';
|
||||
|
||||
@@ -46,7 +46,7 @@ $lang->user->ranzhi = '然之帐号';
|
||||
$lang->user->ditto = '同上';
|
||||
$lang->user->originalPassword = '原密码';
|
||||
$lang->user->newPassword = '新密码';
|
||||
$lang->user->verifyPassword = '您的系统登录密码';
|
||||
$lang->user->verifyPassword = '您的密码';
|
||||
$lang->user->resetPassword = '忘记密码';
|
||||
|
||||
$lang->user->legendBasic = '基本资料';
|
||||
|
||||
Reference in New Issue
Block a user