[PATCH 1/2] qos: add description strings (from Benoît Knecht)

This patch adds the description strings for QoS and updates the
translation template.

diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
index c258d18..026099e 100644 (file)
--- a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+++ b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
@@ -15,44 +15,47 @@ $Id$
 local wa = require "luci.tools.webadmin"
 local fs = require "nixio.fs"
 
 local wa = require "luci.tools.webadmin"
 local fs = require "nixio.fs"
 

-m = Map("qos")
+m = Map("qos", translate("Quality of Service"),
+       translate("With <abbr title=\"Quality of Service\">QoS</abbr> you " ..
+               "can prioritize network traffic selected by addresses, " ..
+               "ports or services."))

 
 s = m:section(TypedSection, "interface", translate("Interfaces"))
 s.addremove = true
 s.anonymous = false
 
 
 s = m:section(TypedSection, "interface", translate("Interfaces"))
 s.addremove = true
 s.anonymous = false
 

-s:option(Flag, "enabled", translate("enable"))
+s:option(Flag, "enabled", translate("Enable"))

 
 

-c = s:option(ListValue, "classgroup")
-c:value("Default", "standard")
+c = s:option(ListValue, "classgroup", translate("Classification group"))
+c:value("Default", translate("default"))

 c.default = "Default"
 
 c.default = "Default"
 

-s:option(Flag, "overhead")
+s:option(Flag, "overhead", translate("Calculate overhead"))

 
 

-s:option(Flag, "halfduplex")
+s:option(Flag, "halfduplex", translate("Half-duplex"))

 
 

-s:option(Value, "download", nil, "kb/s")
+s:option(Value, "download", translate("Download speed (kb/s)"))

 
 

-s:option(Value, "upload", nil, "kb/s")
+s:option(Value, "upload", translate("Upload speed (kb/s)"))

 
 

-s = m:section(TypedSection, "classify")
+s = m:section(TypedSection, "classify", translate("Classification Rules"))

 s.template = "cbi/tblsection"
 s.anonymous = true
 s.addremove = true
 
 s.template = "cbi/tblsection"
 s.anonymous = true
 s.addremove = true
 

-t = s:option(ListValue, "target")
+t = s:option(ListValue, "target", translate("Target"))

 t:value("Priority", translate("priority"))
 t:value("Express", translate("express"))
 t:value("Normal", translate("normal"))
 t:value("Bulk", translate("low"))
 t.default = "Normal"
 
 t:value("Priority", translate("priority"))
 t:value("Express", translate("express"))
 t:value("Normal", translate("normal"))
 t:value("Bulk", translate("low"))
 t.default = "Normal"
 

-srch = s:option(Value, "srchost")
+srch = s:option(Value, "srchost", translate("Source host"))

 srch.rmempty = true
 srch:value("", translate("all"))
 wa.cbi_add_knownips(srch)
 
 srch.rmempty = true
 srch:value("", translate("all"))
 wa.cbi_add_knownips(srch)
 

-dsth = s:option(Value, "dsthost")
+dsth = s:option(Value, "dsthost", translate("Destination host"))

 dsth.rmempty = true
 dsth:value("", translate("all"))
 wa.cbi_add_knownips(dsth)
 dsth.rmempty = true
 dsth:value("", translate("all"))
 wa.cbi_add_knownips(dsth)


@@ -78,8 +81,8 @@ p.rmempty = true
 
 ports = s:option(Value, "ports", translate("Ports"))
 ports.rmempty = true
 
 ports = s:option(Value, "ports", translate("Ports"))
 ports.rmempty = true

-ports:value("", translate("allf", translate("all")))
+ports:value("", translate("all"))

 
 

-bytes = s:option(Value, "connbytes", translate("qos_connbytes"))
+bytes = s:option(Value, "connbytes", translate("Number of bytes"))

 
 return m
 
 return m

diff --git a/po/templates/qos.pot b/po/templates/qos.pot
index 975f892..889ea95 100644 (file)
--- a/po/templates/qos.pot
+++ b/po/templates/qos.pot
@@ -1,100 +1,85 @@
-#  qos.pot
-#  generated from ./applications/luci-qos/luasrc/i18n/qos.en.lua
+# Generated from applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+#
+#, fuzzy

 msgid ""
 msgid ""

-msgstr "Content-Type: text/plain; charset=UTF-8"
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 22:10+0100\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"

 
 

-#. Quality of Service
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:1

 msgid "Quality of Service"
 msgstr ""
 
 msgid "Quality of Service"
 msgstr ""
 

-#. With QoS you can priorize network traffic selected by adresses, ports or services.
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:2

 msgid ""
 msgid ""

-"With QoS you can priorize network traffic selected by adresses, ports or "
-"services."
+"With <abbr title=\"Quality of Service\">QoS</abbr> you can prioritize "
+"network traffic selected by addresses, ports or services."
+msgstr ""
+
+msgid "Interfaces"

 msgstr ""
 
 msgstr ""
 

-#. Classification
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:3
-msgid "Classification"
+msgid "Enable"

 msgstr ""
 
 msgstr ""
 

-#. Calculate Overhead
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:4
-msgid "Calculate Overhead"
+msgid "Classification group"

 msgstr ""
 
 msgstr ""
 

-#. Half-Duplex
-msgid "Half-Duplex"
+msgid "default"

 msgstr ""
 
 msgstr ""
 

-#. Downlink
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:5
-msgid "Downlink"
+msgid "Calculate overhead"

 msgstr ""
 
 msgstr ""
 

-#. Uplink
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:6
-msgid "Uplink"
+msgid "Half-duplex"

 msgstr ""
 
 msgstr ""
 

-#. Prioritization
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:7
-msgid "Prioritization"
+msgid "Download speed (kb/s)"

 msgstr ""
 
 msgstr ""
 

-#. Priority
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:8
-msgid "Priority"
+msgid "Upload speed (kb/s)"

 msgstr ""
 
 msgstr ""
 

-#. Source address
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:9
-msgid "Source address"
+msgid "Classification Rules"

 msgstr ""
 
 msgstr ""
 

-#. source network / source host
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:10
-msgid "source network / source host"
+msgid "Target"

 msgstr ""
 
 msgstr ""
 

-#. Target address
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:11
-msgid "Target address"
+msgid "priority"

 msgstr ""
 
 msgstr ""
 

-#. target network / target host
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:12
-msgid "target network / target host"
+msgid "express"

 msgstr ""
 
 msgstr ""
 

-#. portrange
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:13
-msgid "portrange"
+msgid "normal"

 msgstr ""
 
 msgstr ""
 

-#. low
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:14

 msgid "low"
 msgstr ""
 
 msgid "low"
 msgstr ""
 

-#. normal
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:15
-msgid "normal"
+msgid "Source host"

 msgstr ""
 
 msgstr ""
 

-#. express
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:16
-msgid "express"
+msgid "all"

 msgstr ""
 
 msgstr ""
 

-#. priority
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:17
-msgid "priority"
+msgid "Destination host"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Ports"

 msgstr ""
 
 msgstr ""
 

-#. Bytes sent
-#: applications/luci-qos/luasrc/i18n/qos.en.lua:18
-msgid "Bytes sent"
+msgid "Number of bytes"

 msgstr ""
 msgstr ""