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/java/com/nis/util/Constants.java
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	src/main/resources/nis.properties
This commit is contained in:
duandongmei
2018-07-06 17:20:23 +08:00
parent 7c6251e859 6776899bac
commit c748b7eabd
57 changed files with 2030 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -728,11 +728,11 @@ userregion1=user region 1
userregion2=user region 2
userregion3=user region 3
userregion4=user region 4
userregion5=user region 5
userregion5=user region 5
#=============userregions===============
#=============multipart upload error info=================
single_file_upload_size_error=The size of the file %s is %s,allowing the maximum value of a single file to be %s !
total_file_upload_size_error=The total size of uploaded files is %s,allowing the total size of uploaded to be %s !
file_upload_type_error=%s file type of error,allowing uploaded file type with %s!
file_upload_error=File upload failure !
#=============multipart upload error info=================
#=============multipart upload error info=================

4
src/main/resources/messages/message_ru.properties
View File

@@ -712,11 +712,11 @@ userregion1=user region 1
userregion2=user region 2
userregion3=user region 3
userregion4=user region 4
userregion5=user region 5
userregion5=user region 5
#=============userregions===============
#=============multipart upload error info=================
single_file_upload_size_error=The size of the file %s is %s,allowing the maximum value of a single file to be %s !
total_file_upload_size_error=The total size of uploaded files is %s,allowing the total size of uploaded to be %s !
file_upload_type_error=%s file type of error,allowing uploaded file type with %s!
file_upload_error=File upload failure !
#=============multipart upload error info=================
#=============multipart upload error info=================

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

@@ -829,7 +829,7 @@ userregion1=\u81EA\u5B9A\u4E49\u57DF1
userregion2=\u81EA\u5B9A\u4E49\u57DF2
userregion3=\u81EA\u5B9A\u4E49\u57DF3
userregion4=\u81EA\u5B9A\u4E49\u57DF4
userregion5=\u81EA\u5B9A\u4E49\u57DF5
userregion5=\u81EA\u5B9A\u4E49\u57DF5
#=============userregions===============
#=============multipart upload error info=================
single_file_upload_size_error=\u6587\u4EF6%s\u7684\u5927\u5C0F\u4E3A%s\uFF0C\u5141\u8BB8\u5355\u4E2A\u6587\u4EF6\u7684\u6700\u5927\u503C\u4E3A%s\uFF01