Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js

jero-web/src/common/lang/en-us.js

@@ -1186,6 +1186,7 @@ module.exports = {
   translatedText:'Translated Text',
   Administrativeprivileges:'Administrativ Pprivileges',
   Checkthepermissions:'Check The Permissions',
+  onlyFilesUploaded:'Only.Docx,.Doc files can be uploaded',
   selectDirectorylocation: 'Please select the directory location to add the folder',
   Fileuploaded:'File uploaded, please wait',
   uploadedbyyourself:'You can only delete files and data uploaded by yourself',

jero-web/src/common/lang/zh-cn.js

@@ -917,7 +917,6 @@ module.exports = {
   startMonth: '开始日期',
   endMonth: '结束日期',
   Importing: '导入中...',
-  Fileuploaded:'文件上传中，请稍后',
   projectDeliveryDescription: '工程交付说明',
   cancelConfirm: '取消确认',
   currentInformation: '当前信息',
@@ -1192,5 +1191,6 @@ module.exports = {
   translatedText:'译文',
   Administrativeprivileges:'管理权限',
   Checkthepermissions:'查看权限',
+  onlyFilesUploaded:'只能上传.docx、.doc文件',
   uploadedbyyourself:'只能删除自己上传的文件数据',
 }