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

voip 和流媒体域与服务端表名更改
国际化文件增加voip和流媒体域描述
This commit is contained in:
duandongmei
2018-10-11 19:40:01 +08:00
parent e25be9a7a2 ef6d793d6b
commit c5130454f1
10 changed files with 211 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1215,4 +1215,4 @@ protocol_identify=Protocol Identify
MM_FILE_DIGEST=File Digest Configuration
NTC_ASN_IP=ASN
NTC_STREAMING_MEDIA_URL=Streaming Media URL
NTC_VOIP_ACCOUNT=VoIP Account
NTC_VOIP_ACCOUNT=VoIP Account