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-tw/lang.php b/lib/plugins/config/lang/zh-tw/lang.php
index cc6e0246e..cc2c28c31 100644
--- a/lib/plugins/config/lang/zh-tw/lang.php
+++ b/lib/plugins/config/lang/zh-tw/lang.php
@@ -37,8 +37,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'] = '無預設值';
@@ -109,7 +107,6 @@ $lang['target____media']       = '媒體連結的目標視窗';
 $lang['target____windows']     = 'Windows 連結的目標視窗';
 $lang['mediarevisions']        = '啟用媒體修訂歷史嗎？';
 $lang['refcheck']              = '媒體連結檢查';
-$lang['refshow']               = '媒體連結的顯示數量';
 $lang['gdlib']                 = 'GD Lib 版本';
 $lang['im_convert']            = 'ImageMagick 的轉換工具路徑';
 $lang['jpg_quality']           = 'JPG 壓縮品質(0-100)';