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/ja/lang.php b/lib/plugins/config/lang/ja/lang.php
index 807436cca..e8cf8227b 100644
--- a/lib/plugins/config/lang/ja/lang.php
+++ b/lib/plugins/config/lang/ja/lang.php
@@ -37,8 +37,6 @@ $lang['_notifications']        = '通知設定';
 $lang['_syndication']          = 'RSS配信設定';
 $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']                 = 'GDlibバージョン';
 $lang['im_convert']            = 'ImageMagick変換ツールへのパス';
 $lang['jpg_quality']           = 'JPG圧縮品質（0-100）';