From 83fb32be283505d96a5025045962f2e1083180c3 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Thu, 5 May 2016 01:37:25 +0900
Subject: [PATCH] Change English description of concat_scripts, and add
 Japanese language

---
 modules/admin/lang/en.php | 14 +++++++-------
 modules/admin/lang/ja.php |  6 ++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/admin/lang/en.php b/modules/admin/lang/en.php
index 7a93fca6d..f2f7cc5e5 100644
--- a/modules/admin/lang/en.php
+++ b/modules/admin/lang/en.php
@@ -81,17 +81,17 @@ $lang->about_server_ports = 'If your web server does not use 80 for HTTP or 443
 $lang->use_db_session = 'Use Session DB';
 $lang->about_db_session = 'This setting will use PHP session as DB during authentication. For the Websites which do not use web server frequently, you can uncheck this setting to improve response time. However, session DB will make it impossible to get current users, so you cannot use related functions.';
 $lang->qmail_compatibility = 'Enable Qmail';
-$lang->minify_scripts = 'Auto-minify scripts';
+$lang->minify_scripts = 'Minify scripts';
 $lang->cmd_minify_all = 'All files';
 $lang->cmd_minify_common = 'Common files only';
 $lang->cmd_minify_none = 'None';
 $lang->about_minify_scripts = 'Automatically minify all CSS and JS scripts in the Core and all modules.';
-$lang->concat_scripts = 'Concatenate scripts';
-$lang->cmd_concat_none = 'Do not concatenate';
-$lang->cmd_concat_css_only = 'Concatenate all CSS';
-$lang->cmd_concat_js_only = 'Concatenate all JS';
-$lang->cmd_concat_css_js = 'Concatenate both CSS and JS';
-$lang->about_concat_scripts = 'Automatically concatenate CSS and JS scripts into as few files as possible. External scripts are not concatenated.';
+$lang->concat_scripts = 'Combine scripts';
+$lang->cmd_concat_none = 'Do not combine';
+$lang->cmd_concat_css_only = 'Combine all CSS';
+$lang->cmd_concat_js_only = 'Combine all JS';
+$lang->cmd_concat_css_js = 'Combine both CSS and JS';
+$lang->about_concat_scripts = 'Automatically combine CSS and JS scripts into as few files as possible. External scripts are not combined.';
 $lang->use_gzip = 'gzip Compression';
 $lang->delay_session = 'Delay session start';
 $lang->about_delay_session = 'To improve performance when using a caching proxy server such as Varnish, do not issue sessions to visitors until they log in.<br>Selecting this option may cause view counts and visitor counts to become inaccurate.';
diff --git a/modules/admin/lang/ja.php b/modules/admin/lang/ja.php
index caa9b2df6..be7615755 100644
--- a/modules/admin/lang/ja.php
+++ b/modules/admin/lang/ja.php
@@ -83,6 +83,12 @@ $lang->cmd_minify_all = '全てのファイルを圧縮';
 $lang->cmd_minify_common = '共通のファイルを圧縮';
 $lang->cmd_minify_none = '圧縮されません';
 $lang->about_minify_scripts = 'コアとすべてのモジュールに含まれたCSS、JSファイルを自動的に圧縮(minify)して配信します。';
+$lang->concat_scripts = 'スクリプト自動結合';
+$lang->cmd_concat_none = '結合しません';
+$lang->cmd_concat_css_only = 'CSSのみ結合';
+$lang->cmd_concat_js_only = 'JSのみ結合';
+$lang->cmd_concat_css_js = 'CSSやJSの両方を結合';
+$lang->about_concat_scripts = 'CSS、JSファイルを一つにまとめて送信されます。外部からロードするスクリプトは、合わせてされません.';
 $lang->use_gzip = 'gzip 圧縮';
 $lang->delay_session = 'セッションの開始を遅延';
 $lang->about_delay_session = 'Varnishなどのプロキシキャッシュサーバ使用時のパフォーマンスを向上させるために、ログインしていないユーザーには、認証セッションを付与しません。<br>このオプションを選択した場合、訪問者数とヒット集計が正確でない場合があります。';