OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update-11.22

This commit is contained in:
github-actions[bot] 2021-11-22 15:48:16 +08:00
parent 51f0dd4c04
commit dc5b8af99b
3 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
luci-app-nft-qos/po/fr/nft-qos.po
View File

@ -1,14 +1,14 @@
msgid "" msgid ""
msgstr "" msgstr ""
"PO-Revision-Date: 2020-10-24 08:56+0000\n" "PO-Revision-Date: 2021-11-21 18:56+0000\n"
"Last-Translator: ButterflyOfFire <ButterflyOfFire@protonmail.com>\n" "Last-Translator: Felix Braun <f.bhelicopter@gmail.com>\n"
"Language-Team: French <https://hosted.weblate.org/projects/openwrt/" "Language-Team: French <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsnft-qos/fr/>\n" "luciapplicationsnft-qos/fr/>\n"
"Language: fr\n" "Language: fr\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n" "Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 4.3.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:136
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:155 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:155
@ -233,7 +233,7 @@ msgstr ""
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:257 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:257
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:268 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:268
msgid "Unit" msgid "Unit"
msgstr "" msgstr "unité"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:82 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:82
msgid "Upload Bandwidth (Mbps)" msgid "Upload Bandwidth (Mbps)"

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

@ -1,6 +1,6 @@
msgid "" msgid ""
msgstr "" msgstr ""
"PO-Revision-Date: 2021-11-18 18:36+0000\n" "PO-Revision-Date: 2021-11-20 21:48+0000\n"
"Last-Translator: Simona Iacob <s@zp1.net>\n" "Last-Translator: Simona Iacob <s@zp1.net>\n"
"Language-Team: Romanian <https://hosted.weblate.org/projects/openwrt/" "Language-Team: Romanian <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsnft-qos/ro/>\n" "luciapplicationsnft-qos/ro/>\n"
@ -9,7 +9,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
"20)) ? 1 : 2;\n" "20)) ? 1 : 2;\n"
"X-Generator: Weblate 4.9.1-dev\n" "X-Generator: Weblate 4.9.1\n"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:136 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:136
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:155 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:155
@ -131,7 +131,7 @@ msgstr "Tipul de limită"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:170 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:170
msgid "MAC (optional)" msgid "MAC (optional)"
msgstr "" msgstr "MAC (opțional)"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:248 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:248
msgid "MAC Address" msgid "MAC Address"
@ -168,7 +168,7 @@ msgstr ""
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:205 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:205
msgid "Priority" msgid "Priority"
msgstr "" msgstr "Prioritate"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:197 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:197
msgid "Protocol" msgid "Protocol"

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

@ -11,21 +11,19 @@ boot() {
add_wizard() { add_wizard() {
[ "x$XBOOT" = "x1" ] && return 0 [ "x$XBOOT" = "x1" ] && return 0
local cfg="$1" local cfg="$1"
local wan_proto old_wan_proto wan_ipaddr wan_netmask wan_gateway wan_pppoe_user wan_pppoe_pass local wan_proto wan_ipaddr wan_netmask wan_gateway wan_pppoe_user wan_pppoe_pass
local lan_ipaddr lan_netmask lan_dns lan_gateway dhcp local lan_ipaddr lan_netmask lan_dns lan_gateway dhcp
local device ipv6 old_ipv6 siderouter old_siderouter local device ipv6 old_ipv6
config_get wan_proto "$cfg" wan_proto config_get wan_proto "$cfg" wan_proto
device=$(uci get network.wan.device 2>/dev/null) device=$(uci get network.wan.device 2>/dev/null)
if [ "${wan_proto}" != "${old_wan_proto}" ]; then
case "${wan_proto}" in case "${wan_proto}" in
dhcp) dhcp)
uci delete network.wan uci delete network.wan
uci set network.wan=interface uci set network.wan=interface
uci set network.wan.device="$device" uci set network.wan.device="$device"
uci set network.wan.proto='dhcp' uci set network.wan.proto='dhcp'
uci set network.wan.metric='40'
;; ;;
static) static)
config_get wan_ipaddr "$cfg" wan_ipaddr config_get wan_ipaddr "$cfg" wan_ipaddr
@ -35,32 +33,28 @@ add_wizard() {
uci delete network.wan uci delete network.wan
uci set network.wan=interface uci set network.wan=interface
uci set network.wan.proto='static' uci set network.wan.proto='static'
uci set network.wan.force_link='0'
uci set network.wan.device="$device" uci set network.wan.device="$device"
uci set network.wan.metric='40'
uci set network.wan.ipaddr="${wan_ipaddr}" uci set network.wan.ipaddr="${wan_ipaddr}"
uci set network.wan.netmask="${wan_netmask}" uci set network.wan.netmask="${wan_netmask}"
uci set network.wan.gateway="${wan_gateway}" 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) pppoe)
config_get wan_pppoe_user "$cfg" wan_pppoe_user config_get wan_pppoe_user "$cfg" wan_pppoe_user
config_get wan_pppoe_pass "$cfg" wan_pppoe_pass config_get wan_pppoe_pass "$cfg" wan_pppoe_pass
test -n "${wan_pppoe_user}" && test -n "${wan_pppoe_pass}" && { [[ -n "${wan_pppoe_user} != $(uci -q get network.wan.username)" || -n "${wan_pppoe_pass} != $(uci -q get network.wan.password)" ]] && {
uci delete network.wan uci delete network.wan
uci set network.wan=interface uci set network.wan=interface
uci set network.wan.proto='pppoe' uci set network.wan.proto='pppoe'
uci set network.wan.device="$device" uci set network.wan.device="$device"
uci set network.wan.metric='40'
uci set network.wan.username="${wan_pppoe_user}" uci set network.wan.username="${wan_pppoe_user}"
uci set network.wan.password="${wan_pppoe_pass}" uci set network.wan.password="${wan_pppoe_pass}"
uci set network.wan.keepalive='5 5'
uci set network.wan.mtu='1492'
} }
;; ;;
esac esac
fi
config_get lan_ipaddr "$cfg" lan_ipaddr config_get lan_ipaddr "$cfg" lan_ipaddr
config_get lan_netmask "$cfg" lan_netmask config_get lan_netmask "$cfg" lan_netmask
@ -82,8 +76,9 @@ add_wizard() {
uci -q del network.wan.peerdns uci -q del network.wan.peerdns
uci -q del network.lan.dns uci -q del network.lan.dns
} }
if [ "${siderouter}" != "${old_siderouter}" ]; then [ "$dhcp" == "0" ] && dhcp="1"
if [[ -n "${lan_gateway} != $(uci -q get network.lan.gateway)" || -n "${dhcp} != $(uci -q get dhcp.lan.ignore)" ]]; then
if [ -n "${siderouter}" ]; then if [ -n "${siderouter}" ]; then
uci -q set network.lan.gateway="${lan_gateway}" uci -q set network.lan.gateway="${lan_gateway}"
[ -n "$lan_dns" ] || uci -q set network.lan.dns='223.5.5.5' [ -n "$lan_dns" ] || uci -q set network.lan.dns='223.5.5.5'
@ -92,7 +87,6 @@ add_wizard() {
uci -q del network.lan.gateway uci -q del network.lan.gateway
uci -q del dhcp.lan.ignore uci -q del dhcp.lan.ignore
fi fi
uci -q set wizard.default.old_siderouter="${siderouter}"
fi fi
config_get ipv6 "$cfg" ipv6 config_get ipv6 "$cfg" ipv6
@ -138,8 +132,7 @@ uci -q set wizard.default.lan_ipaddr="$(uci -q get network.lan.ipaddr)"
uci -q set wizard.default.lan_netmask="$(uci -q get network.lan.netmask)" uci -q set wizard.default.lan_netmask="$(uci -q get network.lan.netmask)"
uci -q set wizard.default.lan_gateway="$(uci -q get network.lan.gateway)" uci -q set wizard.default.lan_gateway="$(uci -q get network.lan.gateway)"
uci -q set wizard.default.lan_dns="$(uci -q get network.lan.dns)" uci -q set wizard.default.lan_dns="$(uci -q get network.lan.dns)"
[ "$(uci -q get dhcp.lan.ignore)" ] && uci -q set wizard.default.dhcp="0" [ "$(uci -q get dhcp.lan.ignore)" ] && uci -q set wizard.default.dhcp="0" || uci -q del wizard.default.dhcp
uci -q set wizard.default.old_wan_proto="$(uci -q set wizard.default.wan_proto)"
uci commit wizard uci commit wizard
} }