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:
zhangshilin
2018-03-17 17:09:19 +08:00
parent b96389e37f
commit d5a2a32c51
25 changed files with 2737 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ website_keyword_control=website keyword control
mail_control=mail control
recipient_control=recipient control
sender_control=sender control
theme_control=theme control
subject_control=subject control
mail_keyword_control=mail keyword control
mail_attachment_name_control=mail attachment name control
mail_attachment_content_control=mail attachment content control
@@ -95,6 +95,8 @@ log_search=log search
sysService_manage=system service manage
service_manage=service type manage
system_service_manage=system service type manage
specific_service_cfg=specific service cfg
specific_service_host_cfg=specific service host cfg
#============menu end======================
#============yewu begin======================
@@ -172,6 +174,7 @@ has_approved=It has been approved and can not be operated on !
hasnot_approved=It has not been approved and can not be operated on !
check_one=choose one please !
one_more=please choose at least one !
custom_columns=custom columns
#==========message end=====================
#==========yewuliexingguanli begin=====================