From: Jo-Philipp Wich Date: Fri, 29 May 2009 19:18:18 +0000 (+0000) Subject: luci-0.8: merge r4540 X-Git-Tag: 0.8.7~13 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=563f22c83101216630b4c8e9b650def7887c4c61;p=oweals%2Fluci.git luci-0.8: merge r4540 --- diff --git a/applications/luci-qos/luasrc/i18n/qos.de.lua b/applications/luci-qos/luasrc/i18n/qos.de.lua index 1ef5499bd..0f15f859d 100644 --- a/applications/luci-qos/luasrc/i18n/qos.de.lua +++ b/applications/luci-qos/luasrc/i18n/qos.de.lua @@ -1,6 +1,7 @@ qos = 'Quality of Service' qos_interface_classgroup = 'Klassifizierung' qos_interface_overhead = 'Overheadberechnung' +qos_interface_halfduplex = 'Half-duplex' qos_interface_download = 'Downlink' qos_interface_upload = 'Uplink' qos_classify = 'Priorisierung' diff --git a/applications/luci-qos/luasrc/i18n/qos.en.lua b/applications/luci-qos/luasrc/i18n/qos.en.lua index 67494e71d..befab67ec 100644 --- a/applications/luci-qos/luasrc/i18n/qos.en.lua +++ b/applications/luci-qos/luasrc/i18n/qos.en.lua @@ -2,6 +2,7 @@ qos = 'Quality of Service' qos_desc = 'With QoS you can priorize network traffic selected by adresses, ports or services.' qos_interface_classgroup = 'Classification' qos_interface_overhead = 'Calculate Overhead' +qos_interface_halfduplex = 'Half-duplex' qos_interface_download = 'Downlink' qos_interface_upload = 'Uplink' qos_classify = 'Prioritization' diff --git a/applications/luci-qos/luasrc/i18n/qos.fr.lua b/applications/luci-qos/luasrc/i18n/qos.fr.lua index 73c54dccf..9377d300d 100644 --- a/applications/luci-qos/luasrc/i18n/qos.fr.lua +++ b/applications/luci-qos/luasrc/i18n/qos.fr.lua @@ -12,6 +12,7 @@ qos_express = 'express' qos_interface_classgroup = 'Classification' qos_interface_download = 'Liaison descendante' qos_interface_overhead = 'calcul de la surcharge' +qos_interface_halfduplex = 'Half-duplex' qos_interface_upload = 'Liaison montante' qos_normal = 'normal' qos_priority = 'prioritaire' diff --git a/applications/luci-qos/luasrc/i18n/qos.pt-br.lua b/applications/luci-qos/luasrc/i18n/qos.pt-br.lua index 582e7aa94..6b15ed4d8 100644 --- a/applications/luci-qos/luasrc/i18n/qos.pt-br.lua +++ b/applications/luci-qos/luasrc/i18n/qos.pt-br.lua @@ -2,6 +2,7 @@ qos = 'Qualidade de Serviço' qos_desc = 'Com QoS você pode priozirar o tráfego da rede selecionada por endereços, portas ou serviços.' qos_interface_classgroup = 'Classificação' qos_interface_overhead = 'Calcular Overhead' +qos_interface_halfduplex = 'Half-duplex' qos_interface_download = 'Link para download' qos_interface_upload = 'Link para upload' qos_classify = 'Priorização' diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua index 4b94355f1..22dfbea5f 100644 --- a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua +++ b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua @@ -25,6 +25,8 @@ c.default = "Default" s:option(Flag, "overhead") +s:option(Flag, "halfduplex") + s:option(Value, "download", nil, "kb/s") s:option(Value, "upload", nil, "kb/s") diff --git a/applications/luci-qos/root/lib/uci/schema/default/qos b/applications/luci-qos/root/lib/uci/schema/default/qos index 24f8e0d5d..753d2e6de 100644 --- a/applications/luci-qos/root/lib/uci/schema/default/qos +++ b/applications/luci-qos/root/lib/uci/schema/default/qos @@ -21,6 +21,12 @@ config variable option section 'qos.interface' option datatype 'boolean' +config variable + option name 'halfduplex' + option title 'Half-duplex link' + option section 'qos.interface' + option datatype 'boolean' + config variable option name 'classgroup' option title 'QoS classification'