add x86/nand luci reset support and IGMP Snooping

hpx502766238 · May 23, 2018 · 7ce9569 · 7ce9569
1 parent 4785e97
commit 7ce9569
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/feeds.conf.default b/feeds.conf.default
@@ -1,7 +1,8 @@
 #src-git packages https://git.openwrt.org/feed/packages.git^1b73f267eae2dedc18969b70ed7c5d9b02288bac
 src-git packages https://github.com/openwrt/packages.git
-src-git luci https://git.openwrt.org/project/luci.git^7d55be315d758b2a40494e732d7bdc300ee15c00
-#src-git luci https://github.com/openwrt/luci.git^697db81246bf9e3256c7217a00ee4e7757c87077
+#src-git luci https://git.openwrt.org/project/luci.git^7d55be315d758b2a40494e732d7bdc300ee15c00
+src-git luci https://github.com/openwrt/luci.git^80cb4fef8c7db0dadc373fef122d7abb092a7191
+#src-git luci https://github.com/openwrt/luci.git;openwrt-18.06
 src-git routing https://git.openwrt.org/feed/routing.git;openwrt-18.06
 src-git telephony https://github.com/openwrt/telephony.git;openwrt-18.06
 #src-git video https://github.com/openwrt/video.git

diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=default-settings
 PKG_VERSION:=1.0
-PKG_RELEASE:=45
+PKG_RELEASE:=46
 PKG_LICENSE:=GPLv3
 PKG_LICENSE_FILES:=LICENSE
 

diff --git a/package/lean/default-settings/i18n/more.zh-cn.po b/package/lean/default-settings/i18n/more.zh-cn.po
@@ -926,3 +926,8 @@ msgstr "无流量数据"
 msgid "other"
 msgstr "其他"
 
+msgid "Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> snooping"
+msgstr "开启 <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> snooping"
+
+msgid "Enables IGMP snooping on this bridge"
+msgstr "在此桥接上启用 IGMP snooping 组播（多播）"