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

.github/ISSUE_TEMPLATE.md

@@ -2,8 +2,8 @@
 
 ## 1.关于你要提交的问题
 
-Q：是否搜索了issue
-A：* [ ] 没有类似的issue
+Q：是否搜索了issue (使用 "x" 选择)
+* [ ] 没有类似的issue
 
 ## 2. 详细叙述
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,2 +1,2 @@
-Q：你知道这是`pull request`吗？
-A：* [ ] 我知道
+Q：你知道这是`pull request`吗？(使用 "x" 选择)
+* [ ] 我知道

.github/workflows/openwrt-ci.yml

@@ -33,7 +33,7 @@ jobs:
           sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php /etc/apt/sources.list.d
           sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* mysql* php*
           sudo -E apt-get update
-          sudo -E apt-get -y install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch python3 unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler
+          sudo -E apt-get -y install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch python3 unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler
           sudo -E apt-get -y autoremove --purge
           sudo -E apt-get clean
 

package/lean/luci-app-nps/Makefile

@@ -10,10 +10,8 @@ LUCI_TITLE:=LuCI for Nps
 LUCI_DEPENDS:=+wget +npc
 LUCI_PKGARCH:=all
 PKG_VERSION:=1.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature
-
-

package/lean/luci-app-nps/luasrc/i18n/nps.zh_CN.po

@@ -1,28 +0,0 @@
-# zh_CN translation for npc.
-# Copyright (C) 2015 Yoyodyne, Inc. (msgids)
-# This file is distributed under the same license as the gettext package.
-#
-msgid ""
-msgstr ""
-"PO-Revision-Date: 2015-09-01 09:53中国标准时间\n"
-"Last-Translator: Ardentwheel <Ardentwheel@gmail.com>\n"
-"Language: zh_CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-
-msgid "Nps Setting"
-msgstr "Nps内网穿透"
-
-msgid "Enable Compression"
-msgstr "使用压缩传输"
-
-msgid "Enable Encryption"
-msgstr "使用加密传输"
-
-msgid "The contents will be compressed to speed up the traffic forwarding speed, but this will consume some additional cpu resources"
-msgstr "压缩传输内容，加快流量转发速度，会额外消耗 cpu 资源"
-
-msgid "Encrypted the communication between Npc and Nps, will effectively prevent the traffic intercepted."
-msgstr "加密传输 npc 与 nps 之间的通信内容，会有效防止流量被拦截"

package/lean/luci-app-nps/luasrc/model/cbi/nps.lua

@@ -43,5 +43,3 @@ log_level:value(7,"Debug")
 log_level.default="3"
 
 return m
-
-

package/lean/luci-app-nps/luasrc/view/nps/nps_status.htm

@@ -4,10 +4,10 @@ XHR.poll(3, '<%=url([[admin]], [[services]], [[nps]], [[status]])%>', null,
 		var tb = document.getElementById('nps_status');
 		if (data && tb) {
 			if (data.running) {
-				var links = '<em><b><font color=green>nps <%:RUNNING%></font></b></em>';
+				var links = "<em><b style='color:green;'>Nps <%:RUNNING%></b></em>";
 				tb.innerHTML = links;
 			} else {
-				tb.innerHTML = '<em><b><font color=red>nps <%:NOT RUNNING%></font></b></em>';
+				tb.innerHTML = "<em><b style='color:red;'>Nps <%:NOT RUNNING%></b></em>";
 			}
 		}
 	}

package/lean/luci-app-nps/po/zh-cn/nps.po

@@ -0,0 +1,29 @@
+msgid "Nps Setting"
+msgstr "Nps 内网穿透"
+
+msgid "Nps is a fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet."
+msgstr "Nps 是一种快速反向代理，可帮助您将 NAT 或防火墙后面的本地服务器公开到 Internet。"
+
+msgid "Must an IPv4 address"
+msgstr "必须是 IPv4 地址"
+
+msgid "vkey"
+msgstr "密钥(vkey)"
+
+msgid "Enable Compression"
+msgstr "使用压缩传输"
+
+msgid "Enable Encryption"
+msgstr "使用加密传输"
+
+msgid "The contents will be compressed to speed up the traffic forwarding speed, but this will consume some additional cpu resources."
+msgstr "压缩传输内容，加快流量转发速度，会额外消耗 CPU 资源。"
+
+msgid "Encrypted the communication between Npc and Nps, will effectively prevent the traffic intercepted."
+msgstr "加密传输 npc 与 nps 之间的通信内容，会有效防止流量被拦截。"
+
+msgid "<b style='color:green;'>Nps is running.</b>"
+msgstr "<b style='color:green;'>Nps 运行中</b>"
+
+msgid "<b style='color:red;'>Nps is not running.</b>"
+msgstr "<b style='color:red;'>Nps 未运行</b>"

package/lean/luci-app-nps/root/etc/init.d/nps

@@ -4,7 +4,7 @@
 START=50
 USE_PROCD=1
 
-LOGFILE="/var/etc/nps.log"
+LOGFILE="/tmp/nps.log"
 tmpconf="/tmp/etc/nps.conf"
 
 nps_header() {