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:
zhanghongqing
2018-03-12 15:51:23 +08:00
parent 939f7d68eb
commit b9c403ff40
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,11 @@ dns_monitor=dns monitor
basic_configuration=basic configuration
letter_from=letter from
classification=classification
classification_manage=classification_manage
attribute_manage=attribute_manage
area_manage=area_manage
isp_manage=isp_manage
feature_scope_manage=feature_scope_manage
special_tasks=special tasks
label_manage=label manage
protect_list=protect list
@@ -132,6 +137,7 @@ begin_date=begin date
end_date=end date
delete=delete
special_task=special task
cancel_approved=cancel approved
#============laihan end======================
@@ -152,6 +158,17 @@ turning_page=It is turning to the page
login_timeout=No login or login timeout,please login again,Thank you!
captcha_error=captcha error
enter_captcha=Please enter the captcha
input=please input
input_title=please input title
all_states=all states
filter=filter
to=to
reset=reset
info=info
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 !
#==========message end=====================
#==========yewuliexingguanli begin=====================