From 942850b1785fbd676a1111cd8fa1a2474c6309d0 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Mon, 4 Jan 2010 07:31:34 +0000
Subject: [PATCH] =?UTF-8?q?=20*=20change=20=E7=99=BB=E9=99=86=20to=20?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 trunk/module/common/lang/zh-cn.php  | 2 +-
 trunk/module/company/lang/zh-cn.php | 2 +-
 trunk/module/mail/config.php        | 2 +-
 trunk/module/user/lang/zh-cn.php    | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/trunk/module/common/lang/zh-cn.php b/trunk/module/common/lang/zh-cn.php
index f4537d2fcd..0f6209402b 100644
--- a/trunk/module/common/lang/zh-cn.php
+++ b/trunk/module/common/lang/zh-cn.php
@@ -25,7 +25,7 @@
  */
 $lang->zentaoMS   = '禅道管理';
 $lang->logout     = '退出系统';
-$lang->login      = '登陆';
+$lang->login      = '登录';
 $lang->currentPos = '当前位置：';
 $lang->arrow      = ' » ';
 $lang->colon      = '::';
diff --git a/trunk/module/company/lang/zh-cn.php b/trunk/module/company/lang/zh-cn.php
index 479aa31a0d..dd15e76023 100644
--- a/trunk/module/company/lang/zh-cn.php
+++ b/trunk/module/company/lang/zh-cn.php
@@ -43,7 +43,7 @@ $lang->company->zipcode  = '邮政编码';
 $lang->company->website  = '公司网站';
 $lang->company->backyard = '内网网址';
 $lang->company->pms      = 'PMS网站';
-$lang->company->guest    = '匿名登陆';
+$lang->company->guest    = '匿名登录';
 
 $lang->company->guestList[0] = '不允许';
 $lang->company->guestList[1] = '允许';
diff --git a/trunk/module/mail/config.php b/trunk/module/mail/config.php
index 882d62d116..6e974d930d 100644
--- a/trunk/module/mail/config.php
+++ b/trunk/module/mail/config.php
@@ -16,7 +16,7 @@ if($config->mail->mta == 'smtp')
     $config->mail->smtp->auth     = true;       // 是否需要验证。 
     $config->mail->smtp->host     = '';         // smtp主机。
     $config->mail->smtp->port     = '';         // 端口号。
-    $config->mail->smtp->username = '';         // 登陆用户名，有的smtp需要完整的邮箱地址。
+    $config->mail->smtp->username = '';         // 登录用户名，有的smtp需要完整的邮箱地址。
     $config->mail->smtp->password = '';         // 密码。
 }
 /* GMAIL的配置。*/
diff --git a/trunk/module/user/lang/zh-cn.php b/trunk/module/user/lang/zh-cn.php
index 2179cd3f70..9dd5595a52 100644
--- a/trunk/module/user/lang/zh-cn.php
+++ b/trunk/module/user/lang/zh-cn.php
@@ -30,13 +30,13 @@ $lang->user->edit          = "编辑用户";
 $lang->user->update        = "编辑用户";
 $lang->user->delete        = "删除用户";
 $lang->user->browse        = "浏览用户";
-$lang->user->login         = "用户登陆";
+$lang->user->login         = "用户登录";
 $lang->user->userView      = "人员视图";
 $lang->user->editProfile   = "修改个人信息";
 $lang->user->editPassword  = "修改密码";
 $lang->user->deny          = "访问受限";
 $lang->user->confirmDelete = "您确认删除该用户吗？";
-$lang->user->relogin       = "重新登陆";
+$lang->user->relogin       = "重新登录";
 $lang->user->asGuest       = "游客访问";
 $lang->user->goback        = "返回前一页";
 $lang->user->allUsers      = '全部用户';
@@ -81,4 +81,4 @@ $lang->user->zipcode   = '邮编';
 $lang->user->join      = '加入日期';
 $lang->user->visits    = '访问次数';
 $lang->user->ip        = '最后IP';
-$lang->user->last      = '最后登陆时间';
+$lang->user->last      = '最后登录时间';