summaryrefslogtreecommitdiffhomepage
path: root/modules/niu/luasrc
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-10-31 15:54:11 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-10-31 15:54:11 +0000
commit7c765875884d6866c53b63757731b079bace2e9b (patch)
treedb436df0eaff7de048bca26a7e419aedeb4a08a4 /modules/niu/luasrc
parentdc7138e424dfd454951ed5ed4eeddbf842457e87 (diff)
all: change most translate statements to new format, some need manual cleanup
Diffstat (limited to 'modules/niu/luasrc')
-rw-r--r--modules/niu/luasrc/model/cbi/niu/network/assign1.lua14
-rw-r--r--modules/niu/luasrc/model/cbi/niu/network/etherwan.lua50
-rw-r--r--modules/niu/luasrc/model/cbi/niu/network/lan1.lua34
-rw-r--r--modules/niu/luasrc/model/cbi/niu/network/routes1.lua20
4 files changed, 59 insertions, 59 deletions
diff --git a/modules/niu/luasrc/model/cbi/niu/network/assign1.lua b/modules/niu/luasrc/model/cbi/niu/network/assign1.lua
index 704e9ae669..e226e23767 100644
--- a/modules/niu/luasrc/model/cbi/niu/network/assign1.lua
+++ b/modules/niu/luasrc/model/cbi/niu/network/assign1.lua
@@ -34,12 +34,12 @@ if leasefp then
end
if leases then
- v = m2:section(Table, leases, translate("dhcp_leases_active"))
- ip = v:option(DummyValue, 3, translate("ipaddress"))
+ v = m2:section(Table, leases, translate("Active Leases"))
+ ip = v:option(DummyValue, 3, translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
- mac = v:option(DummyValue, 2, translate("macaddress"))
+ mac = v:option(DummyValue, 2, translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
- ltime = v:option(DummyValue, 1, translate("dhcp_timeremain"))
+ ltime = v:option(DummyValue, 1, translate("Leasetime remaining"))
function ltime.cfgvalue(self, ...)
local value = DummyValue.cfgvalue(self, ...)
return wa.date_format(os.difftime(tonumber(value), os.time()))
@@ -51,9 +51,9 @@ s.addremove = true
s.anonymous = true
s.template = "cbi/tblsection"
-hn = s:option(Value, "name", translate("hostnames_hostname"))
-mac = s:option(Value, "mac", translate("macaddress"))
-ip = s:option(Value, "ip", translate("ipaddress"))
+hn = s:option(Value, "name", translate("Hostname"))
+mac = s:option(Value, "mac", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
+ip = s:option(Value, "ip", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
sys.net.arptable(function(entry)
ip:value(entry["IP address"])
mac:value(
diff --git a/modules/niu/luasrc/model/cbi/niu/network/etherwan.lua b/modules/niu/luasrc/model/cbi/niu/network/etherwan.lua
index 53be7eb65e..e3da1c0aab 100644
--- a/modules/niu/luasrc/model/cbi/niu/network/etherwan.lua
+++ b/modules/niu/luasrc/model/cbi/niu/network/etherwan.lua
@@ -29,10 +29,10 @@ nw.init(m.uci)
s = m:section(NamedSection, "wan", "interface")
s.addremove = false
-s:tab("general", translate("niu_general", "General Settings"))
-s:tab("expert", translate("niu_expert", "Expert Settings"))
+s:tab("general", translate("General Settings"))
+s:tab("expert", translate("Expert Settings"))
-p = s:taboption("general", ListValue, "proto", translate("protocol"))
+p = s:taboption("general", ListValue, "proto", translate("Protocol"))
p.override_scheme = true
p.default = "static"
p:value("static", translate("static"))
@@ -44,53 +44,53 @@ p:value("none", translate("none"))
-ipaddr = s:taboption("general", Value, "ipaddr", translate("ipaddress"))
+ipaddr = s:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
ipaddr.rmempty = true
ipaddr:depends("proto", "static")
-nm = s:taboption("general", Value, "netmask", translate("netmask"))
+nm = s:taboption("general", Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
nm.rmempty = true
nm:depends("proto", "static")
nm:value("255.255.255.0")
nm:value("255.255.0.0")
nm:value("255.0.0.0")
-gw = s:taboption("general", Value, "gateway", translate("gateway"))
+gw = s:taboption("general", Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
gw:depends("proto", "static")
gw.rmempty = true
-bcast = s:taboption("expert", Value, "bcast", translate("broadcast"))
+bcast = s:taboption("expert", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
bcast:depends("proto", "static")
if has_ipv6 then
- ip6addr = s:taboption("expert", Value, "ip6addr", translate("ip6address"), translate("cidr6"))
+ ip6addr = s:taboption("expert", Value, "ip6addr", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"), translate("<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"))
ip6addr:depends("proto", "static")
- ip6gw = s:taboption("expert", Value, "ip6gw", translate("gateway6"))
+ ip6gw = s:taboption("expert", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
ip6gw:depends("proto", "static")
end
-dns = s:taboption("expert", Value, "dns", translate("dnsserver"))
+dns = s:taboption("expert", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
dns:depends("peerdns", "")
mtu = s:taboption("expert", Value, "mtu", "MTU")
mtu.isinteger = true
-mac = s:taboption("expert", Value, "macaddr", translate("macaddress"))
+mac = s:taboption("expert", Value, "macaddr", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
-srv = s:taboption("general", Value, "server", translate("network_interface_server"))
+srv = s:taboption("general", Value, "server", translate("<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"))
srv:depends("proto", "pptp")
srv.rmempty = true
if has_pppd or has_pppoe or has_pppoa or has_pptp then
- user = s:taboption("general", Value, "username", translate("username"))
+ user = s:taboption("general", Value, "username", translate("Username"))
user.rmempty = true
user:depends("proto", "pptp")
user:depends("proto", "pppoe")
user:depends("proto", "pppoa")
- pass = s:taboption("general", Value, "password", translate("password"))
+ pass = s:taboption("general", Value, "password", translate("Password"))
pass.rmempty = true
pass.password = true
pass:depends("proto", "pptp")
@@ -98,8 +98,8 @@ if has_pppd or has_pppoe or has_pppoa or has_pptp then
pass:depends("proto", "pppoa")
ka = s:taboption("expert", Value, "keepalive",
- translate("network_interface_keepalive"),
- translate("network_interface_keepalive_desc")
+ translate("Keep-Alive"),
+ translate("Number of failed connection tests to initiate automatic reconnect")
)
ka.default = "5"
ka:depends("proto", "pptp")
@@ -107,8 +107,8 @@ if has_pppd or has_pppoe or has_pppoa or has_pptp then
ka:depends("proto", "pppoa")
demand = s:taboption("expert", Value, "demand",
- translate("network_interface_demand"),
- translate("network_interface_demand_desc")
+ translate("Automatic Disconnect"),
+ translate("Time (in seconds) after which an unused connection will be closed")
)
demand:depends("proto", "pptp")
demand:depends("proto", "pppoe")
@@ -116,9 +116,9 @@ if has_pppd or has_pppoe or has_pppoa or has_pptp then
end
if has_pppoa then
- encaps = s:taboption("expert", ListValue, "encaps", translate("network_interface_encaps"))
+ encaps = s:taboption("expert", ListValue, "encaps", translate("PPPoA Encapsulation"))
encaps:depends("proto", "pppoa")
- encaps:value("", translate("cbi_select"))
+ encaps:value("", translate("-- Please choose --"))
encaps:value("vc", "VC")
encaps:value("llc", "LLC")
@@ -132,8 +132,8 @@ end
if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
--[[
defaultroute = s:taboption("expert", Flag, "defaultroute",
- translate("network_interface_defaultroute"),
- translate("network_interface_defaultroute_desc")
+ translate("Replace default route"),
+ translate("Let pppd replace the current default route to use the PPP interface after successful connect")
)
defaultroute:depends("proto", "pppoa")
defaultroute:depends("proto", "pppoe")
@@ -144,8 +144,8 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
end
]]
peerdns = s:taboption("expert", Flag, "peerdns",
- translate("network_interface_peerdns"),
- translate("network_interface_peerdns_desc")
+ translate("Use peer DNS"),
+ translate("Configure the local DNS server to use the name servers adverticed by the PPP peer")
)
peerdns:depends("proto", "pppoa")
peerdns:depends("proto", "pppoe")
@@ -154,7 +154,7 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
peerdns.default = "1"
if has_ipv6 then
- ipv6 = s:taboption("expert", Flag, "ipv6", translate("network_interface_ipv6") )
+ ipv6 = s:taboption("expert", Flag, "ipv6", translate("Enable IPv6 on PPP link") )
ipv6:depends("proto", "pppoa")
ipv6:depends("proto", "pppoe")
ipv6:depends("proto", "pptp")
diff --git a/modules/niu/luasrc/model/cbi/niu/network/lan1.lua b/modules/niu/luasrc/model/cbi/niu/network/lan1.lua
index 33bb48c230..19f8230b92 100644
--- a/modules/niu/luasrc/model/cbi/niu/network/lan1.lua
+++ b/modules/niu/luasrc/model/cbi/niu/network/lan1.lua
@@ -24,42 +24,42 @@ nw.init(m.uci)
s = m:section(NamedSection, "lan", "interface")
s.addremove = false
-s:tab("general", translate("niu_general", "General Settings"))
+s:tab("general", translate("General Settings"))
-ipaddr = s:taboption("general", Value, "ipaddr", translate("ipaddress"))
+ipaddr = s:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
-nm = s:taboption("general", Value, "netmask", translate("netmask"))
+nm = s:taboption("general", Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
nm:value("255.255.255.0")
nm:value("255.255.0.0")
nm:value("255.0.0.0")
-s:tab("expert", translate("niu_expert", "Expert Settings"))
+s:tab("expert", translate("Expert Settings"))
-mac = s:taboption("expert", Value, "macaddr", translate("macaddress"))
+mac = s:taboption("expert", Value, "macaddr", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
mtu = s:taboption("expert", Value, "mtu", "MTU")
mtu.isinteger = true
-dns = s:taboption("expert", Value, "dns", translate("dnsserver"))
+dns = s:taboption("expert", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
dns:depends("peerdns", "")
-gw = s:taboption("expert", Value, "gateway", translate("gateway"))
-bcast = s:taboption("expert", Value, "bcast", translate("broadcast"))
+gw = s:taboption("expert", Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
+bcast = s:taboption("expert", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
if has_ipv6 then
- ip6addr = s:taboption("expert", Value, "ip6addr", translate("ip6address"), translate("cidr6"))
- ip6gw = s:taboption("expert", Value, "ip6gw", translate("gateway6"))
+ ip6addr = s:taboption("expert", Value, "ip6addr", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"), translate("<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"))
+ ip6gw = s:taboption("expert", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
end
-stp = s:taboption("expert", Flag, "stp", translate("a_n_i_stp"),
- translate("a_n_i_stp1", "Enables the Spanning Tree Protocol on this bridge"))
+stp = s:taboption("expert", Flag, "stp", translate("Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"),
+ translate("Enables the Spanning Tree Protocol on this bridge"))
-ifname_multi = s:taboption("expert", MultiValue, "ifname_multi", translate("interface"))
+ifname_multi = s:taboption("expert", MultiValue, "ifname_multi", translate("Interface"))
ifname_multi.template = "cbi/network_ifacelist"
ifname_multi.nobridges = true
ifname_multi.widget = "checkbox"
@@ -87,7 +87,7 @@ s.anonymous = true
s.addremove = false
s.dynamic = false
-s:tab("general", translate("niu_general", "General Settings"))
+s:tab("general", translate("General Settings"))
s:depends("interface", "lan")
@@ -96,9 +96,9 @@ enable:value(0, translate("enable"))
enable:value(1, translate("disable"))
-s:tab("expert", translate("niu_expert", "Expert Settings"))
-start = s:taboption("expert", Value, "start", translate("m_n_d_firstaddress"))
-limit = s:taboption("expert", Value, "limit", translate("m_n_d_numleases"), "")
+s:tab("expert", translate("Expert Settings"))
+start = s:taboption("expert", Value, "start", translate("First leased address"))
+limit = s:taboption("expert", Value, "limit", translate("Number of leased addresses"), "")
time = s:taboption("expert", Value, "leasetime")
diff --git a/modules/niu/luasrc/model/cbi/niu/network/routes1.lua b/modules/niu/luasrc/model/cbi/niu/network/routes1.lua
index 3e8e297155..a1d150807d 100644
--- a/modules/niu/luasrc/model/cbi/niu/network/routes1.lua
+++ b/modules/niu/luasrc/model/cbi/niu/network/routes1.lua
@@ -12,34 +12,34 @@ You may obtain a copy of the License at
$Id$
]]--
-m = Map("network", translate("a_n_routes"), translate("a_n_routes1"))
+m = Map("network", translate("Routes"), translate("a_n_routes1"))
local routes6 = luci.sys.net.routes6()
local bit = require "bit"
-s = m:section(TypedSection, "route", translate("a_n_routes_static4"))
+s = m:section(TypedSection, "route", translate("Static IPv4 Routes"))
s.addremove = true
s.anonymous = true
s.template = "cbi/tblsection"
-iface1 = s:option(ListValue, "interface", translate("interface"))
+iface1 = s:option(ListValue, "interface", translate("Interface"))
-s:option(Value, "target", translate("target"), translate("a_n_r_target1"))
-s:option(Value, "netmask", translate("netmask"), translate("a_n_r_netmask1")).rmemepty = true
-s:option(Value, "gateway", translate("gateway"))
+s:option(Value, "target", translate("Target"), translate("Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"))
+s:option(Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"), translate("if target is a network")).rmemepty = true
+s:option(Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
if routes6 then
- s = m:section(TypedSection, "route6", translate("a_n_routes_static6"))
+ s = m:section(TypedSection, "route6", translate("Static IPv6 Routes"))
s.addremove = true
s.anonymous = true
s.template = "cbi/tblsection"
- iface2 = s:option(ListValue, "interface", translate("interface"))
+ iface2 = s:option(ListValue, "interface", translate("Interface"))
- s:option(Value, "target", translate("target"), translate("a_n_r_target6"))
- s:option(Value, "gateway", translate("gateway6")).rmempty = true
+ s:option(Value, "target", translate("Target"), translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"))
+ s:option(Value, "gateway", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway")).rmempty = true
end
m.uci:foreach("network", "interface", function(s)