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

# 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

@@ -1409,7 +1409,7 @@ module.exports = {
   itemInformation:'Item Information',
   modifyHistory:'Historical Record',
   returnToStudio:'Return to Studio',
-  Approved:'Review and pass',
+  Approved:'Approved',
   returnedForApproval:'Returned For Approval',
   changeSetting:'Change Setting',
   referenceDeliverables:'Reference Deliverables',
@@ -1430,8 +1430,8 @@ module.exports = {
   onlyDataStatusSubmittedCanBeSelected:'Only data with process status of result to be submitted can be selected',
   operationWithoutPermission:'Operation without permission',
   data:"'s data",
-  confirmApproval:'Confirm approval?',
-  confirmReturnForApproval:'Confirm return for approval ?',
+  confirmApproval:'Confirm pass review?',
+  confirmReturnForApproval:'Confirm Return for review ?',
   onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of result to be reviewed can be selected',
   confirmResetProcess:'Confirm reset process?',
   confirmUrging:'Confirm urging ?',
@@ -1757,4 +1757,6 @@ module.exports = {
   toBeTracked:'To be tracked',
   NA:'NA',
   electroniccontrollerparameter:'Electronic controller parameter',
+  reviewAndPass:'Review and pass',
+  reviewAndReturn:'Review and return',
 }