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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
duandongmei
2018-07-26 10:02:39 +08:00
parent 8d92397dc5 ddcf13baa9
commit 4bdeba4d42
30 changed files with 1502 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -792,7 +792,7 @@ app_byte_config=APP Byte Feature
social_app=Applicaiton
app_policy_config=APP Policy
app_features_config=APP Feature
cfg_type=Cfg Type
cfg_type=Configuration Type
encrypted_tunnel_behavior=Encrypted Tunnel Behavior
behaviour_type=Behaviour Type
basic_protocol=Basic Protocol

2
src/main/resources/messages/message_ru.properties
View File

@@ -714,7 +714,7 @@ app_byte_config=APP Byte Feature
social_app=Applicaiton
app_policy_config=APP Policy
app_features_config=APP Feature
cfg_type=Cfg Type
cfg_type=Configuration Type
encrypted_tunnel_behavior=Encrypted Tunnel Behavior
behaviour_type=Behaviour Type
basic_protocol=Basic Protocol