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

英文国际化冲突解决提交

Browse Source
This commit is contained in:
duandongmei
2018-10-20 13:47:20 +08:00
parent aaf7942222
commit 55b26d7277
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1264,10 +1264,7 @@ ip_range_in_c=Start IP and end IP in a IP range must with in C subnet
ip_range_bit_field=Start IP and end IP in a IP range has the same network number bit field
ip_range_smaller=Start IP in a IP range should smaller than end IP
alternative_values= Alternative values can be %s
<<<<<<< HEAD
certificate_error=Wrong format of public key file and private key file
public_file_error=Wrong format of public key file
private_file_error=Wrong format of private key file
=======
>>>>>>> branch 'develop' of http://192.168.10.125/k18_web/NFS.git
keyframe_pic_required=No keyframe pictures have been selected.