9 files changed, 32 insertions, 18 deletions
diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php
index 983882eaf..029446cca 100644
--- a/lib/plugins/acl/lang/zh/lang.php
+++ b/lib/plugins/acl/lang/zh/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Chinese(Simplified) language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author ZDYX <zhangduyixiong@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
  * @author George Sheraton guxd@163.com
diff --git a/lib/plugins/authad/lang/zh/settings.php b/lib/plugins/authad/lang/zh/settings.php
index 0ad8d4e4f..84bdc1e5c 100644
--- a/lib/plugins/authad/lang/zh/settings.php
+++ b/lib/plugins/authad/lang/zh/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author lainme <lainme993@gmail.com>
  */
 $lang['account_suffix']        = '您的账户后缀。例如 <code>@my.domain.org</code>';
diff --git a/lib/plugins/authldap/lang/zh/settings.php b/lib/plugins/authldap/lang/zh/settings.php
index 3f38deae9..b531c192a 100644
--- a/lib/plugins/authldap/lang/zh/settings.php
+++ b/lib/plugins/authldap/lang/zh/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author lainme <lainme993@gmail.com>
  */
 $lang['server']                = '您的 LDAP 服务器。填写主机名 (<code>localhost</code>) 或者完整的 URL (<code>ldap://server.tld:389</code>)';
diff --git a/lib/plugins/authmysql/lang/zh/settings.php b/lib/plugins/authmysql/lang/zh/settings.php
index 772f75ecd..b58159e85 100644
--- a/lib/plugins/authmysql/lang/zh/settings.php
+++ b/lib/plugins/authmysql/lang/zh/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author lainme <lainme993@gmail.com>
  */
 $lang['server']                = '您的 MySQL 服务器';
diff --git a/lib/plugins/authpgsql/lang/zh/settings.php b/lib/plugins/authpgsql/lang/zh/settings.php
index dc7223d89..32adb37d9 100644
--- a/lib/plugins/authpgsql/lang/zh/settings.php
+++ b/lib/plugins/authpgsql/lang/zh/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author lainme <lainme993@gmail.com>
  */
 $lang['server']                = '您的 PostgreSQL 服务器';
diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php
index 473d31ead..f69410503 100644
--- a/lib/plugins/plugin/lang/zh/lang.php
+++ b/lib/plugins/plugin/lang/zh/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * english language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author ZDYX <zhangduyixiong@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
  * @author George Sheraton guxd@163.com
diff --git a/lib/plugins/popularity/lang/zh/lang.php b/lib/plugins/popularity/lang/zh/lang.php
index 9c916c2a5..532abb890 100644
--- a/lib/plugins/popularity/lang/zh/lang.php
+++ b/lib/plugins/popularity/lang/zh/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author ZDYX <zhangduyixiong@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
  * @author George Sheraton guxd@163.com
diff --git a/lib/plugins/revert/lang/zh/lang.php b/lib/plugins/revert/lang/zh/lang.php
index d4d010f29..44a72f54b 100644
--- a/lib/plugins/revert/lang/zh/lang.php
+++ b/lib/plugins/revert/lang/zh/lang.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * Chinese(Simplified) language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author ZDYX <zhangduyixiong@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
  * @author George Sheraton guxd@163.com
diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php
index e7a228229..2674983b2 100644
--- a/lib/plugins/usermanager/lang/zh/lang.php
+++ b/lib/plugins/usermanager/lang/zh/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * English language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author ZDYX <zhangduyixiong@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
  * @author George Sheraton guxd@163.com
@@ -14,6 +15,7 @@
  * @author caii, patent agent in China <zhoucaiqi@gmail.com>
  * @author lainme993@gmail.com
  * @author Shuo-Ting Jian <shoting@gmail.com>
+ * @author Rachel <rzhang0802@gmail.com>
  */
 $lang['menu']                  = '用户管理器';
 $lang['noauth']                = '（用户认证不可用）';
@@ -36,6 +38,9 @@ $lang['search']                = '搜索';
 $lang['search_prompt']         = '进行搜索';
 $lang['clear']                 = '重置搜索过滤器';
 $lang['filter']                = '过滤器';
+$lang['import']                = '请输入新用户名';
+$lang['line']                  = '行号';
+$lang['error']                 = '信息错误';
 $lang['summary']               = '找到 %3$d 名用户，显示其中第 %1$d 至 %2$d 位用户。数据库中共有 %4$d 名用户。';
 $lang['nonefound']             = '没有找到用户。数据库中共有 %d 名用户。';
 $lang['delete_ok']             = '用户 %d 已删除';
@@ -56,3 +61,7 @@ $lang['add_ok']                = '用户添加成功';
 $lang['add_fail']              = '用户添加失败';
 $lang['notify_ok']             = '通知邮件已发送';
 $lang['notify_fail']           = '通知邮件无法发送';
+$lang['import_error_baduserid'] = '用户ID丢失';
+$lang['import_error_badname']  = '名称错误';
+$lang['import_error_badmail']  = '邮件地址错误';
+$lang['import_error_create']   = '不能创建新用户';