* luci-0.8: merge translation fixes, theme changes, selective port handling and others

6 files changed, 18 insertions, 3 deletions

diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua
index ffd15a4fce..a9dab7e4b1 100644
--- a/i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/i18n/english/luasrc/i18n/admin-core.en.lua
@@ -195,6 +195,8 @@ dhcp_timeremain = 'Leasetime remaining'
 dhcp_leases_active = 'Active Leases'
 a_n_ptp = 'Point-to-Point Connections'
 a_n_ptp1 = 'Point-to-Point connections with <abbr title="Point-to-Point Protocol over Ethernet">PPPoE</abbr> or <abbr title="Point-to-Point Tunneling Protocol">PPTP</abbr> are often used to connect a device over <abbr title="Digital Subscriber Line">DSL</abbr> or similar technologies to an internet access point.'
+network_interface_prereq = 'You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support'
+network_interface_prereq_mini = 'You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support'
 network_interface_server = '<abbr title="Point-to-Point Tunneling Protocol">PPTP</abbr>-Server'
 network_interface_demand = 'Automatic Disconnect'
 network_interface_demand_desc = 'Time (in seconds) after which an unused connection will be closed'
diff --git a/i18n/english/luasrc/i18n/admin-core.en.xml b/i18n/english/luasrc/i18n/admin-core.en.xml
index 266f362585..9e07e80f05 100644
--- a/i18n/english/luasrc/i18n/admin-core.en.xml
+++ b/i18n/english/luasrc/i18n/admin-core.en.xml
@@ -199,6 +199,8 @@
 <i18n:msg xml:id="dhcp_leases_active">Active Leases</i18n:msg>
 <i18n:msg xml:id="a_n_ptp">Point-to-Point Connections</i18n:msg>
 <i18n:msg xml:id="a_n_ptp1">Point-to-Point connections with <abbr title="Point-to-Point Protocol over Ethernet">PPPoE</abbr> or <abbr title="Point-to-Point Tunneling Protocol">PPTP</abbr> are often used to connect a device over <abbr title="Digital Subscriber Line">DSL</abbr> or similar technologies to an internet access point.</i18n:msg>
+<i18n:msg xml:id="network_interface_prereq">You need to install "comgt" for UMTS/GPRS, "ppp-mod-pppoe" for PPPoE, "ppp-mod-pppoa" for PPPoA or "pptp" for PPtP support</i18n:msg>
+<i18n:msg xml:id="network_interface_prereq_mini">You need to install "ppp-mod-pppoe" for PPPoE or "pptp" for PPtP support</i18n:msg>
 <i18n:msg xml:id="network_interface_server"><abbr title="Point-to-Point Tunneling Protocol">PPTP</abbr>-Server</i18n:msg>
 <i18n:msg xml:id="network_interface_demand">Automatic Disconnect</i18n:msg>
 <i18n:msg xml:id="network_interface_demand_desc">Time (in seconds) after which an unused connection will be closed</i18n:msg>
diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua
index 234cddd09c..245aed1ddf 100644
--- a/i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/i18n/german/luasrc/i18n/admin-core.de.lua
@@ -199,6 +199,8 @@ dhcp_leases = 'Zuweisungen'
 luci_ethers = 'Statische Einträge'
 dhcp_timeremain = 'Verbleibende Gültigkeit'
 dhcp_leases_active = 'Aktive Zuweisungen'
+network_interface_prereq = 'Für die Unterstützung von UMTS/GPRS muss &quot;comgt&quot;, für PPPoE &quot;ppp-mod-pppoe&quot;, für PPPoA &quot;ppp-mod-pppoa&quot; und für PPtP &quot;pptp&quot; installiert sein'
+network_interface_prereq_mini = 'Für die Unterstützung von PPPoE muss &quot;ppp-mod-pppoe&quot; und für PPtP &quot;pptp&quot; installiert sein'
 network_interface_demand = 'Automatische Trennung'
 network_interface_demand_desc = 'Zeit (in s) nach der die Verbindung bei Inaktivität getrennt wird'
 network_interface_keepalive = 'Keep-Alive'
diff --git a/i18n/german/luasrc/i18n/admin-core.de.xml b/i18n/german/luasrc/i18n/admin-core.de.xml
index d2ffe000cd..8d72c08192 100644
--- a/i18n/german/luasrc/i18n/admin-core.de.xml
+++ b/i18n/german/luasrc/i18n/admin-core.de.xml
@@ -206,6 +206,8 @@
 <i18n:msg xml:id="dhcp_timeremain">Verbleibende Gültigkeit</i18n:msg>
 <i18n:msg xml:id="dhcp_leases_active">Aktive Zuweisungen</i18n:msg>
 
+<i18n:msg xml:id="network_interface_prereq">Für die Unterstützung von UMTS/GPRS muss "comgt", für PPPoE "ppp-mod-pppoe", für PPPoA "ppp-mod-pppoa" und für PPtP "pptp" installiert sein</i18n:msg>
+<i18n:msg xml:id="network_interface_prereq_mini">Für die Unterstützung von PPPoE muss "ppp-mod-pppoe" und für PPtP "pptp" installiert sein</i18n:msg>
 <i18n:msg xml:id="network_interface_demand">Automatische Trennung</i18n:msg>
 <i18n:msg xml:id="network_interface_demand_desc">Zeit (in s) nach der die Verbindung bei Inaktivität getrennt wird</i18n:msg>
 <i18n:msg xml:id="network_interface_keepalive">Keep-Alive</i18n:msg>
diff --git a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
index 7d914860b5..f9c1867cb1 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
+++ b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
@@ -195,6 +195,8 @@ dhcp_timeremain = 'Tempo de lease restante'
 dhcp_leases_active = 'Leases Ativos'
 a_n_ptp = 'Conexões Ponto-a-Ponto'
 a_n_ptp1 = 'Conexões Ponto-a-Ponto com <abbr title="Protocolo Ponto-a-Ponto sobre Ethernet">PPPoE</abbr> ou <abbr title="Protocolo de Tunelamento Ponto-a-Ponto">PPTP</abbr> muitas vezes são usados para conectar um dispositivo sobre <abbr title="Linha Digital de Assinante">DSL</abbr> ou tecnologia similar para um ponto de acesso à internet.'
+network_interface_prereq = 'Você precisa instalar os pacotes &quot;comgt&quot; para UMTS/GPRS, &quot;ppp-mod-pppoe&quot; para PPPoE, &quot;ppp-mod-pppoa&quot; para PPPoA ou &quot;pptp&quot; para o suporte PPtP'
+network_interface_prereq_mini = 'Você precisa instalar os pacotes &quot;ppp-mod-pppoe&quot; para PPPoE ou &quot;pptp&quot; para o suporte PPtP'
 network_interface_server = 'Servidor-<abbr title="Protocolo de Tunelamento Ponto-a-Ponto">PPTP</abbr>'
 network_interface_demand = 'Desconexão Automática'
 network_interface_demand_desc = 'Tempo (em segundos) para desconexão de uma conexão não mais utilizada'
diff --git a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml
index 672b2815b9..923b45b53e 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml
+++ b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml
@@ -162,10 +162,13 @@
 <i18n:msg xml:id="dhcp_dnsmasq_noresolv">Ignorar arquivo resolv</i18n:msg>
 <i18n:msg xml:id="dhcp_dnsmasq_dnsforwardmax">Consultas simultâneas</i18n:msg>
 <i18n:msg xml:id="dhcp_dnsmasq_port">Porta do <abbr title="Sistema de Nomes de Domínios">DNS</abbr></i18n:msg>
-<i18n:msg xml:id="dhcp_dnsmasq_ednspacket_max">tamanho <abbr title="máximo">max.</abbr> <abbr title="Mecanismos de Extensão do Sistema de Nomes de Domínios">EDNS0</abbr> do pacote</i18n:msg>
-<i18n:msg xml:id="dhcp_dnsmasq_dhcpleasemax"><abbr title="máximo">max.</abbr> <abbr title="Protocolo de Configuração Dinâmica de Hosts">DHCP</abbr>-Leases</i18n:msg>
+<i18n:msg xml:id="dhcp_dnsmasq_ednspacket_max">tamanho <abbr title="máximo">max.</abbr> do pacote <abbr title="Mecanismos de Extensão do Sistema de Nomes de Domínios">EDNS0</abbr></i18n:msg>
+<i18n:msg xml:id="dhcp_dnsmasq_dhcpleasemax"><abbr title="máximo">max.</abbr> de <abbr title="Protocolo de Configuração Dinâmica de Hosts">DHCP</abbr>-Leases</i18n:msg>
 <i18n:msg xml:id="dhcp_dnsmasq_addnhosts">arquivo host adicional</i18n:msg>
-<i18n:msg xml:id="dhcp_dnsmasq_queryport">porta da consulta</i18n:msg>
+<i18n:msg xml:id="dhcp_dnsmasq_queryport">porta para consulta</i18n:msg>
+<i18n:msg xml:id="dhcp_dnsmasq_enabletftp">Ativar servidor TFTP</i18n:msg>
+<i18n:msg xml:id="dhcp_dnsmasq_tftproot">Diretório raiz do servidor TFTP</i18n:msg>
+<i18n:msg xml:id="dhcp_dnsmasq_dhcpboot">Imagem para o boot remoto</i18n:msg>
 <i18n:msg xml:id="a_n_switch">Switch</i18n:msg>
 <i18n:msg xml:id="a_n_conntrack">Conexões Ativas</i18n:msg>
 <i18n:msg xml:id="a_n_conntrack_desc">Esta página fornece informações sobre as conexões de rede ativas.</i18n:msg>
@@ -196,6 +199,8 @@
 <i18n:msg xml:id="dhcp_leases_active">Leases Ativos</i18n:msg>
 <i18n:msg xml:id="a_n_ptp">Conexões Ponto-a-Ponto</i18n:msg>
 <i18n:msg xml:id="a_n_ptp1">Conexões Ponto-a-Ponto com <abbr title="Protocolo Ponto-a-Ponto sobre Ethernet">PPPoE</abbr> ou <abbr title="Protocolo de Tunelamento Ponto-a-Ponto">PPTP</abbr> muitas vezes são usados para conectar um dispositivo sobre <abbr title="Linha Digital de Assinante">DSL</abbr> ou tecnologia similar para um ponto de acesso à internet.</i18n:msg>
+<i18n:msg xml:id="network_interface_prereq">Você precisa instalar os pacotes "comgt" para UMTS/GPRS, "ppp-mod-pppoe" para PPPoE, "ppp-mod-pppoa" para PPPoA ou "pptp" para o suporte PPtP</i18n:msg>
+<i18n:msg xml:id="network_interface_prereq_mini">Você precisa instalar os pacotes "ppp-mod-pppoe" para PPPoE ou "pptp" para o suporte PPtP</i18n:msg>
 <i18n:msg xml:id="network_interface_server">Servidor-<abbr title="Protocolo de Tunelamento Ponto-a-Ponto">PPTP</abbr></i18n:msg>
 <i18n:msg xml:id="network_interface_demand">Desconexão Automática</i18n:msg>
 <i18n:msg xml:id="network_interface_demand_desc">Tempo (em segundos) para desconexão de uma conexão não mais utilizada</i18n:msg>