gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "冲突"

Browse Source 
This reverts commit 8d9bbabbee.
This commit is contained in:
zhanghongqing
2018-08-20 17:46:28 +08:00
parent 8d9bbabbee
commit ada7d38be9
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/messages/message_en.properties
View File

@@ -1076,8 +1076,6 @@ ip_intercepter_replace=IP Intercept Replace
domain_intercepter_replace=Domain Intercept Replace domain_intercepter_replace=Domain Intercept Replace
ip_intercepter_ratelimit=IP Intercept Ratelimit ip_intercepter_ratelimit=IP Intercept Ratelimit
domain_intercepter_ratelimit=Domain Intercept Ratelimit domain_intercepter_ratelimit=Domain Intercept Ratelimit
app_built_in_features_config=APP Built-in Features app_built_in_features_config=APP Built-in Features
app_ssl_config=APP SSL Cert Feature app_ssl_config=APP SSL Cert Feature
PXY_INTERCEPT_PKT_BIN=Intercept Messages p2p_control=P2P
certificate=Certificate
app_ssl_config=APP SSL Cert Feature

7
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1074,7 +1074,6 @@ ip_intercepter_replace=IP\u62E6\u622A\u66FF\u6362
domain_intercepter_replace=\u57DF\u540D\u62E6\u622A\u66FF\u6362 domain_intercepter_replace=\u57DF\u540D\u62E6\u622A\u66FF\u6362
ip_intercepter_ratelimit=IP\u62E6\u622A\u9650\u901F ip_intercepter_ratelimit=IP\u62E6\u622A\u9650\u901F
domain_intercepter_ratelimit=\u57DF\u540D\u62E6\u622A\u9650\u901F domain_intercepter_ratelimit=\u57DF\u540D\u62E6\u622A\u9650\u901F
app_built_in_features_config=APP\u5185\u7F6E\u7279\u5F81\u7EF4\u62A4 app_built_in_features_config=APP\u5185\u7F6E\u7279\u5F81\u7EF4\u62A4
app_ssl_config=APP SSL\u8BC1\u4E66\u7279\u5F81 app_ssl_config=APP SSL\u8BC1\u4E66\u7279\u5F81
PXY_INTERCEPT_PKT_BIN=\u62E6\u622A\u62A5\u6587 p2p_control=P2P
certificate=\u8BC1\u4E66