Merge pull request #1405 from FireBurn/master

luci-app-minidlna: Don't specify media_dir=

diff --git a/applications/luci-app-aria2/po/zh-cn/aria2.po b/applications/luci-app-aria2/po/zh-cn/aria2.po
index b53299b..3cdc275 100644 (file)
--- a/applications/luci-app-aria2/po/zh-cn/aria2.po
+++ b/applications/luci-app-aria2/po/zh-cn/aria2.po
@@ -22,6 +22,12 @@ msgstr "Aria2 配置"
 msgid "Aria2 Status"
 msgstr "Aria2 状态"
 
+msgid "General settings"
+msgstr "基本设置"
+
+msgid "Files and Locations"
+msgstr "文件和目录"
+
 msgid ""
 "Aria2 is a multi-protocol & multi-source download utility, here you can "
 "configure the settings."
@@ -66,15 +72,9 @@ msgstr "附加选项"
 msgid "Falloc"
 msgstr ""
 
-msgid "Files and Locations"
-msgstr "文件和目录"
-
 msgid "Follow torrent"
 msgstr "自动添加下载的种子"
 
-msgid "General Settings"
-msgstr ""
-
 msgid "Generate Randomly"
 msgstr "随机生成"
 
@@ -206,6 +206,3 @@ msgstr "单位 B, 你可以在数字后跟上 K 或 M"
 
 msgid "in bytes/sec, You can append K or M."
 msgstr "单位 B/s, 你可以在数字后跟上 K 或 M"
-
-#~ msgid "General settings"
-#~ msgstr "一般设置"

diff --git a/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm b/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm
index 1e423b4..d04745a 100644 (file)
--- a/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm
+++ b/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm
@@ -79,19 +79,28 @@
        <div style="display: none" id="update_info" class="alert-message info"></div>
        <div style="display: none" id="update_error" class="alert-message danger"></div>
 </div>
-<input class="cbi-button" value="search for updates" onclick="update_request()" type="button" id="update_button">
+<p>
+       <input class="cbi-button" style="display: none;" value="edit installed packages" onclick="edit_packages()" type="button" id="edit_button">
+       <textarea style="display: none; width: 100%;" id="edit_packages" rows="15"></textarea>
+</P>
+<p>
+       <input class="cbi-button" value="search for updates" onclick="update_request()" type="button" id="update_button">
+</p>
+<p>
+       <input style="display: none" class="cbi-button" value="show build log" onclick="window.open(data.log_url);" type="button" id="log_button">
+</p>
 <div style="display: none" id="packages" class="alert-message success"></div>
 <div class="cbi-value" id="update_packages_container" style="display: block">
-       <label class="cbi-value-title" for="keep">search for package updates:</label>
-       <div class="cbi-value-field">
-               <input type="checkbox" name="update_packages" id="update_packages" />
-       </div>
+       <label class="cbi-value-title" for="update_packages">
+                       <input type="checkbox" name="update_packages" id="update_packages" />
+               Search for package updates
+       </label>
 </div>
 <div class="cbi-value" id="keep_container" style="display: none">
-       <label class="cbi-value-title" for="keep">keep settings:</label>
-       <div class="cbi-value-field">
-               <input type="checkbox" name="keep" id="keep" checked="checked" />
-       </div>
+       <label class="cbi-value-title" for="keep">
+                       <input type="checkbox" name="keep" id="keep" checked="checked" />
+               Keep settings
+       </label>
 </div>
 
 <script type="text/javascript">
@@ -102,6 +111,13 @@ ubus_counter = 1
 origin = document.location.href.replace(location.pathname, "")
 ubus_url = origin + "/ubus/"
 
+function edit_packages() {
+       data.edit_packages = true
+       document.getElementById("edit_button").style.display = "none";
+       document.getElementById("edit_packages").value = data.packages.join("\n");
+       document.getElementById("edit_packages").style.display = "block";
+}
+
 // requests to the update server
 function server_request(request_dict, path, callback) {
        url = data.update_server + "/" + path
@@ -238,6 +254,8 @@ function update_request_callback(response_object) {
        } else if (response_object.status === 200) {
                // new release/updates
                response_object_content = JSON.parse(response_object.responseText)
+               document.getElementById("edit_button").style.display = "block";
+               document.getElementById("update_button").disabled = false;
                update_request_200(response_object_content)
        }
 }
@@ -280,11 +298,18 @@ function update_request_200(response_content) {
 // request the image, need merge with update_request
 function image_request() {
        console.log("image_request")
+       document.getElementById("update_button").disabled = true;
        document.getElementById("update_packages_container").style.display = "none";
+       document.getElementById("edit_packages").style.display = "none";
+       document.getElementById("edit_button").style.display = "none";
        request_dict = {}
        request_dict.version = latest_version;
        request_dict.board = data.board_name
-       request_dict.packages = data.packages;
+       if(data.edit_packages == true) {
+               request_dict.packages = document.getElementById("edit_packages").value.split("\n")
+       } else {
+               request_dict.packages = data.packages;
+       }
        request_dict.model = data.model
        server_request(request_dict, "image-request", image_request_handler)
 }
@@ -294,7 +319,12 @@ function image_request_handler(response) {
                response_content = JSON.parse(response.responseText)
                update_error(response_content.error)
        } else if (response.status === 500) {
-               image_request_500()
+               response_content = JSON.parse(response.responseText)
+               update_error(response_content.error)
+               if(response_content.log != undefined) {
+                       data.log_url = response_content.log
+                       document.getElementById("log_button").style.display = "block";
+               }
        } else if (response.status === 503) {
                update_error("please wait. server overloaded")
                // handle overload
@@ -317,10 +347,14 @@ function image_request_handler(response) {
                setTimeout(image_request, 5000)
        } else if (response.status === 200) {
                // ready to download
-               response_content = JSON.parse(response.responseText)
-               update_info("image created")
-               document.getElementById("update_button").value = "sysupgrade"
-               document.getElementById("update_button").onclick = function() {download_image(response_content.url); }
+               response_content = JSON.parse(response.responseText);
+               data.image_url = response_content.url;
+               data.log_url = data.image_url + ".log";
+               update_info("image created");
+               document.getElementById("log_button").style.display = "block";
+               document.getElementById("update_button").disabled = false;
+               document.getElementById("update_button").value = "sysupgrade";
+               document.getElementById("update_button").onclick = download_image;
                document.getElementById("keep_container").style.display = "block";
        }
 }
@@ -338,7 +372,7 @@ function upload_image(blob) {
 
        upload_request.addEventListener('load', function(event) {
                // this checksum should be parsed
-               document.getElementById("update_info").innerHTML = "flashing... please wait" // show fancy indicator http://www.ajaxload.info/
+               document.getElementById("update_info").innerHTML = "flashing... please wait"; // show fancy indicator http://www.ajaxload.info/
 
                ubus_request("attendedsysupgrade", "sysupgrade", { "keep_settings": document.getElementById("keep").checked }, 'done');
        });
@@ -352,12 +386,12 @@ function upload_image(blob) {
 }
 
 // download image from server once the url was received by image_request
-function download_image(url) {
+function download_image() {
        console.log("download_image")
-       document.getElementById("update_button").value = "flashing..."
+       document.getElementById("update_button").value = "downloading image";
        document.getElementById("update_button").disabled = true;
        var download_request = new XMLHttpRequest();
-       download_request.open("GET", url);
+       download_request.open("GET", data.image_url);
        download_request.responseType = "arraybuffer";
 
        download_request.onload = function () {
@@ -366,7 +400,7 @@ function download_image(url) {
                        upload_image(blob)
                }
        };
-       document.getElementById("update_info").innerHTML = "downloading image"
+       document.getElementById("update_info").innerHTML = "downloading image";
        download_request.send();
 }
 

diff --git a/applications/luci-app-simple-adblock/po/sv/simple-adblock.po b/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
index 8202497..e95f95f 100644 (file)
--- a/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
+msgstr "Content-Type: text/plain; charset=UTF-8\n"
 
 msgid "Blacklisted Domain URLs"
 msgstr "Svartlistade domänadresser"
@@ -47,7 +47,7 @@ msgid "Simple AdBlock"
 msgstr "Simple AdBlock"
 
 msgid "Simple AdBlock Settings"
-msgstr ""Inställningar för Simple AdBlock"
+msgstr "Inställningar för Simple AdBlock"
 
 msgid "Some output"
 msgstr "Viss utmatning"

diff --git a/applications/luci-app-splash/po/sv/splash.po b/applications/luci-app-splash/po/sv/splash.po
index a1be1ea..a5ebcb7 100644 (file)
--- a/applications/luci-app-splash/po/sv/splash.po
+++ b/applications/luci-app-splash/po/sv/splash.po
@@ -45,7 +45,8 @@ msgstr ""
 msgid ""
 "Become an active member of this community and help by operating your own node"
 msgstr ""
-"Bli en aktiv medlem av det här sällskapet och hjälp till genom att tillhandahålla en egen nod"
+"Bli en aktiv medlem av det här sällskapet och hjälp till genom att "
+"tillhandahålla en egen nod"
 
 msgid "Blacklist"
 msgstr "Svartlista"

diff --git a/applications/luci-app-upnp/po/zh-cn/upnp.po b/applications/luci-app-upnp/po/zh-cn/upnp.po
index 693bbc1..022e16e 100644 (file)
--- a/applications/luci-app-upnp/po/zh-cn/upnp.po
+++ b/applications/luci-app-upnp/po/zh-cn/upnp.po
@@ -82,7 +82,7 @@ msgid "External ports"
 msgstr "外部端口"
 
 msgid "General Settings"
-msgstr "ä¸\80è\88¬è®¾ç½®"
+msgstr "å\9fºæ\9c¬è®¾ç½®"
 
 msgid "Internal addresses"
 msgstr "内部地址"

diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index 9068d9c..212f565 100644 (file)
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -3,14 +3,14 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2017-07-28 12:17+0900\n"
+"PO-Revision-Date: 2017-10-20 13:54+0900\n"
 "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Poedit 2.0.4\n"
 "Language-Team: \n"
 
 msgid "%s is untagged in multiple VLANs!"
@@ -161,19 +161,19 @@ msgstr ""
 "を行う必要があります。"
 
 msgid "A43C + J43 + A43"
-msgstr ""
+msgstr "A43C + J43 + A43"
 
 msgid "A43C + J43 + A43 + V43"
-msgstr ""
+msgstr "A43C + J43 + A43 + V43"
 
 msgid "ADSL"
 msgstr "ADSL"
 
 msgid "AICCU (SIXXS)"
-msgstr ""
+msgstr "AICCU (SIXXS)"
 
 msgid "ANSI T1.413"
-msgstr ""
+msgstr "ANSI T1.413"
 
 msgid "APN"
 msgstr "APN"
@@ -298,7 +298,7 @@ msgstr "ローカルホストを許可する"
 
 msgid "Allow remote hosts to connect to local SSH forwarded ports"
 msgstr ""
-"リモートホストがSSH転送されたローカルのポートに接続することを許可します"
+"リモートホストがSSH転送されたローカルのポートに接続することを許可します。"
 
 msgid "Allow root logins with password"
 msgstr "パスワードでの root ログインを許可"
@@ -409,7 +409,7 @@ msgid ""
 msgstr ""
 
 msgid "Assign interfaces..."
-msgstr ""
+msgstr "インターフェースの割当て..."
 
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -561,8 +561,8 @@ msgid ""
 "Build/distribution specific feed definitions. This file will NOT be "
 "preserved in any sysupgrade."
 msgstr ""
-"ビルド/ディストリビューション固有のフィード定義です。このファイルはsysupgrade"
-"の際に引き継がれません。"
+"ビルド / ディストリビューション固有のフィード定義です。このファイルは"
+"sysupgradeの際に引き継がれません。"
 
 msgid "Buttons"
 msgstr "ボタン"
@@ -1038,16 +1038,16 @@ msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
 msgstr "WPS プッシュボタンを有効化するには、WPA(2)-PSKが必要です。"
 
 msgid "Enable key reinstallation (KRACK) countermeasures"
-msgstr ""
+msgstr "Key Reinstallation (KRACK) 対策の有効化"
 
 msgid "Enable learning and aging"
 msgstr "ラーニング エイジング機能を有効にする"
 
 msgid "Enable mirroring of incoming packets"
-msgstr ""
+msgstr "受信パケットのミラーリングを有効化"
 
 msgid "Enable mirroring of outgoing packets"
-msgstr ""
+msgstr "送信パケットのミラーリングを有効化"
 
 msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets."
 msgstr ""
@@ -1948,10 +1948,10 @@ msgid "Minimum hold time"
 msgstr "最短保持時間"
 
 msgid "Mirror monitor port"
-msgstr ""
+msgstr "ミラー監視ポート"
 
 msgid "Mirror source port"
-msgstr ""
+msgstr "ミラー元ポート"
 
 msgid "Missing protocol extension for proto %q"
 msgstr "プロトコル %qのプロトコル拡張が見つかりません"
@@ -2069,7 +2069,7 @@ msgid "Network boot image"
 msgstr "ネットワークブート用イメージ"
 
 msgid "Network without interfaces."
-msgstr ""
+msgstr "インターフェースの無いネットワークです。"
 
 msgid "Next »"
 msgstr "次 »"
@@ -2132,7 +2132,7 @@ msgid "Normal"
 msgstr "標準"
 
 msgid "Not Found"
-msgstr ""
+msgstr "見つかりません"
 
 msgid "Not associated"
 msgstr "アソシエーションされていません"
@@ -2305,7 +2305,7 @@ msgstr ""
 "ネットから計算されます。"
 
 msgid "Override the table used for internal routes"
-msgstr ""
+msgstr "内部ルートに使用されるテーブルを上書きします。"
 
 msgid "Overview"
 msgstr "概要"
@@ -2380,7 +2380,7 @@ msgid "Password of Private Key"
 msgstr "秘密鍵のパスワード"
 
 msgid "Password of inner Private Key"
-msgstr ""
+msgstr "秘密鍵のパスワード"
 
 msgid "Password successfully changed!"
 msgstr "パスワードを変更しました"
@@ -2401,13 +2401,13 @@ msgid "Path to executable which handles the button event"
 msgstr "ボタンイベントをハンドルする実行ファイルのパス"
 
 msgid "Path to inner CA-Certificate"
-msgstr ""
+msgstr "CA 証明書のパス"
 
 msgid "Path to inner Client-Certificate"
-msgstr ""
+msgstr "クライアント証明書のパス"
 
 msgid "Path to inner Private Key"
-msgstr ""
+msgstr "秘密鍵のパス"
 
 msgid "Peak:"
 msgstr "ピーク:"
@@ -3181,7 +3181,7 @@ msgstr ""
 "<code>0-9</code>, <code>_</code>"
 
 msgid "The configuration file could not be loaded due to the following error:"
-msgstr ""
+msgstr "設定ファイルは以下のエラーにより読み込めませんでした:"
 
 msgid ""
 "The device file of the memory or partition (<abbr title=\"for example\">e.g."
@@ -3233,7 +3233,7 @@ msgid ""
 msgstr ""
 
 msgid "The length of the IPv6 prefix in bits"
-msgstr ""
+msgstr "IPv6 プレフィクスの長さ (bit) です。"
 
 msgid "The local IPv4 address over which the tunnel is created (optional)."
 msgstr ""
@@ -3246,12 +3246,18 @@ msgid ""
 "segments. Often there is by default one Uplink port for a connection to the "
 "next greater network like the internet and other ports for a local network."
 msgstr ""
+"ネットワーク ポートは、コンピュータが他と直接通信することができる複数の "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> にまとめることができま"
+"す。 <abbr title=\"Virtual Local Area Network\">VLAN</abbr> は、異なるネット"
+"ワーク セグメントの分離にしばしば用いられます。通常、インターネットなどより上"
+"位のネットワークへの接続に使用するアップリンク ポートと、ローカル ネットワー"
+"ク用のその他のポートが存在します。"
 
 msgid "The selected protocol needs a device assigned"
 msgstr "選択中のプロトコルを使用する場合、デバイスを設定する必要があります"
 
 msgid "The submitted security token is invalid or already expired!"
-msgstr ""
+msgstr "送信されたセキュリティ トークンは無効もしくは期限切れです！"
 
 msgid ""
 "The system is erasing the configuration partition now and will reboot itself "
@@ -3476,7 +3482,7 @@ msgid "UUID"
 msgstr "UUID"
 
 msgid "Unable to dispatch"
-msgstr ""
+msgstr "ディスパッチできません"
 
 msgid "Unavailable Seconds (UAS)"
 msgstr ""
@@ -3561,7 +3567,7 @@ msgid "Use gateway metric"
 msgstr "ゲートウェイ メトリックを使用する"
 
 msgid "Use routing table"
-msgstr ""
+msgstr "ルーティング テーブルの使用"
 
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
@@ -3587,10 +3593,10 @@ msgid ""
 msgstr ""
 
 msgid "User certificate (PEM encoded)"
-msgstr ""
+msgstr "ユーザー証明書（PEM エンコード）"
 
 msgid "User key (PEM encoded)"
-msgstr ""
+msgstr "ユーザー秘密鍵（PEM エンコード）"
 
 msgid "Username"
 msgstr "ユーザー名"
@@ -3602,7 +3608,7 @@ msgid "VDSL"
 msgstr "VDSL"
 
 msgid "VLANs on %q"
-msgstr "%q上のVLANs"
+msgstr "%q上のVLAN"
 
 msgid "VLANs on %q (%s)"
 msgstr "%q上のVLAN (%s)"
@@ -3632,7 +3638,7 @@ msgid "Vendor Class to send when requesting DHCP"
 msgstr "DHCPリクエスト送信時のベンダークラスを設定"
 
 msgid "Verbose"
-msgstr ""
+msgstr "詳細"
 
 msgid "Verbose logging by aiccu daemon"
 msgstr ""
@@ -3680,7 +3686,7 @@ msgid "Waiting for command to complete..."
 msgstr "コマンド実行中です..."
 
 msgid "Waiting for device..."
-msgstr "ã\83\87ã\83\90ã\82¤ã\82¹ã\81®èµ·å\8b\95ã\82\92å¾\85ã\81£ã\81¦ã\81\84ã\81¾す..."
+msgstr "ã\83\87ã\83\90ã\82¤ã\82¹ã\82\92èµ·å\8b\95中ã\81§す..."
 
 msgid "Warning"
 msgstr "警告"
@@ -3739,6 +3745,10 @@ msgid ""
 "workaround might cause interoperability issues and reduced robustness of key "
 "negotiation especially in environments with heavy traffic load."
 msgstr ""
+"キーのインストールに使用される EAPOL キーフレームの再送信を無効にすることによ"
+"り、クライアント サイドの Key Reinstallation Attacks (KRACK) を困難にします。"
+"この回避策は、相互運用性の問題や、特に高負荷のトラフィック環境下におけるキー "
+"ネゴシエーションの信頼性低下の原因となることがあります。"
 
 msgid "Write received DNS requests to syslog"
 msgstr "受信したDNSリクエストをsyslogへ記録します"
@@ -3849,7 +3859,7 @@ msgid "minimum 1280, maximum 1480"
 msgstr "最小値 1280、最大値 1480"
 
 msgid "minutes"
-msgstr ""
+msgstr "分"
 
 msgid "no"
 msgstr "いいえ"
@@ -3919,78 +3929,3 @@ msgstr "はい"
 
 msgid "« Back"
 msgstr "« 戻る"
-
-#~ msgid "Leasetime"
-#~ msgstr "リース時間"
-
-#~ msgid "Optional."
-#~ msgstr "（オプション）"
-
-#~ msgid "automatic"
-#~ msgstr "自動"
-
-#~ msgid "AR Support"
-#~ msgstr "ARサポート"
-
-#~ msgid "Atheros 802.11%s Wireless Controller"
-#~ msgstr "Atheros 802.11%s 無線LANコントローラ"
-
-#~ msgid "Background Scan"
-#~ msgstr "バックグラウンドスキャン"
-
-#~ msgid "Compression"
-#~ msgstr "圧縮"
-
-#~ msgid "Disable HW-Beacon timer"
-#~ msgstr "HWビーコンタイマーを無効にする"
-
-#~ msgid "Do not send probe responses"
-#~ msgstr "プローブレスポンスを送信しない"
-
-#~ msgid "Fast Frames"
-#~ msgstr "ファスト・フレーム"
-
-#~ msgid "Maximum Rate"
-#~ msgstr "最大レート"
-
-#~ msgid "Minimum Rate"
-#~ msgstr "最小レート"
-
-#~ msgid "Multicast Rate"
-#~ msgstr "マルチキャストレート"
-
-#~ msgid "Outdoor Channels"
-#~ msgstr "屋外用周波数"
-
-#~ msgid "Regulatory Domain"
-#~ msgstr "規制ドメイン"
-
-#~ msgid "Separate WDS"
-#~ msgstr "WDSを分離する"
-
-#~ msgid "Static WDS"
-#~ msgstr "静的WDS"
-
-#~ msgid "Turbo Mode"
-#~ msgstr "ターボモード"
-
-#~ msgid "XR Support"
-#~ msgstr "XRサポート"
-
-#~ msgid "Required. Public key of peer."
-#~ msgstr "ピアの公開鍵（必須）"
-
-#~ msgid "An additional network will be created if you leave this unchecked."
-#~ msgstr "チェックボックスがオフの場合、追加のネットワークが作成されます。"
-
-#~ msgid "Join Network: Settings"
-#~ msgstr "ネットワークに接続する: 設定"
-
-#~ msgid "CPU"
-#~ msgstr "CPU"
-
-#~ msgid "Port %d"
-#~ msgstr "ポート %d"
-
-#~ msgid "VLAN Interface"
-#~ msgstr "VLANインターフェース"

diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po
index bbe52fc..c3f407d 100644 (file)
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -1797,7 +1797,7 @@ msgid "Lowest leased address as offset from the network address."
 msgstr ""
 
 msgid "MAC-Address"
-msgstr MAC-adress"
+msgstr "MAC-adress"
 
 msgid "MAC-Address Filter"
 msgstr "Filter för MAC-adress"
@@ -2488,7 +2488,7 @@ msgid ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
-Läs <code>/etc/ethers</code> för att ställa in <abbr title=\"Dynamic Host "
+"Läs <code>/etc/ethers</code> för att ställa in <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-servern"
 
 msgid ""

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm
index c119b57..1a8770e 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm
@@ -7,6 +7,6 @@
 <%+header%>
 <h2 name="content"><%:Kernel Log%></h2>
 <div id="content_syslog">
-<textarea readonly="readonly" wrap="off" rows="<%=dmesg:cmatch("\n")+2%>" id="syslog"><%=dmesg:pcdata()%></textarea>
+<textarea style="font-size: 12px;" readonly="readonly" wrap="off" rows="<%=dmesg:cmatch("\n")+2%>" id="syslog"><%=dmesg:pcdata()%></textarea>
 </div>
 <%+footer%>

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm
index b87f21d..fb734a7 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm
@@ -7,6 +7,6 @@
 <%+header%>
 <h2 name="content"><%:System Log%></h2>
 <div id="content_syslog">
-<textarea readonly="readonly" wrap="off" rows="<%=syslog:cmatch("\n")+2%>" id="syslog"><%=syslog:pcdata()%></textarea>
+<textarea style="font-size: 12px;" readonly="readonly" wrap="off" rows="<%=syslog:cmatch("\n")+2%>" id="syslog"><%=syslog:pcdata()%></textarea>
 </div>
 <%+footer%>