Merge branch 'master' of https://github.com/coolsnowwolf/lede

package/lean/default-settings/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=default-settings
 PKG_VERSION:=1.0
-PKG_RELEASE:=40
+PKG_RELEASE:=42
 PKG_LICENSE:=GPLv3
 PKG_LICENSE_FILES:=LICENSE
 

package/lean/default-settings/files/zzz-default-settings

@@ -27,6 +27,11 @@ sed -i 's/\"services\"/\"nas\"/g' /usr/lib/lua/luci/controller/p910nd.lua
 sed -i 's/\"services\"/\"nas\"/g' /usr/lib/lua/luci/controller/usb_printer.lua
 sed -i 's/\"services\"/\"nas\"/g' /usr/lib/lua/luci/controller/xunlei.lua
 
+sed -i 's/services/nas/g'  /usr/lib/lua/luci/view/minidlna_status.htm
+uci set minidlna.config.enabled=0
+uci commit minidlna
+/etc/init.d/minidlna stop
+
 ln -sf /sbin/ip /usr/bin/ip
 
 rm -rf /tmp/luci-modulecache/
@@ -38,6 +43,7 @@ sed -i 's/root::0:0:99999:7:::/root:$1$V4UetPzk$CYXluq4wUazHjmCDBCqXF.:0:0:99999
 sed -i "s/# //g" /etc/opkg/distfeeds.conf
 
 sed -i '/REDIRECT --to-ports 53/d' /etc/firewall.user
+echo "" >> /etc/firewall.user
 echo "iptables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53" >> /etc/firewall.user
 echo "iptables -t nat -A PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53" >> /etc/firewall.user
 

package/lean/default-settings/i18n/default.zh-cn.po

@@ -25,17 +25,6 @@ msgstr "闪存大小"
 msgid "Free Memory"
 msgstr "释放内存"
 
-msgid "Core"
-msgstr "核心数"
-
-msgid "Thread"
-msgstr "线程数"
-
-msgid "Size of DNS query cache"
-msgstr "DNS查询缓存条目"
-
-msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
-msgstr "最大10000, 0代表不缓存，默认为150"
 
 
 

package/lean/luci-app-kcptun/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-kcptun
-PKG_VERSION:=1.4.3
+PKG_VERSION:=1.4.4
 PKG_RELEASE:=1
 
 PKG_LICENSE:=Apache-2.0