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, 0 insertions, 3 deletions

diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php
index 832dfe749..364ad3fe6 100644
--- a/lib/plugins/config/lang/zh/lang.php
+++ b/lib/plugins/config/lang/zh/lang.php
@@ -42,8 +42,6 @@ $lang['_notifications']        = '通知设置';
 $lang['_syndication']          = '聚合设置';
 $lang['_advanced']             = '高级设置';
 $lang['_network']              = '网络设置';
-$lang['_plugin_sufix']         = '插件设置';
-$lang['_template_sufix']       = '模板设置';
 $lang['_msg_setting_undefined'] = '设置的元数据不存在。';
 $lang['_msg_setting_no_class'] = '设置的分类不存在。';
 $lang['_msg_setting_no_default'] = '设置的默认值不存在。';
@@ -114,7 +112,6 @@ $lang['target____media']       = '媒体文件链接的目标窗口';
 $lang['target____windows']     = 'Windows 链接的目标窗口';
 $lang['mediarevisions']        = '激活媒体修订历史？';
 $lang['refcheck']              = '检查媒体与页面的挂钩情况';
-$lang['refshow']               = '显示媒体与页面挂钩情况的数量';
 $lang['gdlib']                 = 'GD 库版本';
 $lang['im_convert']            = 'ImageMagick 转换工具的路径';
 $lang['jpg_quality']           = 'JPG 压缩质量（0-100）';