Merge branch 'master' into stable

* master: (413 commits)
  release preparation
  fixed strict violation in ACL plugin
  Fix issues from teams:i18n:translation-check in localizations
  ensure locale is set back to the original value
  skip FS#2867 test if \s doesn't match \xA0 after attempting to change the locale
  unittests for auth_loadACL
  translation update
  allow charset for SSO to be configured FS#2148
  Mailer: avoid overlong headers in content ids FS#2868
  translation update
  translation update
  replace \s, \S with [ \t], [^ \t] in regexs used with acls
  translation update
  translation update
  translation update
  translation update
  Fix handling of the legacy subscription action name
  remove obsolete opera handling and session closing
  remove no longer used ajax.php
  fix proxy CONNECT where HTTP 1.1 answer is given
  ...

1 files changed, 22 insertions, 2 deletions

diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php
index e7a228229..25eb1a294 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,8 @@
  * @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>
+ * @author Yangyu Huang <yangyu.huang@gmail.com>
  */
 $lang['menu']                  = '用户管理器';
 $lang['noauth']                = '（用户认证不可用）';
@@ -36,6 +39,11 @@ $lang['search']                = '搜索';
 $lang['search_prompt']         = '进行搜索';
 $lang['clear']                 = '重置搜索过滤器';
 $lang['filter']                = '过滤器';
+$lang['export_all']            = '导出所有用户（CSV）';
+$lang['export_filtered']       = '导出已筛选的用户列表（CSV）';
+$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 +64,15 @@ $lang['add_ok']                = '用户添加成功';
 $lang['add_fail']              = '用户添加失败';
 $lang['notify_ok']             = '通知邮件已发送';
 $lang['notify_fail']           = '通知邮件无法发送';
+$lang['import_userlistcsv']    = '用户列表文件（CSV）';
+$lang['import_header']         = '最近一次导入 - 失败';
+$lang['import_success_count']  = '用户导入：找到了 %d 个用户，%d 个用户被成功导入。';
+$lang['import_failure_count']  = '用户导入：%d 个用户导入失败。下面列出了失败的用户。';
+$lang['import_error_fields']   = '域的数目不足，发现 %d 个，需要 4 个。';
+$lang['import_error_baduserid'] = '用户ID丢失';
+$lang['import_error_badname']  = '名称错误';
+$lang['import_error_badmail']  = '邮件地址错误';
+$lang['import_error_upload']   = '导入失败。CSV 文件无法上传或是空的。';
+$lang['import_error_readfail'] = '导入失败。无法读取上传的文件。';
+$lang['import_error_create']   = '不能创建新用户';
+$lang['import_notify_fail']    = '通知消息无法发送到导入的用户 %s，电子邮件地址是 %s。';