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 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
	
	修改是否十六进制选项选中值
This commit is contained in:
duandongmei
2018-08-24 19:47:32 +08:00
parent 7374c16da7 919c649e4e
commit 846985886f
24 changed files with 275 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1120,5 +1120,6 @@ certificate_subject=Certificate Subject
not_Before_Time=Certificate Start Time
not_After_Time=Certificate End Time
certificate_validity=Certificate Validity Period
end_entity=End-entity Certificate
header=Header
layer=Layer

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

@@ -1118,3 +1118,5 @@ certificate_subject=\u8BC1\u4E66\u62E5\u6709\u8005
not_before_time=\u8BC1\u4E66\u8D77\u59CB\u65F6\u95F4
not_after_time=\u8BC1\u4E66\u7EC8\u6B62\u65F6\u95F4
certificate_validity=\u8BC1\u4E66\u6709\u6548\u671F
header=\u5173\u952E\u5B57
layer=\u5339\u914D\u533A\u57DF