From 1a75cefd00979b95b20130a043047f3df9490d92 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 7 Mar 2020 20:33:24 +0800 Subject: [PATCH] luci-app-ssr-plus-Jo: sync with upstream source --- package/ctcgfw/luci-app-ssr-plus-Jo/Makefile | 4 ++-- .../luasrc/view/shadowsocksr/status.htm | 12 ++++++------ .../luasrc/view/shadowsocksr/status2.htm | 12 ++++++------ .../luasrc/view/shadowsocksr/status3.htm | 8 ++++---- .../ctcgfw/luci-app-ssr-plus-Jo/po/zh-cn/ssr-plus.po | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/Makefile b/package/ctcgfw/luci-app-ssr-plus-Jo/Makefile index 9dab3c2ea5..2c3d950b35 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/Makefile +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus-Jo -PKG_VERSION:=151 -PKG_RELEASE:=20200304-5 +PKG_VERSION:=152 +PKG_RELEASE:=20200307-5 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Trojan \ diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status.htm index af729ff9a2..7912fc852e 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status.htm +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status.htm @@ -104,7 +104,7 @@
-

<%:Visit foreign websites%>
<%:Problem detected%>

+

<%:foreign websites%>
<%:Problem detected%>

@@ -116,7 +116,7 @@
-

<%:Visit domestic website%>
<%:Problem detected%>

+

<%:domestic website%>
<%:Problem detected%>

@@ -177,14 +177,14 @@ tb.innerHTML = '<%:Client%>
<%:Not Running%>'; } if (data.google) { - tb1.innerHTML = '<%:Visit foreign websites%>
<%:Working...%>'; + tb1.innerHTML = '<%:foreign websites%>
<%:Connect OK%>'; } else { - tb1.innerHTML = '<%:Visit foreign websites%>
<%:Problem detected%>'; + tb1.innerHTML = '<%:foreign websites%>
<%:Problem detected%>'; } if (data.baidu) { - tb2.innerHTML = '<%:Visit domestic website%>
<%:Working...%>'; + tb2.innerHTML = '<%:domestic website%>
<%:Connect OK%>'; } else { - tb2.innerHTML = '<%:Visit domestic website%>
<%:Problem detected%>'; + tb2.innerHTML = '<%:domestic website%>
<%:Problem detected%>'; } if (data.game) { tb3.innerHTML = '<%:Game Mode%>
<%:Running%>'; diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status2.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status2.htm index 05a625693c..3a900e0d2c 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status2.htm +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status2.htm @@ -99,7 +99,7 @@
-

<%:Visit foreign websites%>
<%:Problem detected%>

+

<%:foreign websites%>
<%:Problem detected%>

@@ -111,7 +111,7 @@
-

<%:Visit domestic website%>
<%:Problem detected%>

+

<%:domestic website%>
<%:Problem detected%>

@@ -169,14 +169,14 @@ tb.innerHTML = '<%:Client%>
<%:Not Running%>'; } if (data.google) { - tb1.innerHTML = '<%:Visit foreign websites%>
<%:Working...%>'; + tb1.innerHTML = '<%:foreign websites%>
<%:Connect OK%>'; } else { - tb1.innerHTML = '<%:Visit foreign websites%>
<%:Problem detected%>'; + tb1.innerHTML = '<%:foreign websites%>
<%:Problem detected%>'; } if (data.baidu) { - tb2.innerHTML = '<%:Visit domestic website%>
<%:Working...%>'; + tb2.innerHTML = '<%:domestic website%>
<%:Connect OK%>'; } else { - tb2.innerHTML = '<%:Visit domestic website%>
<%:Problem detected%>'; + tb2.innerHTML = '<%:domestic website%>
<%:Problem detected%>'; } if (data.ss_server) { tb3.innerHTML = '<%:SS Servers%>
<%:Running%>'; diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status3.htm b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status3.htm index e2c296c7a2..e6ee8a3aac 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status3.htm +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/luasrc/view/shadowsocksr/status3.htm @@ -94,7 +94,7 @@
-

<%:Visit domestic website%>
<%:Problem detected%>

+

<%:domestic website%>
<%:Problem detected%>

@@ -106,7 +106,7 @@
-

<%:Visit foreign websites%>
<%:Problem detected%>

+

<%:foreign websites%>
<%:Problem detected%>

@@ -162,8 +162,8 @@ function (x, data) { if (data) { document.getElementById('shadowsocksr_status').innerHTML = data.global?'<%:Client%>
<%:Running%>':'<%:Client%>
<%:Not Running%>'; - document.getElementById('baidu_status').innerHTML = data.baidu?'<%:Visit domestic website%>
<%:Working...%>':'<%:Visit domestic website%>
<%:Problem detected%>'; - document.getElementById('google_status').innerHTML = data.google?'<%:Visit foreign websites%>
<%:Working...%>':'<%:Visit foreign websites%>
<%:Problem detected%>'; + document.getElementById('baidu_status').innerHTML = data.baidu?'<%:domestic website%>
<%:Connect OK%>':'<%:domestic website%>
<%:Problem detected%>'; + document.getElementById('google_status').innerHTML = data.google?'<%:foreign websites%>
<%:Connect OK%>':'<%:foreign websites%>
<%:Problem detected%>'; document.getElementById('game_status').innerHTML = data.game?'<%:Game Mode%>
<%:Running%>':'<%:Game Mode%>
<%:Not Running%>'; document.getElementById('chinadns_status').innerHTML = data.chinadns?'ChinaDNS
<%:Running%>':'ChinaDNS
<%:Not Running%>'; document.getElementById('SOCKS5_status').innerHTML = data.SOCKS5?'๐™Ž๐™Š๐˜พ๐™†๐™Ž5
<%:Running%>':'๐™Ž๐™Š๐˜พ๐™†๐™Ž5
<%:Not Running%>'; diff --git a/package/ctcgfw/luci-app-ssr-plus-Jo/po/zh-cn/ssr-plus.po b/package/ctcgfw/luci-app-ssr-plus-Jo/po/zh-cn/ssr-plus.po index 89bcf435c5..c25116a877 100644 --- a/package/ctcgfw/luci-app-ssr-plus-Jo/po/zh-cn/ssr-plus.po +++ b/package/ctcgfw/luci-app-ssr-plus-Jo/po/zh-cn/ssr-plus.po @@ -747,7 +747,7 @@ msgid "UDPspeeder Project" msgstr "UDPspeeder ้กน็›ฎ" msgid "Appointlist List" -msgstr "ๅŠ ้€Ÿๅˆ—่กจ" +msgstr "DNSๅˆ—่กจ" msgid "udp2raw tunnel" msgstr "UDP้šง้“"