* luci-0.8: backport application fixes

diff --git a/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua b/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua
index 4d8c13840e7ac30caf61e7a19e4308a0cfe64253..d952b6043d8d751db03b6082b7aebc9ca1d92f5a 100644 (file)
--- a/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua
+++ b/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua
@@ -7,14 +7,16 @@ function index()
        local nodes = {}
 
        table.insert(nodes, entry({"admin", "network", "firewall"}, alias("admin", "network", "firewall", "zones"), i18n("fw_fw"), 60))
+       nodes[#nodes].index = true
+       
        table.insert(nodes, entry({"admin", "network", "firewall", "zones"}, cbi("luci_fw/zones"), i18n("fw_zones"), 10))
        table.insert(nodes, entry({"admin", "network", "firewall", "redirection"}, cbi("luci_fw/redirect"), i18n("fw_redirect"), 30))   
        table.insert(nodes, entry({"admin", "network", "firewall", "traffic"}, cbi("luci_fw/traffic"), i18n("fw_traffic"), 20))
                
        table.insert(nodes, entry({"admin", "network", "firewall", "rule"}, cbi("luci_fw/trule")))
-       nodes[#nodes].leaf = true               
+       nodes[#nodes].leaf = true
        table.insert(nodes, entry({"admin", "network", "firewall", "redirect"}, cbi("luci_fw/rrule")))
-       nodes[#nodes].leaf = true       
+       nodes[#nodes].leaf = true
        
        table.insert(nodes, entry({"mini", "network", "portfw"}, cbi("luci_fw/miniportfw"), i18n("fw_portfw", "Portweiterleitung"), 70))
        

diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua
index c80a75cc1ec18a4fd48233f9bcfb41510a12ab53..97e5061b9bf5f625a3b523f510460135beadd16c 100644 (file)
--- a/applications/luci-olsr/luasrc/controller/olsr.lua
+++ b/applications/luci-olsr/luasrc/controller/olsr.lua
@@ -12,6 +12,7 @@ function index()
        page.target = call("action_index")
        page.title  = "OLSR"
        page.i18n   = "olsr"
+       page.subindex = true
 
        local page  = node("admin", "status", "olsr", "routes")
        page.target = call("action_routes")
@@ -33,15 +34,17 @@ function index()
        page.title  = "MID"
        page.order  = 50
 
-       entry(
+       local ol = entry(
                {"admin", "services", "olsrd"},
                cbi("olsr/olsrd"), "OLSR"
-       ).i18n = "olsr"
+       )
+       ol.i18n = "olsr"
+       ol.subindex = true
 
        entry(
                {"admin", "services", "olsrd", "hna"},
                cbi("olsr/olsrdhna"), "HNA Announcements"
-       ).i18n = "olsr"
+       )
 
        oplg = entry(
                {"admin", "services", "olsrd", "plugins"},
@@ -49,6 +52,7 @@ function index()
        )
        oplg.i18n = "olsr"
        oplg.leaf = true
+       oplg.subindex = true
 
        local uci = require("luci.model.uci").cursor()
        uci:foreach("olsrd", "LoadPlugin",

diff --git a/applications/luci-p910nd/luasrc/i18n/p910nd.de.lua b/applications/luci-p910nd/luasrc/i18n/p910nd.de.lua
index 7ca30087f08daf21e33ce2ef8e0134a69a3fc190..b8cf6e6f4e4d9a72242e6c801c75f5d6e1649873 100644 (file)
--- a/applications/luci-p910nd/luasrc/i18n/p910nd.de.lua
+++ b/applications/luci-p910nd/luasrc/i18n/p910nd.de.lua
@@ -1,4 +1,4 @@
-bidirectional = 'Bidirektionaler Modus'
-port_help = 'p910nd hoert auf Port 910+N. Z.B. 9100 fuer ersten Drucker'
 p910nd = 'p910nd - Drucker server'
 p910nd_desc = 'Bevor p910nd verwendet werden kann muessen Pakete fuer USB (kmod-usb-printer) und Parallelport (kmod-lp) Support installiert werden.'
+bidirectional = 'Bidirektionaler Modus'
+port_help = 'p910nd hoert auf Port 910+N. Z.B. 9100 fuer ersten Drucker'

diff --git a/applications/luci-p910nd/luasrc/i18n/p910nd.en.lua b/applications/luci-p910nd/luasrc/i18n/p910nd.en.lua
index 74c2f24a874c613efbe02ec8c95631476f97fa0a..c9b3c8f78471174c4315519919cbbc3b6aa64742 100644 (file)
--- a/applications/luci-p910nd/luasrc/i18n/p910nd.en.lua
+++ b/applications/luci-p910nd/luasrc/i18n/p910nd.en.lua
@@ -1,4 +1,4 @@
-bidirectional = 'Bidirectional mode'
-port_help = 'p910nd listens on port 910+N. E.g. 9100 for the first printer.'
 p910nd = 'p910nd - Printer server'
 p910nd_desc = 'First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).'
+bidirectional = 'Bidirectional mode'
+port_help = 'p910nd listens on port 910+N. E.g. 9100 for the first printer.'

diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
index c1cfdb7acf30cf1b560a0df44cca338779fb764c..e051347ab23b6093dd064179128fd62c8213fb0f 100644 (file)
--- a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+++ b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
@@ -82,6 +82,6 @@ p.rmempty = true
 
 ports = s:option(Value, "ports", translate("ports"))
 ports.rmempty = true
-ports:value("", translate("all"))
+ports:value("", translate("allf", translate("all")))
 
-return m
\ No newline at end of file
+return m

diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua b/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
index f8a6bb58882f8d1026cff3bde2de047f3d9aab2e..a1825505bedebd18166d9d853c8f886e42dd846b 100644 (file)
--- a/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
+++ b/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua
@@ -75,6 +75,6 @@ p.rmempty = true
 
 ports = s:option(Value, "ports", translate("ports"))
 ports.rmempty = true
-ports:value("", translate("all"))
+ports:value("", translate("allf", translate("all")))
 
-return m
\ No newline at end of file
+return m

diff --git a/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.xml b/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.xml
index a08db84546c1f7694794ab219467a24785e62fe1..54ad83c1e89de71dbbf5c5d5973ce0157f00d96f 100644 (file)
--- a/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.xml
+++ b/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.xml
@@ -26,6 +26,8 @@
 <i18n:msg xml:id="tinyproxy_tinyproxy_statfile">Documento de estatísticas</i18n:msg>
 <i18n:msg xml:id="tinyproxy_tinyproxy_syslog">Escrever para syslog</i18n:msg>
 <i18n:msg xml:id="tinyproxy_tinyproxy_timeout">Timeout de conexão</i18n:msg>
+<i18n:msg xml:id="tinyproxy_tinyproxy_group">Grupo</i18n:msg>
+<i18n:msg xml:id="tinyproxy_tinyproxy_user">Usuário</i18n:msg>
 <i18n:msg xml:id="tinyproxy_tinyproxy_viaproxyname">Valor do cabeçalho "Via-Header"</i18n:msg>
 <i18n:msg xml:id="tinyproxy_tinyproxy_xtinyproxy">Incluir o IP do cliente</i18n:msg>
 <i18n:msg xml:id="tinyproxy_type_proxy">Via proxy</i18n:msg>

diff --git a/applications/luci-ushare/luasrc/i18n/ushare.de.lua b/applications/luci-ushare/luasrc/i18n/ushare.de.lua
index f855196af7ed4bb077e0c976c7bc823041a2ca0d..a5f239a3d9745b1ed398d8ec508e04858d42ec01 100644 (file)
--- a/applications/luci-ushare/luasrc/i18n/ushare.de.lua
+++ b/applications/luci-ushare/luasrc/i18n/ushare.de.lua
@@ -1,8 +1,8 @@
-ushare = 'uShare'
-ushare_desc = 'uShare'
-settings = 'Einstellungen'
-disable_webif = 'Webinterface deaktivieren'
-disable_telnet = 'Telnet-Konsole deaktivieren'
-servername = 'Servername'
 content_directories = 'Freigabeverzeichnisse'
+disable_telnet = 'Telnet-Konsole deaktivieren'
+disable_webif = 'Webinterface deaktivieren'
 options = 'Optionen'
+servername = 'Servername'
+settings = 'Einstellungen'
+ushare = 'uShare'
+ushare_desc = 'uShare'

diff --git a/applications/luci-ushare/luasrc/i18n/ushare.en.lua b/applications/luci-ushare/luasrc/i18n/ushare.en.lua
index b0414807b9b18fa3e2f257435033e4812358d0e5..834fa91f4a69c5af7c44a27bafc1605d07d0ab63 100644 (file)
--- a/applications/luci-ushare/luasrc/i18n/ushare.en.lua
+++ b/applications/luci-ushare/luasrc/i18n/ushare.en.lua
@@ -1,8 +1,8 @@
-ushare = 'uShare'
-ushare_desc = 'uShare'
-settings = 'Settings'
-disable_webif = 'Disable webinterface'
-disable_telnet = 'Disable telnet console'
-servername = 'Servername'
 content_directories = 'Content directories'
+disable_telnet = 'Disable telnet console'
+disable_webif = 'Disable webinterface'
 options = 'Options'
+servername = 'Servername'
+settings = 'Settings'
+ushare = 'uShare'
+ushare_desc = 'uShare'