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

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