Changeset 8847

Timestamp:

07/01/12 21:05:05 (12 months ago)

Author:

dgolle

Message:

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.

Location:

luci/trunk/modules

Files:

• admin-full/luasrc/model/cbi/admin_network/vlan.lua (modified) (1 diff)
• admin-full/luasrc/view/admin_network/diagnostics.htm (modified) (1 diff)
• admin-full/luasrc/view/admin_network/iface_overview.htm (modified) (4 diffs)
• admin-full/luasrc/view/admin_network/wifi_overview.htm (modified) (4 diffs)
• admin-full/luasrc/view/admin_system/applyreboot.htm (modified) (1 diff)
• admin-mini/luasrc/view/mini/backup.htm (modified) (2 diffs)
• admin-mini/luasrc/view/mini/index.htm (modified) (1 diff)
• niu/luasrc/model/cbi/niu/network/ddns1.lua (modified) (1 diff)
• niu/luasrc/model/cbi/niu/network/lan1.lua (modified) (1 diff)
• niu/luasrc/view/niu/network/warn_ip_change.htm (modified) (1 diff)
• niu/luasrc/view/niu/system/backup.htm (modified) (2 diffs)

luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua

@@ -14 +14 @@
 ]]--
 
-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",

luci/trunk/modules/admin-full/luasrc/view/admin_network/diagnostics.htm

@@ -31 +31 @@
             output.innerHTML =
                 '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> ' +
-                '<%:Waiting for router...%>'
+                '<%:Waiting for command to complete...%>'
             ;
 

luci/trunk/modules/admin-full/luasrc/view/admin_network/iface_overview.htm

@@ -41 +41 @@
 <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;
 
@@ -54 +54 @@
         {
             s.parentNode.style.display = 'block';
-            s.innerHTML = '<%:Waiting for router...%>';
+            s.innerHTML = '<%:Waiting for changes to be applied...%>';
         }
 
@@ -210 +210 @@
     <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>
 
@@ -248 +248 @@
                         <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>

luci/trunk/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm

@@ -128 +128 @@
         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;
 
@@ -137 +137 @@
         {
             s.parentNode.style.display = 'block';
-            s.innerHTML = '<%:Waiting for router...%>';
+            s.innerHTML = '<%:Waiting for changes to be applied...%>';
         }
 
@@ -351 +351 @@
     <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>
 
@@ -389 +389 @@
                         <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>

luci/trunk/modules/admin-full/luasrc/view/admin_system/applyreboot.htm

@@ -42 +42 @@
                     <p>
                         <img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
-                        <%:Waiting for router...%>
+                        <%:Waiting for changes to be applied...%>
                     </p>
                 </fieldset>

luci/trunk/modules/admin-mini/luasrc/view/mini/backup.htm

@@ -16 +16 @@
 <h2><a id="content" name="content"><%:System%></a></h2>
 <h3><%:Backup / Restore%></h3>
-<p><%:Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.%></p>
+<p><%:Here you can backup and restore your configuration and - if possible - reset this device to the default settings.%></p>
 <br />
 <div>
@@ -22 +22 @@
     <li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:Create backup%></a></li>
     <% if reset_avail then -%>
-    <li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:Proceed reverting all settings and resetting to firmware defaults?%>')"><%:Reset router to defaults%></a></li>
+    <li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:Proceed reverting all settings and resetting to firmware defaults?%>')"><%:Reset this device to defaults%></a></li>
     <% end -%>
     </ul>

luci/trunk/modules/admin-mini/luasrc/view/mini/index.htm

@@ -16 +16 @@
 <p><%_This is the administration area of <abbr title="Lua Configuration Interface">LuCI</abbr>.%></p>
 <p><%_<abbr title="Lua Configuration Interface">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.%><br />
-<%:On the following pages you can adjust all important settings of your router.%></p>
+<%:On the following pages you can adjust all important settings of this device.%></p>
 <p><%:As we always want to improve this interface we are looking forward to your feedback and suggestions.%></p>
-<p><%:And now have fun with your router!%></p>
+<p><%:And now have fun with your OpenWrt device!%></p>
 <p><em><strong><a href="<%=controller%>/about"><%_The <abbr title="Lua Configuration Interface">LuCI</abbr> Team%></a></strong></em></p>

luci/trunk/modules/niu/luasrc/model/cbi/niu/network/ddns1.lua

@@ -15 +15 @@
 local nxo = require "nixio"
 
-m = Map("ddns", translate("Dynamic DNS"), translate("Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."))
+m = Map("ddns", translate("Dynamic DNS"), translate("Dynamic DNS allows that this device can be reached with a fixed hostname while having a dynamically changing IP-Address."))
 
 s = m:section(TypedSection, "service", "")

luci/trunk/modules/niu/luasrc/model/cbi/niu/network/lan1.lua

@@ -25 +25 @@
 If you have a DHCP-Server in this network you may also choose DHCP for address configuration.]])
 or translate("These settings affect the devices in your local network. "..
-"Usually you do not need to change anything here for your router to work correctly."))
+"Usually you do not need to change anything here for this device to work correctly."))
 
 s = m:section(NamedSection, "lan", "interface", "Network Settings")

luci/trunk/modules/niu/luasrc/view/niu/network/warn_ip_change.htm

@@ -8 +8 @@
 
 <div style="color: red">Warning! The device IP-address has been changed.<br />
-The router will be available in a few seconds at <a href="<%=url%>"><%=url%></a></div>
+It will be available in a few seconds at <a href="<%=url%>"><%=url%></a></div>
 <br />

luci/trunk/modules/niu/luasrc/view/niu/system/backup.htm

@@ -16 +16 @@
 <h2><a id="content" name="content"><%:System%></a></h2>
 <h3><%:Backup / Restore%></h3>
-<p><%:Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.%></p>
+<p><%:Here you can backup and restore your configuration and - if possible - reset this device to the default settings.%></p>
 <br />
 <div>
@@ -22 +22 @@
     <li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:Create backup%></a></li>
     <% if reset_avail then -%>
-    <li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:Proceed reverting all settings and resetting to firmware defaults?%>')"><%:Reset router to defaults%></a></li>
+    <li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:Proceed reverting all settings and resetting to firmware defaults?%>')"><%:Reset to defaults%></a></li>
     <% end -%>
     </ul>