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://192.168.10.125/k18_web/NFS.git into

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	
	国际化增加no_tc_udp_port_comment_tip
This commit is contained in:
duandongmei
2018-11-02 11:19:51 +08:00
parent 7808f09f1c bc908c37b3
commit c9d983f083
19 changed files with 172 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1275,7 +1275,7 @@ ipv6_subnet_tip=IPv6/Subnet Mask
example_tip=For Example
rule_desc_tip=Rule description
port_comment_tip=Port must between 0 and 65535
port_mask_comment_tip=Port and port mask must between 0 and 65535
port_mask_comment_tip=Port mask must between 0 and 65535
multi_keywords_tip=Allow multiple keywords to be entered and multiple keywords to be replaced by line breaks.
visible_keyword_tip=Single keyword is not allowed to enter invisible characters.
single_keyword_tip=Only single key input is allowed.
@@ -1305,4 +1305,5 @@ default_request=Default Letter
default_value=Default Value
intercept=Intercept
unkown_error=Unkown Error Infomation
exception_info=Exception Infomation
exception_info=Exception Infomation
no_tc_udp_port_comment_tip=Port must between 0

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

@@ -1216,7 +1216,11 @@ protocol_identify=Protocol Identify
NTC_ASN_IP=ASN
MM_FILE_DIGEST=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u0414\u0430\u0439\u0434\u0436\u0435\u0441\u0442\u0430 \u0424\u0430\u0439\u043B\u043E\u0432
NTC_STREAMING_MEDIA_URL=Streaming Media URL
<<<<<<< HEAD
NTC_VOIP_ACCOUNT=VoIP \u0410\u043A\u043A\u0430\u0443\u043D\u0442
=======
NTC_VOIP_ACCOUNT=VoIP \u0410\u043A\u043A\u0430\u0443\u043D\u0442
>>>>>>> branch 'develop' of http://192.168.10.125/k18_web/NFS.git
export_failed=Export Failed
user_manage=Client Account Manage
ip_reuse_policy_object=IP Reuse Policy Object
@@ -1301,4 +1305,5 @@ hex_case_insensitive=Hexadecimal values must case insensitive
default_request=Default Letter
default_value=Default Value
unkown_error=Unkown Error Infomation
exception_info=Exception Infomation
exception_info=Exception Infomation
no_tc_udp_port_comment_tip=Port must between 0

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

@@ -1296,4 +1296,5 @@ hex_case_insensitive=16\u8FDB\u5236\u7684\u503C\u5927\u5C0F\u5199\u4E0D\u654F\u6
default_request=\u9ED8\u8BA4\u51FD
default_value=\u9ED8\u8BA4\u503C
unkown_error=\u672A\u77E5\u9519\u8BEF\u4FE1\u606F
exception_info=\u5F02\u5E38\u4FE1\u606F
exception_info=\u5F02\u5E38\u4FE1\u606F
no_tc_udp_port_comment_tip=Port must between 0

5
src/main/resources/sql/20181030/update_region.sql
View File

@@ -17,4 +17,7 @@ UPDATE function_region_dict SET is_import=0 WHERE function_id=37 AND dict_id=600
#http 高级
UPDATE function_region_dict SET is_import=1 WHERE function_id=8 AND dict_id IN(9,10,11,12,13);
#流媒体
UPDATE function_region_dict SET is_import=1 WHERE function_id=22 AND dict_id IN(25,597);
UPDATE function_region_dict SET is_import=1 WHERE function_id=22 AND dict_id IN(25,597);
#DDOS IP
UPDATE function_region_dict SET is_import=1,config_ip_port_show='3,4' WHERE function_id=301 AND dict_id IN(74);
UPDATE function_service_dict SET is_import=1 WHERE function_id=301;