[PATCH 1/2] firewall: add description strings

The luci-fw application was lacking some important description strings.
This adds them and updates the associated translation template.
This commit is contained in:
Jo-Philipp Wich 2010-04-05 01:16:25 +00:00
parent 08ceafc2e9
commit 03c4a61b2a
7 changed files with 301 additions and 221 deletions

View file

@ -12,7 +12,9 @@ You may obtain a copy of the License at
$Id$
]]--
require("luci.sys")
m = Map("firewall", translate("Port forwarding"), translate("Port forwarding allows to provide network services in the internal network to an external network."))
m = Map("firewall", translate("Port forwarding"),
translate("Port forwarding allows to provide network services in " ..
"the internal network to an external network."))
s = m:section(TypedSection, "redirect", "")
@ -23,7 +25,7 @@ s.template = "cbi/tblsection"
s.addremove = true
s.anonymous = true
name = s:option(Value, "_name", translate("Name"), translate(" (optional)"))
name = s:option(Value, "_name", translate("Name"), translate("(optional)"))
name.size = 10
proto = s:option(ListValue, "proto", translate("Protocol"))
@ -31,15 +33,16 @@ proto:value("tcp", "TCP")
proto:value("udp", "UDP")
proto:value("tcpudp", "TCP+UDP")
dport = s:option(Value, "src_dport")
dport = s:option(Value, "src_dport", translate("External port"))
dport.size = 5
to = s:option(Value, "dest_ip")
to = s:option(Value, "dest_ip", translate("Internal IP address"))
for i, dataset in ipairs(luci.sys.net.arptable()) do
to:value(dataset["IP address"])
end
toport = s:option(Value, "dest_port")
toport = s:option(Value, "dest_port", translate("Internal port"),
translate("(optional)"))
toport.size = 5
return m

View file

@ -12,7 +12,9 @@ You may obtain a copy of the License at
$Id$
]]--
require("luci.sys")
m = Map("firewall", translate("Traffic Redirection"), translate("Traffic redirection allows you to change the destination address of forwarded packets."))
m = Map("firewall", translate("Traffic Redirection"),
translate("Traffic redirection allows you to change the " ..
"destination address of forwarded packets."))
s = m:section(TypedSection, "redirect", "")
@ -21,7 +23,7 @@ s.addremove = true
s.anonymous = true
s.extedit = luci.dispatcher.build_url("admin", "network", "firewall", "redirect", "%s")
name = s:option(Value, "_name", translate("Name"), translate(" (optional)"))
name = s:option(Value, "_name", translate("Name"), translate("(optional)"))
name.size = 10
iface = s:option(ListValue, "src", translate("Zone"))
@ -36,15 +38,15 @@ proto:value("tcp", "TCP")
proto:value("udp", "UDP")
proto:value("tcpudp", "TCP+UDP")
dport = s:option(Value, "src_dport")
dport = s:option(Value, "src_dport", translate("Source port"))
dport.size = 5
to = s:option(Value, "dest_ip")
to = s:option(Value, "dest_ip", translate("Destination IP"))
for i, dataset in ipairs(luci.sys.net.arptable()) do
to:value(dataset["IP address"])
end
toport = s:option(Value, "dest_port")
toport = s:option(Value, "dest_port", translate("Destination port"))
toport.size = 5
return m

View file

@ -14,7 +14,9 @@ $Id$
require("luci.sys")
arg[1] = arg[1] or ""
m = Map("firewall", translate("Traffic Redirection"), translate("Traffic redirection allows you to change the destination address of forwarded packets."))
m = Map("firewall", translate("Traffic Redirection"),
translate("Traffic redirection allows you to change the " ..
"destination address of forwarded packets."))
s = m:section(NamedSection, arg[1], "redirect", "")
@ -29,17 +31,19 @@ name = s:option(Value, "_name", translate("Name"))
name.rmempty = true
name.size = 10
iface = s:option(ListValue, "src", translate("Zone"))
iface = s:option(ListValue, "src", translate("Source zone"))
iface.default = "wan"
luci.model.uci.cursor():foreach("firewall", "zone",
function (section)
iface:value(section.name)
end)
s:option(Value, "src_ip", translate("Source address")).optional = true
s:option(Value, "src_mac", translate("Source MAC")).optional = true
s:option(Value, "src_ip", translate("Source IP address")).optional = true
s:option(Value, "src_mac", translate("Source MAC-address")).optional = true
sport = s:option(Value, "src_port", translate("Source port"))
sport = s:option(Value, "src_port", translate("Source port"),
translate("Match incoming traffic originating from the given " ..
"source port or port range on the client host"))
sport.optional = true
sport:depends("proto", "tcp")
sport:depends("proto", "udp")
@ -52,18 +56,24 @@ proto:value("tcp", "TCP")
proto:value("udp", "UDP")
proto:value("tcpudp", "TCP+UDP")
dport = s:option(Value, "src_dport", translate("External port"))
dport = s:option(Value, "src_dport", translate("External port"),
translate("Match incoming traffic directed at the given " ..
"destination port or port range on this host"))
dport.size = 5
dport:depends("proto", "tcp")
dport:depends("proto", "udp")
dport:depends("proto", "tcpudp")
to = s:option(Value, "dest_ip", translate("Internal address"))
to = s:option(Value, "dest_ip", translate("Internal IP address"),
translate("Redirect matched incoming traffic to the specified " ..
"internal host"))
for i, dataset in ipairs(luci.sys.net.arptable()) do
to:value(dataset["IP address"])
end
toport = s:option(Value, "dest_port", translate("Internal port (optional)"))
toport = s:option(Value, "dest_port", translate("Internal port (optional)"),
translate("Redirect matched incoming traffic to the given port on " ..
"the internal host"))
toport.optional = true
toport.size = 5

View file

@ -14,7 +14,14 @@ $Id$
]]--
m = Map("firewall", translate("Traffic Control"))
s = m:section(TypedSection, "forwarding", translate("Zone-to-Zone traffic"), translate("Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons."))
s = m:section(TypedSection, "forwarding", translate("Zone-to-Zone traffic"),
translate("Here you can specify which network traffic is allowed " ..
"to flow between network zones. Only new connections will " ..
"be matched. Packets belonging to already open " ..
"connections are automatically allowed to pass the " ..
"firewall. If you experience occasional connection " ..
"problems try enabling MSS Clamping otherwise disable it " ..
"for performance reasons."))
s.template = "cbi/tblsection"
s.addremove = true
s.anonymous = true
@ -30,7 +37,7 @@ luci.model.uci.cursor():foreach("firewall", "zone",
s = m:section(TypedSection, "rule")
s = m:section(TypedSection, "rule", translate("Rules"))
s.addremove = true
s.anonymous = true
s.template = "cbi/tblsection"
@ -75,7 +82,7 @@ function dest.cfgvalue(self, s)
end
s:option(DummyValue, "target")
s:option(DummyValue, "target", translate("Action"))
return m
return m

View file

@ -12,7 +12,11 @@ You may obtain a copy of the License at
$Id$
]]--
arg[1] = arg[1] or ""
m = Map("firewall", translate("Advanced Rules"), translate("Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."))
m = Map("firewall", translate("Advanced Rules"),
translate("Advanced rules let you customize the firewall to your " ..
"needs. Only new connections will be matched. Packets " ..
"belonging to already open connections are automatically " ..
"allowed to pass the firewall."))
s = m:section(NamedSection, arg[1], "rule", "")
s.anonymous = true
@ -23,14 +27,14 @@ back.value = ""
back.titleref = luci.dispatcher.build_url("admin", "network", "firewall", "rule")
name = s:option(Value, "_name", translate("Name")..translate(" (optional)"))
name = s:option(Value, "_name", translate("Name").." "..translate("(optional)"))
name.rmempty = true
iface = s:option(ListValue, "src", translate("Source"))
iface = s:option(ListValue, "src", translate("Source zone"))
iface.rmempty = true
oface = s:option(ListValue, "dest", translate("Destination"))
oface:value("", translate("Device"))
oface = s:option(ListValue, "dest", translate("Destination zone"))
oface:value("", translate("any"))
oface.rmempty = true
luci.model.uci.cursor():foreach("firewall", "zone",
@ -49,7 +53,7 @@ proto:value("icmp", "ICMP")
s:option(Value, "src_ip", translate("Source address")).optional = true
s:option(Value, "dest_ip", translate("Destination address")).optional = true
s:option(Value, "src_mac", translate("Source MAC-Address")).optional = true
s:option(Value, "src_mac", translate("Source MAC-address")).optional = true
sport = s:option(Value, "src_port", translate("Source port"))
sport:depends("proto", "tcp")

View file

@ -25,7 +25,7 @@ s = m:section(TypedSection, "defaults")
s.anonymous = true
s.addremove = false
s:option(Flag, "syn_flood")
s:option(Flag, "syn_flood", translate("Enable SYN-flood protection"))
local di = s:option(Flag, "drop_invalid", translate("Drop invalid packets"))
di.rmempty = false
@ -34,9 +34,9 @@ function di.cfgvalue(...)
end
p = {}
p[1] = s:option(ListValue, "input")
p[2] = s:option(ListValue, "output")
p[3] = s:option(ListValue, "forward")
p[1] = s:option(ListValue, "input", translate("Input"))
p[2] = s:option(ListValue, "output", translate("Output"))
p[3] = s:option(ListValue, "forward", translate("Forward"))
for i, v in ipairs(p) do
v:value("REJECT", translate("reject"))
@ -54,9 +54,9 @@ name = s:option(Value, "name", translate("Name"))
name.size = 8
p = {}
p[1] = s:option(ListValue, "input")
p[2] = s:option(ListValue, "output")
p[3] = s:option(ListValue, "forward")
p[1] = s:option(ListValue, "input", translate("input"))
p[2] = s:option(ListValue, "output", translate("output"))
p[3] = s:option(ListValue, "forward", translate("forward"))
for i, v in ipairs(p) do
v:value("REJECT", translate("reject"))
@ -64,10 +64,10 @@ for i, v in ipairs(p) do
v:value("ACCEPT", translate("accept"))
end
s:option(Flag, "masq")
s:option(Flag, "mtu_fix", translate("MSS Clamping"))
s:option(Flag, "masq", translate("Masquerading"))
s:option(Flag, "mtu_fix", translate("MSS clamping"))
net = s:option(MultiValue, "network")
net = s:option(MultiValue, "network", translate("Network"))
net.template = "cbi/network_netlist"
net.widget = "checkbox"
net.rmempty = true

View file

@ -1,236 +1,290 @@
# luci-fw.pot
# generated from ./applications/luci-fw/luasrc/i18n/luci-fw.en.lua
# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/*.lua
#
#, fuzzy
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
#. Port forwarding
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
msgid "Port forwarding"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-03-30 17:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Traffic Redirection
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
msgid "Traffic Redirection"
msgstr ""
#. Traffic redirection allows you to change the destination address of forwarded packets.
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
msgid ""
"Traffic redirection allows you to change the destination address of "
"forwarded packets."
msgstr ""
#. Zone-to-Zone traffic
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
msgid "Zone-to-Zone traffic"
msgstr ""
#. Firewall
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
#
msgid "Firewall"
msgstr ""
#. Zone
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
msgid "Zone"
msgstr ""
#. Zones
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
msgid "Zones"
msgstr ""
#. Custom forwarding
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
msgid "Custom forwarding"
msgstr ""
#. The firewall creates zones over your network interfaces to control network traffic flow.
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
msgstr ""
#. Advanced Rules
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
msgid "Enable SYN-flood protection"
msgstr ""
msgid "Drop invalid packets"
msgstr ""
msgid "Input"
msgstr ""
msgid "Output"
msgstr ""
msgid "Forward"
msgstr ""
msgid "reject"
msgstr ""
msgid "drop"
msgstr ""
msgid "accept"
msgstr ""
msgid "Zones"
msgstr ""
msgid "Name"
msgstr ""
msgid "Masquerading"
msgstr ""
msgid "MSS clamping"
msgstr ""
msgid "Network"
msgstr ""
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
#
# msgid "Name"
# msgstr ""
#
msgid "Traffic Control"
msgstr ""
msgid "Zone-to-Zone traffic"
msgstr ""
msgid ""
"Here you can specify which network traffic is allowed to flow between "
"network zones. Only new connections will be matched. Packets belonging to "
"already open connections are automatically allowed to pass the firewall. If "
"you experience occasional connection problems try enabling MSS Clamping "
"otherwise disable it for performance reasons."
msgstr ""
msgid "Source"
msgstr ""
msgid "Destination"
msgstr ""
msgid "Rules"
msgstr ""
msgid "Protocol"
msgstr ""
msgid "Device"
msgstr ""
msgid "Action"
msgstr ""
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
#
# msgid "Name"
# msgstr ""
#
# msgid "Protocol"
# msgstr ""
#
msgid "Traffic Redirection"
msgstr ""
msgid ""
"Traffic redirection allows you to change the destination address of "
"forwarded packets."
msgstr ""
msgid "(optional)"
msgstr ""
msgid "Zone"
msgstr ""
msgid "Source port"
msgstr ""
msgid "Destination IP"
msgstr ""
msgid "IP address"
msgstr ""
msgid "Destination port"
msgstr ""
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
#
# msgid "Name"
# msgstr ""
#
# msgid "(optional)"
# msgstr ""
#
# msgid "Protocol"
# msgstr ""
#
# msgid "Source port"
# msgstr ""
#
# msgid "Destination port"
# msgstr ""
#
# msgid "Action"
# msgstr ""
#
# msgid "drop"
# msgstr ""
#
# msgid "accept"
# msgstr ""
#
# msgid "reject"
# msgstr ""
#
msgid "Advanced Rules"
msgstr ""
#. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
msgid ""
"Advanced rules let you customize the firewall to your needs. Only new "
"connections will be matched. Packets belonging to already open connections "
"are automatically allowed to pass the firewall."
msgstr ""
#. Input Zone
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
msgid "Input Zone"
msgid "Overview"
msgstr ""
#. Output Zone
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
msgid "Output Zone"
msgid "Source zone"
msgstr ""
msgid "Destination zone"
msgstr ""
msgid "any"
msgstr ""
msgid "Source address"
msgstr ""
#. Destination address
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
msgid "Destination address"
msgstr ""
#. Source MAC-Address
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
msgid "Source MAC-Address"
msgid "Source MAC-address"
msgstr ""
#. Source port
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
msgid "Source port"
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
#
# msgid "Traffic Redirection"
# msgstr ""
#
# msgid ""
# "Traffic redirection allows you to change the destination address of "
# "forwarded packets."
# msgstr ""
#
# msgid "Overview"
# msgstr ""
#
# msgid "Name"
# msgstr ""
#
# msgid "Source zone"
# msgstr ""
#
# msgid "Source MAC-address"
# msgstr ""
#
# msgid "Source port"
# msgstr ""
#
# msgid "Protocol"
# msgstr ""
#
msgid "Source IP address"
msgstr ""
#. Destination port
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
msgid "Destination port"
msgid ""
"Match incoming traffic originating from the given source port or port range "
"on the client host"
msgstr ""
#. Action
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
msgid "Action"
msgid "External port"
msgstr ""
#. accept
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
msgid "accept"
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
msgstr ""
#. reject
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
msgid "reject"
msgid "Internal IP address"
msgstr ""
#. drop
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
msgid "drop"
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr ""
#. Source
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
msgid "Source"
msgid "Internal port (optional)"
msgstr ""
#. Destination
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
msgid "Destination"
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
#. Traffic Control
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
msgid "Traffic Control"
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
#
# msgid "Name"
# msgstr ""
#
# msgid "(optional)"
# msgstr ""
#
# msgid "Protocol"
# msgstr ""
#
# msgid "External port"
# msgstr ""
#
# msgid "Internal IP address"
# msgstr ""
#
msgid "Port forwarding"
msgstr ""
#. MSS Clamping
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
msgid "MSS Clamping"
msgstr ""
#. Drop invalid packets
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
msgid "Drop invalid packets"
msgstr ""
#. Port forwarding allows to provide network services in the internal network to an external network.
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
msgid ""
"Port forwarding allows to provide network services in the internal network "
"to an external network."
msgstr ""
#. External Zone
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
msgid "External Zone"
msgstr ""
#. External port
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
msgid "External port"
msgstr ""
#. Source MAC
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
msgid "Source MAC"
msgstr ""
#. Internal address
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
msgid "Internal address"
msgstr ""
#. IP-Address
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
msgid "IP-Address"
msgstr ""
#. Internal port (optional)
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
msgid "Internal port (optional)"
msgstr ""
#. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
msgid ""
"Here you can specify which network traffic is allowed to flow between "
"network zones. Only new connections will be matched. Packets belonging to "
"already open connections are automatically allowed to pass the firewall. If "
"you experience occasional connection problems try enabling MSS Clamping "
"otherwise disable it for performance reasons."
msgstr ""
#. Input
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
msgid "Input"
msgstr ""
#. Output
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
msgid "Output"
msgstr ""
#. Defaults
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
msgid "Defaults"
msgstr ""
#. These are the default settings that are used if no other rules match.
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
msgid "These are the default settings that are used if no other rules match."
msgstr ""
#. SYN-flood protection
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
msgid "SYN-flood protection"
msgstr ""
#. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
msgid ""
"Zones part the network interfaces into certain isolated areas to separate "
"network traffic. One or more networks can belong to a zone. The MASQ-flag "
"enables NAT masquerading for all outgoing traffic on this zone."
msgstr ""
#. MASQ
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
msgid "MASQ"
msgstr ""
#. Networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
msgid "Networks"
msgstr ""
#. contained networks
#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:56
msgid "contained networks"
msgid "Internal port"
msgstr ""