tqcq/small-package
0
0
Fork 0
mirror of https://github.com/kenzok8/small-package.git synced 2026-02-08 07:37:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

update-11.23

Browse Source
This commit is contained in:
github-actions[bot]
2021-11-23 09:01:26 +08:00
parent 7432ab70aa
commit 14fba93743
6 changed files with 27 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-godproxy/luasrc/model/cbi/koolproxy/basic.lua
View File

@@ -61,7 +61,7 @@ e:value("kp.dat", translate("视频规则"))
e:value("user.txt", translate("自定义规则"))
e = t:option(MultiValue, "thirdparty_rules", translate("第三方规则"))
e.optional = true
e.optional = false
e.rmempty = false
e:value("adg.txt", translate("AdGuard规则"))
e:value("steven.txt", translate("Steven规则"))

12
luci-app-nft-qos/po/ro/nft-qos.po
View File

@@ -1,6 +1,6 @@
msgid ""
msgstr ""
"PO-Revision-Date: 2021-11-20 21:48+0000\n"
"PO-Revision-Date: 2021-11-22 19:53+0000\n"
"Last-Translator: Simona Iacob <s@zp1.net>\n"
"Language-Team: Romanian <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsnft-qos/ro/>\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
"20)) ? 1 : 2;\n"
"X-Generator: Weblate 4.9.1\n"
"X-Generator: Weblate 4.10-dev\n"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:136
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:155
@@ -139,19 +139,23 @@ msgstr "Adresa MAC"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:48
msgid "MB"
msgstr ""
msgstr "MB"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:29
msgid "NFT-QoS Settings"
msgstr ""
msgstr "Setări NFT-QoS"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:109
msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc."
msgstr ""
"Interfața de rețea pentru adaptarea traficului, de exemplu br-lan, eth0.1, "
"eth0 etc."
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:87
msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc."
msgstr ""
"Rețeaua care urmează să fie aplicată, de exemplu 192.168.1.0/24, 10.2.0.0/"
"16, etc."
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:93
msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc."

49
luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js
View File

@@ -25,68 +25,50 @@ return view.extend({
s = m.section(form.NamedSection, 'default', 'wizard');
s.addremove = false;
s.tab('wansetup', _('Wan Settings'), _('Three different ways to access the Internet, please choose according to your own situation.'));
s.tab('lansetup', _('Lan Settings'));
s.tab('netsetup', _('Net Settings'), _('Three different ways to access the Internet, please choose according to your own situation.'));
o = s.taboption('wansetup', form.ListValue, 'wan_proto', _('Protocol'));
o = s.taboption('netsetup', form.ListValue, 'wan_proto', _('Protocol'));
o.rmempty = false;
o.value('dhcp', _('DHCP client'));
o.value('static', _('Static address'));
o.value('pppoe', _('PPPoE'));
o = s.taboption('wansetup', form.Value, 'wan_pppoe_user', _('PAP/CHAP username'));
o = s.taboption('netsetup', form.Value, 'wan_pppoe_user', _('PAP/CHAP username'));
o.depends('wan_proto', 'pppoe');
o = s.taboption('wansetup', form.Value, 'wan_pppoe_pass', _('PAP/CHAP password'));
o = s.taboption('netsetup', form.Value, 'wan_pppoe_pass', _('PAP/CHAP password'));
o.depends('wan_proto', 'pppoe');
o.password = true;
o = s.taboption('wansetup', form.Value, 'wan_ipaddr', _('IPv4 address'));
o.depends('wan_proto', 'static');
o = s.taboption('netsetup', form.Value, 'lan_ipaddr', _('IPv4 address'));
o.datatype = 'ip4addr';
o = s.taboption('wansetup', form.Value, 'wan_netmask', _('IPv4 netmask'));
o.depends('wan_proto', 'static');
o = s.taboption('netsetup', form.Value, 'lan_netmask', _('IPv4 netmask'));
o.datatype = 'ip4addr';
o.value('255.255.255.0');
o.value('255.255.0.0');
o.value('255.0.0.0');
o.default = '255.255.255.0';
o = s.taboption('wansetup', form.Value, 'wan_gateway', _('IPv4 gateway'));
o.depends('wan_proto', 'static');
o.datatype = 'ip4addr';
o = s.taboption('wansetup', form.DynamicList, 'wan_dns', _('Use custom DNS servers'));
o.depends('wan_proto', 'static');
o = s.taboption('netsetup', form.DynamicList, 'lan_dns', _('Use custom DNS servers'), _('留空则使用运营商DNS, 推荐: 223.5.5.5'));
o.datatype = 'ip4addr';
o.cast = 'string';
o = s.taboption('lansetup', form.Value, 'lan_ipaddr', _('IPv4 address'));
o.datatype = 'ip4addr';
o = s.taboption('lansetup', form.Value, 'lan_netmask', _('IPv4 netmask'));
o.datatype = 'ip4addr';
o.value('255.255.255.0');
o.value('255.255.0.0');
o.value('255.0.0.0');
o = s.taboption('lansetup', form.DynamicList, 'lan_dns', _('Use custom DNS servers'), _('留空则使用运营商DNS, 推荐: 223.5.5.5'));
o.datatype = 'ip4addr';
o.cast = 'string';
o = s.taboption('lansetup', form.Flag, 'siderouter', _('Siderouter'));
o = s.taboption('netsetup', form.Flag, 'siderouter', _('Siderouter'));
o.rmempty = false;
o = s.taboption('lansetup', form.Value, 'lan_gateway', _('IPv4 gateway'));
o = s.taboption('netsetup', form.Value, 'lan_gateway', _('IPv4 gateway'));
o.depends('siderouter', '1');
o.datatype = 'ip4addr';
o.placeholder = '请输入主路由IP';
o.rmempty = false;
o = s.taboption('lansetup', form.Flag, 'dhcp', _('DHCP Server'), _('开启此DHCP则需要关闭主路由的DHCP, 关闭此DHCP则需要手动将所有上网设备的网关和DNS改为此旁路由的IP'));
o = s.taboption('netsetup', form.Flag, 'dhcp', _('DHCP Server'), _('开启此DHCP则需要关闭主路由的DHCP, 关闭此DHCP则需要手动将所有上网设备的网关和DNS改为此旁路由的IP'));
o.depends('siderouter', '1');
o.default = o.enabled;
o = s.taboption('netsetup', form.Flag, 'ipv6', _('Enable IPv6'), _('Enable/Disable IPv6'));
o.default = o.enabled;
s.tab('firmware', _('Firmware Settings'));
o = s.taboption('firmware', form.Flag, 'autoupgrade_pkg', _('Packages Auto Upgrade'));
@@ -95,9 +77,6 @@ return view.extend({
o = s.taboption('firmware', form.Flag, 'autoupgrade_fm', _('Firmware Upgrade Notice'));
o.default = o.enabled;
o = s.taboption('firmware', form.Flag, 'ipv6', _('Enable IPv6'), _('Enable/Disable IPv6'));
o.default = o.enabled;
return m.render();
}
});

9
luci-app-wizard/po/zh_Hans/wizard.po
View File

@@ -7,8 +7,8 @@ msgstr "设置向导"
msgid "Inital Router Setup"
msgstr "路由器设置向导"
msgid "Wan Settings"
msgstr "上网设置"
msgid "Net Settings"
msgstr "网络设置"
msgid "Wireless Settings"
msgstr "无线设置"
@@ -22,11 +22,8 @@ msgstr "三种不同的上网方式，请您根据自身情况进行选择。"
msgid "Set the router's wireless name and password. For more advanced settings, please go to the Network-Wireless page."
msgstr "设置路由器的无线名字和密码，更多高级设置请进入 网络-无线 页面。"
msgid "Lan Settings"
msgstr "内网设置"
msgid "Siderouter"
msgstr "作为旁路由"
msgstr "旁路由模式"
msgid "Enable IPv6"
msgstr "启用IPv6"

9
luci-app-wizard/root/etc/config/wizard
View File

@@ -1,10 +1 @@
config wizard 'default'
option lan_ipaddr ''
option lan_netmask '255.255.255.0'
option lan_dns ''
option wan_proto 'dhcp'
option wan_ipaddr ''
option wan_netmask ''
option wan_gateway ''
option wan_pppoe_user ''
option wan_pppoe_pass ''

21
luci-app-wizard/root/etc/init.d/wizard
View File

@@ -11,7 +11,7 @@ boot() {
add_wizard() {
[ "x$XBOOT" = "x1" ] && return 0
local cfg="$1"
local wan_proto wan_ipaddr wan_netmask wan_gateway wan_pppoe_user wan_pppoe_pass
local wan_proto wan_pppoe_user wan_pppoe_pass
local lan_ipaddr lan_netmask lan_dns lan_gateway dhcp
local device ipv6 old_ipv6
@@ -25,23 +25,6 @@ add_wizard() {
uci set network.wan.device="$device"
uci set network.wan.proto='dhcp'
;;
static)
config_get wan_ipaddr "$cfg" wan_ipaddr
config_get wan_netmask "$cfg" wan_netmask
config_get wan_gateway "$cfg" wan_gateway
test -n "${wan_ipaddr}" && test -n "${wan_netmask}" && {
uci delete network.wan
uci set network.wan=interface
uci set network.wan.proto='static'
uci set network.wan.device="$device"
uci set network.wan.ipaddr="${wan_ipaddr}"
uci set network.wan.netmask="${wan_netmask}"
uci set network.wan.gateway="${wan_gateway}"
uci set dhcp.wan.start='100'
uci set dhcp.wan.limit='150'
uci set dhcp.wan.leasetime='12h'
}
;;
pppoe)
config_get wan_pppoe_user "$cfg" wan_pppoe_user
config_get wan_pppoe_pass "$cfg" wan_pppoe_pass
@@ -122,8 +105,6 @@ add_wizard() {
reconfig() {
uci -q set wizard.default.wan_proto="$(uci -q get network.wan.proto)"
uci -q set wizard.default.wan_netmask="$(uci -q get network.wan.netmask)"
uci -q set wizard.default.wan_gateway="$(uci -q get network.wan.gateway)"
uci -q set wizard.default.wan_pppoe_user="$(uci -q get network.wan.username)"
uci -q set wizard.default.wan_pppoe_pass="$(uci -q get network.wan.password)"
uci -q set wizard.default.lan_ipaddr="$(uci -q get network.lan.ipaddr)"