Merge pull request #3861 from tangdou1/patch-1

Update some chinese to make them deambiguation

inc/lang/zh/lang.php

@@ -85,16 +85,16 @@
 $lang['btn_img_backto']        = '返回到 %s';
 $lang['btn_mediaManager']      = '在媒体管理器中查看';
 $lang['loggedinas']            = '登录为:';
-$lang['user']                  = '用户名';
+$lang['user']                  = '账号';
 $lang['pass']                  = '密码';
 $lang['newpass']               = '请输入新密码';
 $lang['oldpass']               = '请输入当前密码';
 $lang['passchk']               = '请再输一次';
 $lang['remember']              = '记住我';
-$lang['fullname']              = '全名';
+$lang['fullname']              = '昵称';
 $lang['email']                 = 'E-Mail';
 $lang['profile']               = '用户信息';
-$lang['badlogin']              = '对不起，用户名或密码错误。';
+$lang['badlogin']              = '对不起，账号或密码错误。';
 $lang['badpassconfirm']        = '对不起，密码错误';
 $lang['minoredit']             = '细微修改';
 $lang['draftdate']             = '草稿自动保存于';
@@ -159,7 +159,7 @@
 $lang['search_sort_by_hits']   = '按照点击率排序';
 $lang['search_sort_by_mtime']  = '按照最新更新时间排序';
 $lang['regmissing']            = '对不起，您必须填写所有的字段。';
-$lang['reguexists']            = '对不起，该用户名已经存在。';
+$lang['reguexists']            = '对不起，该账号已经存在。';
 $lang['regsuccess']            = '新用户已建立，密码将通过电子邮件发送给您。';
 $lang['regsuccess2']           = '新用户已建立';
 $lang['regfail']               = '用户不能被创建。';
@@ -170,7 +170,7 @@
 $lang['reghere']               = '还没有账号？立即注册';
 $lang['profna']                = '本维基不允许修改个人信息';
 $lang['profnochange']          = '没有改动，不进行操作。';
-$lang['profnoempty']           = '不允许使用空的用户名或邮件地址。';
+$lang['profnoempty']           = '不允许使用空的账号或邮件地址。';
 $lang['profchanged']           = '用户信息更新成功。';
 $lang['profnodelete']          = '这个 wiki 不支持删除用户';
 $lang['profdeleteuser']        = '删除账号';