diff options
78 files changed, 755 insertions, 755 deletions
diff --git a/applications/luci-app-advanced-reboot/Makefile b/applications/luci-app-advanced-reboot/Makefile index 97301fc6af..20f9168936 100644 --- a/applications/luci-app-advanced-reboot/Makefile +++ b/applications/luci-app-advanced-reboot/Makefile @@ -13,7 +13,7 @@ LUCI_DESCRIPTION:=Provides Web UI (found under System/Advanced Reboot) to reboot LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full LUCI_PKGARCH:=all -PKG_RELEASE:=46 +PKG_RELEASE:=47 include ../../luci.mk diff --git a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua index 6ed4c66149..3da7bbe0f2 100644 --- a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua +++ b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua @@ -34,7 +34,7 @@ function is_alt_mountable(p1_mtd, p2_mtd) end function get_partition_os_info(op_ubi) - local cp_info, ap_info + local cp_info, op_info if fs.access("/etc/os-release") then cp_info = util.trim(util.exec('. /etc/os-release && echo "$PRETTY_NAME"')) if cp_info:find("SNAPSHOT") then @@ -45,14 +45,14 @@ function get_partition_os_info(op_ubi) alt_partition_unmount(op_ubi) alt_partition_mount(op_ubi) if fs.access("/alt/rom/etc/os-release") then - ap_info = util.trim(util.exec('. /alt/rom/etc/os-release && echo "$PRETTY_NAME"')) - if ap_info:find("SNAPSHOT") then - ap_info = util.trim(util.exec('. /alt/rom/etc/os-release && echo "$OPENWRT_RELEASE"')) + op_info = util.trim(util.exec('. /alt/rom/etc/os-release && echo "$PRETTY_NAME"')) + if op_info:find("SNAPSHOT") then + op_info = util.trim(util.exec('. /alt/rom/etc/os-release && echo "$OPENWRT_RELEASE"')) end end logger(i18n.translate("attempting to unmount alternative partition") .. " (mtd" .. tostring(op_ubi) .. ")") alt_partition_unmount(op_ubi) - return cp_info, ap_info + return cp_info, op_info end function alt_partition_mount(op_ubi) @@ -87,107 +87,124 @@ function alt_partition_unmount(op_ubi) end end -devices = { - -- deviceName, boardName, part1MTD, part2MTD, offset, envVar1, envVar1Value1, envVar1Value2, envVar2, envVar2Value1, envVar2Value2 - {"Linksys EA3500", "linksys-audi", "mtd3", "mtd5", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, - {"Linksys E4200v2/EA4500", "linksys-viper", "mtd3", "mtd5", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, - {"Linksys EA6350v3", "linksys-ea6350v3", "mtd10", "mtd12", 192, "boot_part", 1, 2}, - {"Linksys EA8300", "linksys-ea8300", "mtd10", "mtd12", 192, "boot_part", 1, 2}, - {"Linksys EA8500", "ea8500", "mtd13", "mtd15", 32, "boot_part", 1, 2}, --- {"Linksys EA9500", "linksys-panamera", "mtd3", "mtd6", 28, "boot_part", 1, 2}, - {"Linksys WRT1200AC", "linksys-caiman", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, - {"Linksys WRT1900AC", "linksys-mamba", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, - {"Linksys WRT1900ACv2", "linksys-cobra", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, - {"Linksys WRT1900ACS", "linksys-shelby", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, - {"Linksys WRT3200ACM", "linksys-rango", "mtd5", "mtd7", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, - {"Linksys WRT32X", "linksys-venom", "mtd5", "mtd7", nil, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, - {"ZyXEL NBG6817", "nbg6817", "mmcblk0p4", "mmcblk0p7", 32, nil, 255, 1} -} - --- local errorMessage, d --- local device_name, p1_mtd, p2_mtd, offset, bev1, bev1p1, bev1p2, bev2, bev2p1, bev2p2 -romBoardName = util.trim(util.exec("cat /tmp/sysinfo/board_name")) - -for i=1, #devices do - d = devices[i][2]:gsub('%p','') - if romBoardName and romBoardName:gsub('%p',''):match(d) then - device_name = devices[i][1] - p1_mtd = devices[i][3] or nil - p2_mtd = devices[i][4] or nil - offset = devices[i][5] or nil - bev1 = devices[i][6] or nil - bev1p1 = tonumber(devices[i][7]) or nil - bev1p2 = tonumber(devices[i][8]) or nil - bev2 = devices[i][9] or nil - bev2p1 = devices[i][10] or nil - bev2p2 = devices[i][11] or nil - if p1_mtd and offset then - p1_label = util.trim(util.exec("dd if=/dev/" .. p1_mtd .. " bs=1 skip=" .. offset .. " count=128" .. " 2>/dev/null")) - n, p1_version = p1_label:match('(Linux)-([%d|.]+)') - end - if p2_mtd and offset then - p2_label = util.trim(util.exec("dd if=/dev/" .. p2_mtd .. " bs=1 skip=" .. offset .. " count=128" .. " 2>/dev/null")) - n, p2_version = p2_label:match('(Linux)-([%d|.]+)') - end - if p1_label and p1_label:find("LEDE") then p1_os = "LEDE" end - if p1_label and p1_label:find("OpenWrt") then p1_os = "OpenWrt" end - if p1_label and p1_label:find("Linksys") then p1_os = "Linksys" end - if p2_label and p2_label:find("LEDE") then p2_os = "LEDE" end - if p2_label and p2_label:find("OpenWrt") then p2_os = "OpenWrt" end - if p2_label and p2_label:find("Linksys") then p2_os = "Linksys" end - if device_name == "ZyXEL NBG6817" then - if not p1_os then p1_os = "ZyXEL" end - if not p2_os then p2_os = "ZyXEL" end - end - if device_name == "Linksys WRT32X" then - if not p1_os then p1_os = "Unknown/Compressed" end - if not p2_os then p2_os = "Unknown/Compressed" end - end - if not p1_os then p1_os = "Unknown" end - if not p2_os then p2_os = "Unknown" end - if p1_os and p1_version then p1_os = p1_os .. " (Linux " .. p1_version .. ")" end - if p2_os and p2_version then p2_os = p2_os .. " (Linux " .. p2_version .. ")" end - - if device_name == "ZyXEL NBG6817" then - if not zyxelFlagPartition then zyxelFlagPartition = util.trim(util.exec(". /lib/functions.sh; find_mtd_part 0:DUAL_FLAG")) end - if not zyxelFlagPartition then - errorMessage = errorMessage or "" .. i18n.translate("Unable to find Dual Boot Flag Partition." .. " ") - util.perror(i18n.translate("Unable to find Dual Boot Flag Partition.")) - else - current_partition = tonumber(util.exec("dd if=" .. zyxelFlagPartition .. " bs=1 count=1 2>/dev/null | hexdump -n 1 -e '1/1 \"%d\"'")) +function obtain_device_info() + local i, d, p1_mtd, p2_mtd, offset, bev1, bev1p1, bev1p2, bev2, bev2p1, n + local p1_label, p1_version, p2_label, p2_version, p1_os, p2_os + local errorMessage, current_partition, other_partition + local op_ubi, cp_info, op_info + local zyxelFlagPartition + local devices = { + -- deviceName, boardName, part1MTD, part2MTD, offset, envVar1, envVar1Value1, envVar1Value2, envVar2, envVar2Value1, envVar2Value2 + {"Linksys EA3500", "linksys-audi", "mtd3", "mtd5", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, + {"Linksys E4200v2/EA4500", "linksys-viper", "mtd3", "mtd5", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, + {"Linksys EA6350v3", "linksys-ea6350v3", "mtd10", "mtd12", 192, "boot_part", 1, 2}, + {"Linksys EA8300", "linksys-ea8300", "mtd10", "mtd12", 192, "boot_part", 1, 2}, + {"Linksys EA8500", "ea8500", "mtd13", "mtd15", 32, "boot_part", 1, 2}, + -- {"Linksys EA9500", "linksys-panamera", "mtd3", "mtd6", 28, "boot_part", 1, 2}, + {"Linksys WRT1200AC", "linksys-caiman", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, + {"Linksys WRT1900AC", "linksys-mamba", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, + {"Linksys WRT1900ACv2", "linksys-cobra", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, + {"Linksys WRT1900ACS", "linksys-shelby", "mtd4", "mtd6", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, + {"Linksys WRT3200ACM", "linksys-rango", "mtd5", "mtd7", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, + {"Linksys WRT32X", "linksys-venom", "mtd5", "mtd7", nil, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"}, + {"ZyXEL NBG6817", "nbg6817", "mmcblk0p4", "mmcblk0p7", 32, nil, 255, 1} + } + local romBoardName = util.trim(util.exec("cat /tmp/sysinfo/board_name")) + for i=1, #devices do + d = devices[i][2]:gsub('%p','') + if romBoardName and romBoardName:gsub('%p',''):match(d) then + device_name = devices[i][1] + p1_mtd = devices[i][3] or nil + p2_mtd = devices[i][4] or nil + offset = devices[i][5] or nil + bev1 = devices[i][6] or nil + bev1p1 = tonumber(devices[i][7]) or nil + bev1p2 = tonumber(devices[i][8]) or nil + bev2 = devices[i][9] or nil + bev2p1 = devices[i][10] or nil + bev2p2 = devices[i][11] or nil + if p1_mtd and offset then + p1_label = util.trim(util.exec("dd if=/dev/" .. p1_mtd .. " bs=1 skip=" .. offset .. " count=128" .. " 2>/dev/null")) + n, p1_version = p1_label:match('(Linux)-([%d|.]+)') end - else - if fs.access("/usr/sbin/fw_printenv") and fs.access("/usr/sbin/fw_setenv") then - current_partition = tonumber(util.trim(util.exec("fw_printenv -n " .. bev1))) + if p2_mtd and offset then + p2_label = util.trim(util.exec("dd if=/dev/" .. p2_mtd .. " bs=1 skip=" .. offset .. " count=128" .. " 2>/dev/null")) + n, p2_version = p2_label:match('(Linux)-([%d|.]+)') end - end - other_partition = current_partition == bev1p2 and bev1p1 or bev1p2 - - if is_alt_mountable(p1_mtd, p2_mtd) then - if current_partition == bev1p1 then - op_ubi = tonumber(p2_mtd:sub(4)) + 1 - else - op_ubi = tonumber(p1_mtd:sub(4)) + 1 + if p1_label and p1_label:find("LEDE") then p1_os = "LEDE" end + if p1_label and p1_label:find("OpenWrt") then p1_os = "OpenWrt" end + if p1_label and p1_label:find("Linksys") then p1_os = "Linksys" end + if p2_label and p2_label:find("LEDE") then p2_os = "LEDE" end + if p2_label and p2_label:find("OpenWrt") then p2_os = "OpenWrt" end + if p2_label and p2_label:find("Linksys") then p2_os = "Linksys" end + if device_name == "ZyXEL NBG6817" then + if not p1_os then p1_os = "ZyXEL" end + if not p2_os then p2_os = "ZyXEL" end + end + if device_name == "Linksys WRT32X" then + if not p1_os then p1_os = "Unknown/Compressed" end + if not p2_os then p2_os = "Unknown/Compressed" end end - local cp_info, ap_info = get_partition_os_info(op_ubi) - if current_partition == bev1p1 then - p1_os = cp_info or p1_os - p2_os = ap_info or p2_os + if not p1_os then p1_os = "Unknown" end + if not p2_os then p2_os = "Unknown" end + if p1_os and p1_version then p1_os = p1_os .. " (Linux " .. p1_version .. ")" end + if p2_os and p2_version then p2_os = p2_os .. " (Linux " .. p2_version .. ")" end + + if device_name == "ZyXEL NBG6817" then + if not zyxelFlagPartition then zyxelFlagPartition = util.trim(util.exec(". /lib/functions.sh; find_mtd_part 0:DUAL_FLAG")) end + if not zyxelFlagPartition then + errorMessage = errorMessage or "" .. i18n.translate("Unable to find Dual Boot Flag Partition." .. " ") + util.perror(i18n.translate("Unable to find Dual Boot Flag Partition.")) + else + current_partition = tonumber(util.exec("dd if=" .. zyxelFlagPartition .. " bs=1 count=1 2>/dev/null | hexdump -n 1 -e '1/1 \"%d\"'")) + end else - p1_os = ap_info or p1_os - p2_os = cp_info or p2_os + if fs.access("/usr/sbin/fw_printenv") and fs.access("/usr/sbin/fw_setenv") then + current_partition = tonumber(util.trim(util.exec("fw_printenv -n " .. bev1))) + end + end + other_partition = current_partition == bev1p2 and bev1p1 or bev1p2 + + if is_alt_mountable(p1_mtd, p2_mtd) then + if current_partition == bev1p1 then + op_ubi = tonumber(p2_mtd:sub(4)) + 1 + else + op_ubi = tonumber(p1_mtd:sub(4)) + 1 + end + local cp_info, op_info = get_partition_os_info(op_ubi) + if current_partition == bev1p1 then + p1_os = cp_info or p1_os + p2_os = op_info or p2_os + else + p1_os = op_info or p1_os + p2_os = cp_info or p2_os + end end end end + return romBoardName, device_name, bev1, bev1p1, p1_os, bev1p2, p2_os, bev2, bev2p1, bev2p2, current_partition end function index() - entry({"admin", "system", "advanced_reboot"}, template("advanced_reboot/advanced_reboot"), _("Advanced Reboot"), 90) + entry({"admin", "system", "advanced_reboot"}, call("action_template"), _("Advanced Reboot"), 90) entry({"admin", "system", "advanced_reboot", "reboot"}, post("action_reboot")) entry({"admin", "system", "advanced_reboot", "alternative_reboot"}, post("action_altreboot")) entry({"admin", "system", "advanced_reboot", "power_off"}, post("action_poweroff")) end +function action_template() + local romBoardName, device_name, bev1, bev1p1, p1_os, bev1p2, p2_os, bev2, bev2p1, bev2p2, current_partition = obtain_device_info() + ltemplate.render("advanced_reboot/advanced_reboot",{ + romBoardName=romBoardName, + device_name=device_name, + bev1p1=bev1p1, + p1_os=p1_os, + bev1p2=bev1p2, + p2_os=p2_os, + current_partition=current_partition, + errorMessage = errorMessage}) +end + function action_reboot() ltemplate.render("advanced_reboot/applyreboot", { title = i18n.translate("Rebooting..."), @@ -198,6 +215,7 @@ function action_reboot() end function action_altreboot() + local romBoardName, device_name, bev1, bev1p1, p1_os, bev1p2, p2_os, bev2, bev2p1, bev2p2, current_partition = obtain_device_info() local zyxelFlagPartition, zyxelBootFlag, zyxelNewBootFlag, errorCode, curEnvSetting, newEnvSetting errorMessage = nil errorCode = 0 diff --git a/applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua b/applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua index fe2faaee5d..86ea302c2f 100644 --- a/applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua +++ b/applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua @@ -71,7 +71,7 @@ yuv = s:taboption(this_tab, Flag, "yuv", translate("Enable YUYV format"), transl quality = s:taboption(this_tab, Value, "quality", translate("JPEG compression quality"), translate("Set the quality in percent. This setting activates YUYV format, disables MJPEG")) quality.datatype = "range(0, 100)" -minimum_size = s:taboption(this_tab, Value, "minimum_size", translate("Drop frames smaller then this limit"),translate("Set the minimum size if the webcam produces small-sized garbage frames. May happen under low light conditions")) +minimum_size = s:taboption(this_tab, Value, "minimum_size", translate("Drop frames smaller than this limit"),translate("Set the minimum size if the webcam produces small-sized garbage frames. May happen under low light conditions")) minimum_size.datatype = "uinteger" no_dynctrl = s:taboption(this_tab, Flag, "no_dynctrl", translate("Don't initialize dynctrls"), translate("Do not initialize dynctrls of Linux-UVC driver")) @@ -217,7 +217,7 @@ ringbuffer=s:taboption(this_tab, Value, "ringbuffer", translate("Ring buffer siz exceed=s:taboption(this_tab, Value, "exceed", translate("Exceed"), translate("Allow ringbuffer to exceed limit by this amount")) exceed.datatype = "uinteger" -command=s:taboption(this_tab, Value, "command", translate("Command to run"), translate("Execute command after saving picture. Mjpg-streamer parse the filename as first parameter to your script.")) +command=s:taboption(this_tab, Value, "command", translate("Command to run"), translate("Execute command after saving picture. Mjpg-streamer parses the filename as first parameter to your script.")) link=s:taboption(this_tab, Value, "link", translate("Link newest picture to fixed file name"), translate("Link the last picture in ringbuffer to fixed named file provided.")) diff --git a/applications/luci-app-mjpg-streamer/po/bg/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/bg/mjpg-streamer.po index 005247dded..eb34f3670b 100644 --- a/applications/luci-app-mjpg-streamer/po/bg/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/bg/mjpg-streamer.po @@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -70,7 +70,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/ca/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ca/mjpg-streamer.po index fb00a8e01b..e0b8c87351 100644 --- a/applications/luci-app-mjpg-streamer/po/ca/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/ca/mjpg-streamer.po @@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -76,7 +76,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/cs/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/cs/mjpg-streamer.po index a5102b699f..599ca0d2dc 100644 --- a/applications/luci-app-mjpg-streamer/po/cs/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/cs/mjpg-streamer.po @@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -76,7 +76,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/de/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/de/mjpg-streamer.po index 08495643a5..35aaa4aab2 100644 --- a/applications/luci-app-mjpg-streamer/po/de/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/de/mjpg-streamer.po @@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls" msgstr "Dynctrls nicht initialisieren" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "Verwerfe Bilder, die kleiner als dieses Limit sind" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -76,7 +76,7 @@ msgstr "Überschreiten" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/el/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/el/mjpg-streamer.po index e4361a6d60..473559bdac 100644 --- a/applications/luci-app-mjpg-streamer/po/el/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/el/mjpg-streamer.po @@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -70,7 +70,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/en/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/en/mjpg-streamer.po index 786f9d0cfd..24e4d0b12b 100644 --- a/applications/luci-app-mjpg-streamer/po/en/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/en/mjpg-streamer.po @@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -70,7 +70,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po index 46a321c119..6fda454c1e 100644 --- a/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po @@ -58,7 +58,7 @@ msgid "Don't initialize dynctrls" msgstr "No inicialice dynctrls" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "Drop frames más pequeños que este límite" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -79,7 +79,7 @@ msgstr "Exceder" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" "Ejecute el comando después de guardar la imagen. Mjpg-streamer analiza el " diff --git a/applications/luci-app-mjpg-streamer/po/fr/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/fr/mjpg-streamer.po index 9f5f0f1ed6..6c2185dded 100644 --- a/applications/luci-app-mjpg-streamer/po/fr/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/fr/mjpg-streamer.po @@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -76,7 +76,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/he/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/he/mjpg-streamer.po index ac9c36a847..739d4b0db2 100644 --- a/applications/luci-app-mjpg-streamer/po/he/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/he/mjpg-streamer.po @@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -70,7 +70,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/hi/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/hi/mjpg-streamer.po index de726beeee..3f531e0be9 100644 --- a/applications/luci-app-mjpg-streamer/po/hi/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/hi/mjpg-streamer.po @@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -70,7 +70,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/hu/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/hu/mjpg-streamer.po index 6ed052d121..3f606da1ac 100644 --- a/applications/luci-app-mjpg-streamer/po/hu/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/hu/mjpg-streamer.po @@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -76,7 +76,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/it/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/it/mjpg-streamer.po index c1c36ac2c8..e62d515bb8 100644 --- a/applications/luci-app-mjpg-streamer/po/it/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/it/mjpg-streamer.po @@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -76,7 +76,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po index d4c4543443..2f144327b2 100644 --- a/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po @@ -56,7 +56,7 @@ msgid "Don't initialize dynctrls" msgstr "dynctrlsを初期化しない" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "この制限よりも小さいフレームをドロップする" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -77,7 +77,7 @@ msgstr "超過" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" "画像保存後にコマンドを実行します。Mjpg-streamerは、ファイル名をスクリプトの最" diff --git a/applications/luci-app-mjpg-streamer/po/ko/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ko/mjpg-streamer.po index e54ec194dd..2af2abac0a 100644 --- a/applications/luci-app-mjpg-streamer/po/ko/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/ko/mjpg-streamer.po @@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -70,7 +70,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/mr/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/mr/mjpg-streamer.po index 014e1c7e07..bf635d0d29 100644 --- a/applications/luci-app-mjpg-streamer/po/mr/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/mr/mjpg-streamer.po @@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -76,7 +76,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/ms/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ms/mjpg-streamer.po index e2b596d5f7..dcdc6e1696 100644 --- a/applications/luci-app-mjpg-streamer/po/ms/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/ms/mjpg-streamer.po @@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -70,7 +70,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/nb_NO/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/nb_NO/mjpg-streamer.po index 3d5bfcd46f..3c35e99fd9 100644 --- a/applications/luci-app-mjpg-streamer/po/nb_NO/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/nb_NO/mjpg-streamer.po @@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -76,7 +76,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/pl/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/pl/mjpg-streamer.po index 6a1860f97e..d09469d9b1 100644 --- a/applications/luci-app-mjpg-streamer/po/pl/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/pl/mjpg-streamer.po @@ -56,7 +56,7 @@ msgid "Don't initialize dynctrls" msgstr "Nie ładuj dynamicznych kontroli" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "Porzucaj klatki mniejsze niż ten limit" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -77,7 +77,7 @@ msgstr "Przekraczać" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" "Wykonaj komendę po wykonaniu zdjęcia. Mjpg-streamer analizuje nazwę pliku " diff --git a/applications/luci-app-mjpg-streamer/po/pt-br/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/pt-br/mjpg-streamer.po index 2cfbcedd17..6bb36ebef9 100644 --- a/applications/luci-app-mjpg-streamer/po/pt-br/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/pt-br/mjpg-streamer.po @@ -58,7 +58,7 @@ msgid "Don't initialize dynctrls" msgstr "Não inicia o dynctrls" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "Descarte quadros menores que este limite" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -79,7 +79,7 @@ msgstr "Ultrapassado" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" "Execute o comando depois de salvar a imagem. Mjpg-streamer passa o nome do " diff --git a/applications/luci-app-mjpg-streamer/po/pt/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/pt/mjpg-streamer.po index 83f0072cfe..4800ed76c8 100644 --- a/applications/luci-app-mjpg-streamer/po/pt/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/pt/mjpg-streamer.po @@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls" msgstr "Não iniciar o dynctrls" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "Descarte quadros menores que este limite" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -76,7 +76,7 @@ msgstr "Ultrapassado" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" "Execute o comando depois de gra\\var a imagem. Mjpg-streamer passa o nome do " diff --git a/applications/luci-app-mjpg-streamer/po/ro/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ro/mjpg-streamer.po index 20a69eadb9..610272c768 100644 --- a/applications/luci-app-mjpg-streamer/po/ro/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/ro/mjpg-streamer.po @@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -70,7 +70,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/ru/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ru/mjpg-streamer.po index ed3b7f44b7..b32961545f 100644 --- a/applications/luci-app-mjpg-streamer/po/ru/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/ru/mjpg-streamer.po @@ -61,7 +61,7 @@ msgid "Don't initialize dynctrls" msgstr "Отключить dynctrls" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "Ограничить кол-во кадров" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -82,7 +82,7 @@ msgstr "Превышение" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" "Выполнить команду после сохранения изображения.<br />Mjpg-streamer задаст " diff --git a/applications/luci-app-mjpg-streamer/po/sk/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/sk/mjpg-streamer.po index d7d25d5323..91e1c1717d 100644 --- a/applications/luci-app-mjpg-streamer/po/sk/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/sk/mjpg-streamer.po @@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -70,7 +70,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/sv/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/sv/mjpg-streamer.po index ef9eb27b76..ef794f9d61 100644 --- a/applications/luci-app-mjpg-streamer/po/sv/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/sv/mjpg-streamer.po @@ -55,7 +55,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -76,7 +76,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/tr/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/tr/mjpg-streamer.po index a08ceec6aa..a46d122809 100644 --- a/applications/luci-app-mjpg-streamer/po/tr/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/tr/mjpg-streamer.po @@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -70,7 +70,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/uk/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/uk/mjpg-streamer.po index 39b2213ffb..78dd9daa82 100644 --- a/applications/luci-app-mjpg-streamer/po/uk/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/uk/mjpg-streamer.po @@ -56,7 +56,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -77,7 +77,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/vi/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/vi/mjpg-streamer.po index 2d036a0b57..28cf534d4c 100644 --- a/applications/luci-app-mjpg-streamer/po/vi/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/vi/mjpg-streamer.po @@ -49,7 +49,7 @@ msgid "Don't initialize dynctrls" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -70,7 +70,7 @@ msgstr "" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "" diff --git a/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po index 34c56d5fcf..2e6572d2db 100644 --- a/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po @@ -63,7 +63,7 @@ msgid "Don't initialize dynctrls" msgstr "不要初始化 dynctrls" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "丢弃小于该尺寸限制的帧" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -84,7 +84,7 @@ msgstr "超出" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "保存图片后执行命令。文件名将作为第一个参数传递给命令。" diff --git a/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po index c63ad7e7b3..ac4be2256d 100644 --- a/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po +++ b/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po @@ -62,7 +62,7 @@ msgid "Don't initialize dynctrls" msgstr "不要初始化 dynctrls" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:74 -msgid "Drop frames smaller then this limit" +msgid "Drop frames smaller than this limit" msgstr "丟棄小於該尺寸限制的幀" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12 @@ -83,7 +83,7 @@ msgstr "超出" #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:220 msgid "" -"Execute command after saving picture. Mjpg-streamer parse the filename as " +"Execute command after saving picture. Mjpg-streamer parses the filename as " "first parameter to your script." msgstr "儲存圖片後執行指令。檔名將作為第一個引數傳遞給指令。" 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 606b1ae766..bcbf03d54e 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua @@ -59,6 +59,7 @@ end httping_ssl = mwan_interface:option(Flag, "httping_ssl", translate("Enable ssl tracking"), translate("Enables https tracking on ssl port 443")) httping_ssl:depends("track_method", "httping") +httping_ssl.rmempty = false httping_ssl.default = httping_ssl.enabled reliability = mwan_interface:option(Value, "reliability", translate("Tracking reliability"), @@ -87,8 +88,6 @@ size:value("1016") size:value("1472") size:value("2040") size.datatype = "range(1, 65507)" -size.rmempty = false -size.optional = false max_ttl = mwan_interface:option(Value, "max_ttl", translate("Max TTL")) max_ttl.default = "60" diff --git a/applications/luci-app-nft-qos/Makefile b/applications/luci-app-nft-qos/Makefile index 4f86217c43..a8227de9fd 100644 --- a/applications/luci-app-nft-qos/Makefile +++ b/applications/luci-app-nft-qos/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk -LUCI_TITLE:=Qos over Nftables +LUCI_TITLE:=QoS over Nftables LUCI_DEPENDS:=+luci-compat +nft-qos include ../../luci.mk diff --git a/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua b/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua index 637eb11736..4d0527e33f 100644 --- a/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua +++ b/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua @@ -13,7 +13,7 @@ function index() entry({"admin", "status", "realtime", "rate_status"}, call("action_rate")).leaf = true entry({"admin", "services", "nft-qos"}, cbi("nft-qos/nft-qos"), - _("Qos over Nftables"), 60) + _("QoS over Nftables"), 60) end function _action_rate(rv, n) diff --git a/applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua b/applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua index 61a6d76a7d..6f67a6110b 100644 --- a/applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua +++ b/applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua @@ -20,7 +20,7 @@ local enable_priority = uci:get("nft-qos", "default", "priority_enable") local has_ipv6 = fs.access("/proc/net/ipv6_route") -m = Map("nft-qos", translate("Qos over Nftables")) +m = Map("nft-qos", translate("QoS over Nftables")) -- -- Taboptions @@ -82,13 +82,13 @@ o.default = def_down or '100' o.datatype = "uinteger" o:depends("limit_type","dynamic") -o = s:taboption("limit", Value, "dynamic_cidr", translate("Target Network (IPv4/MASK)"), translate("Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc")) +o = s:taboption("limit", Value, "dynamic_cidr", translate("Target Network (IPv4/MASK)"), translate("Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc.")) o.datatype = "cidr4" ipc.routes({ family = 4, type = 1 }, function(rt) o.default = rt.dest end) o:depends("limit_type","dynamic") if has_ipv6 then - o = s:taboption("limit", Value, "dynamic_cidr6", translate("Target Network6 (IPv6/MASK)"), translate("Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc")) + o = s:taboption("limit", Value, "dynamic_cidr6", translate("Target Network6 (IPv6/MASK)"), translate("Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc.")) o.datatype = "cidr6" o:depends("limit_type","dynamic") end @@ -104,7 +104,7 @@ o = s:taboption("priority", Flag, "priority_enable", translate("Enable Traffic P o.default = enable_priority or o.enabled o.rmempty = false -o = s:taboption("priority", ListValue, "priority_netdev", translate("Default Network Interface"), translate("Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc")) +o = s:taboption("priority", ListValue, "priority_netdev", translate("Default Network Interface"), translate("Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc.")) o:depends("priority_enable", "1") wa.cbi_add_networks(o) @@ -123,9 +123,9 @@ o.datatype = "hostname" o.default = 'undefined' if has_ipv6 then - o = x:option(Value, "ipaddr", translate("IP Address(V4 / V6)")) + o = x:option(Value, "ipaddr", translate("IP Address (v4 / v6)")) else - o = x:option(Value, "ipaddr", translate("IP Address(V4 Only)")) + o = x:option(Value, "ipaddr", translate("IP Address (v4 Only)")) end o.datatype = "ipaddr" if nixio.fs.access("/tmp/dhcp.leases") or nixio.fs.access("/var/dhcp6.leases") then @@ -160,9 +160,9 @@ o.datatype = "hostname" o.default = 'undefined' if has_ipv6 then - o = y:option(Value, "ipaddr", translate("IP Address(V4 / V6)")) + o = y:option(Value, "ipaddr", translate("IP Address (v4 / v6)")) else - o = y:option(Value, "ipaddr", translate("IP Address(V4 Only)")) + o = y:option(Value, "ipaddr", translate("IP Address (v4 Only)")) end o.datatype = "ipaddr" if nixio.fs.access("/tmp/dhcp.leases") or nixio.fs.access("/var/dhcp6.leases") then diff --git a/applications/luci-app-nft-qos/po/bg/nft-qos.po b/applications/luci-app-nft-qos/po/bg/nft-qos.po index 6bfdc6b7bd..253ea521bb 100644 --- a/applications/luci-app-nft-qos/po/bg/nft-qos.po +++ b/applications/luci-app-nft-qos/po/bg/nft-qos.po @@ -94,12 +94,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -124,15 +124,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -154,7 +154,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/ca/nft-qos.po b/applications/luci-app-nft-qos/po/ca/nft-qos.po index e4babf863e..043c8a2145 100644 --- a/applications/luci-app-nft-qos/po/ca/nft-qos.po +++ b/applications/luci-app-nft-qos/po/ca/nft-qos.po @@ -100,12 +100,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -130,15 +130,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -160,7 +160,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/cs/nft-qos.po b/applications/luci-app-nft-qos/po/cs/nft-qos.po index b119020178..b6ce28c6ae 100644 --- a/applications/luci-app-nft-qos/po/cs/nft-qos.po +++ b/applications/luci-app-nft-qos/po/cs/nft-qos.po @@ -100,12 +100,12 @@ msgstr "IP adresa" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -130,15 +130,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -160,7 +160,7 @@ msgstr "Protokol" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/de/nft-qos.po b/applications/luci-app-nft-qos/po/de/nft-qos.po index 72709e866d..9e9b533084 100644 --- a/applications/luci-app-nft-qos/po/de/nft-qos.po +++ b/applications/luci-app-nft-qos/po/de/nft-qos.po @@ -100,13 +100,13 @@ msgstr "IP-Adresse" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" -msgstr "IP-Adresse (V4 / V6)" +msgid "IP Address (v4 / v6)" +msgstr "IP-Adresse (v4 / v6)" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" -msgstr "IP-Adresse (nur V4)" +msgid "IP Address (v4 Only)" +msgstr "IP-Adresse (nur v4)" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 msgid "Limit Enable" @@ -130,16 +130,16 @@ msgid "NFT-QoS Settings" msgstr "NFT-QoS-Einstellungen" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" "Netzwerkschnittstelle für Traffic Shaping, z.B. br-lan, eth0.1, eth0, etc." #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -161,7 +161,7 @@ msgstr "Protokoll" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/el/nft-qos.po b/applications/luci-app-nft-qos/po/el/nft-qos.po index 3894b07ffa..75db0de2a1 100644 --- a/applications/luci-app-nft-qos/po/el/nft-qos.po +++ b/applications/luci-app-nft-qos/po/el/nft-qos.po @@ -100,12 +100,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -130,15 +130,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -160,7 +160,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/en/nft-qos.po b/applications/luci-app-nft-qos/po/en/nft-qos.po index f3e6b4249c..3ffccd4045 100644 --- a/applications/luci-app-nft-qos/po/en/nft-qos.po +++ b/applications/luci-app-nft-qos/po/en/nft-qos.po @@ -94,12 +94,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -124,15 +124,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -154,7 +154,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/es/nft-qos.po b/applications/luci-app-nft-qos/po/es/nft-qos.po index c9e4991baf..eb56a1a2a3 100644 --- a/applications/luci-app-nft-qos/po/es/nft-qos.po +++ b/applications/luci-app-nft-qos/po/es/nft-qos.po @@ -103,12 +103,12 @@ msgstr "Dirección IP" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "Dirección IP (v4/v6)" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "Dirección IP (sólo v4)" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -133,18 +133,18 @@ msgid "NFT-QoS Settings" msgstr "Configuración de NFT-QoS" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" "Interfaz de red para configuración de tráfico, por ejemplo, br-lan, eth0.1, " -"eth0, etc" +"eth0, etc." #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" -msgstr "Red a aplicar, por ejemplo. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." +msgstr "Red a aplicar, por ejemplo. 192.168.1.0/24, 10.2.0.0/16, etc." #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" -msgstr "Red a aplicar, por ejemplo. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." +msgstr "Red a aplicar, por ejemplo. AAAA::BBBB/64, CCCC::1/128, etc." #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 msgid "No information available" @@ -165,7 +165,7 @@ msgstr "Protocolo" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "Qos sobre Nftables" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/fr/nft-qos.po b/applications/luci-app-nft-qos/po/fr/nft-qos.po index 3cc0d2db36..d68c65df43 100644 --- a/applications/luci-app-nft-qos/po/fr/nft-qos.po +++ b/applications/luci-app-nft-qos/po/fr/nft-qos.po @@ -100,12 +100,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -130,15 +130,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -160,7 +160,7 @@ msgstr "Protocole" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/he/nft-qos.po b/applications/luci-app-nft-qos/po/he/nft-qos.po index 9938ccffd2..71b810595d 100644 --- a/applications/luci-app-nft-qos/po/he/nft-qos.po +++ b/applications/luci-app-nft-qos/po/he/nft-qos.po @@ -94,12 +94,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -124,15 +124,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -154,7 +154,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/hi/nft-qos.po b/applications/luci-app-nft-qos/po/hi/nft-qos.po index 29961a28ac..4936b07c1c 100644 --- a/applications/luci-app-nft-qos/po/hi/nft-qos.po +++ b/applications/luci-app-nft-qos/po/hi/nft-qos.po @@ -94,12 +94,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -124,15 +124,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -154,7 +154,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/hu/nft-qos.po b/applications/luci-app-nft-qos/po/hu/nft-qos.po index d398e3b362..dcce63d0f8 100644 --- a/applications/luci-app-nft-qos/po/hu/nft-qos.po +++ b/applications/luci-app-nft-qos/po/hu/nft-qos.po @@ -100,12 +100,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -130,15 +130,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -160,7 +160,7 @@ msgstr "Protokoll" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/it/nft-qos.po b/applications/luci-app-nft-qos/po/it/nft-qos.po index dbabfee7d9..c9ddca3a04 100644 --- a/applications/luci-app-nft-qos/po/it/nft-qos.po +++ b/applications/luci-app-nft-qos/po/it/nft-qos.po @@ -94,12 +94,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -124,15 +124,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -154,7 +154,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/ja/nft-qos.po b/applications/luci-app-nft-qos/po/ja/nft-qos.po index 4863fb6a24..ed8523c6f8 100644 --- a/applications/luci-app-nft-qos/po/ja/nft-qos.po +++ b/applications/luci-app-nft-qos/po/ja/nft-qos.po @@ -94,12 +94,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -124,15 +124,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -154,7 +154,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/ko/nft-qos.po b/applications/luci-app-nft-qos/po/ko/nft-qos.po index 2b7c997d1f..34ea52ff6c 100644 --- a/applications/luci-app-nft-qos/po/ko/nft-qos.po +++ b/applications/luci-app-nft-qos/po/ko/nft-qos.po @@ -94,12 +94,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -124,15 +124,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -154,7 +154,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/mr/nft-qos.po b/applications/luci-app-nft-qos/po/mr/nft-qos.po index f812c20ace..77d0c2d86f 100644 --- a/applications/luci-app-nft-qos/po/mr/nft-qos.po +++ b/applications/luci-app-nft-qos/po/mr/nft-qos.po @@ -100,12 +100,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -130,15 +130,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -160,7 +160,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/ms/nft-qos.po b/applications/luci-app-nft-qos/po/ms/nft-qos.po index 437ac59672..57aa18a2b5 100644 --- a/applications/luci-app-nft-qos/po/ms/nft-qos.po +++ b/applications/luci-app-nft-qos/po/ms/nft-qos.po @@ -94,12 +94,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -124,15 +124,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -154,7 +154,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/nb_NO/nft-qos.po b/applications/luci-app-nft-qos/po/nb_NO/nft-qos.po index 5ecf971916..a1f1df9f0c 100644 --- a/applications/luci-app-nft-qos/po/nb_NO/nft-qos.po +++ b/applications/luci-app-nft-qos/po/nb_NO/nft-qos.po @@ -100,12 +100,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -130,15 +130,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -160,7 +160,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/pl/nft-qos.po b/applications/luci-app-nft-qos/po/pl/nft-qos.po index 08c3b8f531..d64b7b97a9 100644 --- a/applications/luci-app-nft-qos/po/pl/nft-qos.po +++ b/applications/luci-app-nft-qos/po/pl/nft-qos.po @@ -101,12 +101,12 @@ msgstr "Adres IP" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" -msgstr "Adres IP (V4 / V6)" +msgid "IP Address (v4 / v6)" +msgstr "Adres IP (V4 / v6)" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "Adres IP (tylko v4)" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -131,16 +131,16 @@ msgid "NFT-QoS Settings" msgstr "Ustawienia NFT-QoS" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" "Interfejs sieciowy dla kształtowania ruchu, np. br-lan, eth0.1, eth0 itp." #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "Sieć do zastosowania, np. 192.168.1.0/24, 10.2.0.0/16, itp." #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "Sieć do zastosowania, np. AAAA::BBBB/64, CCCC::1/128, itp." #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -162,7 +162,7 @@ msgstr "Protokół" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/pt/nft-qos.po b/applications/luci-app-nft-qos/po/pt/nft-qos.po index 9b1d95e0b9..f8fb5135b9 100644 --- a/applications/luci-app-nft-qos/po/pt/nft-qos.po +++ b/applications/luci-app-nft-qos/po/pt/nft-qos.po @@ -100,13 +100,13 @@ msgstr "Endereço IP" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" -msgstr "Endereço IP (V4 / V6)" +msgid "IP Address (v4 / v6)" +msgstr "Endereço IP (v4 / v6)" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" -msgstr "Endereço IP (apenas V4)" +msgid "IP Address (v4 Only)" +msgstr "Endereço IP (apenas v4)" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 msgid "Limit Enable" @@ -130,18 +130,18 @@ msgid "NFT-QoS Settings" msgstr "Configurações NFT-QoS" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" "Interface de Rede para Traffic Shaping, por exemplo, br-lan, eth0.1, eth0, " -"etc" +"etc." #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" -msgstr "Rede a aplicar, por exemplo, 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." +msgstr "Rede a aplicar, por exemplo, 192.168.1.0/24, 10.2.0.0/16, etc." #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" -msgstr "Rede a aplicar, por exemplo, AAAA::BBBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." +msgstr "Rede a aplicar, por exemplo, AAAA::BBBBB/64, CCCC::1/128, etc." #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 msgid "No information available" @@ -162,7 +162,7 @@ msgstr "Protocolo" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "Qos sobre Nftables" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/pt_BR/nft-qos.po b/applications/luci-app-nft-qos/po/pt_BR/nft-qos.po index 19bc9677ba..10c1c0c97b 100644 --- a/applications/luci-app-nft-qos/po/pt_BR/nft-qos.po +++ b/applications/luci-app-nft-qos/po/pt_BR/nft-qos.po @@ -100,13 +100,13 @@ msgstr "Endereço IP" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" -msgstr "Endereço IP (V4 / V6)" +msgid "IP Address (v4 / v6)" +msgstr "Endereço IP (v4 / v6)" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" -msgstr "Endereço IP (apenas V4)" +msgid "IP Address (v4 Only)" +msgstr "Endereço IP (apenas v4)" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 msgid "Limit Enable" @@ -130,18 +130,18 @@ msgid "NFT-QoS Settings" msgstr "Configurações NFT-QoS" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" "A Interface de rede para realizar Traffic Shaping, por exemplo, br-lan, " -"eth0.1, eth0.1, eth0, etc" +"eth0.1, eth0.1, eth0, etc." #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" -msgstr "Rede a ser aplicada, por exemplo, 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." +msgstr "Rede a ser aplicada, por exemplo, 192.168.1.0/24, 10.2.0.0/16, etc." #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" -msgstr "Rede a ser aplicada, por exemplo, AAAA::BBBB/64, CCCC:1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." +msgstr "Rede a ser aplicada, por exemplo, AAAA::BBBB/64, CCCC:1/128, etc." #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 msgid "No information available" @@ -162,7 +162,7 @@ msgstr "Protocolo" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "Qos sobre Nftables" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/ro/nft-qos.po b/applications/luci-app-nft-qos/po/ro/nft-qos.po index d14b7e48d7..ea51c00052 100644 --- a/applications/luci-app-nft-qos/po/ro/nft-qos.po +++ b/applications/luci-app-nft-qos/po/ro/nft-qos.po @@ -94,12 +94,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -124,15 +124,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -154,7 +154,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/ru/nft-qos.po b/applications/luci-app-nft-qos/po/ru/nft-qos.po index dd90bc5317..e829960f7e 100644 --- a/applications/luci-app-nft-qos/po/ru/nft-qos.po +++ b/applications/luci-app-nft-qos/po/ru/nft-qos.po @@ -94,12 +94,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -124,15 +124,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -154,7 +154,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/sk/nft-qos.po b/applications/luci-app-nft-qos/po/sk/nft-qos.po index 6807137602..05782fd8eb 100644 --- a/applications/luci-app-nft-qos/po/sk/nft-qos.po +++ b/applications/luci-app-nft-qos/po/sk/nft-qos.po @@ -94,12 +94,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -124,15 +124,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -154,7 +154,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/sv/nft-qos.po b/applications/luci-app-nft-qos/po/sv/nft-qos.po index 465c235ea6..bfc9ce8af5 100644 --- a/applications/luci-app-nft-qos/po/sv/nft-qos.po +++ b/applications/luci-app-nft-qos/po/sv/nft-qos.po @@ -100,12 +100,12 @@ msgstr "IP-adress" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -130,15 +130,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -160,7 +160,7 @@ msgstr "Protokoll" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/tr/nft-qos.po b/applications/luci-app-nft-qos/po/tr/nft-qos.po index 761eb07df9..cb1a48063f 100644 --- a/applications/luci-app-nft-qos/po/tr/nft-qos.po +++ b/applications/luci-app-nft-qos/po/tr/nft-qos.po @@ -100,12 +100,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -130,15 +130,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -160,7 +160,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/uk/nft-qos.po b/applications/luci-app-nft-qos/po/uk/nft-qos.po index 34241b60fe..d82addad2d 100644 --- a/applications/luci-app-nft-qos/po/uk/nft-qos.po +++ b/applications/luci-app-nft-qos/po/uk/nft-qos.po @@ -101,12 +101,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -131,15 +131,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -161,7 +161,7 @@ msgstr "Протокол" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/vi/nft-qos.po b/applications/luci-app-nft-qos/po/vi/nft-qos.po index dcbba216a1..faf04cea85 100644 --- a/applications/luci-app-nft-qos/po/vi/nft-qos.po +++ b/applications/luci-app-nft-qos/po/vi/nft-qos.po @@ -100,12 +100,12 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" +msgid "IP Address (v4 / v6)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" +msgid "IP Address (v4 Only)" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 @@ -130,15 +130,15 @@ msgid "NFT-QoS Settings" msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -160,7 +160,7 @@ msgstr "Giao thức" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/zh-cn/nft-qos.po b/applications/luci-app-nft-qos/po/zh-cn/nft-qos.po index 2a0e90d827..0ebfae2dfd 100644 --- a/applications/luci-app-nft-qos/po/zh-cn/nft-qos.po +++ b/applications/luci-app-nft-qos/po/zh-cn/nft-qos.po @@ -106,13 +106,13 @@ msgstr "IP 地址" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" -msgstr "IP 地址（V4 / V6）" +msgid "IP Address (v4 / v6)" +msgstr "IP 地址（v4 / v6）" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" -msgstr "IP 地址（仅 V4）" +msgid "IP Address (v4 Only)" +msgstr "IP 地址（仅 v4）" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 msgid "Limit Enable" @@ -136,15 +136,15 @@ msgid "NFT-QoS Settings" msgstr "NFT-QoS 设置" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "流量整形的目标网络接口，例如br-lan、eth0.1、eth0等" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "将要应用规则的网络，例如192.168.1.0/24、10.2.0.0/16等" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "将要应用规则的网络，例如AAAA::BBBB/64、CCCC::1/128等" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -166,7 +166,7 @@ msgstr "协议" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "QoS Nftables 版" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/applications/luci-app-nft-qos/po/zh-tw/nft-qos.po b/applications/luci-app-nft-qos/po/zh-tw/nft-qos.po index 5be9d8abf6..11c9be0fac 100644 --- a/applications/luci-app-nft-qos/po/zh-tw/nft-qos.po +++ b/applications/luci-app-nft-qos/po/zh-tw/nft-qos.po @@ -105,13 +105,13 @@ msgstr "IP 位址" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 -msgid "IP Address(V4 / V6)" -msgstr "IP 位址（V4 / V6）" +msgid "IP Address (v4 / v6)" +msgstr "IP 位址（v4 / v6）" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165 -msgid "IP Address(V4 Only)" -msgstr "IP 位址（僅 V4）" +msgid "IP Address (v4 Only)" +msgstr "IP 位址（僅 v4）" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38 msgid "Limit Enable" @@ -135,15 +135,15 @@ msgid "NFT-QoS Settings" msgstr "NFT-QoS 設定" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107 -msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc" +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." msgstr "流量整形的目標網路介面，例如br-lan、eth0.1、eth0等" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85 -msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc" +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." msgstr "將要應用規則的網路，例如192.168.1.0/24、10.2.0.0/16等" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91 -msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc" +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." msgstr "將要應用規則的網路，例如AAAA::BBBB/64、CCCC::1/128等" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 @@ -165,7 +165,7 @@ msgstr "協議" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23 -msgid "Qos over Nftables" +msgid "QoS over Nftables" msgstr "QoS Nftables 版" #: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12 diff --git a/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json b/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json index 298b5ed336..ba0c213c9e 100644 --- a/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json +++ b/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json @@ -39,16 +39,20 @@ "/proc/sys/net/netfilter/nf_conntrack_*": [ "read" ], "/proc/mounts": [ "read" ], "/usr/lib/lua/luci/version.lua": [ "read" ], + "/bin/dmesg -r": [ "exec" ], "/bin/ping *": [ "exec" ], "/bin/ping6 *": [ "exec" ], "/bin/traceroute *": [ "exec" ], "/bin/traceroute6 *": [ "exec" ], + "/sbin/logread -e ^": [ "exec" ], "/usr/bin/ping *": [ "exec" ], "/usr/bin/ping6 *": [ "exec" ], "/usr/bin/traceroute *": [ "exec" ], "/usr/bin/traceroute6 *": [ "exec" ], "/usr/bin/nslookup *": [ "exec" ], - "/usr/libexec/luci-peeraddr": [ "exec" ] + "/usr/libexec/luci-peeraddr": [ "exec" ], + "/usr/sbin/iptables --line-numbers -w -nvxL -t *": [ "exec" ], + "/usr/sbin/ip6tables --line-numbers -w -nvxL -t *": [ "exec" ] }, "ubus": { "file": [ "list", "read", "stat" ], @@ -68,6 +72,7 @@ "file": { "/etc/crontabs/root": [ "write" ], "/etc/dropbear/authorized_keys": [ "write" ], + "/etc/init.d/firewall restart": [ "exec" ], "/etc/luci-uploads/*": [ "write" ], "/etc/rc.local": [ "write" ], "/etc/sysupgrade.conf": [ "write" ], @@ -83,7 +88,9 @@ "/bin/umount": [ "exec" ], "/tmp/backup.tar.gz": [ "write" ], "/tmp/firmware.bin": [ "write" ], - "/tmp/upload.ipk": [ "write" ] + "/tmp/upload.ipk": [ "write" ], + "/usr/sbin/iptables -Z": [ "exec" ], + "/usr/sbin/ip6tables -Z": [ "exec" ] }, "ubus": { "file": [ "write", "remove", "exec" ], diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua index bcc26cd442..8841d1ff82 100644 --- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua +++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua @@ -71,7 +71,7 @@ if leases then end ip = v:option(DummyValue, 3, translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address")) mac = v:option(DummyValue, 2, translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address")) - ltime = v:option(DummyValue, 1, translate("Leasetime remaining")) + ltime = v:option(DummyValue, 1, translate("Lease time remaining")) function ltime.cfgvalue(self, ...) local value = DummyValue.cfgvalue(self, ...) return wa.date_format(os.difftime(tonumber(value), os.time())) diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js index 716d67b2aa..c4db638b11 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js @@ -52,7 +52,7 @@ CBILease6Status = form.DummyValue.extend({ E('div', { 'class': 'th' }, _('Host')), E('div', { 'class': 'th' }, _('IPv6-Address')), E('div', { 'class': 'th' }, _('DUID')), - E('div', { 'class': 'th' }, _('Leasetime remaining')) + E('div', { 'class': 'th' }, _('Lease time remaining')) ]), E('div', { 'class': 'tr placeholder' }, [ E('div', { 'class': 'td' }, E('em', _('Collecting data...'))) diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js new file mode 100644 index 0000000000..3b9428eaf1 --- /dev/null +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/dmesg.js @@ -0,0 +1,35 @@ +'use strict'; +'require fs'; +'require ui'; + +return L.view.extend({ + load: function() { + return fs.exec_direct('/bin/dmesg', [ '-r' ]).catch(function(err) { + ui.addNotification(null, E('p', {}, _('Unable to load log data: ' + err.message))); + return ''; + }); + }, + + render: function(logdata) { + var loglines = logdata.trim().split(/\n/).map(function(line) { + return line.replace(/^<\d+>/, ''); + }); + + return E([], [ + E('h2', {}, [ _('Kernel Log') ]), + E('div', { 'id': 'content_syslog' }, [ + E('textarea', { + 'id': 'syslog', + 'style': 'font-size:12px', + 'readonly': 'readonly', + 'wrap': 'off', + 'rows': loglines.length + 1 + }, [ loglines.join('\n') ]) + ]) + ]); + }, + + handleSaveApply: null, + handleSave: null, + handleReset: null +}); diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js index 83c0c151eb..b1068f0e36 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js @@ -28,7 +28,7 @@ return L.Class.extend({ E('div', { 'class': 'th' }, _('Hostname')), E('div', { 'class': 'th' }, _('IPv4-Address')), E('div', { 'class': 'th' }, _('MAC-Address')), - E('div', { 'class': 'th' }, _('Leasetime remaining')) + E('div', { 'class': 'th' }, _('Lease time remaining')) ]) ]); @@ -55,7 +55,7 @@ return L.Class.extend({ E('div', { 'class': 'th' }, _('Host')), E('div', { 'class': 'th' }, _('IPv6-Address')), E('div', { 'class': 'th' }, _('DUID')), - E('div', { 'class': 'th' }, _('Leasetime remaining')) + E('div', { 'class': 'th' }, _('Lease time remaining')) ]) ]); diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js index eaeba578fe..04abcba9d0 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js @@ -1,232 +1,196 @@ -var table_names = [ 'Filter', 'NAT', 'Mangle', 'Raw' ], - current_mode = document.querySelector('.cbi-tab[data-mode="6"]') ? 6 : 4; - -function create_table_section(table) -{ - var idiv = document.getElementById('iptables'), - tdiv = idiv.querySelector('[data-table="%s"]'.format(table)), - title = '%s: %s'.format(_('Table'), table); - - if (!tdiv) { - tdiv = E('div', { 'data-table': table }, [ - E('h3', {}, title), - E('div') - ]); +'use strict'; +'require fs'; +'require ui'; + +var table_names = [ 'Filter', 'NAT', 'Mangle', 'Raw' ]; + +return L.view.extend({ + load: function() { + return L.resolveDefault(fs.stat('/usr/sbin/ip6tables')); + }, + + createTableSection: function(is_ipv6, table) { + var idiv = document.querySelector('div[data-tab="%s"]'.format(is_ipv6 ? 'ip6tables' : 'iptables')), + tdiv = idiv.querySelector('[data-table="%s-%s"]'.format(is_ipv6 ? 'ipv6' : 'ipv4', table)), + title = '%s: %s'.format(_('Table'), table); + + if (!tdiv) { + tdiv = E('div', { 'data-table': '%s-%s'.format(is_ipv6 ? 'ipv6' : 'ipv4', table) }, [ + E('h3', {}, title), + E('div') + ]); - if (idiv.firstElementChild.nodeName.toLowerCase() === 'p') - idiv.removeChild(idiv.firstElementChild); + if (idiv.firstElementChild.nodeName.toLowerCase() === 'p') + idiv.removeChild(idiv.firstElementChild); - var added = false, thisIdx = table_names.indexOf(table); + var added = false, thisIdx = table_names.indexOf(table); - idiv.querySelectorAll('[data-table]').forEach(function(child) { - var childIdx = table_names.indexOf(child.getAttribute('data-table')); + idiv.querySelectorAll('[data-table]').forEach(function(child) { + var childIdx = table_names.indexOf(child.getAttribute('data-table').split(/-/)[1]); - if (added === false && childIdx > thisIdx) { - idiv.insertBefore(tdiv, child); - added = true; - } - }); - - if (added === false) - idiv.appendChild(tdiv); - } - - return tdiv.lastElementChild; -} - -function create_chain_section(table, chain, policy, packets, bytes, references) -{ - var tdiv = create_table_section(table), - cdiv = tdiv.querySelector('[data-chain="%s"]'.format(chain)), - title; - - if (policy) - title = '%s <em>%s</em> <span>(%s: <em>%s</em>, %d %s, %.2mB %s)</span>' - .format(_('Chain'), chain, _('Policy'), policy, packets, _('Packets'), bytes, _('Traffic')); - else - title = '%s <em>%s</em> <span class="references">(%d %s)</span>' - .format(_('Chain'), chain, references, _('References')); - - if (!cdiv) { - cdiv = E('div', { 'data-chain': chain }, [ - E('h4', { 'id': 'rule_%s_%s'.format(table.toLowerCase(), chain) }, title), - E('div', { 'class': 'table' }, [ - E('div', { 'class': 'tr table-titles' }, [ - E('div', { 'class': 'th center' }, _('Pkts.')), - E('div', { 'class': 'th center' }, _('Traffic')), - E('div', { 'class': 'th' }, _('Target')), - E('div', { 'class': 'th' }, _('Prot.')), - E('div', { 'class': 'th' }, _('In')), - E('div', { 'class': 'th' }, _('Out')), - E('div', { 'class': 'th' }, _('Source')), - E('div', { 'class': 'th' }, _('Destination')), - E('div', { 'class': 'th' }, _('Options')), - E('div', { 'class': 'th' }, _('Comment')) - ]) - ]) - ]); + if (added === false && childIdx > thisIdx) { + idiv.insertBefore(tdiv, child); + added = true; + } + }); - tdiv.appendChild(cdiv); - } - else { - cdiv.firstElementChild.innerHTML = title; - } - - return cdiv.lastElementChild; -} - -function update_chain_section(chaintable, rows) -{ - if (!chaintable) - return; - - cbi_update_table(chaintable, rows, _('No rules in this chain.')); - - if (rows.length === 0 && - document.querySelector('form > [data-hide-empty="true"]')) - chaintable.parentNode.style.display = 'none'; - else - chaintable.parentNode.style.display = ''; - - chaintable.parentNode.setAttribute('data-empty', rows.length === 0); -} - -function hide_empty(btn) -{ - var hide = (btn.getAttribute('data-hide-empty') === 'false'); - - btn.setAttribute('data-hide-empty', hide); - btn.value = hide ? _('Show empty chains') : _('Hide empty chains'); - btn.blur(); - - document.querySelectorAll('[data-chain][data-empty="true"]') - .forEach(function(chaintable) { - chaintable.style.display = hide ? 'none' : ''; - }); -} - -function jump_target(ev) -{ - var link = ev.target, - table = findParent(link, '[data-table]').getAttribute('data-table'), - chain = link.textContent, - num = +link.getAttribute('data-num'), - elem = document.getElementById('rule_%s_%s'.format(table.toLowerCase(), chain)); - - if (elem) { - (document.documentElement || document.body.parentNode || document.body).scrollTop = elem.offsetTop - 40; - elem.classList.remove('flash'); - void elem.offsetWidth; - elem.classList.add('flash'); - - if (num) { - var rule = elem.nextElementSibling.childNodes[num]; - if (rule) { - rule.classList.remove('flash'); - void rule.offsetWidth; - rule.classList.add('flash'); - } + if (added === false) + idiv.appendChild(tdiv); } - } -} - -function parse_output(table, s) -{ - var current_chain = null; - var current_rules = []; - var seen_chains = {}; - var chain_refs = {}; - var re = /([^\n]*)\n/g; - var m, m2; - - while ((m = re.exec(s)) != null) { - if (m[1].match(/^Chain (.+) \(policy (\w+) (\d+) packets, (\d+) bytes\)$/)) { - var chain = RegExp.$1, - policy = RegExp.$2, - packets = +RegExp.$3, - bytes = +RegExp.$4; - - update_chain_section(current_chain, current_rules); - - seen_chains[chain] = true; - current_chain = create_chain_section(table, chain, policy, packets, bytes); - current_rules = []; - } - else if (m[1].match(/^Chain (.+) \((\d+) references\)$/)) { - var chain = RegExp.$1, - references = +RegExp.$2; - update_chain_section(current_chain, current_rules); + return tdiv.lastElementChild; + }, + + createChainSection: function(is_ipv6, table, chain, policy, packets, bytes, references) { + var tdiv = this.createTableSection(is_ipv6, table), + cdiv = tdiv.querySelector('[data-chain="%s"]'.format(chain)), + title; + + if (policy) + title = '%s <em>%s</em> <span>(%s: <em>%s</em>, %d %s, %.2mB %s)</span>' + .format(_('Chain'), chain, _('Policy'), policy, packets, _('Packets'), bytes, _('Traffic')); + else + title = '%s <em>%s</em> <span class="references">(%d %s)</span>' + .format(_('Chain'), chain, references, _('References')); + + if (!cdiv) { + cdiv = E('div', { 'data-chain': chain }, [ + E('h4', { 'id': 'rule_%s-%s_%s'.format(is_ipv6 ? 'ipv6' : 'ipv4', table.toLowerCase(), chain) }, title), + E('div', { 'class': 'table' }, [ + E('div', { 'class': 'tr table-titles' }, [ + E('div', { 'class': 'th center' }, _('Pkts.')), + E('div', { 'class': 'th center' }, _('Traffic')), + E('div', { 'class': 'th' }, _('Target')), + E('div', { 'class': 'th' }, _('Prot.')), + E('div', { 'class': 'th' }, _('In')), + E('div', { 'class': 'th' }, _('Out')), + E('div', { 'class': 'th' }, _('Source')), + E('div', { 'class': 'th' }, _('Destination')), + E('div', { 'class': 'th' }, _('Options')), + E('div', { 'class': 'th' }, _('Comment')) + ]) + ]) + ]); - seen_chains[chain] = true; - current_chain = create_chain_section(table, chain, null, null, null, references); - current_rules = []; + tdiv.appendChild(cdiv); } - else if (m[1].match(/^num /)) { - continue; + else { + cdiv.firstElementChild.innerHTML = title; } - else if ((m2 = m[1].match(/^(\d+) +(\d+) +(\d+) +(.*?) +(\S+) +(\S*) +(\S+) +(\S+) +([a-f0-9:.]+(?:\/[a-f0-9:.]+)?) +([a-f0-9:.]+(?:\/[a-f0-9:.]+)?) +(.+)$/)) !== null) { - var num = +m2[1], - pkts = +m2[2], - bytes = +m2[3], - target = m2[4], - proto = m2[5], - indev = m2[7], - outdev = m2[8], - srcnet = m2[9], - dstnet = m2[10], - options = m2[11] || '-', - comment = '-'; - - options = options.trim().replace(/(?:^| )\/\* (.+) \*\//, - function(m1, m2) { - comment = m2.replace(/^!fw3(: |$)/, '').trim() || '-'; - return ''; - }) || '-'; - - current_rules.push([ - '%.2m'.format(pkts).nobr(), - '%.2mB'.format(bytes).nobr(), - target ? '<span class="target">%s</span>'.format(target) : '-', - proto, - (indev !== '*') ? '<span class="ifacebadge">%s</span>'.format(indev) : '*', - (outdev !== '*') ? '<span class="ifacebadge">%s</span>'.format(outdev) : '*', - srcnet, - dstnet, - options, - [ comment ] - ]); - if (target) { - chain_refs[target] = chain_refs[target] || []; - chain_refs[target].push([ current_chain, num ]); + return cdiv.lastElementChild; + }, + + updateChainSection: function(chaintable, rows) { + if (!chaintable) + return; + + cbi_update_table(chaintable, rows, _('No rules in this chain.')); + + if (rows.length === 0 && + document.querySelector('[data-hide-empty="true"]')) + chaintable.parentNode.style.display = 'none'; + else + chaintable.parentNode.style.display = ''; + + chaintable.parentNode.setAttribute('data-empty', rows.length === 0); + }, + + parseIptablesDump: function(is_ipv6, table, s) { + var current_chain = null; + var current_rules = []; + var seen_chains = {}; + var chain_refs = {}; + var re = /([^\n]*)\n/g; + var m, m2; + + while ((m = re.exec(s)) != null) { + if (m[1].match(/^Chain (.+) \(policy (\w+) (\d+) packets, (\d+) bytes\)$/)) { + var chain = RegExp.$1, + policy = RegExp.$2, + packets = +RegExp.$3, + bytes = +RegExp.$4; + + this.updateChainSection(current_chain, current_rules); + + seen_chains[chain] = true; + current_chain = this.createChainSection(is_ipv6, table, chain, policy, packets, bytes); + current_rules = []; + } + else if (m[1].match(/^Chain (.+) \((\d+) references\)$/)) { + var chain = RegExp.$1, + references = +RegExp.$2; + + this.updateChainSection(current_chain, current_rules); + + seen_chains[chain] = true; + current_chain = this.createChainSection(is_ipv6, table, chain, null, null, null, references); + current_rules = []; + } + else if (m[1].match(/^num /)) { + continue; + } + else if ((m2 = m[1].match(/^(\d+) +(\d+) +(\d+) +(.*?) +(\S+) +(\S*) +(\S+) +(\S+) +([a-f0-9:.]+(?:\/[a-f0-9:.]+)?) +([a-f0-9:.]+(?:\/[a-f0-9:.]+)?) +(.+)$/)) !== null) { + var num = +m2[1], + pkts = +m2[2], + bytes = +m2[3], + target = m2[4], + proto = m2[5], + indev = m2[7], + outdev = m2[8], + srcnet = m2[9], + dstnet = m2[10], + options = m2[11] || '-', + comment = '-'; + + options = options.trim().replace(/(?:^| )\/\* (.+) \*\//, + function(m1, m2) { + comment = m2.replace(/^!fw3(: |$)/, '').trim() || '-'; + return ''; + }) || '-'; + + current_rules.push([ + '%.2m'.format(pkts).nobr(), + '%.2mB'.format(bytes).nobr(), + target ? '<span class="target">%s</span>'.format(target) : '-', + proto, + (indev !== '*') ? '<span class="ifacebadge">%s</span>'.format(indev) : '*', + (outdev !== '*') ? '<span class="ifacebadge">%s</span>'.format(outdev) : '*', + srcnet, + dstnet, + options, + [ comment ] + ]); + + if (target) { + chain_refs[target] = chain_refs[target] || []; + chain_refs[target].push([ current_chain, num ]); + } } } - } - update_chain_section(current_chain, current_rules); + this.updateChainSection(current_chain, current_rules); - document.querySelectorAll('[data-table="%s"] [data-chain]'.format(table)) - .forEach(function(cdiv) { + document.querySelectorAll('[data-table="%s-%s"] [data-chain]'.format(is_ipv6 ? 'ipv6' : 'ipv4', table)).forEach(L.bind(function(cdiv) { if (!seen_chains[cdiv.getAttribute('data-chain')]) { cdiv.parentNode.removeChild(cdiv); return; } - cdiv.querySelectorAll('.target').forEach(function(tspan) { + cdiv.querySelectorAll('.target').forEach(L.bind(function(tspan) { if (seen_chains[tspan.textContent]) { tspan.classList.add('jump'); - tspan.addEventListener('click', jump_target); + tspan.addEventListener('click', this.handleJumpTarget); } - }); + }, this)); - cdiv.querySelectorAll('.references').forEach(function(rspan) { + cdiv.querySelectorAll('.references').forEach(L.bind(function(rspan) { var refs = chain_refs[cdiv.getAttribute('data-chain')]; if (refs && refs.length) { rspan.classList.add('cbi-tooltip-container'); rspan.appendChild(E('small', { 'class': 'cbi-tooltip ifacebadge', 'style': 'top:1em; left:auto' }, [ E('ul') ])); - refs.forEach(function(ref) { + refs.forEach(L.bind(function(ref) { var chain = ref[0].parentNode.getAttribute('data-chain'), num = ref[1]; @@ -235,19 +199,136 @@ function parse_output(table, s) E('span', { 'class': 'jump', 'data-num': num, - 'onclick': 'jump_target(event)' + 'click': this.handleJumpTarget }, chain), ', %s #%d'.format(_('Rule'), num) ])); - }); + }, this)); + } + }, this)); + }, this)); + }, + + pollFirewallLists: function(has_ip6tables) { + var cmds = [ '/usr/sbin/iptables' ]; + + if (has_ip6tables) + cmds.push('/usr/sbin/ip6tables'); + + L.Poll.add(L.bind(function() { + var tasks = []; + + for (var i = 0; i < cmds.length; i++) { + for (var j = 0; j < table_names.length; j++) { + tasks.push(L.resolveDefault( + fs.exec_direct(cmds[i], [ '--line-numbers', '-w', '-nvxL', '-t', table_names[j].toLowerCase() ]) + .then(this.parseIptablesDump.bind(this, i > 0, table_names[j])))); + } + } + + return Promise.all(tasks); + }, this)); + }, + + handleJumpTarget: function(ev) { + var link = ev.target, + table = findParent(link, '[data-table]').getAttribute('data-table'), + chain = link.textContent, + num = +link.getAttribute('data-num'), + elem = document.getElementById('rule_%s_%s'.format(table.toLowerCase(), chain)); + + if (elem) { + (document.documentElement || document.body.parentNode || document.body).scrollTop = elem.offsetTop - 40; + elem.classList.remove('flash'); + void elem.offsetWidth; + elem.classList.add('flash'); + + if (num) { + var rule = elem.nextElementSibling.childNodes[num]; + if (rule) { + rule.classList.remove('flash'); + void rule.offsetWidth; + rule.classList.add('flash'); } + } + } + }, + + handleHideEmpty: function(ev) { + var btn = ev.currentTarget, + hide = (btn.getAttribute('data-hide-empty') === 'false'); + + btn.setAttribute('data-hide-empty', hide); + btn.firstChild.data = hide ? _('Show empty chains') : _('Hide empty chains'); + btn.blur(); + + document.querySelectorAll('[data-chain][data-empty="true"]') + .forEach(function(chaintable) { + chaintable.style.display = hide ? 'none' : ''; }); - }); -} - -table_names.forEach(function(table) { - L.poll(5, L.url('admin/status/iptables_dump', current_mode, table.toLowerCase()), null, - function (xhr) { - parse_output(table, xhr.responseText); - }); + }, + + handleCounterReset: function(has_ip6tables, ev) { + return Promise.all([ + fs.exec('/usr/sbin/iptables', [ '-Z' ]) + .catch(function(err) { ui.addNotification(null, E('p', {}, _('Unable to reset iptables counters: %s').format(err.message))) }), + has_ip6tables ? fs.exec('/usr/sbin/ip6tables', [ '-Z' ]) + .catch(function(err) { ui.addNotification(null, E('p', {}, _('Unable to reset ip6tables counters: %s').format(err.message))) }) : null + ]); + }, + + handleRestart: function(ev) { + return fs.exec_direct('/etc/init.d/firewall', [ 'restart' ]) + .catch(function(err) { ui.addNotification(null, E('p', {}, _('Unable to restart firewall: %s').format(err.message))) }); + }, + + render: function(has_ip6tables) { + var view = E([], [ + E('style', { 'type': 'text/css' }, [ + '.cbi-tooltip-container, span.jump { border-bottom:1px dotted #00f;cursor:pointer }', + 'ul { list-style:none }', + '.references { position:relative }', + '.references .cbi-tooltip { left:0!important;top:1.5em!important }', + 'h4>span { font-size:90% }' + ]), + + E('h2', {}, [ _('Firewall Status') ]), + E('div', { 'class': 'right', 'style': 'margin-bottom:-1.5em' }, [ + E('button', { + 'class': 'cbi-button', + 'data-hide-empty': false, + 'click': ui.createHandlerFn(this, 'handleHideEmpty') + }, [ _('Hide empty chains') ]), + ' ', + E('button', { + 'class': 'cbi-button', + 'click': ui.createHandlerFn(this, 'handleCounterReset', has_ip6tables) + }, [ _('Reset Counters') ]), + ' ', + E('button', { + 'class': 'cbi-button', + 'click': ui.createHandlerFn(this, 'handleRestart') + }, [ _('Restart Firewall') ]) + ]), + E('div', {}, [ + E('div', { 'data-tab': 'iptables', 'data-tab-title': has_ip6tables ? _('IPv4 Firewall') : null }, [ + E('p', {}, E('em', { 'class': 'spinning' }, [ _('Collecting data...') ])) + ]), + has_ip6tables ? E('div', { 'data-tab': 'ip6tables', 'data-tab-title': _('IPv6 Firewall') }, [ + E('p', {}, E('em', { 'class': 'spinning' }, [ _('Collecting data...') ])) + ]) : E([]) + ]) + ]); + + if (has_ip6tables) + ui.tabs.initTabGroup(view.lastElementChild.childNodes); + + this.pollFirewallLists(has_ip6tables); + + return view; + }, + + handleSaveApply: null, + handleSave: null, + handleReset: null }); diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js new file mode 100644 index 0000000000..69694bcfb3 --- /dev/null +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js @@ -0,0 +1,33 @@ +'use strict'; +'require fs'; +'require ui'; + +return L.view.extend({ + load: function() { + return fs.exec_direct('/sbin/logread', [ '-e', '^' ]).catch(function(err) { + ui.addNotification(null, E('p', {}, _('Unable to load log data: ' + err.message))); + return ''; + }); + }, + + render: function(logdata) { + var loglines = logdata.trim().split(/\n/); + + return E([], [ + E('h2', {}, [ _('System Log') ]), + E('div', { 'id': 'content_syslog' }, [ + E('textarea', { + 'id': 'syslog', + 'style': 'font-size:12px', + 'readonly': 'readonly', + 'wrap': 'off', + 'rows': loglines.length + 1 + }, [ loglines.join('\n') ]) + ]) + ]); + }, + + handleSaveApply: null, + handleSave: null, + handleReset: null +}); diff --git a/modules/luci-mod-status/luasrc/controller/admin/status.lua b/modules/luci-mod-status/luasrc/controller/admin/status.lua deleted file mode 100644 index 2684bdf715..0000000000 --- a/modules/luci-mod-status/luasrc/controller/admin/status.lua +++ /dev/null @@ -1,50 +0,0 @@ --- Copyright 2008 Steven Barth <steven@midlink.org> --- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org> --- Licensed to the public under the Apache License 2.0. - -module("luci.controller.admin.status", package.seeall) - -function action_syslog() - local syslog = luci.sys.syslog() - luci.template.render("admin_status/syslog", {syslog=syslog}) -end - -function action_dmesg() - local dmesg = luci.sys.dmesg() - luci.template.render("admin_status/dmesg", {dmesg=dmesg}) -end - -function dump_iptables(family, table) - local prefix = (family == "6") and "ip6" or "ip" - local ok, lines = pcall(io.lines, "/proc/net/%s_tables_names" % prefix) - if ok and lines then - local s - for s in lines do - if s == table then - luci.http.prepare_content("text/plain") - luci.sys.process.exec({ - "/usr/sbin/%stables" % prefix, "-w", "-t", table, - "--line-numbers", "-nxvL" - }, luci.http.write) - return - end - end - end - - luci.http.status(404, "No such table") - luci.http.prepare_content("text/plain") -end - -function action_iptables() - if luci.http.formvalue("zero") then - if luci.http.formvalue("family") == "6" then - luci.util.exec("/usr/sbin/ip6tables -Z") - else - luci.util.exec("/usr/sbin/iptables -Z") - end - elseif luci.http.formvalue("restart") then - luci.util.exec("/etc/init.d/firewall restart") - end - - luci.http.redirect(luci.dispatcher.build_url("admin/status/iptables")) -end diff --git a/modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm b/modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm deleted file mode 100644 index 1a8770ef88..0000000000 --- a/modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm +++ /dev/null @@ -1,12 +0,0 @@ -<%# - Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> - Licensed to the public under the Apache License 2.0. --%> - -<%+header%> -<h2 name="content"><%:Kernel Log%></h2> -<div id="content_syslog"> -<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-status/luasrc/view/admin_status/iptables.htm b/modules/luci-mod-status/luasrc/view/admin_status/iptables.htm deleted file mode 100644 index 89f229f3ba..0000000000 --- a/modules/luci-mod-status/luasrc/view/admin_status/iptables.htm +++ /dev/null @@ -1,73 +0,0 @@ -<%# - Copyright 2008-2009 Steven Barth <steven@midlink.org> - Copyright 2008-2018 Jo-Philipp Wich <jo@mein.io> - Licensed to the public under the Apache License 2.0. --%> - -<%- - local fs = require "nixio.fs" - local has_ip6tables = fs.access("/usr/sbin/ip6tables") - local mode = 4 - - if has_ip6tables then - mode = luci.dispatcher.context.requestpath - mode = tonumber(mode[#mode] ~= "iptables" and mode[#mode]) or 4 - end --%> - -<%+header%> - -<style type="text/css"> - span.jump, .cbi-tooltip-container { - border-bottom: 1px dotted blue; - cursor: pointer; - } - - ul { - list-style: none; - } - - .references { - position: relative; - } - - .references .cbi-tooltip { - left: 0 !important; - top: 1.5em !important; - } - - h4 > span { - font-size: 90%; - } -</style> - -<h2 name="content"><%:Firewall Status%></h2> - -<% if has_ip6tables then %> -<ul class="cbi-tabmenu"> - <li data-mode="4" class="cbi-tab<%= mode ~= 4 and "-disabled" %>"> - <a href="<%=url("admin/status/iptables/4")%>"><%:IPv4 Firewall%></a> - </li> - <li data-mode="6" class="cbi-tab<%= mode ~= 6 and "-disabled" %>"> - <a href="<%=url("admin/status/iptables/6")%>"><%:IPv6 Firewall%></a> - </li> -</ul> -<% end %> - -<div style="position: relative"> - <form method="post" action="<%=url("admin/status/iptables_action")%>" style="position: absolute; right: 0"> - <input type="hidden" name="token" value="<%=token%>" /> - <input type="hidden" name="family" value="<%=mode%>" /> - <input type="button" class="cbi-button" data-hide-empty="false" value="<%:Hide empty chains%>" onclick="hide_empty(this)" /> - <input type="submit" class="cbi-button" name="zero" value="<%:Reset Counters%>" /> - <input type="submit" class="cbi-button" name="restart" value="<%:Restart Firewall%>" /> - </form> -</div> - -<div id="iptables"> - <p><em class="spinning"><%:Collecting data...%></em></p> -</div> - -<script type="text/javascript" src="<%=resource%>/view/status/iptables.js"></script> - -<%+footer%> diff --git a/modules/luci-mod-status/luasrc/view/admin_status/syslog.htm b/modules/luci-mod-status/luasrc/view/admin_status/syslog.htm deleted file mode 100644 index fb734a76d9..0000000000 --- a/modules/luci-mod-status/luasrc/view/admin_status/syslog.htm +++ /dev/null @@ -1,12 +0,0 @@ -<%# - Copyright 2008 Steven Barth <steven@midlink.org> - Copyright 2008 Jo-Philipp Wich <jow@openwrt.org> - Licensed to the public under the Apache License 2.0. --%> - -<%+header%> -<h2 name="content"><%:System Log%></h2> -<div id="content_syslog"> -<textarea style="font-size: 12px;" readonly="readonly" wrap="off" rows="<%=syslog:cmatch("\n")+2%>" id="syslog"><%=syslog:pcdata()%></textarea> -</div> -<%+footer%> diff --git a/modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json b/modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json index 03f7dce3b9..5b53b12d39 100644 --- a/modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json +++ b/modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json @@ -8,28 +8,12 @@ } }, - "admin/status/iptables/*": { + "admin/status/iptables": { "title": "Firewall", "order": 2, "action": { - "type": "template", - "path": "admin_status/iptables" - } - }, - - "admin/status/iptables_dump/*": { - "action": { - "type": "call", - "module": "luci.controller.admin.status", - "function": "dump_iptables" - } - }, - - "admin/status/iptables_action/*": { - "action": { - "type": "call", - "module": "luci.controller.admin.status", - "function": "action_iptables" + "type": "view", + "path": "status/iptables" } }, @@ -46,9 +30,8 @@ "title": "System Log", "order": 4, "action": { - "type": "call", - "module": "luci.controller.admin.status", - "function": "action_syslog" + "type": "view", + "path": "status/syslog" } }, @@ -56,9 +39,8 @@ "title": "Kernel Log", "order": 5, "action": { - "type": "call", - "module": "luci.controller.admin.status", - "function": "action_dmesg" + "type": "view", + "path": "status/dmesg" } }, @@ -117,13 +99,5 @@ "type": "view", "path": "status/connections" } - }, - - "admin/status/nameinfo/*": { - "action": { - "type": "call", - "module": "luci.controller.admin.status", - "function": "action_nameinfo" - } } } diff --git a/themes/luci-theme-rosy/Makefile b/themes/luci-theme-rosy/Makefile index def973da74..a6e9f99ca9 100755 --- a/themes/luci-theme-rosy/Makefile +++ b/themes/luci-theme-rosy/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Rosy Theme -LUCI_DEPENDS:= +LUCI_DEPENDS:=@BROKEN include ../../luci.mk |