diff options
Diffstat (limited to 'applications/luci-app-mwan3')
16 files changed, 349 insertions, 235 deletions
diff --git a/applications/luci-app-mwan3/Makefile b/applications/luci-app-mwan3/Makefile index d65cd3af16..c719cb134c 100644 --- a/applications/luci-app-mwan3/Makefile +++ b/applications/luci-app-mwan3/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for the MWAN3 multiwan hotplug script -LUCI_DEPENDS:=+mwan3 +luci-mod-admin-full +luci-app-firewall +luci-lib-nixio +LUCI_DEPENDS:=+mwan3 +libuci-lua +luci-mod-admin-full +luci-app-firewall +luci-lib-nixio LUCI_PKGARCH:=all PKG_LICENSE:=GPLv2 diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua index 64ee9f548c..d5fc4a3ede 100644 --- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua +++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua @@ -56,7 +56,7 @@ function index() arcombine(cbi("mwan/rule"), cbi("mwan/ruleconfig")), _("Rules"), 40).leaf = true entry({"admin", "network", "mwan", "notify"}, - cbi("mwan/notify"), + form("mwan/notify"), _("Notification"), 50).leaf = true end @@ -85,7 +85,8 @@ function diagnosticsData(interface, task) function getInterfaceNumber(interface) local number = 0 local interfaceNumber - uci.cursor():foreach("mwan3", "interface", + local uci = require "luci.model.uci".cursor() + uci:foreach("mwan3", "interface", function (section) number = number+1 if section[".name"] == interface then @@ -98,7 +99,7 @@ function diagnosticsData(interface, task) function diag_command(cmd, addr) if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then - local util = io.popen(cmd % addr) + local util = io.popen(cmd % ut.shellquote(addr)) if util then while true do local ln = util:read("*l") @@ -130,7 +131,7 @@ function diagnosticsData(interface, task) local results = "" local number = getInterfaceNumber(interface) - local uci = uci.cursor(nil, "/var/state") + local uci = require "luci.model.uci".cursor(nil, "/var/state") local device = uci:get("network", interface, "ifname") luci.http.prepare_content("text/plain") @@ -138,7 +139,7 @@ function diagnosticsData(interface, task) if task == "ping_gateway" then local gateway = get_gateway(interface) if gateway ~= nil then - diag_command("ping -c 5 -W 1 %q 2>&1", gateway) + diag_command("ping -c 5 -W 1 %s 2>&1", gateway) else luci.http.prepare_content("text/plain") luci.http.write(string.format("No gateway for interface %s found.", interface)) @@ -147,7 +148,7 @@ function diagnosticsData(interface, task) local trackips = uci:get("mwan3", interface, "track_ip") if #trackips > 0 then for i in pairs(trackips) do - diag_command("ping -c 5 -W 1 %q 2>&1", trackips[i]) + diag_command("ping -c 5 -W 1 %s 2>&1", trackips[i]) end else luci.http.write(string.format("No tracking Hosts for interface %s defined.", interface)) @@ -185,10 +186,10 @@ function diagnosticsData(interface, task) luci.http.write(string.format("Routing table %s for interface %s not found", number, interface)) end elseif task == "hotplug_ifup" then - os.execute(string.format("/usr/sbin/mwan3 ifup %s", interface)) + os.execute(string.format("/usr/sbin/mwan3 ifup %s", ut.shellquote(interface))) luci.http.write(string.format("Hotplug ifup sent to interface %s", interface)) elseif task == "hotplug_ifdown" then - os.execute(string.format("/usr/sbin/mwan3 ifdown %s", interface)) + os.execute(string.format("/usr/sbin/mwan3 ifdown %s", ut.shellquote(interface))) luci.http.write(string.format("Hotplug ifdown sent to interface %s", interface)) else luci.http.write("Unknown task") diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua index 14bf1384f7..162b388d17 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua @@ -3,17 +3,18 @@ -- Licensed to the public under the GNU General Public License v2. dsp = require "luci.dispatcher" +uci = require "uci" -function interfaceWarnings(overview, count) +function interfaceWarnings(overview, count, iface_max) local warnings = "" - if count <= 250 then + if count <= iface_max then warnings = string.format("<strong>%s</strong><br />", - translatef("There are currently %d of 250 supported interfaces configured", count) + translatef("There are currently %d of %d supported interfaces configured", count, iface_max) ) else warnings = string.format("<strong>%s</strong><br />", - translatef("WARNING: %d interfaces are configured exceeding the maximum of 250!", count) + translatef("WARNING: %d interfaces are configured exceeding the maximum of %d!", count, iface_max) ) end @@ -103,16 +104,43 @@ function configCheck() end end ) - return overview, count + + -- calculate iface_max usage from firewall mmx_mask + function bit(p) + return 2 ^ (p - 1) + end + function hasbit(x, p) + return x % (p + p) >= p + end + function setbit(x, p) + return hasbit(x, p) and x or x + p + end + + local uci = require("uci").cursor(nil, "/var/state") + local mmx_mask = uci:get("mwan3", "globals", "mmx_mask") or "0x3F00" + local number = tonumber(mmx_mask, 16) + local bits = 0 + local iface_max = 0 + for i=1,16 do + if hasbit(number, bit(i)) then + bits = bits + 1 + iface_max = setbit( iface_max, bit(bits)) + end + end + + -- subtract blackhole, unreachable and default table from iface_max + iface_max = iface_max - 3 + + return overview, count, iface_max end m5 = Map("mwan3", translate("MWAN - Interfaces"), interfaceWarnings(configCheck())) mwan_interface = m5:section(TypedSection, "interface", nil, - translate("MWAN supports up to 250 physical and/or logical interfaces<br />" .. + translate("MWAN supports up to 252 physical and/or logical interfaces<br />" .. "MWAN requires that all interfaces have a unique metric configured in /etc/config/network<br />" .. - "Names must match the interface name found in /etc/config/network (see advanced tab)<br />" .. + "Names must match the interface name found in /etc/config/network<br />" .. "Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />" .. "Interfaces may not share the same name as configured members, policies or rules")) mwan_interface.addremove = true @@ -142,7 +170,7 @@ track_method.rawhtml = true function track_method.cfgvalue(self, s) local tracked = self.map:get(s, "track_ip") if tracked then - return self.map:get(s, "track_method") or "—" + return self.map:get(s, "track_method") or "ping" else return "—" end @@ -153,7 +181,7 @@ reliability.rawhtml = true function reliability.cfgvalue(self, s) local tracked = self.map:get(s, "track_ip") if tracked then - return self.map:get(s, "reliability") or "—" + return self.map:get(s, "reliability") or "1" else return "—" end @@ -168,7 +196,7 @@ function interval.cfgvalue(self, s) if intervalValue then return intervalValue .. "s" else - return "—" + return "5s" end else return "—" @@ -180,7 +208,7 @@ down.rawhtml = true function down.cfgvalue(self, s) local tracked = self.map:get(s, "track_ip") if tracked then - return self.map:get(s, "down") or "—" + return self.map:get(s, "down") or "3" else return "—" end @@ -191,7 +219,7 @@ up.rawhtml = true function up.cfgvalue(self, s) local tracked = self.map:get(s, "track_ip") if tracked then - return self.map:get(s, "up") or "—" + return self.map:get(s, "up") or "3" else return "—" end diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua index 3a896d3bcf..a439502671 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua @@ -171,7 +171,7 @@ metric = mwan_interface:option(DummyValue, "metric", translate("Metric"), translate("This displays the metric assigned to this interface in /etc/config/network")) metric.rawhtml = true function metric.cfgvalue(self, s) - local uci = uci.cursor(nil, "/var/state") + local uci = require "luci.model.uci".cursor(nil, "/var/state") local metric = uci:get("network", arg[1], "metric") if metric then return metric diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua index c4567f756b..4543260f6f 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua @@ -3,6 +3,7 @@ -- Licensed to the public under the GNU General Public License v2. dsp = require "luci.dispatcher" +uci = require "uci" function policyCheck() @@ -25,7 +26,7 @@ function policyError(policy_error) for i, k in pairs(policy_error) do if policy_error[i] == true then warnings = warnings .. string.format("<strong>%s</strong><br />", - translatef("WARNING: Policie %s has exceeding the maximum name of 15 characters", i) + translatef("WARNING: Policy %s has exceeding the maximum name of 15 characters", i) ) end end @@ -38,9 +39,11 @@ m5 = Map("mwan3", translate("MWAN - Policies"), mwan_policy = m5:section(TypedSection, "policy", nil, translate("Policies are profiles grouping one or more members controlling how MWAN distributes traffic<br />" .. - "Member interfaces with lower metrics are used first. Interfaces with the same metric load-balance<br />" .. + "Member interfaces with lower metrics are used first<br />" .. + "Member interfaces with the same metric will be load-balanced<br />" .. "Load-balanced member interfaces distribute more traffic out those with higher weights<br />" .. - "Names may contain characters A-Z, a-z, 0-9, _ and no spaces. Names must be 15 characters or less<br />" .. + "Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />" .. + "Names must be 15 characters or less<br />" .. "Policies may not share the same name as configured interfaces, members or rules")) mwan_policy.addremove = true mwan_policy.dynamic = false diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua index fb885f8b37..f0b94bd0bb 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua @@ -3,6 +3,7 @@ -- Licensed to the public under the GNU General Public License v2. dsp = require "luci.dispatcher" +uci = require "uci" function ruleCheck() diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm index 4ec0edf049..49d120c1ae 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm @@ -19,7 +19,7 @@ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_ switch (status.interfaces[iface].status) { case 'online': - state = '<%:Online (tracking active)%>'; + state = '<%:Online%>'; css = 'success'; break; case 'offline': @@ -69,6 +69,7 @@ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_ <fieldset id="interface_field" class="cbi-section"> <legend><%:MWAN Interfaces%></legend> <div id="mwan_status_text"> - <img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%> + <img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> + <%:Collecting data...%> </div> </fieldset> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm index 70eac72520..bcc23beb31 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm @@ -18,9 +18,7 @@ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "detailed_status")%>', null, function(x) { - var legend = document.getElementById('diag-rc-legend'); var output = document.getElementById('diag-rc-output'); - legend.style.display = 'none'; output.innerHTML = String.format('<pre>%h</pre>', x.responseText); } ); @@ -32,9 +30,9 @@ <div><strong><%:INFO: MWAN not running%></strong></div> <%end%> <fieldset class="cbi-section"> - <legend id="diag-rc-legend"><%:Collecting data...%></legend> <span id="diag-rc-output"> <img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align: middle;" /> + <%:Collecting data...%> </span> </fieldset> </div> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm index f1c5d8fd98..22f4734ddd 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm @@ -31,7 +31,6 @@ function update_status(iface, task) { - var legend = document.getElementById('diag-rc-legend'); var output = document.getElementById('diag-rc-output'); output.innerHTML = @@ -45,7 +44,6 @@ stxhr.post('<%=url('admin/status/mwan')%>/diagnostics_display' + '/' + iface + '/' + task, { token: '<%=token%>' }, function(x) { - legend.style.display = 'none'; output.innerHTML = String.format('<pre>%h</pre>', x.responseText); } ); @@ -86,7 +84,6 @@ </fieldset> </div> <fieldset class="cbi-section" style="display:none"> - <legend id="diag-rc-legend"><%:Collecting data...%></legend> <span id="diag-rc-output"></span> </fieldset> </form> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm index cb476967f9..4518bd6588 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm @@ -15,6 +15,7 @@ <script type="text/javascript" src="<%=resource%>/cbi.js"></script> -<%+mwan/overview_status_interface%> - +<div class="cbi-map"> + <%+mwan/overview_status_interface%> +</div> <%+footer%> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm index 77d009231e..f60e0da0aa 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm @@ -18,9 +18,7 @@ XHR.poll(15, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "troubleshooting_display")%>', null, function(x) { - var legend = document.getElementById('diag-rc-legend'); var output = document.getElementById('diag-rc-output'); - legend.style.display = 'none'; output.innerHTML = String.format('<pre>%h</pre>', x.responseText); } ); @@ -32,9 +30,9 @@ <div><strong><%:INFO: MWAN not running%></strong></div> <%end%> <fieldset class="cbi-section"> - <legend id="diag-rc-legend"><%:Collecting data...%></legend> <span id="diag-rc-output"> <img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align: middle;" /> + <%:Collecting data...%> </span> </fieldset> </div> diff --git a/applications/luci-app-mwan3/po/ja/mwan3.po b/applications/luci-app-mwan3/po/ja/mwan3.po index 4b3662a425..6ee351c4c2 100644 --- a/applications/luci-app-mwan3/po/ja/mwan3.po +++ b/applications/luci-app-mwan3/po/ja/mwan3.po @@ -103,6 +103,9 @@ msgstr "ホットプラグ ifdown" msgid "Hotplug ifup" msgstr "ホットプラグ ifup" +msgid "INFO: MWAN not running" +msgstr "" + msgid "IPset" msgstr "IPset" @@ -174,8 +177,8 @@ msgstr "" msgid "MWAN Interface Configuration - %s" msgstr "MWAN インターフェース設定 - %s" -msgid "MWAN Interface Live Status" -msgstr "MWAN インターフェース Live ステータス" +msgid "MWAN Interfaces" +msgstr "" msgid "MWAN Member Configuration - %s" msgstr "MWAN メンバー設定 - %s" @@ -195,24 +198,21 @@ msgstr "" msgid "MWAN Status - Troubleshooting" msgstr "" -msgid "MWAN status - Interface Live Status" -msgstr "" - msgid "" -"MWAN supports up to 250 physical and/or logical interfaces<br />MWAN " +"MWAN supports up to 252 physical and/or logical interfaces<br />MWAN " "requires that all interfaces have a unique metric configured in /etc/config/" "network<br />Names must match the interface name found in /etc/config/" -"network (see advanced tab)<br />Names may contain characters A-Z, a-z, 0-9, " -"_ and no spaces<br />Interfaces may not share the same name as configured " -"members, policies or rules" +"network<br />Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br /" +">Interfaces may not share the same name as configured members, policies or " +"rules" msgstr "" -"MWAN は、250個までの物理または論理、あるいは両方のインターフェースをサポート" +"MWAN は、252個までの物理または論理、あるいは両方のインターフェースをサポート" "します。<br />MWAN は、全てのインターフェースが /etc/config/network で設定さ" "れるユニークなメトリックを持つことを必要とします。<br />下記 \"インターフェー" "ス\" の名前は、 /etc/config/network に存在するインターフェース名と同じでなけ" -"ればなりません（詳細設定タブを確認）。<br />名前は A-Z, a-z, 0-9, _ を含むこ" -"とができますが、スペースは使用できません。<br />インターフェースには、設定済" -"みのメンバーやポリシー、ルールと同じ名前を使用することはできません。" +"ればなりません。<br />名前は A-Z, a-z, 0-9, _ を含むことができますが、スペー" +"スは使用できません。<br />インターフェースには、設定済みのメンバーやポリ" +"シー、ルールと同じ名前を使用することはできません。" msgid "" "May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or " @@ -268,12 +268,6 @@ msgstr "オフライン" msgid "Online" msgstr "オンライン" -msgid "Online (tracking active)" -msgstr "オンライン（追跡実行中）" - -msgid "Online (tracking off)" -msgstr "オンライン（追跡オフ）" - msgid "Ping count" msgstr "Ping 回数" @@ -304,11 +298,11 @@ msgstr "ポリシー" msgid "" "Policies are profiles grouping one or more members controlling how MWAN " "distributes traffic<br />Member interfaces with lower metrics are used " -"first. Interfaces with the same metric load-balance<br />Load-balanced " -"member interfaces distribute more traffic out those with higher weights<br /" -">Names may contain characters A-Z, a-z, 0-9, _ and no spaces. Names must be " -"15 characters or less<br />Policies may not share the same name as " -"configured interfaces, members or rules" +"first<br />Member interfaces with the same metric will be load-balanced<br /" +">Load-balanced member interfaces distribute more traffic out those with " +"higher weights<br />Names may contain characters A-Z, a-z, 0-9, _ and no " +"spaces<br />Names must be 15 characters or less<br />Policies may not share " +"the same name as configured interfaces, members or rules" msgstr "" "ポリシーは、MWANがどのようにトラフィックの分配を行うかを制御する、1つ以上のメ" "ンバーをグループ化するプロファイルです。<br />最小のメトリックを持つメンバー " @@ -370,8 +364,8 @@ msgstr "CIDR 表記のサポート（例: \"192.168.100.0/24\"）" msgid "Task" msgstr "" -msgid "There are currently %d of 250 supported interfaces configured" -msgstr "現在、250個中 %d 個のサポートされたインターフェースが設定済みです。" +msgid "There are currently %d of %d supported interfaces configured" +msgstr "現在、%d 個中 %d 個のサポートされたインターフェースが設定済みです。" msgid "" "This displays the metric assigned to this interface in /etc/config/network" @@ -395,21 +389,14 @@ msgid "" "will<br />be executed with each netifd hotplug interface event<br />on " "interfaces for which mwan3 is enabled.<br /><br />There are three main " "environment variables that are passed to this script.<br /><br />$ACTION " -"Either \"ifup\" or \"ifdown\"<br />$INTERFACE Name of the interface which " -"went up or down (e.g. \"wan\" or \"wwan\")<br />$DEVICE Physical device name " -"which interface went up or down (e.g. \"eth0\" or \"wwan0\")<br /><br />" -msgstr "" -"このセクションでは、 \"/etc/mwan3.user\" の内容を変更することができます。" -"<br />このファイルは、 sysupgrade 時に保持されます。<br /><br />注意: <br />" -"このファイルは、シェルスクリプトとして解釈されます。<br />スクリプトの1行目" -"は、"#!bin/sh" である必要があります（クォーテーション不要）。<br /># " -"で始まる行はコメントであり、実行されません。<br />mwan3 のカスタム動作をここ" -"に入力してください。これらは、 mwan3 が有効なインターフェースの<br />netifd " -"ホットプラグ インターフェース イベント毎に実行されます。<br /><br />主に3つの" -"環境変数が利用可能です。<br /><br />$ACTION - \"ifup\" および \"ifdown\"<br /" -">$INTERFACE - Up または Down が行われたインターフェース名（例: \"wan\" や " -"\"wwan\"）<br />$DEVICE - Up または Down が行われた物理デバイス名（例: " -"\"eth0\" や \"wwan0\"）<br /><br />" +"<br />* \"ifup\" Is called by netifd and mwan3track <br />* \"ifdown\" Is " +"called by netifd and mwan3track <br />* \"connected\" Is only called by " +"mwan3track if tracking was successful <br />* \"disconnected\" Is only " +"called by mwan3track if tracking has failed <br />$INTERFACE Name of the " +"interface which went up or down (e.g. \"wan\" or \"wwan\")<br />$DEVICE " +"Physical device name which interface went up or down (e.g. \"eth0\" or " +"\"wwan0\")<br /><br />" +msgstr "" msgid "Tracking hostname or IP address" msgstr "追跡ホスト名または IP アドレス" @@ -441,9 +428,9 @@ msgstr "" msgid "View the content of /etc/protocols for protocol description" msgstr "" -msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!" +msgid "WARNING: %d interfaces are configured exceeding the maximum of %d!" msgstr "" -"警告: %d 個のインターフェースが、最大個数の 250個 を超えて設定されています！" +"警告: %d 個のインターフェースが、最大個数の %d 個 を超えて設定されています！" msgid "WARNING: Interface %s are not found in /etc/config/network" msgstr "" @@ -459,7 +446,7 @@ msgstr "" msgid "WARNING: Interface %s has no default route in the main routing table" msgstr "" -msgid "WARNING: Policie %s has exceeding the maximum name of 15 characters" +msgid "WARNING: Policy %s has exceeding the maximum name of 15 characters" msgstr "" msgid "" @@ -503,6 +490,41 @@ msgstr "never" msgid "unreachable (reject)" msgstr "unreachable (reject)" +#~ msgid "Online (tracking active)" +#~ msgstr "オンライン（追跡実行中）" + +#~ msgid "MWAN Interface Live Status" +#~ msgstr "MWAN インターフェース Live ステータス" + +#~ msgid "Online (tracking off)" +#~ msgstr "オンライン（追跡オフ）" + +#~ msgid "" +#~ "This section allows you to modify the content of \"/etc/mwan3.user\".<br /" +#~ ">The file is also preserved during sysupgrade.<br /><br />Notes:<br /" +#~ ">This file is interpreted as a shell script.<br />The first line of the " +#~ "script must be "#!/bin/sh" without quotes.<br />Lines beginning " +#~ "with # are comments and are not executed.<br />Put your custom mwan3 " +#~ "action here, they will<br />be executed with each netifd hotplug " +#~ "interface event<br />on interfaces for which mwan3 is enabled.<br /><br /" +#~ ">There are three main environment variables that are passed to this " +#~ "script.<br /><br />$ACTION Either \"ifup\" or \"ifdown\"<br />$INTERFACE " +#~ "Name of the interface which went up or down (e.g. \"wan\" or \"wwan" +#~ "\")<br />$DEVICE Physical device name which interface went up or down (e." +#~ "g. \"eth0\" or \"wwan0\")<br /><br />" +#~ msgstr "" +#~ "このセクションでは、 \"/etc/mwan3.user\" の内容を変更することができます。" +#~ "<br />このファイルは、 sysupgrade 時に保持されます。<br /><br />注意: " +#~ "<br />このファイルは、シェルスクリプトとして解釈されます。<br />スクリプト" +#~ "の1行目は、"#!bin/sh" である必要があります（クォーテーション不" +#~ "要）。<br /># で始まる行はコメントであり、実行されません。<br />mwan3 のカ" +#~ "スタム動作をここに入力してください。これらは、 mwan3 が有効なインター" +#~ "フェースの<br />netifd ホットプラグ インターフェース イベント毎に実行され" +#~ "ます。<br /><br />主に3つの環境変数が利用可能です。<br /><br />$ACTION - " +#~ "\"ifup\" および \"ifdown\"<br />$INTERFACE - Up または Down が行われたイン" +#~ "ターフェース名（例: \"wan\" や \"wwan\"）<br />$DEVICE - Up または Down が" +#~ "行われた物理デバイス名（例: \"eth0\" や \"wwan0\"）<br /><br />" + #~ msgid "Currently Configured Interfaces" #~ msgstr "設定済みインターフェース" diff --git a/applications/luci-app-mwan3/po/ru/mwan3.po b/applications/luci-app-mwan3/po/ru/mwan3.po index 8d5742c7e8..11721ecc57 100644 --- a/applications/luci-app-mwan3/po/ru/mwan3.po +++ b/applications/luci-app-mwan3/po/ru/mwan3.po @@ -107,6 +107,9 @@ msgstr "Hotplug ifdown" msgid "Hotplug ifup" msgstr "Hotplug ifup" +msgid "INFO: MWAN not running" +msgstr "" + msgid "IPset" msgstr "IPset" @@ -177,8 +180,8 @@ msgstr "MWAN - Правила" msgid "MWAN Interface Configuration - %s" msgstr "Настройка интерфейсов MWAN - %s" -msgid "MWAN Interface Live Status" -msgstr "Состояние интерфейса MWAN в настоящее время" +msgid "MWAN Interfaces" +msgstr "" msgid "MWAN Member Configuration - %s" msgstr "MWAN настройка узлов - %s" @@ -198,24 +201,20 @@ msgstr "Состояние MWAN - Диагностика" msgid "MWAN Status - Troubleshooting" msgstr "Состояние MWAN - Устранение неполадок" -msgid "MWAN status - Interface Live Status" -msgstr "Состояние MWAN - Интерфейс в настоящее время" - msgid "" -"MWAN supports up to 250 physical and/or logical interfaces<br />MWAN " +"MWAN supports up to 252 physical and/or logical interfaces<br />MWAN " "requires that all interfaces have a unique metric configured in /etc/config/" "network<br />Names must match the interface name found in /etc/config/" -"network (see advanced tab)<br />Names may contain characters A-Z, a-z, 0-9, " -"_ and no spaces<br />Interfaces may not share the same name as configured " -"members, policies or rules" +"network<br />Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br /" +">Interfaces may not share the same name as configured members, policies or " +"rules" msgstr "" -"MWAN поддерживает до 250 физических и / или логических интерфейсов.<br /" +"MWAN поддерживает до 252 физических и / или логических интерфейсов.<br /" ">MWAN требует, чтобы все интерфейсы имели уникальную метрику, настроенную в " "config файле /etc/config/network.<br />Имена должны соответствовать имени " -"интерфейса, найденному в /etc/config/network (см. соответствующую страницу)." -"<br />Имена могут содержать символы A-Z, a-z, 0-9, _ и пробелы.<br /" -">Интерфейсы не могут иметь одинаковые имена с настроенными узлами, " -"политиками или правилами." +"интерфейса, найденному в /etc/config/network.<br />Имена могут содержать " +"символы A-Z, a-z, 0-9, _ и пробелы.<br />Интерфейсы не могут иметь " +"одинаковые имена с настроенными узлами, политиками или правилами." msgid "" "May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or " @@ -270,12 +269,6 @@ msgstr "Отключен" msgid "Online" msgstr "Онлайн" -msgid "Online (tracking active)" -msgstr "Онлайн (отслеживание активно)" - -msgid "Online (tracking off)" -msgstr "Онлайн (отслеживание отключено)" - msgid "Ping count" msgstr "Кол-во пинг-запросов" @@ -306,11 +299,11 @@ msgstr "Политики" msgid "" "Policies are profiles grouping one or more members controlling how MWAN " "distributes traffic<br />Member interfaces with lower metrics are used " -"first. Interfaces with the same metric load-balance<br />Load-balanced " -"member interfaces distribute more traffic out those with higher weights<br /" -">Names may contain characters A-Z, a-z, 0-9, _ and no spaces. Names must be " -"15 characters or less<br />Policies may not share the same name as " -"configured interfaces, members or rules" +"first<br />Member interfaces with the same metric will be load-balanced<br /" +">Load-balanced member interfaces distribute more traffic out those with " +"higher weights<br />Names may contain characters A-Z, a-z, 0-9, _ and no " +"spaces<br />Names must be 15 characters or less<br />Policies may not share " +"the same name as configured interfaces, members or rules" msgstr "" "Политики это профили, объединяющие один или несколько узлов, контролирующих, " "как MWAN распределяет трафик.<br />Сначала используются интерфейсы-узлы с " @@ -385,8 +378,8 @@ msgstr "Поддерживает CIDR нотацию (например '192.168. msgid "Task" msgstr "Задача" -msgid "There are currently %d of 250 supported interfaces configured" -msgstr "В настоящее время настроено %d из 250 поддерживаемых интерфейсов." +msgid "There are currently %d of %d supported interfaces configured" +msgstr "В настоящее время настроено %d из %d поддерживаемых интерфейсов." msgid "" "This displays the metric assigned to this interface in /etc/config/network" @@ -411,23 +404,14 @@ msgid "" "will<br />be executed with each netifd hotplug interface event<br />on " "interfaces for which mwan3 is enabled.<br /><br />There are three main " "environment variables that are passed to this script.<br /><br />$ACTION " -"Either \"ifup\" or \"ifdown\"<br />$INTERFACE Name of the interface which " -"went up or down (e.g. \"wan\" or \"wwan\")<br />$DEVICE Physical device name " -"which interface went up or down (e.g. \"eth0\" or \"wwan0\")<br /><br />" +"<br />* \"ifup\" Is called by netifd and mwan3track <br />* \"ifdown\" Is " +"called by netifd and mwan3track <br />* \"connected\" Is only called by " +"mwan3track if tracking was successful <br />* \"disconnected\" Is only " +"called by mwan3track if tracking has failed <br />$INTERFACE Name of the " +"interface which went up or down (e.g. \"wan\" or \"wwan\")<br />$DEVICE " +"Physical device name which interface went up or down (e.g. \"eth0\" or " +"\"wwan0\")<br /><br />" msgstr "" -"Страница позволяет изменять содержимое файла mwan3.user (/etc/mwan3.user)." -"<br />Файл также сохраняется во время перепрошивки sysupgrade-совместимым " -"образом.<br /><br />Примечание:<br />Этот файл интерпретируется как shell " -"скрипт.<br />Первая строка скрипта должна быть "#!/bin/sh" без " -"кавычек.<br />Строки начинающиеся с #, являются комментариями и не " -"исполняются.<br />Поместите свои пользовательские действия mwan3 здесь, они " -"будут<br />выполняться с каждым событием netifd hotplug интерфейса<br />на " -"интерфейсах, для которых включен mwan3.<br /><br />В этот сценарий " -"передаются три основные переменные среды.<br /><br />$ACTION либо \"ifup\" " -"или \"ifdown\"<br />$INTERFACE - имя интерфейса, который включили или " -"отключили (например, 'wan' или 'wwan') <br />$DEVICE - имя физического " -"устройства, чей интерфейс включили или отключили (например, 'eth0' или " -"'wwan0')<br /><br />." msgid "Tracking hostname or IP address" msgstr "Отслеживание имени хоста или IP-адреса" @@ -459,10 +443,10 @@ msgstr "" msgid "View the content of /etc/protocols for protocol description" msgstr "Просмотр содержимого файла /etc/protocols для описания протокола." -msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!" +msgid "WARNING: %d interfaces are configured exceeding the maximum of %d!" msgstr "" "ВНИМАНИЕ: Интерфейсы %d настроены, превышая установленное ограничение в " -"количестве 250шт.!" +"количестве %dшт.!" msgid "WARNING: Interface %s are not found in /etc/config/network" msgstr "ВНИМАНИЕ: Интерфейс %s не настроен в config файле /etc/config/network." @@ -483,7 +467,7 @@ msgstr "" "ВНИМАНИЕ: Интерфейс %s не имеет маршрута по умолчанию в основной таблице " "маршрутизации." -msgid "WARNING: Policie %s has exceeding the maximum name of 15 characters" +msgid "WARNING: Policy %s has exceeding the maximum name of 15 characters" msgstr "" "ВНИМАНИЕ: Имя политики %s превышает установленное ограничение в 15 символов." @@ -527,3 +511,43 @@ msgstr "никогда" msgid "unreachable (reject)" msgstr "недоступен (отклонить)" + +#~ msgid "Online (tracking active)" +#~ msgstr "Онлайн (отслеживание активно)" + +#~ msgid "MWAN Interface Live Status" +#~ msgstr "Состояние интерфейса MWAN в настоящее время" + +#~ msgid "MWAN status - Interface Live Status" +#~ msgstr "Состояние MWAN - Интерфейс в настоящее время" + +#~ msgid "Online (tracking off)" +#~ msgstr "Онлайн (отслеживание отключено)" + +#~ msgid "" +#~ "This section allows you to modify the content of \"/etc/mwan3.user\".<br /" +#~ ">The file is also preserved during sysupgrade.<br /><br />Notes:<br /" +#~ ">This file is interpreted as a shell script.<br />The first line of the " +#~ "script must be "#!/bin/sh" without quotes.<br />Lines beginning " +#~ "with # are comments and are not executed.<br />Put your custom mwan3 " +#~ "action here, they will<br />be executed with each netifd hotplug " +#~ "interface event<br />on interfaces for which mwan3 is enabled.<br /><br /" +#~ ">There are three main environment variables that are passed to this " +#~ "script.<br /><br />$ACTION Either \"ifup\" or \"ifdown\"<br />$INTERFACE " +#~ "Name of the interface which went up or down (e.g. \"wan\" or \"wwan" +#~ "\")<br />$DEVICE Physical device name which interface went up or down (e." +#~ "g. \"eth0\" or \"wwan0\")<br /><br />" +#~ msgstr "" +#~ "Страница позволяет изменять содержимое файла mwan3.user (/etc/mwan3.user)." +#~ "<br />Файл также сохраняется во время перепрошивки sysupgrade-совместимым " +#~ "образом.<br /><br />Примечание:<br />Этот файл интерпретируется как shell " +#~ "скрипт.<br />Первая строка скрипта должна быть "#!/bin/sh" без " +#~ "кавычек.<br />Строки начинающиеся с #, являются комментариями и не " +#~ "исполняются.<br />Поместите свои пользовательские действия mwan3 здесь, " +#~ "они будут<br />выполняться с каждым событием netifd hotplug " +#~ "интерфейса<br />на интерфейсах, для которых включен mwan3.<br /><br />В " +#~ "этот сценарий передаются три основные переменные среды.<br /><br />" +#~ "$ACTION либо \"ifup\" или \"ifdown\"<br />$INTERFACE - имя интерфейса, " +#~ "который включили или отключили (например, 'wan' или 'wwan') <br />$DEVICE " +#~ "- имя физического устройства, чей интерфейс включили или отключили " +#~ "(например, 'eth0' или 'wwan0')<br /><br />." diff --git a/applications/luci-app-mwan3/po/templates/mwan3.pot b/applications/luci-app-mwan3/po/templates/mwan3.pot index b7266240f9..f6b3a1b380 100644 --- a/applications/luci-app-mwan3/po/templates/mwan3.pot +++ b/applications/luci-app-mwan3/po/templates/mwan3.pot @@ -88,6 +88,9 @@ msgstr "" msgid "Hotplug ifup" msgstr "" +msgid "INFO: MWAN not running" +msgstr "" + msgid "IPset" msgstr "" @@ -157,7 +160,7 @@ msgstr "" msgid "MWAN Interface Configuration - %s" msgstr "" -msgid "MWAN Interface Live Status" +msgid "MWAN Interfaces" msgstr "" msgid "MWAN Member Configuration - %s" @@ -178,16 +181,13 @@ msgstr "" msgid "MWAN Status - Troubleshooting" msgstr "" -msgid "MWAN status - Interface Live Status" -msgstr "" - msgid "" -"MWAN supports up to 250 physical and/or logical interfaces<br />MWAN " +"MWAN supports up to 252 physical and/or logical interfaces<br />MWAN " "requires that all interfaces have a unique metric configured in /etc/config/" "network<br />Names must match the interface name found in /etc/config/" -"network (see advanced tab)<br />Names may contain characters A-Z, a-z, 0-9, " -"_ and no spaces<br />Interfaces may not share the same name as configured " -"members, policies or rules" +"network<br />Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br /" +">Interfaces may not share the same name as configured members, policies or " +"rules" msgstr "" msgid "" @@ -236,12 +236,6 @@ msgstr "" msgid "Online" msgstr "" -msgid "Online (tracking active)" -msgstr "" - -msgid "Online (tracking off)" -msgstr "" - msgid "Ping count" msgstr "" @@ -272,11 +266,11 @@ msgstr "" msgid "" "Policies are profiles grouping one or more members controlling how MWAN " "distributes traffic<br />Member interfaces with lower metrics are used " -"first. Interfaces with the same metric load-balance<br />Load-balanced " -"member interfaces distribute more traffic out those with higher weights<br /" -">Names may contain characters A-Z, a-z, 0-9, _ and no spaces. Names must be " -"15 characters or less<br />Policies may not share the same name as " -"configured interfaces, members or rules" +"first<br />Member interfaces with the same metric will be load-balanced<br /" +">Load-balanced member interfaces distribute more traffic out those with " +"higher weights<br />Names may contain characters A-Z, a-z, 0-9, _ and no " +"spaces<br />Names must be 15 characters or less<br />Policies may not share " +"the same name as configured interfaces, members or rules" msgstr "" msgid "Policy" @@ -330,7 +324,7 @@ msgstr "" msgid "Task" msgstr "" -msgid "There are currently %d of 250 supported interfaces configured" +msgid "There are currently %d of %d supported interfaces configured" msgstr "" msgid "" @@ -351,9 +345,13 @@ msgid "" "will<br />be executed with each netifd hotplug interface event<br />on " "interfaces for which mwan3 is enabled.<br /><br />There are three main " "environment variables that are passed to this script.<br /><br />$ACTION " -"Either \"ifup\" or \"ifdown\"<br />$INTERFACE Name of the interface which " -"went up or down (e.g. \"wan\" or \"wwan\")<br />$DEVICE Physical device name " -"which interface went up or down (e.g. \"eth0\" or \"wwan0\")<br /><br />" +"<br />* \"ifup\" Is called by netifd and mwan3track <br />* \"ifdown\" Is " +"called by netifd and mwan3track <br />* \"connected\" Is only called by " +"mwan3track if tracking was successful <br />* \"disconnected\" Is only " +"called by mwan3track if tracking has failed <br />$INTERFACE Name of the " +"interface which went up or down (e.g. \"wan\" or \"wwan\")<br />$DEVICE " +"Physical device name which interface went up or down (e.g. \"eth0\" or " +"\"wwan0\")<br /><br />" msgstr "" msgid "Tracking hostname or IP address" @@ -381,7 +379,7 @@ msgstr "" msgid "View the content of /etc/protocols for protocol description" msgstr "" -msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!" +msgid "WARNING: %d interfaces are configured exceeding the maximum of %d!" msgstr "" msgid "WARNING: Interface %s are not found in /etc/config/network" @@ -398,7 +396,7 @@ msgstr "" msgid "WARNING: Interface %s has no default route in the main routing table" msgstr "" -msgid "WARNING: Policie %s has exceeding the maximum name of 15 characters" +msgid "WARNING: Policy %s has exceeding the maximum name of 15 characters" msgstr "" msgid "" diff --git a/applications/luci-app-mwan3/po/zh-cn/mwan3.po b/applications/luci-app-mwan3/po/zh-cn/mwan3.po index c838bdb563..ef59339862 100644 --- a/applications/luci-app-mwan3/po/zh-cn/mwan3.po +++ b/applications/luci-app-mwan3/po/zh-cn/mwan3.po @@ -99,6 +99,9 @@ msgstr "Hotplug ifdown" msgid "Hotplug ifup" msgstr "Hotplug ifup" +msgid "INFO: MWAN not running" +msgstr "" + msgid "IPset" msgstr "IPset" @@ -168,8 +171,8 @@ msgstr "" msgid "MWAN Interface Configuration - %s" msgstr "MWAN 接口配置 - %s" -msgid "MWAN Interface Live Status" -msgstr "MWAN 接口实时状态" +msgid "MWAN Interfaces" +msgstr "" msgid "MWAN Member Configuration - %s" msgstr "MWAN 成员配置 - %s" @@ -189,22 +192,18 @@ msgstr "" msgid "MWAN Status - Troubleshooting" msgstr "" -msgid "MWAN status - Interface Live Status" -msgstr "" - msgid "" -"MWAN supports up to 250 physical and/or logical interfaces<br />MWAN " +"MWAN supports up to 252 physical and/or logical interfaces<br />MWAN " "requires that all interfaces have a unique metric configured in /etc/config/" "network<br />Names must match the interface name found in /etc/config/" -"network (see advanced tab)<br />Names may contain characters A-Z, a-z, 0-9, " -"_ and no spaces<br />Interfaces may not share the same name as configured " -"members, policies or rules" +"network<br />Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br /" +">Interfaces may not share the same name as configured members, policies or " +"rules" msgstr "" -"MWAN 支持最多 250 个物理或逻辑接口。<br />MWAN 要求所有接口必须在 /etc/" +"MWAN 支持最多 252 个物理或逻辑接口。<br />MWAN 要求所有接口必须在 /etc/" "config/network 中设定唯一的网关跃点。<br />名称必须与 /etc/config/network 中" -"的接口名称匹配。（可查看“高级”选项卡）<br />名称允许包括 A-Z、a-z、0-9、_ 但" -"是不能有空格。<br />接口不应该与成员、策略、规则中的任意一个设置项使用相同的" -"名称" +"的接口名称匹配。<br />名称允许包括 A-Z、a-z、0-9、_ 但是不能有空格。<br />接" +"口不应该与成员、策略、规则中的任意一个设置项使用相同的名称" msgid "" "May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or " @@ -259,12 +258,6 @@ msgstr "离线" msgid "Online" msgstr "在线" -msgid "Online (tracking active)" -msgstr "在线（跟踪启用中）" - -msgid "Online (tracking off)" -msgstr "在线（跟踪已关闭）" - msgid "Ping count" msgstr "Ping 计数" @@ -295,11 +288,11 @@ msgstr "策略" msgid "" "Policies are profiles grouping one or more members controlling how MWAN " "distributes traffic<br />Member interfaces with lower metrics are used " -"first. Interfaces with the same metric load-balance<br />Load-balanced " -"member interfaces distribute more traffic out those with higher weights<br /" -">Names may contain characters A-Z, a-z, 0-9, _ and no spaces. Names must be " -"15 characters or less<br />Policies may not share the same name as " -"configured interfaces, members or rules" +"first<br />Member interfaces with the same metric will be load-balanced<br /" +">Load-balanced member interfaces distribute more traffic out those with " +"higher weights<br />Names may contain characters A-Z, a-z, 0-9, _ and no " +"spaces<br />Names must be 15 characters or less<br />Policies may not share " +"the same name as configured interfaces, members or rules" msgstr "" "“策略”把成员进行分组，告诉 MWAN 如何分配“规则”中使用这一策略的流量<br />拥有" "较低跃点数的成员将会被优先使用。拥有相同跃点数的成员把流量进行负载均衡。<br /" @@ -358,8 +351,8 @@ msgstr "支持 CIDR 记法（例如：\"192.168.100.0/24\"）不含引号" msgid "Task" msgstr "" -msgid "There are currently %d of 250 supported interfaces configured" -msgstr "当前已配置 %d 个接口，最大支持 250 个" +msgid "There are currently %d of %d supported interfaces configured" +msgstr "当前已配置 %d 个接口，最大支持 %d 个" msgid "" "This displays the metric assigned to this interface in /etc/config/network" @@ -379,18 +372,14 @@ msgid "" "will<br />be executed with each netifd hotplug interface event<br />on " "interfaces for which mwan3 is enabled.<br /><br />There are three main " "environment variables that are passed to this script.<br /><br />$ACTION " -"Either \"ifup\" or \"ifdown\"<br />$INTERFACE Name of the interface which " -"went up or down (e.g. \"wan\" or \"wwan\")<br />$DEVICE Physical device name " -"which interface went up or down (e.g. \"eth0\" or \"wwan0\")<br /><br />" -msgstr "" -"这里允许您修改“/etc/mwan3.user”的内容。<br />该文件在 sysupgrade 期间也会保" -"留。<br /><br />注意：<br />该文件会作为 shell 脚本解释。<br />脚本的第一行必" -"须是"#!/bin/sh"，不带引号。<br />以#开头的行是注释，不会执行。<br />" -"将您的自定义 mwan3 动作放在这里，他们将<br />在启用 mwan3 的接口上<br />在 " -"netifd hotplug 接口事件时执行。<br /><br />有三个主要的环境变量传递给这个脚" -"本。<br /><br />$ACTION “ifup”或“ifdown”<br />$INTERFACE 启动或停止的接口名" -"（例如“wan”或“wwan”）<br />$DEVICE 启动或停止接口的物理设备名（例" -"如“eth0”或“wwan0”）<br /><br />" +"<br />* \"ifup\" Is called by netifd and mwan3track <br />* \"ifdown\" Is " +"called by netifd and mwan3track <br />* \"connected\" Is only called by " +"mwan3track if tracking was successful <br />* \"disconnected\" Is only " +"called by mwan3track if tracking has failed <br />$INTERFACE Name of the " +"interface which went up or down (e.g. \"wan\" or \"wwan\")<br />$DEVICE " +"Physical device name which interface went up or down (e.g. \"eth0\" or " +"\"wwan0\")<br /><br />" +msgstr "" msgid "Tracking hostname or IP address" msgstr "跟踪的主机或 IP 地址" @@ -419,8 +408,8 @@ msgstr "使用该接口的 IP 地址作为路由器本身发起的流量的源 I msgid "View the content of /etc/protocols for protocol description" msgstr "" -msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!" -msgstr "警告：已配置 %d 个接口，超过最大值 250！" +msgid "WARNING: %d interfaces are configured exceeding the maximum of %d!" +msgstr "警告：已配置 %d 个接口，超过最大值 %d！" msgid "WARNING: Interface %s are not found in /etc/config/network" msgstr "" @@ -436,7 +425,7 @@ msgstr "" msgid "WARNING: Interface %s has no default route in the main routing table" msgstr "" -msgid "WARNING: Policie %s has exceeding the maximum name of 15 characters" +msgid "WARNING: Policy %s has exceeding the maximum name of 15 characters" msgstr "" msgid "" @@ -478,6 +467,38 @@ msgstr "从不" msgid "unreachable (reject)" msgstr "不可达（拒绝）" +#~ msgid "Online (tracking active)" +#~ msgstr "在线（跟踪启用中）" + +#~ msgid "MWAN Interface Live Status" +#~ msgstr "MWAN 接口实时状态" + +#~ msgid "Online (tracking off)" +#~ msgstr "在线（跟踪已关闭）" + +#~ msgid "" +#~ "This section allows you to modify the content of \"/etc/mwan3.user\".<br /" +#~ ">The file is also preserved during sysupgrade.<br /><br />Notes:<br /" +#~ ">This file is interpreted as a shell script.<br />The first line of the " +#~ "script must be "#!/bin/sh" without quotes.<br />Lines beginning " +#~ "with # are comments and are not executed.<br />Put your custom mwan3 " +#~ "action here, they will<br />be executed with each netifd hotplug " +#~ "interface event<br />on interfaces for which mwan3 is enabled.<br /><br /" +#~ ">There are three main environment variables that are passed to this " +#~ "script.<br /><br />$ACTION Either \"ifup\" or \"ifdown\"<br />$INTERFACE " +#~ "Name of the interface which went up or down (e.g. \"wan\" or \"wwan" +#~ "\")<br />$DEVICE Physical device name which interface went up or down (e." +#~ "g. \"eth0\" or \"wwan0\")<br /><br />" +#~ msgstr "" +#~ "这里允许您修改“/etc/mwan3.user”的内容。<br />该文件在 sysupgrade 期间也会" +#~ "保留。<br /><br />注意：<br />该文件会作为 shell 脚本解释。<br />脚本的第" +#~ "一行必须是"#!/bin/sh"，不带引号。<br />以#开头的行是注释，不会执" +#~ "行。<br />将您的自定义 mwan3 动作放在这里，他们将<br />在启用 mwan3 的接口" +#~ "上<br />在 netifd hotplug 接口事件时执行。<br /><br />有三个主要的环境变量" +#~ "传递给这个脚本。<br /><br />$ACTION “ifup”或“ifdown”<br />$INTERFACE 启动" +#~ "或停止的接口名（例如“wan”或“wwan”）<br />$DEVICE 启动或停止接口的物理设备" +#~ "名（例如“eth0”或“wwan0”）<br /><br />" + #~ msgid "Currently Configured Interfaces" #~ msgstr "当前配置的接口" diff --git a/applications/luci-app-mwan3/po/zh-tw/mwan3.po b/applications/luci-app-mwan3/po/zh-tw/mwan3.po index d28bd82bdc..6af9fae7e3 100644 --- a/applications/luci-app-mwan3/po/zh-tw/mwan3.po +++ b/applications/luci-app-mwan3/po/zh-tw/mwan3.po @@ -99,6 +99,9 @@ msgstr "Hotplug ifdown" msgid "Hotplug ifup" msgstr "Hotplug ifup" +msgid "INFO: MWAN not running" +msgstr "" + msgid "IPset" msgstr "IPset" @@ -168,8 +171,8 @@ msgstr "" msgid "MWAN Interface Configuration - %s" msgstr "MWAN 介面配置 - %s" -msgid "MWAN Interface Live Status" -msgstr "MWAN 介面實時狀態" +msgid "MWAN Interfaces" +msgstr "" msgid "MWAN Member Configuration - %s" msgstr "MWAN 成員配置 - %s" @@ -189,22 +192,18 @@ msgstr "" msgid "MWAN Status - Troubleshooting" msgstr "" -msgid "MWAN status - Interface Live Status" -msgstr "" - msgid "" -"MWAN supports up to 250 physical and/or logical interfaces<br />MWAN " +"MWAN supports up to 252 physical and/or logical interfaces<br />MWAN " "requires that all interfaces have a unique metric configured in /etc/config/" "network<br />Names must match the interface name found in /etc/config/" -"network (see advanced tab)<br />Names may contain characters A-Z, a-z, 0-9, " -"_ and no spaces<br />Interfaces may not share the same name as configured " -"members, policies or rules" +"network<br />Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br /" +">Interfaces may not share the same name as configured members, policies or " +"rules" msgstr "" -"MWAN 支援最多 250 個物理或邏輯介面。<br />MWAN 要求所有介面必須在 /etc/" +"MWAN 支援最多 252 個物理或邏輯介面。<br />MWAN 要求所有介面必須在 /etc/" "config/network 中設定唯一的閘道器躍點。<br />名稱必須與 /etc/config/network " -"中的介面名稱匹配。（可檢視“高階”選項卡）<br />名稱允許包括 A-Z、a-z、0-9、_ " -"但是不能有空格。<br />介面不應該與成員、策略、規則中的任意一個設定項使用相同" -"的名稱" +"中的介面名稱匹配。<br />名稱允許包括 A-Z、a-z、0-9、_ 但是不能有空格。<br />" +"介面不應該與成員、策略、規則中的任意一個設定項使用相同的名稱" msgid "" "May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or " @@ -259,12 +258,6 @@ msgstr "離線" msgid "Online" msgstr "線上" -msgid "Online (tracking active)" -msgstr "線上（跟蹤啟用中）" - -msgid "Online (tracking off)" -msgstr "線上（跟蹤已關閉）" - msgid "Ping count" msgstr "Ping 計數" @@ -295,11 +288,11 @@ msgstr "策略" msgid "" "Policies are profiles grouping one or more members controlling how MWAN " "distributes traffic<br />Member interfaces with lower metrics are used " -"first. Interfaces with the same metric load-balance<br />Load-balanced " -"member interfaces distribute more traffic out those with higher weights<br /" -">Names may contain characters A-Z, a-z, 0-9, _ and no spaces. Names must be " -"15 characters or less<br />Policies may not share the same name as " -"configured interfaces, members or rules" +"first<br />Member interfaces with the same metric will be load-balanced<br /" +">Load-balanced member interfaces distribute more traffic out those with " +"higher weights<br />Names may contain characters A-Z, a-z, 0-9, _ and no " +"spaces<br />Names must be 15 characters or less<br />Policies may not share " +"the same name as configured interfaces, members or rules" msgstr "" "“策略”把成員進行分組，告訴 MWAN 如何分配“規則”中使用這一策略的流量<br />擁有" "較低躍點數的成員將會被優先使用。擁有相同躍點數的成員把流量進行負載均衡。<br /" @@ -358,8 +351,8 @@ msgstr "支援 CIDR 記法（例如：\"192.168.100.0/24\"）不含引號" msgid "Task" msgstr "" -msgid "There are currently %d of 250 supported interfaces configured" -msgstr "當前已配置 %d 個介面，最大支援 250 個" +msgid "There are currently %d of %d supported interfaces configured" +msgstr "當前已配置 %d 個介面，最大支援 %d 個" msgid "" "This displays the metric assigned to this interface in /etc/config/network" @@ -379,18 +372,14 @@ msgid "" "will<br />be executed with each netifd hotplug interface event<br />on " "interfaces for which mwan3 is enabled.<br /><br />There are three main " "environment variables that are passed to this script.<br /><br />$ACTION " -"Either \"ifup\" or \"ifdown\"<br />$INTERFACE Name of the interface which " -"went up or down (e.g. \"wan\" or \"wwan\")<br />$DEVICE Physical device name " -"which interface went up or down (e.g. \"eth0\" or \"wwan0\")<br /><br />" -msgstr "" -"這裡允許您修改“/etc/mwan3.user”的內容。<br />該檔案在 sysupgrade 期間也會保" -"留。<br /><br />注意：<br />該檔案會作為 shell 指令碼解釋。<br />指令碼的第一" -"行必須是"#!/bin/sh"，不帶引號。<br />以#開頭的行是註釋，不會執行。" -"<br />將您的自定義 mwan3 動作放在這裡，他們將<br />在啟用 mwan3 的介面上<br /" -">在 netifd hotplug 介面事件時執行。<br /><br />有三個主要的環境變數傳遞給這個" -"腳本。<br /><br />$ACTION “ifup”或“ifdown”<br />$INTERFACE 啟動或停止的介面名" -"（例如“wan”或“wwan”）<br />$DEVICE 啟動或停止介面的物理裝置名（例" -"如“eth0”或“wwan0”）<br /><br />" +"<br />* \"ifup\" Is called by netifd and mwan3track <br />* \"ifdown\" Is " +"called by netifd and mwan3track <br />* \"connected\" Is only called by " +"mwan3track if tracking was successful <br />* \"disconnected\" Is only " +"called by mwan3track if tracking has failed <br />$INTERFACE Name of the " +"interface which went up or down (e.g. \"wan\" or \"wwan\")<br />$DEVICE " +"Physical device name which interface went up or down (e.g. \"eth0\" or " +"\"wwan0\")<br /><br />" +msgstr "" msgid "Tracking hostname or IP address" msgstr "跟蹤的主機或 IP 位址" @@ -419,8 +408,8 @@ msgstr "使用該介面的 IP 位址作為路由器本身發起的流量的源 I msgid "View the content of /etc/protocols for protocol description" msgstr "" -msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!" -msgstr "警告：已配置 %d 個介面，超過最大值 250！" +msgid "WARNING: %d interfaces are configured exceeding the maximum of %d!" +msgstr "警告：已配置 %d 個介面，超過最大值 %d！" msgid "WARNING: Interface %s are not found in /etc/config/network" msgstr "" @@ -436,7 +425,7 @@ msgstr "" msgid "WARNING: Interface %s has no default route in the main routing table" msgstr "" -msgid "WARNING: Policie %s has exceeding the maximum name of 15 characters" +msgid "WARNING: Policy %s has exceeding the maximum name of 15 characters" msgstr "" msgid "" @@ -478,6 +467,38 @@ msgstr "從不" msgid "unreachable (reject)" msgstr "不可達（拒絕）" +#~ msgid "Online (tracking active)" +#~ msgstr "線上（跟蹤啟用中）" + +#~ msgid "MWAN Interface Live Status" +#~ msgstr "MWAN 介面實時狀態" + +#~ msgid "Online (tracking off)" +#~ msgstr "線上（跟蹤已關閉）" + +#~ msgid "" +#~ "This section allows you to modify the content of \"/etc/mwan3.user\".<br /" +#~ ">The file is also preserved during sysupgrade.<br /><br />Notes:<br /" +#~ ">This file is interpreted as a shell script.<br />The first line of the " +#~ "script must be "#!/bin/sh" without quotes.<br />Lines beginning " +#~ "with # are comments and are not executed.<br />Put your custom mwan3 " +#~ "action here, they will<br />be executed with each netifd hotplug " +#~ "interface event<br />on interfaces for which mwan3 is enabled.<br /><br /" +#~ ">There are three main environment variables that are passed to this " +#~ "script.<br /><br />$ACTION Either \"ifup\" or \"ifdown\"<br />$INTERFACE " +#~ "Name of the interface which went up or down (e.g. \"wan\" or \"wwan" +#~ "\")<br />$DEVICE Physical device name which interface went up or down (e." +#~ "g. \"eth0\" or \"wwan0\")<br /><br />" +#~ msgstr "" +#~ "這裡允許您修改“/etc/mwan3.user”的內容。<br />該檔案在 sysupgrade 期間也會" +#~ "保留。<br /><br />注意：<br />該檔案會作為 shell 指令碼解釋。<br />指令碼" +#~ "的第一行必須是"#!/bin/sh"，不帶引號。<br />以#開頭的行是註釋，不會" +#~ "執行。<br />將您的自定義 mwan3 動作放在這裡，他們將<br />在啟用 mwan3 的介" +#~ "面上<br />在 netifd hotplug 介面事件時執行。<br /><br />有三個主要的環境變" +#~ "數傳遞給這個腳本。<br /><br />$ACTION “ifup”或“ifdown”<br />$INTERFACE 啟" +#~ "動或停止的介面名（例如“wan”或“wwan”）<br />$DEVICE 啟動或停止介面的物理裝" +#~ "置名（例如“eth0”或“wwan0”）<br /><br />" + #~ msgid "Currently Configured Interfaces" #~ msgstr "當前配置的介面" |