Merge branch '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

@@ -770,6 +770,7 @@ module.exports = {
   SynchronousReportLibrary: 'Synchronous Report Library',
   FreezeConfiguration: 'Freeze Configuration',
   distributionAndCollection: 'Distribution And Collection',
+  OneclickCollection: 'One-click Collection',
   deleteConfiguration: 'Delete Configuration',
   addConfiguration: 'Add Configuration',
   electricMachinery: 'ElectricMachinery',
@@ -1152,4 +1153,16 @@ module.exports = {
   TechnicalEvaluationResultsForReference:'Technical Evaluation Results For Reference',
   ComplianceConfirmationRecord:'Compliance Confirmation Record',
   complianceConfirmation:'Compliance Confirmation',
+  noComparisonDocumentSelected:'No comparison document selected',
+  RemarkInfo:'Remarks Info',
+  initiateDocumentComparison:'Initiate Document Comparison',
+  comparativeComments:'Comparative Comments',
+  viewTheComparisonResults:'View The Comparison Results',
+  addFullTextComment:'Add Full Text Comment',
+  turnOffAutomaticMatching:'Turn Off Automatic Matching',
+  Deriveconformanceresults:'Derive Conformance Results',
+  Regulatorycompliancekanban:'Regulatory Compliance Kanban',
+  exportComparisonReport:'Export Comparison Report',
+  comparisonDifferenceComment:'Comparison Difference Comment',
+  fullTextComments:'Full text comments',
 }