summaryrefslogtreecommitdiffhomepage
path: root/modules/admin-full/luasrc
diff options
context:
space:
mode:
Diffstat (limited to 'modules/admin-full/luasrc')
-rw-r--r--modules/admin-full/luasrc/controller/admin/system.lua2
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua2
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua2
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua2
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua2
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_system/system.lua2
-rw-r--r--modules/admin-full/luasrc/view/admin_network/wifi_overview.htm2
-rw-r--r--modules/admin-full/luasrc/view/admin_system/flashops.htm2
-rw-r--r--modules/admin-full/luasrc/view/admin_system/upgrade.htm2
9 files changed, 9 insertions, 9 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 55ad01ca48..5fa4c3a387 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -288,7 +288,7 @@ function action_flashops()
local keep = (luci.http.formvalue("keep") == "1") and "" or "-n"
luci.template.render("admin_system/applyreboot", {
title = luci.i18n.translate("Flashing..."),
- msg = luci.i18n.translate("The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
+ msg = luci.i18n.translate("The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
addr = (#keep > 0) and "192.168.1.1" or nil
})
fork_exec("killall dropbear uhttpd; sleep 1; /sbin/sysupgrade %s %q" %{ keep, image_tmp })
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index 5817908394..bd6f403c53 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -86,7 +86,7 @@ s:taboption("advanced", Flag, "localise_queries",
s:taboption("general", Value, "local",
translate("Local server"),
- translate("Local domain specification. Names matching this domain are never forwared and resolved from DHCP or hosts files only"))
+ translate("Local domain specification. Names matching this domain are never forwarded and are resolved from DHCP or hosts files only"))
s:taboption("general", Value, "domain",
translate("Local domain"),
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index 247ddbfba6..9be5ff1a7d 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -450,7 +450,7 @@ if has_dnsmasq and net:proto() == "static" then
limit.default = "150"
local ltime = s:taboption("general", Value, "leasetime", translate("Leasetime"),
- translate("Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."))
+ translate("Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."))
ltime.rmempty = true
ltime.default = "12h"
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index 4ae2f77765..5a5efa9256 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -22,7 +22,7 @@ arg[1] = arg[1] or ""
m = Map("wireless", "",
translate("The <em>Device Configuration</em> section covers physical settings of the radio " ..
- "hardware such as channel, transmit power or antenna selection which is shared among all " ..
+ "hardware such as channel, transmit power or antenna selection which are shared among all " ..
"defined wireless networks (if the radio hardware is multi-SSID capable). Per network settings " ..
"like encryption or operation mode are grouped in the <em>Interface Configuration</em>."))
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
index 5b646d9a31..cb42648865 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
@@ -60,7 +60,7 @@ if iw and iw.mbssid_support then
function replace.cfgvalue() return "1" end
else
replace = m:field(DummyValue, "replace", translate("Replace wireless configuration"))
- replace.default = translate("The hardware is not multi-SSID capable and existing " ..
+ replace.default = translate("The hardware is not multi-SSID capable and the existing " ..
"configuration will be replaced if you proceed.")
function replace.formvalue() return "1" end
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index 3a884c4813..5e82289bd8 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -183,7 +183,7 @@ if has_ntpd then
x = s:option(Button, "_enable")
x.title = translate("Time Synchronization is not configured yet.")
- x.inputtitle = translate("Setup Time Synchronization")
+ x.inputtitle = translate("Set up Time Synchronization")
x.inputstyle = "apply"
else
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
index 97d900d5cf..d52887645c 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -134,7 +134,7 @@ You may obtain a copy of the License at
function wifi_shutdown(id, toggle) {
var reconnect = (toggle.getAttribute('active') == 'false');
- if (!reconnect && !confirm(String.format('<%:Really shutdown network ?\nYou might lose access to this device if you are connected via this interface.%>')))
+ if (!reconnect && !confirm(String.format('<%:Really shut down network?\nYou might lose access to this device if you are connected via this interface.%>')))
return;
is_reconnecting = true;
diff --git a/modules/admin-full/luasrc/view/admin_system/flashops.htm b/modules/admin-full/luasrc/view/admin_system/flashops.htm
index 0ba22a5e01..debc796e89 100644
--- a/modules/admin-full/luasrc/view/admin_system/flashops.htm
+++ b/modules/admin-full/luasrc/view/admin_system/flashops.htm
@@ -85,7 +85,7 @@ $Id$
<% end %>
</form>
<% else %>
- <div class="cbi-section-descr"><%:Sorry, there is no sysupgrade support present, a new firmware image must be flashed manually. Please refer to the OpenWrt wiki for device specific install instructions.%></div>
+ <div class="cbi-section-descr"><%:Sorry, there is no sysupgrade support present; a new firmware image must be flashed manually. Please refer to the OpenWrt wiki for device specific install instructions.%></div>
<% end %>
</fieldset>
diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index 69fde9a683..ce285332eb 100644
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -24,7 +24,7 @@ $Id$
<% if storage > 0 and size > storage then %>
<br /><br />
- <div class="error"><%:It appears that you try to
+ <div class="error"><%:It appears that you are trying to
flash an image that does not fit into the flash memory, please verify
the image file! %></div>
<% end %>