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

@@ -176,6 +176,8 @@ module.exports = {
   MenuType: 'Menu type',
   menu: 'Menu',
   ButtonsPermissions: 'Buttons / permissions',
+  ConventionalExport:'Conventional export',
+  CustomExport:'Custom export',
   assembly: 'Assembly',
   route: 'Route',
   AddSubmenu: 'Add submenu',
@@ -385,6 +387,7 @@ module.exports = {
   StandardDetails: 'Standard Details',
   whole: 'Whole',
   DocumentLibrary: 'Document Library',
+  GeneralExportInformation:'General export information',
   DocumentComparisonLibrary: 'Document comparison Library',
   weekly: 'Weekly',
   SyncLibrary: 'Sync to doc. library',
@@ -727,6 +730,7 @@ module.exports = {
   // 参数收集开始
   MaintainConfigureInfo: 'Maintain configuration information',
   ParameteItemCollectionList: 'Parameter item collection list',
+  ParameterViewPage:'Parameter View page',
   Areyousureparameteritems: 'Are you sure to submit the selected parameter items?',
   Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed',
   NoConfigurationNotStart: 'No configuration added, unable to start collection, please check',
@@ -757,6 +761,7 @@ module.exports = {
   operatethisbutton: 'You do not have permission to operate this button',
   ParameterLibrary: 'Parameter Library',
   referenceparameter: 'Reference Parameter',
+  tempSave: 'Temp Save',
   Assignedby: 'Assignedby',
   CompulsoryWithdrawal: 'CompulsoryWithdrawal',
   SynchronousReportLibrary: 'Synchronous Report Library',
@@ -791,6 +796,10 @@ module.exports = {
   releaseVersion: 'Release Version',
   parameterTemplate: 'Parameter Template',
   contentDescription: 'Content Description',
+  WhetherMergeParameters:'Whether to merge parameters',
+  merge:'merge',
+  nonjoinder:'nonjoinder',
+  MergeSeparator:'Merge separator',
   parameterTemplateExportName: 'Parameter List',
   parameterDataExport: 'Parameter Export Data',
   // 参数收集结束
@@ -941,14 +950,14 @@ module.exports = {
   reportNotUploaded: 'Report not uploaded',
   position: 'position',
 //  认证权限状态
-  CollectionInitiated: 'Collection to be initiated',
-  handledInterface: 'To be handled by the project interface',
-  ReturnedPerson: 'Returned by project contact person',
-  completed: 'To be completed',
-  Filledreturn: 'Filled by return',
-  Submitted: 'Submitted',
-  ReturnedEngineer: 'Returned by Certification Engineer',
-  SynchronizedLibrary: 'Synchronized to the upper reporting Library',
+  CollectionInitiated: 'Wait Collect',
+  handledInterface: 'Wait Sdt',
+  ReturnedPerson: 'Sdt Back',
+  completed: 'Wait Fill',
+  Filledreturn: 'Dre Back',
+  Submitted: 'Submit',
+  ReturnedEngineer: 'Cert Back',
+  SynchronizedLibrary: 'Sync Report',
   Statusis: 'Statusis',
   toHavePermission: 'To Have Permission',
   and: 'and',
@@ -1055,7 +1064,7 @@ module.exports = {
   Ftext: 'Text+Pull single+File',
   Nnothing: 'Null',
   Nchinese: 'Chinese',
-  NpositiveInteger: 'Positive integer',
+  NpositiveInteger: 'Integer',
   NPositivefloatingpointnumber: 'Positive float',
   NintegerOrDecimal: 'Integer decimal',
   NOneDecimalPlace: 'Decimal one',
@@ -1073,4 +1082,9 @@ module.exports = {
   pleaseSelectinitiatedOrRejected:'Please select the data whose list confirmation status is not initiated or rejected',
   TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty',
   theResponsiblePersonAndDeadlineClank:'The responsible person and deadline of cannot be blank',
+  bringInTheProjectInterface:'Bring in the project interface',
+  theCurrentListSaved:'The current list data has been submitted and cannot be temporarily saved',
+  defaultTemplate:'Default template',
+  newRequestCommentListTemplate:'New request for comment list template',
+  NewReleasedStandardTemplate:'New released standard template',
 }