Cosmetic changes to the terminology in the UI:

Replace references to the device running LuCI as being a "router", as that is
not necessarily the case.

5 files changed, 11 insertions, 11 deletions

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
index 15f227f93..25fd0a899 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
@@ -13,7 +13,7 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 
-m = Map("network", translate("Switch"), translate("The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."))
+m = Map("network", translate("Switch"), translate("The network ports on this device can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."))
 
 m.uci:foreach("network", "switch",
 	function(x)
diff --git a/modules/admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
index 8045f96ec..953b98839 100644
--- a/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
+++ b/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
@@ -30,7 +30,7 @@ $Id$
 		{
 			output.innerHTML =
 				'<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> ' +
-				'<%:Waiting for router...%>'
+				'<%:Waiting for command to complete...%>'
 			;
 
 			legend.parentNode.style.display = 'block';
diff --git a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm b/modules/admin-full/luasrc/view/admin_network/iface_overview.htm
index 545d1386d..9580a9dca 100644
--- a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/iface_overview.htm
@@ -40,7 +40,7 @@ You may obtain a copy of the License at
 <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
 <script type="text/javascript">//<![CDATA[
 	function iface_shutdown(id, reconnect) {
-		if (!reconnect && !confirm(String.format('<%_Really shutdown interface "%s" ?\nYou might lose access to this router if you are connected via this interface.%>', id)))
+		if (!reconnect && !confirm(String.format('<%_Really shutdown interface "%s" ?\nYou might lose access to this device if you are connected via this interface.%>', id)))
 			return;
 
 		var d = document.getElementById(id + '-ifc-description');
@@ -53,7 +53,7 @@ You may obtain a copy of the License at
 		if (s)
 		{
 			s.parentNode.style.display = 'block';
-			s.innerHTML = '<%:Waiting for router...%>';
+			s.innerHTML = '<%:Waiting for changes to be applied...%>';
 		}
 
 		XHR.get('<%=luci.dispatcher.build_url("admin", "network")%>/iface_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, null,
@@ -209,7 +209,7 @@ You may obtain a copy of the License at
 <fieldset class="cbi-section" style="display:none">
 	<legend><%:Reconnecting interface%></legend>
 	<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
-	<span id="ifc-rc-status"><%:Waiting for router...%></span>
+	<span id="ifc-rc-status"><%:Waiting for changes to be applied...%></span>
 </fieldset>
 
 <div class="cbi-map">
@@ -247,7 +247,7 @@ You may obtain a copy of the License at
 						<input type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', true)" title="<%:Reconnect this interface%>" value="<%:Connect%>" />
 						<input type="button" class="cbi-button cbi-button-reset" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', false)" title="<%:Shutdown this interface%>" value="<%:Stop%>" />
 						<input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=luci.dispatcher.build_url("admin/network/network", net[1])%>'" title="<%:Edit this interface%>" value="<%:Edit%>" id="<%=net[1]%>-ifc-edit" />
-						<input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="if (confirm('<%:Really delete this interface? The deletion cannot be undone!\nYou might lose access to this router if you are connected via this interface.%>')) location.href='<%=luci.dispatcher.build_url("admin/network/iface_delete", net[1])%>'" title="<%:Delete this interface%>" value="<%:Delete%>" />
+						<input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="if (confirm('<%:Really delete this interface? The deletion cannot be undone!\nYou might lose access to this device if you are connected via this interface.%>')) location.href='<%=luci.dispatcher.build_url("admin/network/iface_delete", net[1])%>'" title="<%:Delete this interface%>" value="<%:Delete%>" />
 					</td>
 				</tr>
 			<% end %>
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 22d27cb1c..4ba01a5d1 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -127,7 +127,7 @@ $Id$
 	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 router if you are connected via this interface.%>')))
+		if (!reconnect && !confirm(String.format('<%:Really shutdown network ?\nYou might lose access to this device if you are connected via this interface.%>')))
 			return;
 
 		is_reconnecting = true;
@@ -136,7 +136,7 @@ $Id$
 		if (s)
 		{
 			s.parentNode.style.display = 'block';
-			s.innerHTML = '<%:Waiting for router...%>';
+			s.innerHTML = '<%:Waiting for changes to be applied...%>';
 		}
 
 		for (var net in wifidevs)
@@ -350,7 +350,7 @@ $Id$
 <fieldset class="cbi-section" style="display:none">
 	<legend><%:Reconnecting interface%></legend>
 	<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
-	<span id="iw-rc-status"><%:Waiting for router...%></span>
+	<span id="iw-rc-status"><%:Waiting for changes to be applied...%></span>
 </fieldset>
 
 <div class="cbi-map">
@@ -388,7 +388,7 @@ $Id$
 					<td class="cbi-value-field" style="width:310px;text-align:right">
 						<input id="<%=net:id()%>-iw-toggle" type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="wifi_shutdown('<%=net:id()%>', this)" title="<%:Delete this network%>" value="<%:Enable%>" />
 						<input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=net:adminlink()%>'" title="<%:Edit this network%>" value="<%:Edit%>" />
-						<input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="if (confirm('<%:Really delete this wireless network? The deletion cannot be undone!\nYou might lose access to this router if you are connected via this network.%>')) location.href='<%=luci.dispatcher.build_url("admin/network/wireless_delete", net:ifname())%>'" title="<%:Delete this network%>" value="<%:Remove%>" />
+						<input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="if (confirm('<%:Really delete this wireless network? The deletion cannot be undone!\nYou might lose access to this device if you are connected via this network.%>')) location.href='<%=luci.dispatcher.build_url("admin/network/wireless_delete", net:ifname())%>'" title="<%:Delete this network%>" value="<%:Remove%>" />
 					</td>
 				</tr>
 				<% end %>
diff --git a/modules/admin-full/luasrc/view/admin_system/applyreboot.htm b/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
index 4f06b287d..866d213f0 100644
--- a/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
+++ b/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
@@ -41,7 +41,7 @@ $Id$
 					</p>
 					<p>
 						<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
-						<%:Waiting for router...%>
+						<%:Waiting for changes to be applied...%>
 					</p>
 				</fieldset>
 			</div>