Merge pull request #5977 from danielkucera/patch-1

proper cache control in firefox

diff --git a/applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js b/applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js
index c859aa177fd5196aafddd03103b1319d9747c683..0999ba0294e4122879354e79d602ee3878060170 100644 (file)
--- a/applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js
+++ b/applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js
@@ -45,7 +45,7 @@ var baseProxyConf = [
        [form.ListValue, 'type', _('Proxy type'), _('ProxyType specifies the type of this proxy. Valid values include "tcp", "udp", "http", "https", "stcp", and "xtcp".<br />By default, this value is "tcp".'), {values: ['tcp', 'udp', 'http', 'https', 'stcp', 'xtcp']}],
        [form.Flag, 'use_encryption', _('Encryption'), _('UseEncryption controls whether or not communication with the server will be encrypted. Encryption is done using the tokens supplied in the server and client configuration.<br />By default, this value is false.'), {datatype: 'bool'}],
        [form.Flag, 'use_compression', _('Compression'), _('UseCompression controls whether or not communication with the server will be compressed.<br />By default, this value is false.'), {datatype: 'bool'}],
-       [form.Value, 'local_ip', _('Local IP'), _('LocalIp specifies the IP address or host name to proxy to.'), {datatype: 'ipaddr'}],
+       [form.Value, 'local_ip', _('Local IP'), _('LocalIp specifies the IP address or host name to proxy to.'), {datatype: 'host'}],
        [form.Value, 'local_port', _('Local port'), _('LocalPort specifies the port to proxy to.'), {datatype: 'port'}],
 ];
 
@@ -72,6 +72,16 @@ var stcpProxyConf = [
        [form.Value, 'sk', _('Sk')],
 ];
 
+var pluginConf = [
+       [form.ListValue, 'plugin', _('Plugin'), undefined, {values: ['', 'http_proxy', 'socks5', 'unix_domain_socket'], rmempty: true}],
+       [form.Value, 'plugin_http_user', _('HTTP user'), undefined, {depends: {plugin: 'http_proxy'}}],
+       [form.Value, 'plugin_http_passwd', _('HTTP password'), undefined, {depends: {plugin: 'http_proxy'}}],
+       [form.Value, 'plugin_user', _('SOCKS5 user'), undefined, {depends: {plugin: 'socks5'}}],
+       [form.Value, 'plugin_passwd', _('SOCKS5 password'), undefined, {depends: {plugin: 'socks5'}}],
+       [form.Value, 'plugin_unix_path', _('Unix domain socket path'), undefined, {depends: {plugin: 'unix_domain_socket'}, optional: false, rmempty: false,
+               datatype: 'file', placeholder: '/var/run/docker.sock', default: '/var/run/docker.sock'}],
+];
+
 function setParams(o, params) {
        if (!params) return;
        for (var key in params) {
@@ -207,11 +217,20 @@ return view.extend({
 
                s.tab('general', _('General Settings'));
                s.tab('http', _('HTTP Settings'));
+               s.tab('plugin', _('Plugin Settings'));
 
                s.option(form.Value, 'name', _('Proxy name')).modalonly = false;
                s.option(form.Value, 'type', _('Proxy type')).modalonly = false;
                s.option(form.Value, 'local_ip', _('Local IP')).modalonly = false;
                s.option(form.Value, 'local_port', _('Local port')).modalonly = false;
+               o = s.option(form.Value, 'remote_port', _('Remote port'));
+               o.modalonly = false;
+               o.depends('type', 'tcp');
+               o.depends('type', 'udp');
+               o.cfgvalue = function() {
+                       var v = this.super('cfgvalue', arguments);
+                       return v&&v!='0'?v:'#';
+               };
 
                defTabOpts(s, 'general', baseProxyConf, {modalonly: true});
 
@@ -227,6 +246,9 @@ return view.extend({
                // STCP and XTCP
                defTabOpts(s, 'general', stcpProxyConf, {modalonly: true, depends: [{type: 'stcp'}, {type: 'xtcp'}]});
 
+               // Plugin
+               defTabOpts(s, 'plugin', pluginConf, {modalonly: true});
+
                return m.render();
        }
 });

diff --git a/applications/luci-app-frpc/po/templates/frpc.pot b/applications/luci-app-frpc/po/templates/frpc.pot
index 17ab6e8f6f30385550febcc8e9324e6654077843..86373f8258a341999877e97bfe01122f100620da 100644 (file)
--- a/applications/luci-app-frpc/po/templates/frpc.pot
+++ b/applications/luci-app-frpc/po/templates/frpc.pot
@@ -410,3 +410,18 @@ msgstr ""
 #: applications/luci-app-frpc/root/usr/share/luci/menu.d/luci-app-frpc.json:3
 msgid "frp Client"
 msgstr ""
+
+msgid "Plugin Settings"
+msgstr ""
+
+msgid "Plugin"
+msgstr ""
+
+msgid "SOCKS5 user"
+msgstr ""
+
+msgid "SOCKS5 password"
+msgstr ""
+
+msgid "Unix domain socket path"
+msgstr ""

diff --git a/applications/luci-app-frpc/po/zh_Hans/frpc.po b/applications/luci-app-frpc/po/zh_Hans/frpc.po
index 68d911256f3c8f32c828f8117a6e379f418f7517..e876bcccd4ecd24186925f0d9d5f4252c02e109f 100644 (file)
--- a/applications/luci-app-frpc/po/zh_Hans/frpc.po
+++ b/applications/luci-app-frpc/po/zh_Hans/frpc.po
@@ -197,15 +197,15 @@ msgstr "本地 IP"
 #: applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js:49
 #: applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js:214
 msgid "Local port"
-msgstr "监听端口"
+msgstr "本地端口"
 
 #: applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js:48
 msgid "LocalIp specifies the IP address or host name to proxy to."
-msgstr "LocalIp 指定要被代理的 IP 地址或主机名。"
+msgstr "本地 IP 指定要被代理的 IP 地址或主机名。"
 
 #: applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js:49
 msgid "LocalPort specifies the port to proxy to."
-msgstr "LocalPort 指定要被代理的端口。"
+msgstr "本地端口指定要被代理的端口。"
 
 #: applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js:62
 msgid "Locations"
@@ -454,5 +454,20 @@ msgstr ""
 msgid "frp Client"
 msgstr "frp 客户端"
 
+msgid "Plugin Settings"
+msgstr "插件设置"
+
+msgid "Plugin"
+msgstr "插件"
+
+msgid "SOCKS5 user"
+msgstr "SOCKS5 用户"
+
+msgid "SOCKS5 password"
+msgstr "SOCKS5 密码"
+
+msgid "Unix domain socket path"
+msgstr "Unix 域套接字路径"
+
 #~ msgid "Name can not be \"common\""
 #~ msgstr "名称不能\"common\""

diff --git a/applications/luci-app-simple-adblock/po/pt/simple-adblock.po b/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
index 1d2765c0895520fd40d4011db52531032d01e41b..40ea2be253f31c76c396e14f4c150b3a350ac589 100644 (file)
--- a/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2022-08-30 18:53+0000\n"
-"Last-Translator: ssantos <ssantos@web.de>\n"
+"PO-Revision-Date: 2022-09-16 09:21+0000\n"
+"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationssimple-adblock/pt/>\n"
 "Language: pt\n"
@@ -119,7 +119,7 @@ msgstr "Conjunto IP do DNSMASQ"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:325
 msgid "DNSMASQ NFT Set"
-msgstr ""
+msgstr "Conjunto DNSMASQ NFT"
 
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:327
 msgid "DNSMASQ Servers File"

diff --git a/applications/luci-app-smartdns/po/pt-BR/smartdns.po b/applications/luci-app-smartdns/po/pt-BR/smartdns.po
index 264c7ff7a79cb7ef58568d1ee505289ecc829b31..a0da23b625b445dba33f94f46c551bb7b1a79e7a 100644 (file)
--- a/applications/luci-app-smartdns/po/pt-BR/smartdns.po
+++ b/applications/luci-app-smartdns/po/pt-BR/smartdns.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2021-07-22 08:04+0000\n"
+"PO-Revision-Date: 2022-09-16 09:21+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
 "openwrt/luciapplicationssmartdns/pt_BR/>\n"
@@ -8,7 +8,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.7.2-dev\n"
+"X-Generator: Weblate 4.14.1-dev\n"
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:418
 msgid "Additional Args for upstream dns servers"
@@ -33,11 +33,12 @@ msgstr ""
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:184
 msgid "Automatically Set Dnsmasq"
-msgstr ""
+msgstr "Definir o Dnsmasq automaticamente"
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:184
 msgid "Automatically set as upstream of dnsmasq when port changes."
 msgstr ""
+"Definido automaticamente como upstream do dnsmasq quando a porta se alterar."
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:175
 msgid "Cache Size"
@@ -92,7 +93,7 @@ msgstr "Encaminhamento do Dnsmasq para Falha do Smartdns"
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:379
 msgid "Do not check certificate."
-msgstr ""
+msgstr "Não verifique o certificado."
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:248
 msgid "Do not check speed."
@@ -179,11 +180,11 @@ msgstr "Impor AAAA SOA."
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:194
 msgid "Force HTTPS SOA"
-msgstr ""
+msgstr "Impor o HTTPS SOA"
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:194
 msgid "Force HTTPS SOA."
-msgstr ""
+msgstr "Impor o HTTPS SOA."
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:121
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:124
@@ -246,7 +247,7 @@ msgstr "NÃO ESTÁ EM EXECUÇÃO"
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:378
 msgid "No check certificate"
-msgstr ""
+msgstr "Não verifique o certificado"
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:241
 msgid "Query DNS through specific dns server group, such as office, home."
@@ -260,19 +261,19 @@ msgstr "EM EXECUÇÃO"
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:216
 msgid "Reply Domain TTL Max"
-msgstr ""
+msgstr "Responda ao domínio com TTL Max"
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:217
 msgid "Reply maximum TTL for all domain result."
-msgstr ""
+msgstr "Responda com TTL máximo em todos os resultados do domínio."
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:179
 msgid "Resolve Local Hostnames"
-msgstr ""
+msgstr "Resolve os nomes dos host locais"
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:179
 msgid "Resolve local hostnames by reading Dnsmasq lease file."
-msgstr ""
+msgstr "Resolve os nomes dos hosts lendo o arquivo de concessão do Dnsmasq."
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:125
 msgid "Second Server Settings"
@@ -402,6 +403,8 @@ msgid ""
 "Smartdns local server port, smartdns will be automatically set as main dns "
 "when the port is 53."
 msgstr ""
+"Porta do servidor local do Smartdns, o smartdns será automaticamente "
+"definido como dns principal quando a porta for 53."
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:133
 msgid "Smartdns server name"

diff --git a/applications/luci-app-smartdns/po/zh_Hans/smartdns.po b/applications/luci-app-smartdns/po/zh_Hans/smartdns.po
index 68fefad7dc00d6ccc03d62e5f3d27ebd0b5ac7f9..477295be490e20cb8e0aca28ca58be3cb112510f 100644 (file)
--- a/applications/luci-app-smartdns/po/zh_Hans/smartdns.po
+++ b/applications/luci-app-smartdns/po/zh_Hans/smartdns.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2021-04-12 08:24+0000\n"
-"Last-Translator: xiazhang <xz@xia.plus>\n"
+"PO-Revision-Date: 2022-09-17 11:23+0000\n"
+"Last-Translator: Eric <hamburger1024@mailbox.org>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "openwrt/luciapplicationssmartdns/zh_Hans/>\n"
 "Language: zh_Hans\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.6-dev\n"
+"X-Generator: Weblate 4.14.1-dev\n"
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:418
 msgid "Additional Args for upstream dns servers"
@@ -35,7 +35,7 @@ msgstr "自动设置Dnsmasq"
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:184
 msgid "Automatically set as upstream of dnsmasq when port changes."
-msgstr "自动设置为Dnsmasq的上游服务器"
+msgstr "端口更改时自动设为 dnsmasq 的上游。"
 
 #: applications/luci-app-smartdns/htdocs/luci-static/resources/view/smartdns/smartdns.js:175
 msgid "Cache Size"

diff --git a/modules/luci-mod-dashboard/po/pt/dashboard.po b/modules/luci-mod-dashboard/po/pt/dashboard.po
index 0889583b042f5a9818caf14260155cd536ce1b00..c186af27a6104d053ce87bf66617620c6d41de8b 100644 (file)
--- a/modules/luci-mod-dashboard/po/pt/dashboard.po
+++ b/modules/luci-mod-dashboard/po/pt/dashboard.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2022-04-25 11:12+0000\n"
-"Last-Translator: ssantos <ssantos@web.de>\n"
+"PO-Revision-Date: 2022-09-16 09:22+0000\n"
+"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/openwrt/"
 "lucimodulesluci-mod-dashboard/pt/>\n"
 "Language: pt\n"
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.12.1-dev\n"
+"X-Generator: Weblate 4.14.1-dev\n"
 
 #: modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/30_wifi.js:163
 msgid "Active"
@@ -190,7 +190,6 @@ msgid "System"
 msgstr "Sistema"
 
 #: modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/30_wifi.js:86
-#, fuzzy
 msgid "Up."
 msgstr "Ativo."
 

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js
index 3a11f1e8308452b9433fe18969376551107d99fc..82660c15951f32438084909a646242f7e0ed8ddb 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js
@@ -46,8 +46,8 @@ var expr_translations = {
        'ip.dport': _('Destination port', 'nft ip dport'),
        'ip6.saddr': _('Source IPv6', 'nft ip6 saddr'),
        'ip6.daddr': _('Destination IPv6', 'nft ip6 daddr'),
-       'icmp.code': _('ICMPv6 code', 'nft icmpv6 code'),
-       'icmp.type': _('ICMPv6 type', 'nft icmpv6 type'),
+       'icmp.code': _('ICMP code', 'nft icmp code'),
+       'icmp.type': _('ICMP type', 'nft icmp type'),
        'icmpv6.code': _('ICMPv6 code', 'nft icmpv6 code'),
        'icmpv6.type': _('ICMPv6 type', 'nft icmpv6 type'),
        'tcp.sport': _('TCP source port', 'nft tcp sport'),