diff options
22 files changed, 27 insertions, 27 deletions
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-app.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-app.lua index 72685b011..ac64754cb 100644 --- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-app.lua +++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-app.lua @@ -153,7 +153,7 @@ app_lookupblacklist:value("no", "Do Not Load") app_lookupblacklist:value("auto", "Load as Required") app_lookupblacklist.rmempty = true -app_lookupcidname = module:option(ListValue, "app_lookupcidname", "Look up CallerID Name from local databas", "") +app_lookupcidname = module:option(ListValue, "app_lookupcidname", "Look up CallerID Name from local database", "") app_lookupcidname:value("yes", "Load") app_lookupcidname:value("no", "Do Not Load") app_lookupcidname:value("auto", "Load as Required") diff --git a/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js b/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js index 60f586ded..e7d2eca39 100644 --- a/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js +++ b/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js @@ -128,7 +128,7 @@ function ubus_call(command, argument, params, variable) { } } } else { - error_box("<b>Ubus call faild:</b><br />Request: " + request_json + "<br />Response: " + JSON.stringify(response)) + error_box("<b>Ubus call failed:</b><br />Request: " + request_json + "<br />Response: " + JSON.stringify(response)) } ubus_closed++; } @@ -170,7 +170,7 @@ function upgrade_check() { function upgrade_check_callback(request_text) { var request_json = JSON.parse(request_text) - // create simple output to tell user whats going to be upgrade (release/packages) + // create simple output to tell user what's going to be upgrade (release/packages) var info_output = "" if(request_json.version != undefined) { info_output += "<h3>New firmware release available</h3>" @@ -201,7 +201,7 @@ function upgrade_request() { // Request the image // Needed values // version/release - // board_name or model (server tries to find the corrent profile) + // board_name or model (server tries to find the correct profile) // packages // The rest is added by server_request() $("#upgrade_button").disabled = true; @@ -386,7 +386,7 @@ function server_request(request_dict, path, callback) { error_box(error_box_content) } else if (request.status === 501) { - error_box("No sysupgrade file produced, may not supported by modell.") + error_box("No sysupgrade file produced, may not supported by model.") } else if (request.status === 502) { // python part offline diff --git a/applications/luci-app-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua b/applications/luci-app-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua index b09c237ca..b56305482 100644 --- a/applications/luci-app-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua +++ b/applications/luci-app-freifunk-policyrouting/luasrc/model/cbi/freifunk/policyrouting.lua @@ -4,7 +4,7 @@ local uci = require "luci.model.uci".cursor() m = Map("freifunk-policyrouting", translate("Policy Routing"), translate("These pages can be used to setup policy routing for certain firewall zones. ".. - "This is useful if you need to use your own internet connection for yourself but you don't want to share it with others (thats why it can also be ".. + "This is useful if you need to use your own internet connection for yourself but you don't want to share it with others (that's why it can also be ".. "called 'Ego Mode'). Your own traffic is then sent via your internet connection while traffic originating from the mesh will use another gateway in the mesh. ")) m:chain("network") 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 d89ab27c2..ad77a9022 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 @@ -74,7 +74,7 @@ quality = s:taboption(this_tab, Value, "quality", translate("JPEG compression qu 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.datatype = "uinteger" -no_dynctrl = s:taboption(this_tab, Flag, "no_dynctrl", translate("Don't initalize dynctrls"), translate("Do not initalize dynctrls of Linux-UVC driver")) +no_dynctrl = s:taboption(this_tab, Flag, "no_dynctrl", translate("Don't initialize dynctrls"), translate("Do not initialize dynctrls of Linux-UVC driver")) led = s:taboption(this_tab, ListValue, "led", translate("Led control")) led:value("on", translate("On")) @@ -206,7 +206,7 @@ folder=s:taboption(this_tab, Value, "folder", translate("Folder"), translate("Se --mjpeg=s:taboption(this_tab, Value, "mjpeg", translate("Mjpeg output"), translate("Check to save the stream to an mjpeg file")) -delay=s:taboption(this_tab, Value, "delay", translate("Interval between saving pictures"), translate("Set the inteval in millisecond")) +delay=s:taboption(this_tab, Value, "delay", translate("Interval between saving pictures"), translate("Set the interval in millisecond")) delay.placeholder="5000" delay.datatype = "uinteger" diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua index a075bcf26..90a615699 100644 --- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua +++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua @@ -259,7 +259,7 @@ function lqmult.validate(self, value) local host = val[1] local mult = val[2] if not host or not mult then - return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) seperated by space.") + return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) separated by space.") end if not (host == "default" or ip.IPv4(host) or ip.IPv6(host)) then return nil, translate("Can only be a valid IPv4 or IPv6 address or 'default'") diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua index 0007e673e..0206b67dc 100644 --- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua +++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua @@ -253,7 +253,7 @@ function lqmult.validate(self, value) local host = val[1] local mult = val[2] if not host or not mult then - return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) seperated by space.") + return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) separated by space.") end if not (host == "default" or ip.IPv6(host)) then return nil, translate("Can only be a valid IPv6 address or 'default'") diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua index d6b7cd16a..7de2ad9b4 100644 --- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua +++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua @@ -84,7 +84,7 @@ function lqmult.validate(self, value) local host = val[1] local mult = val[2] if not host or not mult then - return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) seperated by space.") + return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) separated by space.") end if not (host == "default" or ip.IPv4(host) or ip.IPv6(host)) then return nil, translate("Can only be a valid IPv4 or IPv6 address or 'default'") diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua index 2f0fa6c38..00f242df1 100644 --- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua +++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua @@ -84,7 +84,7 @@ function lqmult.validate(self, value) local host = val[1] local mult = val[2] if not host or not mult then - return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) seperated by space.") + return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) separated by space.") end if not (host == "default" or ip.IPv6(host)) then return nil, translate("Can only be a valid IPv6 address or 'default'") diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua index 71c66562e..a0d007927 100644 --- a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua +++ b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua @@ -9,7 +9,7 @@ local m, s m = Map("shadowsocks-libev", translate("Remote Servers"), translate("Definition of remote shadowsocks servers. \ - Disable any of them will also disable instances refering to it.")) + Disable any of them will also disable instances referring to it.")) local sname = arg[1] if sname then diff --git a/applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua b/applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua index 4d1c140b0..0bbedaa9d 100644 --- a/applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua +++ b/applications/luci-app-siitwizard/luasrc/controller/siitwizard.lua @@ -5,5 +5,5 @@ module "luci.controller.siitwizard" function index() - entry({"admin", "network", "siitwizard"}, form("siitwizard"), "SIIT 4over6 assistent", 99) + entry({"admin", "network", "siitwizard"}, form("siitwizard"), "SIIT 4over6 assistant", 99) end diff --git a/applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua b/applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua index c09d2e0f7..bd88e8a6e 100644 --- a/applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua +++ b/applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua @@ -2,7 +2,7 @@ require("luci.model.uci") -m = Map("luci_splash", translate("Client-Splash"), translate("Client-Splash is a hotspot authentification system for wireless mesh networks.")) +m = Map("luci_splash", translate("Client-Splash"), translate("Client-Splash is a hotspot authentication system for wireless mesh networks.")) s = m:section(NamedSection, "general", "core", translate("General")) s.addremove = false diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua index dc3d3fb2b..d336a7e51 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/disk.lua @@ -4,7 +4,7 @@ m = Map("luci_statistics", translate("Disk Plugin Configuration"), translate( - "The disk plugin collects detailled usage statistics " .. + "The disk plugin collects detailed usage statistics " .. "for selected partitions or whole disks." )) diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua index 29b998b87..dafcc452c 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/dns.lua @@ -7,7 +7,7 @@ require("luci.sys") m = Map("luci_statistics", translate("DNS Plugin Configuration"), translate( - "The dns plugin collects detailled statistics about dns " .. + "The dns plugin collects detailed statistics about dns " .. "related traffic on selected interfaces." )) diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua index 48e0ec2d7..9c8e3e188 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua @@ -51,8 +51,8 @@ notify = m:section( TypedSection, "collectd_exec_notify", translate( "Here you can define external commands which will be " .. "started by collectd when certain threshold values have " .. - "been reached. The values leading to invokation will be " .. - "feeded to the the called programs stdin." + "been reached. The values leading to invocation will be " .. + "fed to the the called programs stdin." )) notify.addremove = true notify.anonymous = true diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua index aa469843e..ded3f7f99 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua @@ -19,7 +19,7 @@ m = Map("luci_statistics", translate("Iptables Plugin Configuration"), translate( "The iptables plugin will monitor selected firewall rules and " .. - "collect informations about processed bytes and packets per rule." + "collect information about processed bytes and packets per rule." )) -- collectd_iptables config section diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua index 917abd0c4..66449ec46 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua @@ -9,7 +9,7 @@ local devices = luci.sys.net.devices() m = Map("luci_statistics", translate("Netlink Plugin Configuration"), translate( - "The netlink plugin collects extended informations like " .. + "The netlink plugin collects extended information like " .. "qdisc-, class- and filter-statistics for selected interfaces." )) diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua index 4171a886b..c0a18a9c1 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua @@ -4,7 +4,7 @@ m = Map("luci_statistics", translate("Processes Plugin Configuration"), translate( - "The processes plugin collects informations like cpu time, " .. + "The processes plugin collects information like cpu time, " .. "page faults and memory usage of selected processes." )) diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua index 3c650180a..a02b2be4f 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua @@ -4,7 +4,7 @@ m = Map("luci_statistics", translate("TCPConns Plugin Configuration"), translate( - "The tcpconns plugin collects informations about open tcp " .. + "The tcpconns plugin collects information about open tcp " .. "connections on selected ports." )) diff --git a/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua b/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua index 11f34fbad..e38dec4b9 100644 --- a/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua +++ b/applications/luci-app-tinyproxy/luasrc/model/cbi/tinyproxy.lua @@ -216,7 +216,7 @@ s.addremove = true t = s:option(ListValue, "type", translate("Policy"), - translate("<em>Via proxy</em> routes requests to the given target via the specifed upstream proxy, <em>Reject access</em> disables any upstream proxy for the target")) + translate("<em>Via proxy</em> routes requests to the given target via the specified upstream proxy, <em>Reject access</em> disables any upstream proxy for the target")) t:value("proxy", translate("Via proxy")) t:value("reject", translate("Reject access")) diff --git a/applications/luci-app-unbound/luasrc/controller/unbound.lua b/applications/luci-app-unbound/luasrc/controller/unbound.lua index 734476aca..5e1962184 100644 --- a/applications/luci-app-unbound/luasrc/controller/unbound.lua +++ b/applications/luci-app-unbound/luasrc/controller/unbound.lua @@ -158,7 +158,7 @@ function QueryCacheDump() "unbound-control -c /var/lib/unbound/unbound.conf dump_cache") local lcldesc = luci.i18n.translate( - "This shows Unbound 'cache_dump'. Usefull to check if unbound is actually caching dns entities.") + "This shows Unbound 'cache_dump'. Useful to check if unbound is actually caching dns entities.") luci.template.render("unbound/show-textbox", {heading = "", description = lcldesc, content = lcldata}) diff --git a/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua b/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua index 07730225b..61a94ca5d 100644 --- a/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua +++ b/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua @@ -239,7 +239,7 @@ function force_wifi.validate(self, value, d) if fs.access("/usr/bin/iwinfo") then return value else - return nil, translate("Could not find required programm /usr/bin/iwinfo") + return nil, translate("Could not find required program /usr/bin/iwinfo") end else return "1" diff --git a/modules/luci-base/luasrc/template.lua b/modules/luci-base/luasrc/template.lua index 588028c2e..ed46f5075 100644 --- a/modules/luci-base/luasrc/template.lua +++ b/modules/luci-base/luasrc/template.lua @@ -95,6 +95,6 @@ function Template.render(self, scope) local stat, err = util.copcall(self.template) if not stat then error("Failed to execute template '" .. self.name .. "'.\n" .. - "A runtime error occured: " .. tostring(err or "(nil)")) + "A runtime error occurred: " .. tostring(err or "(nil)")) end end |