From e07f7152579065971bdc0da1998b667ea5e28c35 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 21 Feb 2020 14:37:31 +0800 Subject: [PATCH] Merge Lean's source --- package/lean/luci-app-ssr-plus/Makefile | 6 +++--- package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 3f8c651477..9d826919f9 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus -PKG_VERSION:=149 +PKG_VERSION:=150 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -38,7 +38,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Socks bool "Include Socks Sever" - default y + default n endef define Package/$(PKG_NAME) @@ -111,7 +111,7 @@ define Package/$(PKG_NAME)/install $(INSTALL_DATA) ./luasrc/view/shadowsocksr/* $(1)/usr/lib/lua/luci/view/shadowsocksr/ $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - po2lmo ./po/zh_Hans/ssr-plus.po $(1)/usr/lib/lua/luci/i18n/ssr-plus.zh-cn.lmo + po2lmo ./po/zh-cn/ssr-plus.po $(1)/usr/lib/lua/luci/i18n/ssr-plus.zh-cn.lmo endef define Package/$(PKG_NAME)/postinst diff --git a/package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po b/package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po index ad40b0c22a..167842a377 100644 --- a/package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po +++ b/package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po @@ -398,7 +398,7 @@ msgid "Anti-pollution DNS Server" msgstr "访问国外域名DNS服务器" msgid "Custom DNS Server format as IP:PORT (default: 8.8.4.4:53)" -msgstr "自定义国外域名DNS服务器，格式为 IP:PORT (默认: 8.8.4.4:53)。可自定义DNS用于 Netflix 解锁等" +msgstr "自定义国外域名DNS服务器，格式为 IP:PORT (默认: 8.8.4.4:53)" msgid "Use Pdnsd tcp query and cache" msgstr "使用PDNSD TCP查询并缓存"