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
This commit is contained in:
duandongmei
2018-07-11 16:18:23 +08:00
parent 89ec630a33 f067b24fba
commit 4466b9c1e1
17 changed files with 493 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,7 +562,10 @@ av_sample_voip_control=VoIPSample Control
av_sample_audio_porn_control=Audio Porn Sign Sample Control
av_sample_vedio_porn_control=Vedio Porn Sign Sample Control
av_sample_control=Sample Control
<<<<<<< HEAD
configure_statistics_info=Configure statistics info
=======
>>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git
harm_level=Degree of harm
src_file=Source File
select_file=Please Select Upload File
@@ -845,6 +848,7 @@ single_file_upload_size_error=Filesize of file %s is %s,Allow the maximum value
total_file_upload_size_error=The maximum size of the uploaded file is %s,The total size of the file allowed to upload is %s\uFF01
file_upload_type_error=%s file type is incorrect,Allow uploaded files type contains %s\uFF01
file_upload_error=File upload failure\uFF01
<<<<<<< HEAD
#=============multipart upload error info=================
#=============function_service_dict==>service_name=================
audio_sample_reject=Audio and video sample control
@@ -933,3 +937,6 @@ ip_reuse_adress_pool_loop=IP reuse address pool
app_strategy_monit=APP strategy monitoring
app_strategy_drop=APP strategy drop
#=============function_service_dict==>service_name=================
=======
#=============multipart upload error info=================
>>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git