Merge branch 'master' into 'fix_bug_first_stage'

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

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

@@ -388,7 +388,8 @@ module.exports = {
   StandardDetails: 'Standard Details',
   whole: 'Whole',
   DocumentLibrary: 'Document Library',
-  GeneralExportInformation:'General export Information',
+  GeneralExportInformation:'General export information',
+  CustomizeExportInformation:'Customize export information',
   DocumentComparisonLibrary: 'Document comparison Library',
   weekly: 'Weekly',
   SyncLibrary: 'Sync to doc. library',
@@ -1054,6 +1055,7 @@ module.exports = {
   NcontrolType: 'Control Type',
   NcontrolVerification: 'Control Verify',
   NcontrolAlternatives: 'Control Values',
+  DefaultValue: 'Default Value',
   NattachmentTemplate: 'File Template',
   Ntext: 'Text',
   NDropdownradio: 'Pull Single',
@@ -1065,6 +1067,7 @@ module.exports = {
   Dtext: 'Pull single+File',
   Etext: 'Pull more+File',
   Ftext: 'Text+Pull single+File',
+  Gtext: 'Title',
   Nnothing: 'Null',
   Nchinese: 'Chinese',
   NpositiveInteger: 'Integer',
@@ -1106,4 +1109,46 @@ module.exports = {
   PreHomoNotification:'Pre-Homo Notification',
   ValidationComplianceNotification:'Validation Compliance Notification',
   RegulationTaskConfirmationNotification:'Regulation Task Confirmation Notification',
+  evaluationMethod:'Evaluation method',
+  uploadRelevantMaterials:'Upload relevant materials',
+  processBackground:'Process background',
+  selectedStandard:'Selected standard',
+  standardDecompositionDocument:'Standard decomposition document',
+  pleaseSelectStandardFirst:'Please select a standard first',
+  RelevantMaterials:'RelevantMaterials',
+  evaluatorFeedback:'Evaluator feedback',
+  nameTechnicalDocument:'Name of technical document',
+  chapter:'chapter',
+  problemDescription:'Problem description',
+  filingExternalOpinions:'Filing of external opinions',
+  regulatoryTechnicalEvaluationResults:'Regulatory technical evaluation results',
+  initiateProcessForCurrentStandard:'Initiate process for current standard',
+  engineerFeedbackResults:'Engineer feedback results',
+  fileExport:'File export',
+  feedbackTime:'Feedback time',
+  regulatoryTechnologyAssessmentProcess:'Regulatory technology assessment process',
+  feedbackEvaluation:'Feedback evaluation',
+  clauseEvaluation:'Clause evaluation',
+  standardDocuments:'Standard documents',
+  pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list',
+  reviewComments:'Review comments',
+  PleaseCompleteList:'Please complete the compliance results in the list',
+  sponsorFeedback:'Sponsor feedback',
+  processNumber:'Process number',
+  processName:'Process Name',
+  feedbackResults:'Feedback results',
+  theDoesNotSupportPreview:'The current file format does not support Preview',
+  releaseSituation:'Release situation',
+  comparisonResults:'Comparison results',
+  Published:'Published',
+  initiateComparison:'Initiate comparison',
+  translationLanguage:'Translation language',
+  translationResults:'Translation results',
+  conversionTime:'Conversion time',
+  category:'Category',
+  RegulatoryProcessEvaluationResults :'Regulatory Process Evaluation Results',
+  ViewConformanceResults:'View Conformance Results',
+  CommentsCollectionResultsForReference:'Comments Collection Results For Reference',
+  TechnicalEvaluationResultsForReference:'Technical Evaluation Results For Reference',
+  ComplianceConfirmationRecord:'Compliance Confirmation Record',
 }