summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-olsr/luasrc
diff options
context:
space:
mode:
Diffstat (limited to 'applications/luci-app-olsr/luasrc')
-rw-r--r--applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua10
-rw-r--r--applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua10
-rw-r--r--applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua2
-rw-r--r--applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua2
-rw-r--r--applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua4
-rw-r--r--applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua4
-rw-r--r--applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm4
7 files changed, 18 insertions, 18 deletions
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 90a615699a..bc04dbdc9f 100644
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -71,9 +71,9 @@ tos.placeholder = "16"
fib = s:taboption("general", ListValue, "FIBMetric", translate("FIB metric"),
translate ("FIBMetric controls the metric value of the host-routes OLSRd sets. "..
"\"flat\" means that the metric value is always 2. This is the preferred value "..
- "because it helps the linux kernel routing to clean up older routes. "..
+ "because it helps the Linux kernel routing to clean up older routes. "..
"\"correct\" uses the hopcount as the metric value. "..
- "\"approx\" use the hopcount as the metric value too, but does only update the hopcount if the nexthop changes too. "..
+ "\"approx\" uses the hopcount as the metric value too, but does only update the hopcount if the nexthop changes too. "..
"Default is \"flat\"."))
fib:value("flat")
fib:value("correct")
@@ -144,7 +144,7 @@ sgw.enabled="yes"
sgw.disabled="no"
sgw.rmempty = true
-sgwnat = s:taboption("smartgw", Flag, "SmartGatewayAllowNAT", translate("Allow gateways with NAT"), translate("Allow the selection of an outgoing ipv4 gateway with NAT"))
+sgwnat = s:taboption("smartgw", Flag, "SmartGatewayAllowNAT", translate("Allow gateways with NAT"), translate("Allow the selection of an outgoing IPv4 gateway with NAT"))
sgwnat:depends("SmartGateway", "yes")
sgwnat.default="yes"
sgwnat.enabled="yes"
@@ -224,8 +224,8 @@ i:tab("addrs", translate("IP Addresses"))
i:tab("timing", translate("Timing and Validity"))
mode = i:taboption("general", ListValue, "Mode", translate("Mode"),
- translate("Interface Mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
- "valid Modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
+ translate("Interface mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
+ "Valid modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
mode:value("mesh")
mode:value("ether")
mode.optional = true
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 0206b67dc0..8418a07ba6 100644
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua
@@ -65,9 +65,9 @@ tos.placeholder = "16"
fib = s:taboption("general", ListValue, "FIBMetric", translate("FIB metric"),
translate ("FIBMetric controls the metric value of the host-routes OLSRd sets. "..
"\"flat\" means that the metric value is always 2. This is the preferred value "..
- "because it helps the linux kernel routing to clean up older routes. "..
+ "because it helps the Linux kernel routing to clean up older routes. "..
"\"correct\" uses the hopcount as the metric value. "..
- "\"approx\" use the hopcount as the metric value too, but does only update the hopcount if the nexthop changes too. "..
+ "\"approx\" uses the hopcount as the metric value too, but does only update the hopcount if the nexthop changes too. "..
"Default is \"flat\"."))
fib:value("flat")
fib:value("correct")
@@ -138,7 +138,7 @@ sgw.enabled="yes"
sgw.disabled="no"
sgw.rmempty = true
-sgwnat = s:taboption("smartgw", Flag, "SmartGatewayAllowNAT", translate("Allow gateways with NAT"), translate("Allow the selection of an outgoing ipv4 gateway with NAT"))
+sgwnat = s:taboption("smartgw", Flag, "SmartGatewayAllowNAT", translate("Allow gateways with NAT"), translate("Allow the selection of an outgoing IPv4 gateway with NAT"))
sgwnat:depends("SmartGateway", "yes")
sgwnat.default="yes"
sgwnat.enabled="yes"
@@ -218,8 +218,8 @@ i:tab("addrs", translate("IP Addresses"))
i:tab("timing", translate("Timing and Validity"))
mode = i:taboption("general", ListValue, "Mode", translate("Mode"),
- translate("Interface Mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
- "valid Modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
+ translate("Interface mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
+ "Valid modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
mode:value("mesh")
mode:value("ether")
mode.optional = true
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
index e4b093aa13..230990dd0a 100644
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
@@ -5,7 +5,7 @@
local uci = require "luci.model.uci".cursor()
local ipv = uci:get_first("olsrd", "olsrd", "IpVersion", "4")
-mh = Map("olsrd", translate("OLSR - HNA-Announcements"), translate("Hosts in a OLSR routed network can announce connecitivity " ..
+mh = Map("olsrd", translate("OLSR - HNA-Announcements"), translate("Hosts in an OLSR routed network can announce connectivity " ..
"to external networks using HNA messages."))
if ipv == "6and4" or ipv == "4" then
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua
index 682421ff7a..717436b130 100644
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua
@@ -4,7 +4,7 @@
local uci = require "luci.model.uci".cursor()
-mh = Map("olsrd6", translate("OLSR - HNA6-Announcements"), translate("Hosts in a OLSR routed network can announce connecitivity " ..
+mh = Map("olsrd6", translate("OLSR - HNA6-Announcements"), translate("Hosts in an OLSR routed network can announce connectivity " ..
"to external networks using HNA6 messages."))
hna6 = mh:section(TypedSection, "Hna6", translate("Hna6"), translate("IPv6 network must be given in full notation, " ..
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 7de2ad9b44..df757c641b 100644
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua
@@ -49,8 +49,8 @@ network.widget = "radio"
network.nocreate = true
mode = i:taboption("general", ListValue, "Mode", translate("Mode"),
- translate("Interface Mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
- "valid Modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
+ translate("Interface mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
+ "Valid modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
mode:value("mesh")
mode:value("ether")
mode.optional = true
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 00f242df1b..77e423d939 100644
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua
+++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua
@@ -49,8 +49,8 @@ network.widget = "radio"
network.nocreate = true
mode = i:taboption("general", ListValue, "Mode", translate("Mode"),
- translate("Interface Mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
- "valid Modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
+ translate("Interface mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
+ "Valid modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
mode:value("mesh")
mode:value("ether")
mode.optional = true
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
index 8cd2088e42..99da8154be 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
@@ -27,7 +27,7 @@ if luci.http.formvalue("status") == "1" then
proto = gw.IPv4 and '4' or '6',
originator = gw.originator,
selected = gw.selected and luci.i18n.translate('yes') or luci.i18n.translate('no'),
- cost = gw.cost > 0 and string.format("%.3f", gw.cost) or luci.i18n.translate('infinate'),
+ cost = gw.cost > 0 and string.format("%.3f", gw.cost) or luci.i18n.translate('infinite'),
hops = gw.hops,
uplink = gw.uplink,
downlink = gw.downlink,
@@ -131,7 +131,7 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
<% end %>
<div class="td cbi-section-table-cell left"><%=gw.selected and luci.i18n.translate('yes') or luci.i18n.translate('no')%></div>
- <div class="td cbi-section-table-cell left"><%=gw.cost > 0 and string.format("%.3f", gw.cost) or luci.i18n.translate('infinate')%></div>
+ <div class="td cbi-section-table-cell left"><%=gw.cost > 0 and string.format("%.3f", gw.cost) or luci.i18n.translate('infinite')%></div>
<div class="td cbi-section-table-cell left"><%=gw.hops%></div>
<div class="td cbi-section-table-cell left"><%=gw.uplink%></div>
<div class="td cbi-section-table-cell left"><%=gw.downlink%></div>