[OpenWrt-Devel] [PATCH] [luci] Improve spelling and grammar

Alex Henrie alexhenrie24 at gmail.com
Thu Jul 24 15:52:42 EDT 2014


Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
 applications/luci-ahcp/luasrc/model/cbi/ahcp.lua                  | 2 +-
 .../luci-firewall/luasrc/model/cbi/firewall/zone-details.lua      | 2 +-
 .../luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua      | 2 +-
 applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua | 8 ++++----
 applications/luci-wol/luasrc/model/cbi/wol.lua                    | 2 +-
 applications/luci-wshaper/luasrc/model/cbi/wshaper.lua            | 2 +-
 modules/admin-full/luasrc/controller/admin/system.lua             | 2 +-
 modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua        | 2 +-
 modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua      | 2 +-
 modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua        | 2 +-
 modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua    | 2 +-
 modules/admin-full/luasrc/model/cbi/admin_system/system.lua       | 2 +-
 modules/admin-full/luasrc/view/admin_network/wifi_overview.htm    | 2 +-
 modules/admin-full/luasrc/view/admin_system/flashops.htm          | 2 +-
 modules/admin-full/luasrc/view/admin_system/upgrade.htm           | 2 +-
 modules/admin-mini/luasrc/view/mini/upgrade.htm                   | 4 ++--
 modules/failsafe/luasrc/controller/failsafe/failsafe.lua          | 2 +-
 modules/failsafe/luasrc/view/failsafe/flashops.htm                | 2 +-
 modules/failsafe/luasrc/view/failsafe/upgrade.htm                 | 2 +-
 19 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/applications/luci-ahcp/luasrc/model/cbi/ahcp.lua b/applications/luci-ahcp/luasrc/model/cbi/ahcp.lua
index 18764a1..a48f8b4 100644
--- a/applications/luci-ahcp/luasrc/model/cbi/ahcp.lua
+++ b/applications/luci-ahcp/luasrc/model/cbi/ahcp.lua
@@ -14,7 +14,7 @@ $Id: init.lua 5764 2010-03-08 19:05:34Z jow $
 
 m = Map("ahcpd", translate("AHCP Server"), translate("AHCP is an autoconfiguration protocol " ..
 	"for IPv6 and dual-stack IPv6/IPv4 networks designed to be used in place of router " ..
-	"discovery and DHCP on networks where it is difficult or impossible to configure a " ..
+	"discovery or DHCP on networks where it is difficult or impossible to configure a " ..
 	"server within every link-layer broadcast domain, for example mobile ad-hoc networks."))
 
 
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
index a3b1a6e..e5bcb34 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
+++ b/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
@@ -50,7 +50,7 @@ s = m:section(NamedSection, zone.sid, "zone",
 		<em>forward</em> option describes the policy for forwarded traffic \
 		between different networks within the zone. \
 		<em>Covered networks</em> specifies which available networks are \
-		member of this zone.", zone:name()))
+		members of this zone.", zone:name()))
 
 s.anonymous = true
 s.addremove = false
diff --git a/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua b/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
index 8cb0822..68f7a5a 100644
--- a/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
+++ b/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
@@ -22,7 +22,7 @@ n.anonymous = true
 
 function cbi_configure(device)
 	local configure = n:taboption(device, Flag, device .. "_config", translate("Configure this interface"),
-		translate("Note: this will setup this interface for mesh operation, i.e. add to zone 'freifunk' and enable olsr."))
+		translate("Note: this will set up this interface for mesh operation, i.e. add it to zone 'freifunk' and enable olsr."))
 end
 
 function cbi_ip4addr(device)
diff --git a/applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua b/applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua
index 9f47bca..bcaf438 100644
--- a/applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua
+++ b/applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua
@@ -14,8 +14,8 @@ $Id$
 
 m = Map("system", 
 	translate("Watchcat"), 
-	translate("Watchcat allows to configure a periodic reboot and/or when " ..
-		  "internet connection has been lost for a certain period of time."  
+	translate("Watchcat allows configuring a periodic reboot when the " ..
+		  "Internet connection has been lost for a certain period of time."
 		 ))
 
 s = m:section(TypedSection, "watchcat")
@@ -30,8 +30,8 @@ mode:value("allways", "Periodic reboot")
 
 forcedelay = s:option(Value, "forcedelay",
 		      translate("Forced reboot delay"),
-		      translate("When rebooting the system the watchcat will trigger a soft reboot, " ..
-				"Entering a non zero value here, will trigger a delayed hard reboot " ..
+		      translate("When rebooting the system, the watchcat will trigger a soft reboot. " ..
+				"Entering a non zero value here will trigger a delayed hard reboot " ..
 				"if the soft reboot fails. Enter a number of seconds to enable, " ..
 				"use 0 to disable"))
 forcedelay.datatype = "uinteger"
diff --git a/applications/luci-wol/luasrc/model/cbi/wol.lua b/applications/luci-wol/luasrc/model/cbi/wol.lua
index d683b6e..ece9e49 100644
--- a/applications/luci-wol/luasrc/model/cbi/wol.lua
+++ b/applications/luci-wol/luasrc/model/cbi/wol.lua
@@ -28,7 +28,7 @@ s = m:section(SimpleSection)
 
 if has_ewk and has_wol then
 	bin = s:option(ListValue, "binary", translate("WoL program"),
-		translate("Sometimes only one of both tools work. If one of fails, try the other one"))
+		translate("Sometimes only one of the two tools works. If one fails, try the other one"))
 
 	bin:value("/usr/bin/etherwake", "Etherwake")
 	bin:value("/usr/bin/wol", "WoL")
diff --git a/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua b/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua
index 81225ce..faa64f6 100644
--- a/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua
+++ b/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua
@@ -13,7 +13,7 @@ You may obtain a copy of the License at
 require("luci.tools.webadmin")
 
 m = Map("wshaper", translate("Wondershaper"),
-	translate("Wondershaper uses traffic shaping to ensure low latencies for interactive traffic even when your " ..
+	translate("Wondershaper shapes traffic to ensure low latencies for interactive traffic even when your " ..
 	"internet connection is highly saturated."))
 
 s = m:section(NamedSection, "settings", "wshaper", translate("Wondershaper settings"))
diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 55ad01c..5fa4c3a 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 5817908..bd6f403 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 247ddbf..9be5ff1 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 4ae2f77..5a5efa9 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 5b646d9..cb42648 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 3a884c4..5e82289 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 97d900d..d528876 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 0ba22a5..debc796 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 69fde9a..ce28533 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 %>
diff --git a/modules/admin-mini/luasrc/view/mini/upgrade.htm b/modules/admin-mini/luasrc/view/mini/upgrade.htm
index 1083a16..6ff5d84 100644
--- a/modules/admin-mini/luasrc/view/mini/upgrade.htm
+++ b/modules/admin-mini/luasrc/view/mini/upgrade.htm
@@ -59,7 +59,7 @@ $Id$
 
 		<% if flashsize > 0 and filesize > flashsize 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 %>
@@ -95,7 +95,7 @@ $Id$
 <% elseif step == 3 then %>
 	<p><%_ The system is flashing now.<br />
 		DO NOT POWER OFF THE DEVICE!<br />
-		Wait a few minutes until you try to reconnect.
+		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. %></p>
 		
diff --git a/modules/failsafe/luasrc/controller/failsafe/failsafe.lua b/modules/failsafe/luasrc/controller/failsafe/failsafe.lua
index 1da3438..db4bda6 100644
--- a/modules/failsafe/luasrc/controller/failsafe/failsafe.lua
+++ b/modules/failsafe/luasrc/controller/failsafe/failsafe.lua
@@ -132,7 +132,7 @@ function action_flashops()
 			local keep = (luci.http.formvalue("keep") == "1") and "" or "-n"
 			luci.template.render("failsafe/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/failsafe/luasrc/view/failsafe/flashops.htm b/modules/failsafe/luasrc/view/failsafe/flashops.htm
index accbba0..5ff23e5 100644
--- a/modules/failsafe/luasrc/view/failsafe/flashops.htm
+++ b/modules/failsafe/luasrc/view/failsafe/flashops.htm
@@ -36,7 +36,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/failsafe/luasrc/view/failsafe/upgrade.htm b/modules/failsafe/luasrc/view/failsafe/upgrade.htm
index 66f6457..7a86000 100644
--- a/modules/failsafe/luasrc/view/failsafe/upgrade.htm
+++ b/modules/failsafe/luasrc/view/failsafe/upgrade.htm
@@ -25,7 +25,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 %>
-- 
1.9.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list