patch(TPS-3225): removed too small total timeout for service account

This fix is intended to include context files in a data service
published artifact. When a dataservice job is published for the first
time and was never build from Studio before, published artifact was
missing the context files.

i18n/plugins/org.talend.designer.abstractmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.abstractmap.nl</artifactId>

i18n/plugins/org.talend.designer.abstractmap.nl/src/java/main/messages_zh_CN.properties

@@ -7,11 +7,11 @@ DraggingInfosPopup.draggingEntry=\u62D6\u52A8 {0} \u6761\u76EE
 DraggingInfosPopup.dropInvalid=\\n<<\u65E0\u6548\u5220\u9664>>\\n
 DraggingInfosPopup.draggingEntries=\u62D6\u52A8 {0} \u6761\u76EE
 DraggingInfosPopup.dropInvalidWithKey=\\n<<\u65E0\u6548\u5220\u9664>>\\n\u6309\u4F4F Shift \u548C Ctrl \u952E\u4EE5\u9010\u4E00 map \u5E76\u6539\u5199
-DraggingInfosPopup.overwriteMode=\ > \u8986\u76D6\u6A21\u5F0F
+DraggingInfosPopup.overwriteMode=\\ > \u8986\u76D6\u6A21\u5F0F
 DraggingInfosPopup.appendMode=>\u9644\u52A0\u6A21\u5F0F
 DraggingInfosPopup.appendModeToOverwrite=\u9644\u52A0\u6A21\u5F0F(\u6309Ctrl\u952E\u7528\u6765\u8986\u76D6)
 DraggingInfosPopup.insertAllSelectedEntries=> \u63D2\u5165\u6240\u6709\u9009\u62E9\u9879
-DraggingInfosPopup.insertRemainingEntries=\ > \u63D2\u5165\u5269\u4F59\u9879
+DraggingInfosPopup.insertRemainingEntries=\\ > \u63D2\u5165\u5269\u4F59\u9879
 DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> \u6BCF\u4E2A\u6E90\u6761\u76EE\u8868\u8FBE\u5F0F\u5230\u6BCF\u4E2A\u76EE\u6807\u8868\u8FBE\u5F0F
 DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> \u6BCF\u4E2A\u6E90\u6761\u76EE\u5230\u6BCF\u4E2A\u76EE\u6807\u8868\u8FBE\u5F0F
 DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=\u6240\u6709\u6E90\u9879\u90FD\u8868\u793A\u4E3A\u5355\u4E2A\u76EE\u6807\u8868\u8FBE\u5F0F(Shift\u952E\u8F6C\u6362\u4E3A\u66F4\u6539\u6620\u5C04)

i18n/plugins/org.talend.designer.alfrescooutput.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.alfrescooutput.nl</artifactId>

i18n/plugins/org.talend.designer.business.diagram.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram.nl</artifactId>

i18n/plugins/org.talend.designer.codegen.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.codegen.nl</artifactId>

i18n/plugins/org.talend.designer.codegen.nl/src/main/java/messages_ja.properties

@@ -16,13 +16,13 @@ generatedcode.copyright.body2=/ JobDesigner (CodeGenerator\u30D0\u30FC\u30B8\u30
 JavaRoutineSynchronizer.UnsupportedOperation.Exception2=\u30E1\u30BD\u30C3\u30C9\u304C\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093: org.talend.designer.codegen.JavaRoutineSynchronizer line:58
 CodeGenerator.getGraphicalNode1=------process.getGraphicalNodes()------
 CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
-CodeGenerator.newLine=\n\n\n\n
+CodeGenerator.newLine=\\n\\n\\n\\n
 JetSkeletonManager.unableLoad=\u30B9\u30B1\u30EB\u30C8\u30F3\u66F4\u65B0\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
 JetSkeletonManager.unableSave=\u30B9\u30B1\u30EB\u30C8\u30F3\u66F4\u65B0\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
 JetSkeletonManager.updateProblem=\u30B9\u30B1\u30EB\u30C8\u30F3\u6C38\u7D9A\u30C7\u30FC\u30BF\u66F4\u65B0\u6642\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 CodeGeneratorEmittersPoolFactory.codeThread=\u30B3\u30FC\u30C9\u751F\u6210\u306E\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u30B9\u30EC\u30C3\u30C9
 CodeGeneratorEmittersPoolFactory.componentCompiled=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F{0}\u30DF\u30EA\u79D2\u3067\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u307E\u3057\u305F
-CodeGeneratorEmittersPoolFactory.failCompail=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u306B\u5931\u6557\u3057\u307E\u3057\u305F : \r\n
+CodeGeneratorEmittersPoolFactory.failCompail=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u306B\u5931\u6557\u3057\u307E\u3057\u305F : \\r\\n
 CodeGeneratorEmittersPoolFactory.initialException=\u521D\u671F\u5316\u4E2D\u306B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 CodeGeneratorEmittersPoolFactory.jetEmitterInitialException=JetEmitter\u306E\u521D\u671F\u5316\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 CodeGeneratorService.invalidLanguage1=\u7121\u52B9\u306A\u8A00\u8A9E\u30BF\u30A4\u30D7\u3067\u3059\u3002

i18n/plugins/org.talend.designer.codegen.nl/src/main/java/messages_zh_CN.properties

@@ -11,18 +11,18 @@ CodeGenerator.JET.TimeOut=JET\u521D\u59CB\u5316\u8D85\u65F6\uFF01
 generatedcode.copyright.body4=\u4F60\u53EF\u4EE5\u5728\u5728GNU LGPL \u8BB8\u53EF\u8BC1\u4E0B\u652F\u914D\u8FD9\u4E9B\u4EE3\u7801
 CodeGenerator.Node.NotFound=\u5728\u5F53\u524D
 generatedcode.copyright.body3=\u4F60\u53EF\u4EE5\u5728www.talend.com\u53D1\u73B0\u66F4\u591A\u5173\u4E8ETalend\u4EA7\u54C1\u4FE1\u606F
-EmittersPoolFactoryImpl.Class.IllegalArg=\u7C7B ' {0}' \u4E0D\u662F\u4E00\u4E2A\u6709\u6548\u7684\u5206\u7C7B\u5668
+EmittersPoolFactoryImpl.Class.IllegalArg=\u7C7B \' {0}\' \u4E0D\u662F\u4E00\u4E2A\u6709\u6548\u7684\u5206\u7C7B\u5668
 generatedcode.copyright.body2=/ \u4F5C\u4E1A\u8BBE\u8BA1 (CodeGenerator version {0}).
 JavaRoutineSynchronizer.UnsupportedOperation.Exception2=\u65B9\u6CD5\u672A\u5B9E\u65BD\uFF1Aorg.talend.designer.codegen.JavaRoutineSynchronizer line:58
 CodeGenerator.getGraphicalNode1=\u8FDB\u7A0B\u5F97\u5230\u56FE\u5F62\u8282\u70B9\uFF08\uFF09
 CodeGenerator.getGraphicalNode2=\u8FDB\u7A0B\u5F97\u5230\u751F\u6210\u8282\u70B9\uFF08\uFF09
-CodeGenerator.newLine=\n\n\n\n
+CodeGenerator.newLine=\\n\\n\\n\\n
 JetSkeletonManager.unableLoad=\u65E0\u6CD5\u52A0\u8F7D\u4E3B\u5E72\u66F4\u65B0\u7F13\u5B58\u6587\u4EF6
 JetSkeletonManager.unableSave=\u65E0\u6CD5\u4FDD\u5B58\u4E3B\u5E72\u66F4\u65B0\u7F13\u5B58\u6587\u4EF6
 JetSkeletonManager.updateProblem=\u5F53\u66F4\u65B0\u6301\u4E45\u6570\u636E\u65F6\u51FA\u73B0\u9519\u8BEF
 CodeGeneratorEmittersPoolFactory.codeThread=\u4EE3\u7801\u751F\u6210\u540E\u53F0\u7EBF\u7A0B
 CodeGeneratorEmittersPoolFactory.componentCompiled=\u7EC4\u4EF6\u7F16\u8BD1{0}\u6BEB\u79D2
-CodeGeneratorEmittersPoolFactory.failCompail=\u7EC4\u4EF6\u7F16\u8BD1\u5931\u8D25: \r\n
+CodeGeneratorEmittersPoolFactory.failCompail=\u7EC4\u4EF6\u7F16\u8BD1\u5931\u8D25: \\r\\n
 CodeGeneratorEmittersPoolFactory.initialException=\u521D\u59CB\u5316\u5F02\u5E38
 CodeGeneratorEmittersPoolFactory.jetEmitterInitialException=\u521D\u59CB\u5316JetEmitter\u51FA\u9519
 CodeGeneratorService.invalidLanguage1=\u65E0\u6548\u7684\u8BED\u8A00\u7C7B\u578B.
@@ -33,7 +33,7 @@ CodeGenInit.deleteProject=\u5220\u9664{0} \u5DE5\u7A0B
 CodeGenInit.initTemplate=\u521D\u59CB\u5316\u6A21\u677F
 CodeGenInit.removeLink=\u5220\u9664\u94FE\u63A5\u8D44\u6E90
 CodeGenInit.saveWorkspace=\u4FDD\u5B58\u5DE5\u4F5C\u533A
-DocumentRootImpl.mixed=\ (\u6DF7\u5408:
+DocumentRootImpl.mixed=\\ (\u6DF7\u5408:
 NodesSubTree.enableParallel=__ENABLE_PARALLEL__
 PoolTypeImpl.persistentPool=\\ (persistentPool:
 TalendJetEmitter.compileFail=\\ \u7F16\u8BD1\u5931\u8D25\uFF1A{0} : {1}
@@ -44,7 +44,7 @@ CodeGeneratorEmittersPoolFactory.operationCanceled=\u64CD\u4F5C\u5DF2\u53D6\u6D8
 ComponentsFactory.afterSystemComponent=\u5728\u7CFB\u7EDF\u7EC4\u4EF6
 ComponentsFactory.componentNotFound=\u7EC4\u4EF6\u6587\u4EF6\u5939\u6CA1\u53D1\u73B0
 ComponentsFactory.load.components=\u52A0\u8F7D\u7EC4\u4EF6...
-ComponentsFactory.parentNotRecompiled=\u8B66\u544A\: \u7236 *.inc.javajet \u6CA1\u6709\u91CD\u65B0\u7F16\u8BD1
+ComponentsFactory.parentNotRecompiled=\u8B66\u544A\\: \u7236 *.inc.javajet \u6CA1\u6709\u91CD\u65B0\u7F16\u8BD1
 ComponentsLocalProviderService.componentLoadError=\u7EC4\u4EF6\u52A0\u8F7D\u9519\u8BEF
 ComponentsLocalProviderService.talendExchangeError=Talend Exchange\u9519\u8BEF
 ComponentsPreferencePage.ButtonLabel0=\u786E\u5B9A
@@ -134,7 +134,7 @@ FAMILY.XML=XML
 CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=\u66F4\u65B0\u7F16\u8F91\u5668\u7684\u8C03\u8272\u677F
 ComponentsPreferencePage.componentAssist=\u542F\u7528\u7EC4\u4EF6\u521B\u5EFA\u52A9\u624B
 ComponentsPreferencePage.notValidDirectory=\u60A8\u7684\u9009\u62E9\u5C06\u5BFC\u81F4\u6587\u4EF6\u5939\u5D4C\u5957\uFF0C\u8FD9\u662F\u4E0D\u63A8\u8350\u7684\u3002 \u4F60\u60F3\u7EE7\u7EED\u5417\uFF1F
-ComponentsFactory.loadComponents.missingFolder=\u6587\u4EF6\u5939 "{0}" \u7F3A\u5C11\u63D2\u4EF6 "{1}".
+ComponentsFactory.loadComponents.missingFolder=\u6587\u4EF6\u5939 \"{0}\" \u7F3A\u5C11\u63D2\u4EF6 \"{1}\".
 ComponentsPreferencePage_SuccessTitle=\u6210\u529F
 ComponentsPreferencePage_SuccessMessage1=\u9700\u8981\u91CD\u542FStudio\u6765\u52A0\u8F7D\u7EC4\u4EF6\u3002\u5426\u5219\uFF0C\u4F1A\u5728\u4E0B\u6B21\u542F\u52A8\u65F6\u52A0\u8F7D\u3002
 ComponentsPreferencePage_SuccessMessage2=\u60A8\u60F3\u8981\u9A6C\u4E0A\u91CD\u542F\u5417\uFF1F

i18n/plugins/org.talend.designer.components.exchange.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange.nl</artifactId>

i18n/plugins/org.talend.designer.core.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.core.nl</artifactId>

i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_ar.properties

@@ -120,3 +120,4 @@ ModifyMergeOrderAction.ERROE=\u062E\u0637\u0623
 ConnectionDeleteCommand.COLLAPSE=\u062A\u062D\u0630\u064A\u0631
 DbTableController.dialog.title=\u062E\u0637\u0623
 ProcessUpdateManager.Question=\u0633\u0624\u0627\u0644
+JobDependenciesPanel.deleteTitle=\u062D\u0630\u0641

i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_en.properties

@@ -983,7 +983,6 @@ NewDependencyItemDialog.name=&Name
 NewOrEditDependencyDialog.properties=Properties
 NewDependencyItemDialog.optional=&Optional
 NewDependencyItemDialog.existCheckMessage=Item already exist
-ManageResourcePanel.reourceCol=Route Resource
 ManageResourcePanel.Version=Version
 ManageResourcePanel.Path=Path
 ManageResourcePanel.Context=Context
@@ -991,3 +990,4 @@ ManageResourcePanel.usedBy={0}({1}) is used by {2}
 ManageResourcePanel.copyTitle=Copy Successfully
 ManageResourcePanel.CopyPath=Copy Path
 ManageResourcePanel.copyMsg='{0}' has been copied to clipboard.
+ManageResourcePanel.reourceNameCol=Resource

i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_ja.properties

@@ -240,7 +240,7 @@ EParameterName.ConnectionFormat=\u63A5\u7D9A\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8
 ExecuteSystemCommandCommand.Title=\u5B9F\u884C\u3057\u305F\u30B3\u30DE\u30F3\u30C9
 ChangeActivateStatusSubjobCommand.Label.DeactiveComplete=\u63A5\u7D9A\u306E\u3042\u308B\u30B5\u30D6\u30B8\u30E7\u30D6\u3092\u5168\u3066\u7121\u52B9\u5316
 EParameterName.Description=\u8AAC\u660E
-Process.IfToUpgradeMetadata=\u4EE5\u4E0B\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3067\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u30E1\u30BF\u30C7\u30FC\u30BF\u306F\u5909\u66F4\u3055\u308C\u3066\u3044\u307E\u3059\u3002 \n\u66F4\u65B0\u3057\u305F\u3044\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30EA\u30DD\u30B8\u30C8\u30EA\u304B\u3089\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+Process.IfToUpgradeMetadata=\u4EE5\u4E0B\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3067\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u30E1\u30BF\u30C7\u30FC\u30BF\u306F\u5909\u66F4\u3055\u308C\u3066\u3044\u307E\u3059\u3002 \\n\u66F4\u65B0\u3057\u305F\u3044\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30EA\u30DD\u30B8\u30C8\u30EA\u304B\u3089\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 NewProcessWizard.title=\u65B0\u898F\u30B8\u30E7\u30D6
 CheckController.decoration.description=\u30EA\u30DD\u30B8\u30C8\u30EA\u304B\u3089\u53D6\u5F97\u3057\u305F\u5024
 ContextParameterPage.comment=\u30B3\u30E1\u30F3\u30C8
@@ -381,7 +381,7 @@ EParameterName.ImplictDefaultProjectsetting=\u6697\u9ED9\u306E\u30C7\u30D5\u30A9
 EmfComponent.0=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8{0}\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
 EmfComponent.RGBNotCorrect=\u30E9\u30D9\u30EB\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9\u30FC\u5185\u306ERGB\u5B9A\u7FA9\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093\u3002\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8{0}\u3002
 EmfComponent.attachedConnection=\u4ED8\u52A0\u3055\u308C\u305F\u63A5\u7D9A
-EmfComponent.componentNotExist=<\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\uFF1A{0}>\u30B3\u30CD\u30AF\u30BF\u30FC \\"{1}\\" \u304Cxml\u5185\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
+EmfComponent.componentNotExist=<\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\uFF1A{0}>\u30B3\u30CD\u30AF\u30BF\u30FC \\\\\"{1}\\\\\" \u304Cxml\u5185\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
 ExecuteSystemCommandCommand.contentNull=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u304CNULL\u5024\u3067\u3059
 ExecuteSystemCommandCommand.typeNull=\u30BF\u30A4\u30D7\u304CNULL\u5024\u3067\u3059
 Extra.UseProjectSettings=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u8A2D\u5B9A\u306E\u4F7F\u7528
@@ -415,7 +415,7 @@ JobLaunchConfigurationDelegate.jobNotFound=\u30B8\u30E7\u30D6 {0} \u306F\u898B\u
 JobTemplateViewsAndProcessUtil.jobName=\u30B8\u30E7\u30D6\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30A6\u30A3\u30B6\u30FC\u30C9\u7528\u306E\u30E2\u30C3\u30AF\u30B8\u30E7\u30D6
 MultipleThreadDynamicComposite.gatherInformation=\u30EA\u30DD\u30B8\u30C8\u30EA\u304B\u3089\u60C5\u5831\u3092\u53CE\u96C6\u4E2D
 Node.componentNotExist=\u3053\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 {0}\u306B\u4F9D\u5B58\u3057\u3066\u3044\u307E\u3059\u304C\u3001\u305D\u308C\u306F\u5B58\u5728\u3057\u3066\u3044\u307E\u305B\u3093\u3002
-Node.differentFromSchemaDefined=\u5165\u529B\u30EA\u30F3\u30AF "{0}\\" \u304B\u3089\u306E\u30B9\u30AD\u30FC\u30DE\u306F\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30B9\u30AD\u30FC\u30DE\u3068\u7570\u306A\u3063\u3066\u3044\u307E\u3059\u3002
+Node.differentFromSchemaDefined=\u5165\u529B\u30EA\u30F3\u30AF \"{0}\\\\\" \u304B\u3089\u306E\u30B9\u30AD\u30FC\u30DE\u306F\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30B9\u30AD\u30FC\u30DE\u3068\u7570\u306A\u3063\u3066\u3044\u307E\u3059\u3002
 Node.errorMessage1=\u30B5\u30D6\u30D7\u30ED\u30BB\u30B9\u3092\u8D77\u52D5\u3057\u306A\u3044\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F "on sub job ok" / "on sub job error" \u306E\u3044\u305A\u308C\u306E\u30EA\u30F3\u30AF\u3082\u5165\u529B\u306B\u3042\u308A\u307E\u305B\u3093\u3002
 Node.errorMessage2=\u30B5\u30D6\u30D7\u30ED\u30BB\u30B9\u3092\u8D77\u52D5\u3057\u306A\u3044\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F "data" \u30EA\u30F3\u30AF \u307E\u305F\u306F "iterate" \u30EA\u30F3\u30AF\u3057\u304B\u5165\u529B\u306B\u3042\u308A\u307E\u305B\u3093\u3002
 Node.errorMessage3=\u30B5\u30D6\u30D7\u30ED\u30BB\u30B9\u3092\u8D77\u52D5\u3057\u306A\u3044\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F "run if" \u30EA\u30F3\u30AF\u306F\u5165\u529B\u306B\u3042\u308A\u307E\u305B\u3093\u3002
@@ -424,21 +424,21 @@ Node.getSchemaOrNot=\u30BF\u30FC\u30B2\u30C3\u30C8 \u30B3\u30F3\u30DD\u30FC\u30C
 Node.input=\u5165\u529B\uFF1A\uFF08
 Node.inputLinkDifferentFromSchemaDefined=\u30DE\u30FC\u30B8\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u6700\u521D\u306E\u5165\u529B\u30EA\u30F3\u30AF "{0}" \u306E\u30B9\u30AD\u30FC\u30DE\u306F\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30B9\u30AD\u30FC\u30DE\u3068\u7570\u306A\u3063\u3066\u3044\u307E\u3059\u3002
 Node.needOneValue=\u30D1\u30E9\u30E1\u30FC\u30BF ({0}) \u306F\u5C11\u306A\u304F\u3068\u3082\uFF11\u3064\u306E\u5024\u3092\u6301\u305F\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093\u3002
-Node.noColumnDefined="{0}"\u3068\u3044\u3046\u540D\u524D\u306E\u51FA\u529B\u30B9\u30AD\u30FC\u30DE/\u30EA\u30F3\u30AF\u306B\u306F\u30AB\u30E9\u30E0\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+Node.noColumnDefined=\"{0}\"\u3068\u3044\u3046\u540D\u524D\u306E\u51FA\u529B\u30B9\u30AD\u30FC\u30DE/\u30EA\u30F3\u30AF\u306B\u306F\u30AB\u30E9\u30E0\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 Node.noInputLink=\u3053\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F\u5165\u529B\u30EA\u30F3\u30AF\u3092\u6301\u305F\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093\u3002
 Node.noOutputLink=\u3053\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F\u30EA\u30F3\u30AF\u3092\u6301\u3063\u305F\u51FA\u529B\u304C\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093\u3002
 Node.noRowMainLink=\u3053\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F\u5C11\u306A\u304F\u3068\u3082\uFF11\u3064\u306E Row Main \u30EA\u30F3\u30AF\u3092\u6301\u305F\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093\u3002
 Node.noSchemaDefined=\u30B9\u30AD\u30FC\u30DE\u304C\u307E\u3060\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 Node.notEnoughTypeInput=\u3053\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u306F\u5341\u5206\u306A "{0}" \u30BF\u30A4\u30D7\u306E\u5165\u529B\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-Node.notEnoughTypeOutput=\u3053\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u306F\u5341\u5206\u306A "{0}" \u30BF\u30A4\u30D7\u306E\u51FA\u529B\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+Node.notEnoughTypeOutput=\u3053\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u306F\u5341\u5206\u306A \"{0}\" \u30BF\u30A4\u30D7\u306E\u51FA\u529B\u304C\u3042\u308A\u307E\u305B\u3093\u3002
 Node.output=\u51FA\u529B\uFF1A\uFF08
 Node.outputNeedInputLink=\u3053\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u51FA\u529B\u304C\u3042\u308B\u306A\u3089\u3001\u30C7\u30FC\u30BF\u3092\u53CD\u6620\u3059\u308B\u5165\u529B\u30EA\u30F3\u30AF\u304C\u5FC5\u8981\u3067\u3059\u3002
 Node.parameterEmpty=\u30D1\u30E9\u30E1\u30FC\u30BF ({0}) \u304C\u7A7A\u3067\u3059\u3001\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044\u3002
 Node.parameterNotExist=\u30D1\u30E9\u30E1\u30FC\u30BF ({0}) \u306F\u3082\u3046\u5B58\u5728\u3057\u306A\u3044\u5024 ({1}) \u3092\u6301\u3063\u3066\u3044\u307E\u3059\u3002
 Node.schemaDifferent=\u30D1\u30E9\u30E1\u30FC\u30BF ({0}) : \u30B9\u30AD\u30FC\u30DE\u306F\u30AF\u30A8\u30EA\u3068\u7570\u306A\u3063\u3066\u3044\u307E\u3059\u3002
-Node.schemaNotSame=\u30DE\u30FC\u30B8\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u5165\u529B\u30EA\u30F3\u30AF "{0}" \u306E\u30B9\u30AD\u30FC\u30DE\u306F\u4E92\u3044\u306B\u7570\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u540C\u3058\u3067\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093\u3002
-Node.tooMuchTypeInput=\u3053\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E "{0}" \u30BF\u30A4\u30D7\u306E\u5165\u529B\u306F\u591A\u3059\u304E\u307E\u3059\u3002
-Node.tooMuchTypeOutput=\u3053\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E "{0}" \u30BF\u30A4\u30D7\u306E\u51FA\u529B\u306F\u591A\u3059\u304E\u307E\u3059\u3002
+Node.schemaNotSame=\u30DE\u30FC\u30B8\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u5165\u529B\u30EA\u30F3\u30AF \"{0}\" \u306E\u30B9\u30AD\u30FC\u30DE\u306F\u4E92\u3044\u306B\u7570\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u540C\u3058\u3067\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093\u3002
+Node.tooMuchTypeInput=\u3053\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E \"{0}\" \u30BF\u30A4\u30D7\u306E\u5165\u529B\u306F\u591A\u3059\u304E\u307E\u3059\u3002
+Node.tooMuchTypeOutput=\u3053\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E \"{0}\" \u30BF\u30A4\u30D7\u306E\u51FA\u529B\u306F\u591A\u3059\u304E\u307E\u3059\u3002
 OpenContextChooseComboDialog.context=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8:
 OpenExistVersionProcess.open=\u4ED6\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u958B\u304F
 OpenExistVersionProcess.open.dialog=\u30B8\u30E7\u30D6\u3092\u958B\u304F
@@ -701,7 +701,7 @@ AbstractMultiPageTalendEditor.canNotSaveMessage.routine=\u30EB\u30FC\u30C1\u30F3
 EParameterName.dParallelize=\u4E26\u5217\u5316\u7121\u52B9\u5316
 EOozieParameterName.hadoopAppPath=HDFS\u30D1\u30B9
 EOozieParameterName.jobId=\u30B8\u30E7\u30D6ID
-EOozieParameterName.repositoryConnectionId="Oozie\u63A5\u7D9AID"
+EOozieParameterName.repositoryConnectionId=\"Oozie\u63A5\u7D9AID\"
 PropertiesContextAction.parallelization=\u30D1\u30E9\u30EC\u30EB\u5316\u3092\u8A2D\u5B9A
 Connection.paral_partitioner=\u30ED\u30A6\u3092\u5206\u5272
 Connection.paral_departitioner=\u30ED\u30A6\u3092\u7D71\u5408
@@ -950,3 +950,44 @@ Node.checkMultipleTRunjobVersion=\u540C\u3058\u30D7\u30ED\u30BB\u30B9\u306EtRunJ
 Process.errorCircleConnectionDetected=\u30B5\u30FC\u30AF\u30EB\u63A5\u7D9A\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u63A5\u7D9A\u306F<{0}>\u3001\u30BD\u30FC\u30B9\u306F<{1}>\u3001\u30BF\u30FC\u30B2\u30C3\u30C8\u306F<{2}>\u3067\u3059\u3002
 JobletPropertiesWizard.renameWarning.title=\u8B66\u544A
 JobletPropertiesWizard.renameWarning.msg=\u5E7E\u3064\u304B\u306E\u30B8\u30E7\u30D6\u3067\u3053\u306E\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u306F\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30EA\u30CD\u30FC\u30E0\u3067\u304D\u307E\u305B\u3093\u3002
+AbstractMultiPageTalendEditor.DependenciesPage=\u4F9D\u5B58\u6027
+JobDependenciesEditor.Resources=\u30EA\u30BD\u30FC\u30B9
+JobDependenciesEditor.filterLabel=&\u691C\u7D22
+JobDependenciesEditor.hideBuiltInItems=\u7D44\u307F\u8FBC\u307F\u30A2\u30A4\u30C6\u30E0\u3092\u96A0\u3059
+JobDependenciesEditor.refreshDependenciesTooltip=\u30EB\u30FC\u30C8\u306E\u6700\u65B0\u30B3\u30F3\u30C6\u30F3\u30C4\u306B\u5F93\u3063\u3066\u3059\u3079\u3066\u306E\u4F9D\u5B58\u95A2\u4FC2\u3092\u66F4\u65B0
+JobDependenciesEditor.KeyBindingWord=\u30AD\u30FC\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0: Delete\u3001Insert\u3001Enter
+JobDependenciesPanel.multiItemsSelectedStatusMsg=\\  \u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0
+JobDependenciesPanel.deleteTitle=\u524A\u9664
+JobDependenciesPanel.deleteMsg=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u3059\u3079\u3066\u524A\u9664\u3057\u307E\u3059\u304B?
+JobDependenciesPanel.addBtn=\u8FFD\u52A0...
+JobDependenciesPanel.removeBtn=\u524A\u9664
+JobDependenciesPanel.editBtn=\u7DE8\u96C6
+JobDependenciesPanel.upBtn=\u30A2\u30C3\u30D7
+JobDependenciesPanel.downBtn=\u30C0\u30A6\u30F3
+DependencyVersionPart.comboInclusive=\u5305\u62EC\u7684
+DependencyVersionPart.comboExclusive=\u6392\u4ED6\u7684
+DependencyVersionPart.minimumVersion=\u6700\u5C0F\u30D0\u30FC\u30B8\u30E7\u30F3:
+DependencyVersionPart.maximumVersion=\u6700\u5927\u30D0\u30FC\u30B8\u30E7\u30F3:
+DependencyVersionPart.version=\u30D0\u30FC\u30B8\u30E7\u30F3:
+DependencyVersionDialog.versionRangeError=\u6700\u5C0F\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u6700\u5927\u30D0\u30FC\u30B8\u30E7\u30F3\u4EE5\u4E0B\u3067\u306A\u304F\u3066\u306F\u306A\u3089\u306A\u3044
+DependenceVersionPart.groupText=\u30DE\u30C3\u30C1\u3059\u308B\u30D0\u30FC\u30B8\u30E7\u30F3
+DependenciesResourceSelectionDialog.selectResource=\u30EA\u30BD\u30FC\u30B9\u306E\u9078\u629E
+DependenciesContextSelectionDialog.selectContext=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u5909\u6570\u306E\u9078\u629E
+DependenciesContextSelectionDialog.addContext=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u5909\u6570\u306E\u8FFD\u52A0
+DependenciesContextSelectionDialog.contextInUseError=\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u5909\u6570\u306F\u65E2\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059!
+NewDependencyItemDialog.addTitle={0}\u306E\u8FFD\u52A0
+NewDependencyItemDialog.editTitle={0}\u306E\u7DE8\u96C6
+NewDependencyItemDialog.addMsg=\u65B0\u3057\u3044{0}\u306E\u8FFD\u52A0
+NewDependencyItemDialog.editMsg=\u9078\u629E\u3057\u305F{0}\u306E\u5C5E\u6027\u3092\u7DE8\u96C6
+NewDependencyItemDialog.name=&\u540D\u524D
+NewOrEditDependencyDialog.properties=\u30D7\u30ED\u30D1\u30C6\u30A3
+NewDependencyItemDialog.optional=&\u30AA\u30D7\u30B7\u30E7\u30F3
+NewDependencyItemDialog.existCheckMessage=\u30A2\u30A4\u30C6\u30E0\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059
+ManageResourcePanel.Version=\u30D0\u30FC\u30B8\u30E7\u30F3
+ManageResourcePanel.Path=\u30D1\u30B9
+ManageResourcePanel.Context=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8
+ManageResourcePanel.usedBy={0}({1})\u306F{2}\u306B\u3088\u3063\u3066\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
+ManageResourcePanel.copyTitle=\u30B3\u30D4\u30FC\u304C\u6210\u529F\u3057\u307E\u3057\u305F
+ManageResourcePanel.CopyPath=\u30B3\u30D4\u30FC\u30D1\u30B9
+ManageResourcePanel.copyMsg=\'\'{0}\'\'\u304C\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u306B\u30B3\u30D4\u30FC\u3055\u308C\u307E\u3057\u305F\u3002
+ManageResourcePanel.reourceNameCol=\u30EA\u30BD\u30FC\u30B9

i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_pt_BR.properties

@@ -242,3 +242,4 @@ ModifyMergeOrderAction.ERROE=Erro
 ConnectionDeleteCommand.COLLAPSE=Advert\u00eancia
 DbTableController.dialog.title=Erro
 ProcessUpdateManager.Question=Pergunta
+JobDependenciesPanel.deleteTitle=Deletar

i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_ro.properties

@@ -47,3 +47,4 @@ EParameterName.Use.Dynamic.Job=Foloseste actiune dinamica
 OoziePreferencePage.userName=Nume utilizator
 AbstractMultiPageTalendEditor.canNotSaveMessage.routine=Rutina nu este blocat\u00e3 de utilizator, nu se poate salva 
 Connection.paral_none=Nici unul
+JobDependenciesPanel.deleteTitle=sterge

i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_ru.properties

@@ -297,3 +297,4 @@ DbTableController.dialog.title=\u041E\u0448\u0438\u0431\u043A\u0430
 EOozieParameterName.jobId=Id \u0440\u0430\u0431\u043E\u0442\u044B
 Connection.paral_none=\u041D\u0438\u0447\u0435\u0433\u043E
 ProcessUpdateManager.Question=\u0412\u043E\u043F\u0440\u043E\u0441\u044B
+JobDependenciesPanel.deleteTitle=\u0423\u0434\u0430\u043B\u0438\u0442\u044C

i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_tr.properties

@@ -36,3 +36,4 @@ ConnectionSetAsMainRef.ERROR=Hata
 ModifyMergeOrderAction.ERROE=Hata
 DbTableController.dialog.title=Hata
 ProcessUpdateManager.Question=Soru
+JobDependenciesPanel.deleteTitle=Sil

i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_zh_CN.properties

@@ -54,7 +54,6 @@ EParameterName.componentList=\u7ec4\u4ef6\u5217\u8868
 EParameterName.ModuleList=\u6A21\u5757\u5217\u8868
 ConnectionCreateAction.dialogTitle=\u8f93\u51fa
 DesignerPreferencePage.component.defaultLabel=\u7ec4\u5efa\u7f3a\u7701\u6807\u7b7e
-EParameterName.schemaType=\u67B6\u6784
 EParameterName.tableStats=\u9759\u6001\u4fe1\u606f\u8868
 EParameterName.Family=\u65cf
 UpdateDetectionDialog.Remarks=\u5907\u6CE8
@@ -118,7 +117,7 @@ ContextParameterExtractor.ExistedMessages=\u4E00\u4E9B\u4E0A\u4E0B\u6587\u53C2\u
 TextController.decoration.description=\u4ece\u50a8\u5b58\u5e93\u4e2d\u83b7\u53d6\u7684\u503cy
 StatsAndLogsComposite.SaveToolTipText=\u4FDD\u5B58\u503C\u5230\u9996\u9009\u9879\uFF08Shift+S)
 NodeReturn.Availability.FLOW=\u6d41\u7a0b
-CodeView.MultipleComponentError=/// \u6ca1\u6709\u4ee3\u7801\n/// \u591a\u4e2a\u7ec4\u4ef6\u4e0d\u80fd\n/// \u663e\u793a\u4ee3\u7801\u3002
+CodeView.MultipleComponentError=/// \u6ca1\u6709\u4ee3\u7801\\n/// \u591a\u4e2a\u7ec4\u4ef6\u4e0d\u80fd\\n/// \u663e\u793a\u4ee3\u7801\u3002
 EParameterName.onFileFlag=\u8f93\u51fa\u5230\u6587\u4ef6
 JobHierarchyMessages.JobHierarchyViewPart_title=\u4F5C\u4E1A {1}\uFF0C\u5DE5\u7A0B {2}
 ParallelExecutionCommand.numberInvalid=\u6570\u5B57\u65E0\u6548\u3002
@@ -175,7 +174,6 @@ EParameterName.fileNameStats=\u9759\u6001\u4fe1\u606f\u6587\u4ef6
 ConnectionReconnectCommand.LabelSource=\u79fb\u52a8\u8fde\u63a5\u6e90
 Problems.category.routines=\u5E38\u89C4
 ComboController.valueFromRepository=\u4ece\u50a8\u5b58\u5e93\u4e2d\u83b7\u53d6\u7684\u503c
-EParameterName.schemaDb=\u67B6\u6784
 ProblemsView.resource=\u8D44\u6E90
 ConnectionCreateAction.error=\u9519\u8BEF
 OpaqueNoteSection.Label=\u900f\u660e\u5ea6
@@ -231,7 +229,7 @@ ActivateSubjobAction.DeactivatePart=\u505C\u7528\u5F53\u524D\u5B50\u4F5C\u4E1A
 ConnectionCreateCommand.Label=\u521b\u5efa\u8fde\u63a5
 DisplaySubjobCommand.HideSubjob=\u9690\u85CF\u5B50\u4F5C\u4E1A
 MultiPageEditorContributor.runProcess=\u8fd0\u884c\u4f5c\u4e1a
-ConnectionCreateAction.errorCreateConnectionName=\u540d\u5b57 "{0}" \u4e0d\u5408\u6cd5\u6216\u5df2\u5b58\u5728\u3002.
+ConnectionCreateAction.errorCreateConnectionName=\u540d\u5b57 \"{0}\" \u4e0d\u5408\u6cd5\u6216\u5df2\u5b58\u5728\u3002.
 DisplaySubjobCommand.DisplaySubjob=\u663E\u793A\u5B50\u4F5C\u4E1A
 ContextParameterPage.title=\u4e0a\u4e0b\u6587\u53c2\u6570
 NodeReturn.Availability.AFTER=\u4e4b\u540e
@@ -240,7 +238,7 @@ EParameterName.ConnectionFormat=\u8FDE\u63A5\u683C\u5F0F
 ExecuteSystemCommandCommand.Title=\u5DF2\u6267\u884C\u7684\u547D\u4EE4
 ChangeActivateStatusSubjobCommand.Label.DeactiveComplete=\u505C\u7528\u6240\u6709\u8FDE\u63A5\u7684\u5B50\u4F5C\u4E1A
 EParameterName.Description=\u63cf\u8ff0
-Process.IfToUpgradeMetadata=\u7ec4\u4ef6{0}\u4e2d\u7684\u5143\u6570\u636e\u88ab\u4fee\u6539\u3002\n\u662f\u5426\u8981\u4ece\u50a8\u5b58\u5e93\u4e2d\u5347\u7ea7\uff1f
+Process.IfToUpgradeMetadata=\u7ec4\u4ef6{0}\u4e2d\u7684\u5143\u6570\u636e\u88ab\u4fee\u6539\u3002\\n\u662f\u5426\u8981\u4ece\u50a8\u5b58\u5e93\u4e2d\u5347\u7ea7\uff1f
 NewProcessWizard.title=\u65b0\u4f5c\u4e1a
 CheckController.decoration.description=\u4ece\u50a8\u5b58\u5e93\u4e2d\u83b7\u53d6\u7684\u503c
 ContextParameterPage.comment=\u5907\u6ce8
@@ -312,7 +310,7 @@ AbstractLanguageMemoController.generateSampleCode=\u8BD5\u56FE\u4E3A\u6B64\u7EC4
 AbstractPreferenceComposite.jobAssigned=\u5B50\u5DE5\u4F5C\u5E94\u5206\u914D\u7ED9{0}
 AbstractPreferenceComposite.textContent=\u5E94\u7528\u5B50\u5DE5\u4F5C
 AbstractPreferenceComposite.tipContent=\u5E94\u7528\u5B50\u5DE5\u4F5C
-AbstractPreferenceComposite.warning=\u8B66\u544A\: {0}
+AbstractPreferenceComposite.warning=\u8B66\u544A\\: {0}
 ColumnListController.confirm=\u786E\u5B9A
 ColumnListController.saveChange=\u5728{0} schema\u7684\u680F\u4F4D\u5DF2\u88AB\u4FEE\u6539\uFF0C\u60A8\u8981\u4F20\u64AD\u8FD9\u79CD\u6539\u53D8\u5417?
 ComboController.alert=\u8B66\u6212
@@ -549,7 +547,7 @@ DesignerPreferencePage.iconSize32=32 \u50CF\u7D20
 DesignerPreferencePage.tableView=\u8868\u89C6\u56FE
 EParameterName.useExistConn=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
 ErrorMessageDialog.DETAIL=\u7EC6\u8282
-ErrorMessageDialog.ERROR_MESS=\u9519\u8BEF\!
+ErrorMessageDialog.ERROR_MESS=\u9519\u8BEF\\!
 ErrorMessageDialog.EXCEP_IN_COM=\u7EC4\u4EF6\u5F02\u5E38
 GuessSchemaController.connError=\u8FDE\u63A5\u9519\u8BEF
 GuessSchemaController.waitOpenDatabase=\u7B49\u5F85\u6253\u5F00\u6570\u636E\u5E93
@@ -610,7 +608,7 @@ AbstractMultiPageTalendEditor_pleaseWait=\u4FDD\u5B58\u4E2D\uFF0C\u8BF7\u7B49\u5
 DocumentationPreferencePage.use_css_template=\u5BFC\u51FA\u5230HTML\u65F6\uFF0C\u4F7F\u7528CSS\u6587\u4EF6\u4F5C\u4E3A\u6A21\u677F
 DocumentationPreferencePage.css_file=CSS \u6587\u4EF6
 DocumentationPreferencePage.must_css_file=\u5FC5\u987B\u662F\u4E00\u4E2Acss\u6587\u4EF6
-DocumentationPreferencePage.must_existing_value=\u5FC5\u987B\u662F\u5DF2\u5B58\u5728\u7684\u6587\u4EF6\n
+DocumentationPreferencePage.must_existing_value=\u5FC5\u987B\u662F\u5DF2\u5B58\u5728\u7684\u6587\u4EF6\\n
 Node.componentDoesntSupportDynamic=\u6B64\u7EC4\u4EF6\u4E0D\u652F\u6301\u52A8\u6001\u7C7B\u578B
 Node.dynamicNotSupported=\u6B64\u7248\u672C\u4E0D\u652F\u6301\u52A8\u6001\u7C7B\u578B
 Node.hl7HaveNoMergeLink=\u6CA1\u6709\u5408\u5E76\u94FE\u63A5
@@ -618,7 +616,7 @@ Node.onlyOneDynamicPerSchema=\u4E00\u4E2A schema \u4E2D\u53EA\u80FD\u5B58\u5728\
 Node.schemaNotSynchronized=Schema \u672A\u540C\u6B65
 I18nPreferencePage.wait_process=\u8FD9\u4E2A\u8FC7\u7A0B\u9700\u8981\u51E0\u5206\u949F\u65F6\u95F4\uFF0C\u8BF7\u7A0D\u5019...
 Node.lengthDiffWarning=\u8F93\u5165\u94FE\u63A5 \"{0}\u201D\u7684 schema \u4E2D\u81F3\u5C11\u6709\u4E00\u4E2A\u5217\u7684\u957F\u5EA6\u4E0D\u540C\u4E8E\u7EC4\u4EF6\u4E2D\u5B9A\u4E49\u7684 schema\u3002
-WSDL2JAVAController.WSDLEquals=WSDL\u4E0D\u80FD\u7B49\u4E8E "";
+WSDL2JAVAController.WSDLEquals=WSDL\u4E0D\u80FD\u7B49\u4E8E \"\";
 BringForwardAction_bring_forward=\u5411\u524D
 BringToFrontAction_bring_to_front=\u7F6E\u4E8E\u9876\u5C42
 Processor.commandLineLog=\u547D\u4EE4\u884C\uFF1A
@@ -796,7 +794,7 @@ RoutinesFunctionProposal.System=\u7CFB\u7EDF
 RoutinesFunctionProposal.User=\u7528\u6237
 RoutinesFunctionProposal.VariableName=\\n\\n\u53D8\u91CF\u540D\u79F0\uFF1A{2}
 GlobalVariableProposal.Description=\u63CF\u8FF0\uFF1A {0}
-GlobalVariableProposal.VariableName=\n\n\u53D8\u91CF\u540D\uFF1A{1}
+GlobalVariableProposal.VariableName=\\n\\n\u53D8\u91CF\u540D\uFF1A{1}
 ActivateSubjobAction.ActivateCompleteRoute=\u6FC0\u6D3B\u5168\u90E8\u7EBF\u8DEF
 ActivateSubjobAction.DeactivateCompleteRoute=\u7981\u7528\u6574\u4E2A\u8DEF\u7EBF\u6D41
 MissingSettingsMultiThreadDynamicComposite_missingModulesMessages=\u6B64\u7EC4\u4EF6 {0} \u9700\u8981\u81F3\u5C11\u5B89\u88C5\u4E00\u4E2A\u5916\u90E8 jar\u3002
@@ -948,3 +946,46 @@ AbstractJobSettingsPage.save=\u662F\u5426\u8981\u66F4\u65B0\u6240\u6709\u4F5C\u4
 EmfComponent.Count=\u8BA1\u6570
 Node.checkMultipleTRunjobVersion=\u540C\u4E00\u8FDB\u7A0B\u7684\u6240\u6709 tRunJob \u5FC5\u987B\u4E3A\u76F8\u540C\u7248\u672C\u3002\u8BF7\u68C0\u67E5\u3002
 Process.errorCircleConnectionDetected=\u68C0\u6D4B\u5230\u5706\u5F62\u8FDE\u63A5\u3002\u8FDE\u63A5\u662F <{0}>\uFF0C\u6765\u6E90\u662F <{1}>\uFF0C\u76EE\u6807\u662F <{2}>\u3002
+JobletPropertiesWizard.renameWarning.title=\u8B66\u544A
+JobletPropertiesWizard.renameWarning.msg=\u4E00\u4E9B\u5E94\u7528\u6B64\u5C0F\u4F5C\u4E1A\u7684\u4F5C\u4E1A\u5DF2\u88AB\u9501\u5B9A\u3002\u56E0\u6B64\u60A8\u4E0D\u80FD\u5BF9\u5176\u91CD\u547D\u540D\u3002
+AbstractMultiPageTalendEditor.DependenciesPage=\u4F9D\u8D56\u5173\u7CFB
+JobDependenciesEditor.Resources=\u8D44\u6E90
+JobDependenciesEditor.filterLabel=\u641C\u7D22(&S)
+JobDependenciesEditor.hideBuiltInItems=\u9690\u85CF\u5185\u7F6E\u9879
+JobDependenciesEditor.refreshDependenciesTooltip=\u6839\u636E\u6700\u65B0\u7684\u8DEF\u7531\u5185\u5BB9\u5237\u65B0\u6240\u6709\u4F9D\u8D56\u5173\u7CFB
+JobDependenciesEditor.KeyBindingWord=\u952E\u7ED1\u5B9A: Delete\u3001Insert\u3001Enter
+JobDependenciesPanel.multiItemsSelectedStatusMsg=\\ \u9009\u5B9A\u7684\u9879
+JobDependenciesPanel.deleteTitle=\u5220\u9664
+JobDependenciesPanel.deleteMsg=\u662F\u5426\u8981\u5220\u9664\u6240\u6709\u9009\u5B9A\u7684\u9879?
+JobDependenciesPanel.addBtn=\u6DFB\u52A0...
+JobDependenciesPanel.removeBtn=\u79FB\u9664
+JobDependenciesPanel.editBtn=\u7F16\u8F91
+JobDependenciesPanel.upBtn=\u5411\u4E0A
+JobDependenciesPanel.downBtn=\u5411\u4E0B
+DependencyVersionPart.comboInclusive=\u5305\u542B
+DependencyVersionPart.comboExclusive=\u4E0D\u542B
+DependencyVersionPart.minimumVersion=\u6700\u4F4E\u7248\u672C:
+DependencyVersionPart.maximumVersion=\u6700\u9AD8\u7248\u672C:
+DependencyVersionPart.version=\u7248\u672C:
+DependencyVersionDialog.versionRangeError=\u6700\u4F4E\u7248\u672C\u5FC5\u987B\u5C0F\u4E8E\u6216\u7B49\u4E8E\u6700\u9AD8\u7248\u672C
+DependenceVersionPart.groupText=\u8981\u5339\u914D\u7684\u7248\u672C
+DependenciesResourceSelectionDialog.selectResource=\u9009\u62E9\u8D44\u6E90
+DependenciesContextSelectionDialog.selectContext=\u9009\u62E9\u4E0A\u4E0B\u6587\u53D8\u91CF
+DependenciesContextSelectionDialog.addContext=\u6DFB\u52A0\u4E0A\u4E0B\u6587\u53D8\u91CF
+DependenciesContextSelectionDialog.contextInUseError=\u6B64\u4E0A\u4E0B\u6587\u53D8\u91CF\u5DF2\u5728\u4F7F\u7528\u4E2D!
+NewDependencyItemDialog.addTitle=\u6DFB\u52A0 {0}
+NewDependencyItemDialog.editTitle=\u7F16\u8F91 {0}
+NewDependencyItemDialog.addMsg=\u6DFB\u52A0\u65B0\u7684 {0}
+NewDependencyItemDialog.editMsg=\u7F16\u8F91\u9009\u5B9A {0} \u7684\u7279\u6027
+NewDependencyItemDialog.name=\u540D\u79F0(&N)
+NewOrEditDependencyDialog.properties=\u5C5E\u6027
+NewDependencyItemDialog.optional=\u53EF\u9009(&O)
+NewDependencyItemDialog.existCheckMessage=\u9879\u5DF2\u7ECF\u5B58\u5728
+ManageResourcePanel.Version=\u7248\u672C
+ManageResourcePanel.Path=\u8DEF\u5F84
+ManageResourcePanel.Context=\u4E0A\u4E0B\u6587
+ManageResourcePanel.usedBy={0}({1}) \u88AB {2} \u4F7F\u7528
+ManageResourcePanel.copyTitle=\u590D\u5236\u6210\u529F
+ManageResourcePanel.CopyPath=\u590D\u5236\u8DEF\u5F84
+ManageResourcePanel.copyMsg=\'\'{0}\'\' \u5DF2\u88AB\u590D\u5236\u5230\u526A\u8D34\u677F\u3002
+ManageResourcePanel.reourceNameCol=\u8D44\u6E90

i18n/plugins/org.talend.designer.dbmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.dbmap.nl</artifactId>

i18n/plugins/org.talend.designer.dbmap.nl/src/main/java/messages_ja.properties

@@ -9,7 +9,7 @@ VarsTable.baseNameCannotNull=\u30D9\u30FC\u30B9\u540D\u3092NULL\u5024\u306B\u305
 UIManager.tableNameIsNotValid=\u30C6\u30FC\u30D6\u30EB\u540D\u304C\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
 EntryContentProposal.expressionKey=\u5F0F\u30AD\u30FC\uFF1A
 ToolbarInputZone.moveupTooltip=\u9078\u629E\u3057\u305F\u51FA\u529B\u53C2\u7167\u30C6\u30FC\u30D6\u30EB\u3092\u4E0A\u306B\u79FB\u52D5
-VarsTable.columnNameTip=\u30AB\u30E9\u30E0\u540D '
+VarsTable.columnNameTip=\u30AB\u30E9\u30E0\u540D \'
 EntryContentProposal.default=\u30C7\u30D5\u30A9\u30EB\u30C8\uFF1A
 TabFolderEditors.SqlSelectQuery="{0}" \u51FA\u529B\u306E SQL SELECT\u30AF\u30A8\u30EA\u3092\u751F\u6210\u3057\u307E\u3057\u305F
 EntryContentProposal.metadataColumn=\u30E1\u30BF\u30C7\u30FC\u30BF\u30AB\u30E9\u30E0
@@ -40,7 +40,7 @@ AliasDialog.addNewAlias=\u65B0\u898F\u306E\u30A8\u30A4\u30EA\u30A2\u30B9\u306E\u
 MapperManager.exceptionMessage.useOtherSignature=\u30A8\u30F3\u30C8\u30EA\u3092\u8FFD\u52A0\u3059\u308B\u306B\u306F\u4ED6\u306E\u30B7\u30B0\u30CD\u30C1\u30E3\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
 UIManager.propagateTitle=\u53CD\u6620
 MapperManager.removeOutputTableTitle=\u51FA\u529B\u30C6\u30FC\u30D6\u30EB\u306E\u524A\u9664
-ProblemsManager.entryDoesntMatch=\u30A8\u30F3\u30C8\u30EA "{0}.{1}" \u304C\u30C6\u30FC\u30D6\u30EB "{2}" \u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30B9\u30AD\u30FC\u30DE\u306B\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
+ProblemsManager.entryDoesntMatch=\u30A8\u30F3\u30C8\u30EA \"{0}.{1}\" \u304C\u30C6\u30FC\u30D6\u30EB \"{2}\" \u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30B9\u30AD\u30FC\u30DE\u306B\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
 EntryContentProposal.type=\u30BF\u30A4\u30D7 :
 EntryContentProposal.length=\u9577\u3055 :
 VarsTable.columnNameIsNull=\u30AB\u30E9\u30E0\u540D\u304CNULL\u3067\u3059\u3002
@@ -154,6 +154,6 @@ OutputDataMapTableView.columnTitle.AdditionalOtherClauses=\u4ED6\u306E\u8FFD\u52
 OutputDataMapTableView.columnTitle.AdditionalOtherClauses.oracle=\u4ED6\u306E\u8FFD\u52A0\u53E5(GROUP BY...) :
 DataMapTableView.buttonTooltip.menu.addWhereClauses=WHERE\u53E5\u3092\u8FFD\u52A0
 DataMapTableView.buttonTooltip.menu.addOtherClauses=\u4ED6\u306ESQL\u53E5\uFF08GROUP\u7B49\uFF09\u3092\u8FFD\u52A0
-ProblemsAnalyser.needAlias.error1='{0}'\u304C\u30EA\u30F3\u30AF\u3055\u308C\u305F\u30C6\u30FC\u30D6\u30EB\u540D'{1}'\u306F\u8907\u96D1\u904E\u304E\u307E\u3059\u3002\u30A8\u30A4\u30EA\u30A2\u30B9\u3092\u4F7F\u7528\u3057\u3066sql\u3092\u751F\u6210\u3057\u3066\u4E0B\u3055\u3044!
+ProblemsAnalyser.needAlias.error1=\'{0}\'\u304C\u30EA\u30F3\u30AF\u3055\u308C\u305F\u30C6\u30FC\u30D6\u30EB\u540D\'{1}\'\u306F\u8907\u96D1\u904E\u304E\u307E\u3059\u3002\u30A8\u30A4\u30EA\u30A2\u30B9\u3092\u4F7F\u7528\u3057\u3066sql\u3092\u751F\u6210\u3057\u3066\u4E0B\u3055\u3044!
 ToolbarOutputZone.widgetTooltip.delimitedIdentifiers=\u30B9\u30AD\u30FC\u30DE\u304C\u533A\u5207\u308A\u8A18\u53F7\u4ED8\u304D\u8B58\u5225\u5B50\u3092\u30B5\u30DD\u30FC\u30C8\u3059\u308B\u3088\u3046\u306B\u4E8C\u91CD\u5F15\u7528\u7B26\u3092\u8FFD\u52A0\u3059\u308B\u306B\u306F\u3001me\u3092\u30A2\u30AF\u30C6\u30A3\u30D6\u306B\u3057\u307E\u3059\u3002
 ToolbarOutputZone.widgetText.delimitedIdentifiers=\u533A\u5207\u308A\u8A18\u53F7\u4ED8\u304D\u8B58\u5225\u5B50

i18n/plugins/org.talend.designer.dbmap.nl/src/main/java/messages_zh_CN.properties

@@ -2,14 +2,14 @@ UIManager.1=\u7528\u4F8B\u672A\u627E\u5230
 TabFolderEditors.expressionEditor=\u8868\u8FBE\u5F0F\u7F16\u8F91\u5668
 EntryContentProposal.comment=\u5907\u6CE8 :
 DataMapTableView.buttonTooltip.addFilterRow=\u6DFB\u52A0\u8FC7\u6EE4\u884C
-TableEntriesManager.exceptionMessage.typeIsNotValid=\u7C7B\u578B "{0}" \u65E0\u6548\u3002
+TableEntriesManager.exceptionMessage.typeIsNotValid=\u7C7B\u578B \"{0}\" \u65E0\u6548\u3002
 UIManager.addNewOutputTable=\u6DFB\u52A0\u65B0\u7684\u8F93\u51FA\u8868\u683C
 EntryContentProposal.variable=\u53D8\u91CF
 VarsTable.baseNameCannotNull=baseName \u4E0D\u80FD\u4E3A\u7A7A
 UIManager.tableNameIsNotValid=\u8FDE\u63A5/\u8868\u7684\u540D\u5B57\u65E0\u6548\u6216\u5DF2\u5B58\u5728\u3002
 EntryContentProposal.expressionKey=\u8868\u8FBE\u5F0F\u952E\u7801 :
 ToolbarInputZone.moveupTooltip=\u4E0A\u79FB\u9009\u62E9\u7684\u8F93\u5165\u68C0\u67E5\u8868\u683C
-VarsTable.columnNameTip=\u5217\u540D'
+VarsTable.columnNameTip=\u5217\u540D\'
 EntryContentProposal.default=\u786E\u7701 :
 TabFolderEditors.SqlSelectQuery=\u4E3A \'\'{0}\'\' \u8F93\u51FA\u751F\u6210\u7684 SQL \u9009\u62E9\u67E5\u8BE2
 EntryContentProposal.metadataColumn=\u5143\u6570\u636E\u5217
@@ -19,7 +19,7 @@ EntryContentProposal.precision=\u7CBE\u5EA6 :
 ToolbarOutputZone.widgetTooltip.addOutputTable=\u6DFB\u52A0\u8F93\u51FA\u8868\u683C
 ToolbarOutputZone.widgetText.autoMap=\u81EA\u52A8\u6620\u5C04\uFF01
 EntryContentProposal.properties=\u5C5E\u6027 :
-VarsTable.existTip=\t\n' \u5DF2\u5B58\u5728\u3002
+VarsTable.existTip=\' \u5DF2\u5B58\u5728\u3002
 InputDataMapTableView.Operator=\u64cd\u4f5c
 AliasDialog.SelectTableToUse=\u9009\u62E9\u8868\u4F7F\u7528:
 TabFolderEditors.schemaEditor=\u56FE\u89E3\u7F16\u8F91\u5668
@@ -29,7 +29,7 @@ EntryContentProposal.dbType=\u6570\u636E\u5E93\u7C7B\u578B
 MapperManager.removeInputTableTitleMessage=\u60A8\u786E\u5B9A\u8981\u79FB\u9664\u8F93\u5165\u8868\u201C{0}\u201D\uFF1F
 ToolbarInputZone.movedownTooltip=\u4E0B\u79FB\u9009\u62E9\u7684\u8F93\u51FA\u68C0\u67E5\u8868\u683C
 ToolbarOutputZone.movedownTooltip=\u4E0B\u79FB\u9009\u62E9\u7684\u8F93\u51FA\u8868\u683C
-AliasDialog.aliasAlreadyExists=\u522B\u540D\u8868\u6216\u6570\u636E\u5E93\u8868\u7684\u5DF2\u7ECF\u5B58\u5728\u540D\u79F0'{0}'!
+AliasDialog.aliasAlreadyExists=\u522B\u540D\u8868\u6216\u6570\u636E\u5E93\u8868\u7684\u5DF2\u7ECF\u5B58\u5728\u540D\u79F0\'\'{0}\'\'!
 ProblemsManager.inputExpressionEmpty=\u672A\u8BBE\u5B9A\u8F93\u5165\u9879 \'\'{0}.{1}\'\' \u7684\u8868\u8FBE\u5F0F\u3002
 ToolbarOutputZone.restorTooltip=\u6062\u590D\u6240\u6709\u8F93\u51FA\u8868\u683C
 TableEntriesManager.exceptionMessage.caseNotFound=\u7528\u4F8B\u672A\u627E\u5230
@@ -67,16 +67,16 @@ EntryContentProposal.column=\u5217 :
 ToolbarInputZone.restoreTooltip=\u6062\u590D\u6240\u6709\u8F93\u5165\u8868\u683C
 InputDataMapTableView.columnTitle.Operator=\u64cd\u4f5c
 ProblemsManager.operatorNotSet=\u672A\u8BBE\u5B9A\u8F93\u5165\u9879 \'\'{0}\'\' \u7684\u64CD\u4F5C\u7B26\u3002
-VarsTable.invalidTip='\u662F\u65E0\u6548\u7684
-UIManager.3= \u4E0D\u5B58\u5728\uFF01
+VarsTable.invalidTip=\'\u662F\u65E0\u6548\u7684
+UIManager.3=\u4E0D\u5B58\u5728\uFF01
 UIManager.2=\u533A\u57DF
 DbMapComponent.unknowValue=\u5143\u7D20\u7684\u53C2\u6570\u540D\u672A\u77E5
 UIManager.nameExistOrNull=\u540D\u79F0\u5DF2\u5B58\u5728\u6216\u4E3A\u7A7A\u3002
 AliasDialog.inputValid=\u8F93\u5165\u65E0\u6548\u3002
 DbGenerationManager.conditionNotSet=\u8FDE\u63A5\u6761\u4EF6\u672A\u8BBE\u7F6E
-DbGenerationManager.InputExpSetMessage=\u8868\u8FBE\u5F0F\u8F93\u5165\u9879 '{0}' \u672A\u8BBE\u7F6E
-DbGenerationManager.InputOperationSetMessage=\u8FD0\u7B97\u7B26\u8F93\u5165\u9879 '{0}' \u672A\u8BBE\u7F6E
-DbGenerationManager.OuputExpSetMessage=\u8868\u8FBE\u5F0F\u8F93\u51FA\u9879 '{0}' \u672A\u8BBE\u7F6E
+DbGenerationManager.InputExpSetMessage=\u8868\u8FBE\u5F0F\u8F93\u5165\u9879 \'{0}\' \u672A\u8BBE\u7F6E
+DbGenerationManager.InputOperationSetMessage=\u8FD0\u7B97\u7B26\u8F93\u5165\u9879 \'{0}\' \u672A\u8BBE\u7F6E
+DbGenerationManager.OuputExpSetMessage=\u8868\u8FBE\u5F0F\u8F93\u51FA\u9879 \'{0}\' \u672A\u8BBE\u7F6E
 HTMLDocGenerator_generate_document=\u751F\u6210\u7684\u6587\u6863
 HTMLDocGenerator.author=\u4F5C\u8005
 HTMLDocGenerator.author1=\u4F5C\u8005

i18n/plugins/org.talend.designer.documentation.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.documentation.nl</artifactId>

i18n/plugins/org.talend.designer.fileoutputxml.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.fileoutputxml.nl</artifactId>

i18n/plugins/org.talend.designer.gefabstractmap.nl/plugin_zh_CN.properties

@@ -1 +1,2 @@
+pluginName=AbstractMapper \u6A21\u578B
 providerName=www.example.org

i18n/plugins/org.talend.designer.gefabstractmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.gefabstractmap.nl</artifactId>

i18n/plugins/org.talend.designer.mapper.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.mapper.nl</artifactId>

i18n/plugins/org.talend.designer.mapper.nl/src/main/java/messages_fr.properties

@@ -117,7 +117,7 @@ HTMLDocGenerator.component=Composant :
 HTMLDocGenerator.component_description=Description des composants
 HTMLDocGenerator.component_list=Liste des composants
 HTMLDocGenerator.component_name=Nom du composant
-HTMLDocGenerator.component_parameters=Description des param\u00e8tres
+HTMLDocGenerator.component_parameters=Param\u00e8tres du composant :
 HTMLDocGenerator.component_type=Type de composant
 HTMLDocGenerator.content=contenu
 HTMLDocGenerator.context=Contexte :

i18n/plugins/org.talend.designer.mapper.nl/src/main/java/messages_ja.properties

@@ -12,7 +12,7 @@ UIManager.tableNameIsNotValid=\u63A5\u7D9A\u540D/\u30C6\u30FC\u30D6\u30EB\u540D\
 EntryContentProposal.expressionKey=\u5F0F\u30AD\u30FC\uFF1A
 ToolbarInputZone.moveupTooltip=\u9078\u629E\u3057\u305F\u51FA\u529B\u53C2\u7167\u30C6\u30FC\u30D6\u30EB\u3092\u4E0A\u306B\u79FB\u52D5
 VarsDataMapTableView.entryItemTooltip.addVariable=\u5909\u6570\u306E\u8FFD\u52A0
-VarsTable.columnNameTip=\u30AB\u30E9\u30E0\u540D '
+VarsTable.columnNameTip=\u30AB\u30E9\u30E0\u540D \'
 EntryContentProposal.default=\u30C7\u30D5\u30A9\u30EB\u30C8\uFF1A
 EntryContentProposal.metadataColumn=\u30E1\u30BF\u30C7\u30FC\u30BF\u30AB\u30E9\u30E0
 UIManager.SaveDespiteErrors.Message=\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059\u304C\u3001\u30C7\u30FC\u30BF\u3092\u4FDD\u5B58\u3057\u307E\u3059\u304B?

i18n/plugins/org.talend.designer.mapper.nl/src/main/java/messages_zh_CN.properties

@@ -2,7 +2,7 @@ UIManager.1=\u7528\u4F8B\u672A\u627E\u5230
 TabFolderEditors.expressionEditor=\u8868\u8FBE\u5F0F\u7F16\u8F91\u5668
 EntryContentProposal.comment=\u5907\u6CE8 :
 DataMapTableView.buttonTooltip.addFilterRow=\u6DFB\u52A0\u8FC7\u6EE4\u884C
-TableEntriesManager.exceptionMessage.typeIsNotValid=\u7C7B\u578B "{0}" \u65E0\u6548\u3002
+TableEntriesManager.exceptionMessage.typeIsNotValid=\u7C7B\u578B \"{0}\" \u65E0\u6548\u3002
 InputDataMapTableView.widgetTooltip.innerJoin=\u5185\u8054
 UIManager.comfirmToRemoveTableKeys=\u6309 [\u786E\u5B9A] \u79FB\u9664\u8F93\u5165\u8868\u4E2D\u7684\u65E0\u6548\u952E \'
 UIManager.addNewOutputTable=\u6DFB\u52A0\u65B0\u7684\u8F93\u51FA\u8868\u683C
@@ -12,7 +12,7 @@ UIManager.tableNameIsNotValid=\u8FDE\u63A5/\u8868\u7684\u540D\u5B57\u65E0\u6548\
 EntryContentProposal.expressionKey=\u8868\u8FBE\u5F0F\u952E\u7801 :
 ToolbarInputZone.moveupTooltip=\u4E0A\u79FB\u9009\u62E9\u7684\u8F93\u5165\u68C0\u67E5\u8868\u683C
 VarsDataMapTableView.entryItemTooltip.addVariable=\u6DFB\u52A0\u53D8\u91CF
-VarsTable.columnNameTip=\u5217\u540D'
+VarsTable.columnNameTip=\u5217\u540D\'
 EntryContentProposal.default=\u786E\u7701 :
 EntryContentProposal.metadataColumn=\u5143\u6570\u636E\u5217
 UIManager.SaveDespiteErrors.Message=\u4F60\u786E\u5B9A\u4FDD\u5B58\u6570\u636E\u9519\u8BEF\u5417\uFF1F
@@ -22,7 +22,7 @@ ToolbarOutputZone.widgetTooltip.addOutputTable=\u6DFB\u52A0\u8F93\u51FA\u8868\u6
 InputDataMapTableView.widgetTooltip.rejectMainRow=\u5982\u679C\u68C0\u67E5\u884C\u4E0D\u5B58\u5728\uFF0C\u5219\u62D2\u7EDD\u4E3B\u884C\u3002
 ToolbarOutputZone.widgetText.autoMap=\u81EA\u52A8\u6620\u5C04\uFF01
 EntryContentProposal.properties=\u5C5E\u6027 :
-VarsTable.existTip=\t\n' \u5DF2\u5B58\u5728\u3002
+VarsTable.existTip=\' \u5DF2\u5B58\u5728\u3002
 MapperUI.CancelWithoutSaveModifications.Title=\u5173\u95ED\u7A97\u53E3\u4E0D\u4FDD\u5B58
 TabFolderEditors.schemaEditor=\u56FE\u89E3\u7F16\u8F91\u5668
 TableEntriesManager.exceptionMessage.tableEntriesNotSame=tableEntries \u4E0D\u4E00\u81F4\uFF01
@@ -69,9 +69,9 @@ DataMapTableView.buttonTooltip.minimize=\u6700\u5C0F\u5316
 EntryContentProposal.column=\u5217 :
 Problem.warning.setExpressionKey=\u8BD5\u7740\u5728Lookup\u8868\u201C{0}\u201D\u91CC\u8BBE\u7F6E\u4E00\u4E2A\u8868\u8FBE\u5173\u952E\u5B57\u6765\u589E\u5F3A\u6027\u80FD
 ToolbarInputZone.restoreTooltip=\u6062\u590D\u6240\u6709\u8F93\u5165\u8868\u683C
-VarsTable.invalidTip='\u662F\u65E0\u6548\u7684
+VarsTable.invalidTip=\'\u662F\u65E0\u6548\u7684
 Problem.warning.unusableReject=\u56E0\u4E3A\u5728\u8868{0}\u91CC\u6CA1\u6709\u5B9A\u4E49\u8FC7\u6EE4\uFF0C\u6240\u4EE5\u65E0\u6CD5\u4F7F\u7528\u8F93\u51FA\u6392\u9664\u529F\u80FD\u3002
-UIManager.3= \u4E0D\u5B58\u5728\uFF01
+UIManager.3=\u4E0D\u5B58\u5728\uFF01
 UIManager.2=\u533A\u57DF
 OutputDataMapTableView.columnTitle.filterCondition=\u8FC7\u6EE4\u6761\u4EF6 (AND)
 MapperComponent.generationNotInitial=perljet/javajet \u672A\u521D\u59CB\u5316 generationManager\uFF01

i18n/plugins/org.talend.designer.maven.job.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.job.nl</artifactId>

i18n/plugins/org.talend.designer.maven.job.nl/src/main/java/messages_ja.properties

@@ -2,6 +2,6 @@ RepositorySettingPage_CreatingMavenSettingNote=\u6CE8\u8A18\uFF1A
 RepositorySettingPage_CreatingMavenSettingNoteMessage=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u8A2D\u5B9A\u306B\u3088\u308A'{0}'\u3092\u5143\u306B\u4F5C\u6210\u3055\u308C\u307E\u3059\u3002
 StandaloneJobPomProjectSettingPage_Title=POM\u30B9\u30AF\u30EA\u30D7\u30C8
 StandaloneJobAssemblyProjectSettingPage_Title=\u30A2\u30BB\u30F3\u30D6\u30EA\u30B9\u30AF\u30EA\u30D7\u30C8
-StandaloneJobRepositorySettingPage_ExistedMavenSettingMessage=\u30AB\u30B9\u30BF\u30E0Maven\u30D5\u30A1\u30A4\u30EB'{0}'\u3068'{1}'\u304C\u3042\u308A\u307E\u3059\u3002\n\u3053\u308C\u3089\u3092\u7DE8\u96C6\u3059\u308B\u3053\u3068\u304C\u53EF\u80FD\u3067\u3059\u3002
-StandaloneJobRepositorySettingPage_CreatingMavenSettingMessage=Maven\u30D5\u30A1\u30A4\u30EB'{0}'\u3068'{1}'\u3092\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3067\u304D\u307E\u3059\u3002
+StandaloneJobRepositorySettingPage_ExistedMavenSettingMessage=\u30AB\u30B9\u30BF\u30E0Maven\u30D5\u30A1\u30A4\u30EB\'{0}\'\u3068\'{1}\'\u304C\u3042\u308A\u307E\u3059\u3002\\n\u3053\u308C\u3089\u3092\u7DE8\u96C6\u3059\u308B\u3053\u3068\u304C\u53EF\u80FD\u3067\u3059\u3002
+StandaloneJobRepositorySettingPage_CreatingMavenSettingMessage=Maven\u30D5\u30A1\u30A4\u30EB\'{0}\'\u3068\'{1}\'\u3092\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3067\u304D\u307E\u3059\u3002
 StandaloneJobRepositorySettingNode_Label=\u81EA\u7ACB\u578B\u30B8\u30E7\u30D6

i18n/plugins/org.talend.designer.rowgenerator.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.rowgenerator.nl</artifactId>

i18n/plugins/org.talend.designer.rowgenerator.nl/src/main/java/messages_ja.properties

@@ -24,7 +24,7 @@ TabFolderEditors.RowNum.LabelText=\u30D7\u30EC\u30D3\u30E5\u30FC\u3059\u308B\u88
 FunParaTableView2.Value=\u5024
 RowGeneratorUI.SchemaTitle.Text=\u30B9\u30AD\u30FC\u30DE
 RowGenTableEditor2.Fuctions.TitleText=\u95A2\u6570
-RowGenProcessMain.checkParameter=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\uFF01 {0}\\n
+RowGenProcessMain.checkParameter=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\uFF01 {0}\\\\n
 HTMLDocGenerator_generate_document=\u751F\u6210\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8
 HTMLDocGenerator.author=\u4F5C\u6210\u8005
 HTMLDocGenerator.author1=\u4F5C\u6210\u8005

i18n/plugins/org.talend.designer.rowgenerator.nl/src/main/java/messages_zh_CN.properties

@@ -22,7 +22,6 @@ MetadataToolbarEditorViewExt.RowNum.LabelText=RowGenerator\u8FD0\u884C\u884C\u65
 RowGenTableEditor2.Parameters.TitleText=\u53C2\u6570
 TabFolderEditors.RowNum.LabelText=\u9884\u89C8\u884C\u6570
 FunParaTableView2.Value=\u53C2\u6570\u503C
-RowGeneratorUI.SchemaTitle.Text=\u67B6\u6784
 RowGenTableEditor2.Fuctions.TitleText=\u51FD\u6570
 RowGenProcessMain.checkParameter=\u8BF7\u68C0\u67E5\u60A8\u7684\u53C2\u6570\uFF01{0}\\\\n
 HTMLDocGenerator_generate_document=\u751F\u6210\u7684\u6587\u6863

i18n/plugins/org.talend.designer.runprocess.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.runprocess.nl</artifactId>

i18n/plugins/org.talend.designer.runprocess.nl/src/main/java/messages_ja.properties

@@ -63,7 +63,7 @@ ProcessDebugDialog.debugBtn=\u30C7\u30D0\u30C3\u30B0
 prefs.configuration.title=\u5B9F\u884C\u30D7\u30ED\u30BB\u30B9\u306E\u69CB\u6210 :
 ProcessComposite.startPattern=\u30B8\u30E7\u30D6 {0} \u3092 {1,date,HH:mm dd/MM/yyyy} \u306B\u958B\u59CB\u3057\u307E\u3057\u305F\u3002
 DefaultRunProcessService.methodCalledError=\u3053\u3053\u3067\u306F\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u547C\u3073\u51FA\u305B\u307E\u305B\u3093\u3002RunProcessService\u30AF\u30E9\u30B9\u3067\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-ErrorDetailDialog.errorExist=\ \u8B66\u544A\u3002\u30B8\u30E7\u30D6\u306B\u30A8\u30E9\u30FC\u304C\u5B58\u5728\u3057\u307E\u3059\u3002\u7D99\u7D9A\u3057\u307E\u3059\u304B\uFF1F
+ErrorDetailDialog.errorExist=\\ \u8B66\u544A\u3002\u30B8\u30E7\u30D6\u306B\u30A8\u30E9\u30FC\u304C\u5B58\u5728\u3057\u307E\u3059\u3002\u7D99\u7D9A\u3057\u307E\u3059\u304B\uFF1F
 ErrorDetailDialog.findError=\u30A8\u30E9\u30FC\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
 ProcessComposite.hideContext=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306E\u975E\u8868\u793A
 ProcessComposite.lineLimited=\u884C\u6570\u306E\u5236\u9650
@@ -105,7 +105,7 @@ JavaProcessorUtilities.msg.missingjar.warningtitle=\u8B66\u544A\uFF01
 Log4jPreferencePage.title=Log4j\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
 ProcessComposite.log4jLevel=log4j\u30EC\u30D9\u30EB
 ProcessComposite.applyLog4jToChildren=log4j\u8A2D\u5B9A\u3092\u5B50\u30B8\u30E7\u30D6\u306B\u9069\u7528
-JobErrorsChecker_compile_error_message=\u30B8\u30E7\u30D6"{0}"\u306F\u30B3\u30F3\u30D1\u30A4\u30EB\u30A8\u30E9\u30FC\u3067\u3059\u3002\u4FEE\u6B63\u304A\u3088\u3073\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3092\u518D\u5EA6\u884C\u3063\u3066\u304F\u3060\u3055\u3044\u3002
+JobErrorsChecker_compile_error_message=\u30B8\u30E7\u30D6\"{0}\"\u306F\u30B3\u30F3\u30D1\u30A4\u30EB\u30A8\u30E9\u30FC\u3067\u3059\u3002\u4FEE\u6B63\u304A\u3088\u3073\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3092\u518D\u5EA6\u884C\u3063\u3066\u304F\u3060\u3055\u3044\u3002
 JobErrorsChecker_compile_error_line=\u30A8\u30E9\u30FC\u884C
 JobErrorsChecker_compile_error_detailmessage=\u8A73\u7D30\u30E1\u30C3\u30BB\u30FC\u30B8
 JobErrorsChecker_compile_error_jvmmessage=JVM\u4E92\u63DB\u6027\u306B\u3088\u308B\u30A8\u30E9\u30FC\u3067\u3059\u3002Studio\u306EJVM\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002
@@ -123,7 +123,7 @@ ShellBatSettingPreferencePage_Title=Bat\u30B9\u30AF\u30EA\u30D7\u30C8
 ProcessView.anotherJobMonitoring=\u5225\u306E\u30B8\u30E7\u30D6\u76E3\u8996\u304C\u3042\u308A\u307E\u3059
 ProcessView.remoteMonitoringUnavailable=\u30EA\u30E2\u30FC\u30C8\u76E3\u8996\u304C\u51FA\u6765\u307E\u305B\u3093\u3002Preferences\u306E\u8A2D\u5B9A\u3092\u78BA\u8A8D\u3057\u3066\u6709\u52B9\u5316\u3057\u3066\u4E0B\u3055\u3044\u3002
 ProcessView.commandlineForbidden=Commandline\u30E2\u30CB\u30BF\u30EA\u30F3\u30B0\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093
-JobErrorsChecker_routines_compile_errors=\u30EB\u30FC\u30C1\u30F3"{0}"\u306B\u30B3\u30F3\u30D1\u30A4\u30EB\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059
+JobErrorsChecker_routines_compile_errors=\u30EB\u30FC\u30C1\u30F3\"{0}\"\u306B\u30B3\u30F3\u30D1\u30A4\u30EB\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059
 JavaProcessor.warn.codeFormatTimeout.title=\u8B66\u544A
 JavaProcessor.warn.codeFormatTimeout.message=\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u306B\u5BFE\u3059\u308B\u30B3\u30FC\u30C9\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u30A2\u30AF\u30B7\u30E7\u30F3\u304C\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u306E\u305F\u3081\u306BStudio\u306B\u3088\u3063\u3066\u505C\u6B62\u3055\u308C\u3066\u3044\u307E\u3059\u3002 \n\n\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u306F\u3001Window > \u74B0\u5883\u8A2D\u5B9A> Talend > \u30D1\u30D5\u30A9\u30FC\u30DE\u30F3\u30B9: \u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u306E\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u79D2)\u3067\u8A2D\u5B9A\u3067\u304D\u307E\u3059
 ProcessView.connectToMonitorServerFailed=\u30EA\u30E2\u30FC\u30C8\u76E3\u8996\u30B5\u30FC\u30D0\u30FC\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093

i18n/plugins/org.talend.designer.runprocess.nl/src/main/java/messages_zh_CN.properties

@@ -1,7 +1,7 @@
 ProcessComposite2.statsComposite=\u7edf\u8ba1&& \u8ddf\u8e2a
 ProcessComposite.clearBefore=\u8fd0\u884c\u4e4b\u524d\u7684\u6e05\u7406
 ProcessComposite.kill=\u7ec8\u6b62
-ProcessComposite.confirmText= \u4f60\u786e\u8ba4\u8981\u4f7f\u7528\u4e0a\u4e0b\u6587{0}\u6765\u52a0\u8f7d\u4f5c\u4e1a\u5417\uff1f
+ProcessComposite.confirmText=\u4f60\u786e\u8ba4\u8981\u4f7f\u7528\u4e0a\u4e0b\u6587{0}\u6765\u52a0\u8f7d\u4f5c\u4e1a\u5417\uff1f
 Processor.perlModuleNotFound=\u6ca1\u6709\u53d1\u73b0Perl\u6a21\u5757\u63d2\u4ef6
 PromptDialog.title=\u8fd0\u884c\u4e0a\u4e0b\u6587{0}\u53c2\u6570\uff1a
 ProcessComposite.execTimeHint=\u663e\u793a\u8fd0\u884c\u4f5c\u4e1a\u7684\u65f6\u95f4
@@ -48,11 +48,11 @@ ProcessComposite.confirmTitle=\u786e\u8ba4\u52a0\u8f7d
 Processor.generationFailed=\u751f\u6210\u4ee3\u7801\u5931\u8d25
 ProcessView.lostFocusLog=\u8fd0\u884c\u4f5c\u4e1a\u5e76\u5931\u53bb\u7126\u70b9
 JavaCodeProblemsChecker.processDetailError=\u9519\u8bef
-ProcessDebugDialog.errortext=\u4e0d\u80fd\u591f\u8fdb\u884c\u4f5c\u4e1a\u8c03\u8bd5\u3002\n\u8bf7\u68c0\u67e5\u4f60\u7684\u914d\u7f6e
+ProcessDebugDialog.errortext=\u4e0d\u80fd\u591f\u8fdb\u884c\u4f5c\u4e1a\u8c03\u8bd5\u3002\\n\u8bf7\u68c0\u67e5\u4f60\u7684\u914d\u7f6e
 ShadowProcess.notGeneratedOutputException=\u6ca1\u6709\u8f93\u51fa\u751f\u6210
 ProcessComposite.contextGroup=\u4e0a\u4e0b\u6587
 prefs.clientConfiguration=Talend \u5ba2\u6237\u914d\u7f6e
-ProcessComposite.endPattern=\u5728{1,date,HH:mm dd/MM/yyyy}\u7ed3\u675f\u4f5c\u4e1a{0}\u3002[\u9000\u51fa\u4ee3\u7801\uff1d{2,number}]\n
+ProcessComposite.endPattern=\u5728{1,date,HH:mm dd/MM/yyyy}\u7ed3\u675f\u4f5c\u4e1a{0}\u3002[\u9000\u51fa\u4ee3\u7801\uff1d{2,number}]
 ProcessView.title=\u8fd0\u884c\uff08{0}\uff09
 Processor.configurePerl=Perl\u62e6\u622a\u5668\u6ca1\u6709\u914d\u7f6e
 JavaProcessor.notFoundedFolderException=\u6ca1\u6709\u53d1\u73b0\u5305\u542b.Java project\u7684\u6587\u4ef6\u5939
@@ -61,7 +61,7 @@ ProcessComposite.valueCol=\u503c
 ProcessComposite.saveBeforeRunHint=\u8FD0\u884C\u4F5C\u4E1A\u524D\u5148\u4FDD\u5B58\u3002
 ProcessDebugDialog.debugBtn=\u8c03\u8bd5
 prefs.configuration.title=\u8fd0\u884c\u6b65\u9aa4\u914d\u7f6e
-ProcessComposite.startPattern=\u5728{1,date,HH:mm dd/MM/yyyy}\u5f00\u59cb\u4f5c\u4e1a{0}.\n
+ProcessComposite.startPattern=\u5728{1,date,HH:mm dd/MM/yyyy}\u5f00\u59cb\u4f5c\u4e1a{0}.
 DefaultRunProcessService.methodCalledError=\u65B9\u6CD5\u4E0D\u80FD\u5728\u6B64\u8C03\u7528\uFF0C\u8BF7\u5728RunProcessService\u7C7B\u4E2D\u8C03\u7528\u3002
 ErrorDetailDialog.errorExist=\u8B66\u544A\uFF01\u4F5C\u4E1A\u4E2D\u5B58\u5728\u4E00\u4E9B\u9519\u8BEF\uFF0C\u4ECD\u8981\u7EE7\u7EED\u5417\uFF1F
 ErrorDetailDialog.findError=\u5728\u4F5C\u4E1A\u4E2D\u627E\u51FA\u9519\u8BEF
@@ -87,7 +87,7 @@ RunProcessPreferencePage.traces=\u8ddf\u8e2a
 RunProcessPreferencePage.vmArgument=\u4F5C\u4E1A\u8FD0\u884C VM \u53C2\u6570
 RunProcessService.delegateServiceError=delegateService \u4E0D\u80FD\u4E3A null\uFF0C\u4E0D\u80FD\u4ECE RunProcessService \u7EE7\u627F
 VMArgumentsViewer.argument=\u53C2\u6570
-VMArgumentsViewer.argumentcolon=\u8BBA\u636E 
+VMArgumentsViewer.argumentcolon=\u8BBA\u636E
 VMArgumentsViewer.vmArgument=\u8BBE\u7F6E\u865A\u62DF\u673A\u53C2\u6570
 ProcessComposite.JVMTab=JVM \u53C2\u6570
 ProcessComposite.traceDebug=\u8DDF\u8E2A\u8C03\u8BD5

i18n/plugins/org.talend.designer.scd.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.scd.nl</artifactId>

i18n/plugins/org.talend.designer.webservice.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.webservice.nl</artifactId>

i18n/plugins/org.talend.designer.xmlmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.xmlmap.nl</artifactId>

i18n/plugins/org.talend.designer.xmlmap.nl/src/main/java/messages_en.properties

@@ -24,3 +24,75 @@ InsertNewColumnCommand_message=Please input a valid column name
 InsertNewColumn_invalid="Column name {0} is invalid!"
 InputTreeGlobalMapKeysTable.expressionTitle=Exp.
 InputTreeGlobalMapKeysTable.globalMapKeyTitle=GlobalMap Key
+HTMLDocGenerator_generate_document=Generated documentation
+HTMLDocGenerator.author=AUTHOR
+HTMLDocGenerator.author1=Author
+HTMLDocGenerator.column=Column
+HTMLDocGenerator.comment=Comment
+HTMLDocGenerator.component=Component:
+HTMLDocGenerator.component_description=Components Description
+HTMLDocGenerator.component_list=Component List
+HTMLDocGenerator.component_name=Component Name
+HTMLDocGenerator.component_parameters=Component Parameters:
+HTMLDocGenerator.component_type=Component Type
+HTMLDocGenerator.content=content
+HTMLDocGenerator.context=Context:
+HTMLDocGenerator.context_list=Context List
+HTMLDocGenerator.creation=Creation
+HTMLDocGenerator.description=Description
+HTMLDocGenerator.ended=ended
+HTMLDocGenerator.extra_settings=Extra settings
+HTMLDocGenerator.generation_date=GENERATION DATE
+HTMLDocGenerator.input=INPUT(S)
+HTMLDocGenerator.job_description=Description
+HTMLDocGenerator.job_preview_picture=Preview Picture
+HTMLDocGenerator.job_settings=Settings
+HTMLDocGenerator.key=Key
+HTMLDocGenerator.label=LABEL
+HTMLDocGenerator.language=Language
+HTMLDocGenerator.length=Length
+HTMLDocGenerator.mapper.alias=Alias
+HTMLDocGenerator.mapper.entries=Custom Conditions Entries
+HTMLDocGenerator.mapper.expression=Expression
+HTMLDocGenerator.mapper.iaminimized=isMinimized
+HTMLDocGenerator.mapper.isjoin=isJoin
+HTMLDocGenerator.mapper.join.type=Join Type
+HTMLDocGenerator.mapper.metadatatable.entries=Metadata Table Entries
+HTMLDocGenerator.mapper.operator=Operator
+HTMLDocGenerator.mapper.table.for=Mapper table for
+HTMLDocGenerator.mapper.table.name=Table Name
+HTMLDocGenerator.mapper.table.properties=Mapper table Properties
+HTMLDocGenerator.modification=Modification
+HTMLDocGenerator.name=Name
+HTMLDocGenerator.need_prompt=Need Prompt?
+HTMLDocGenerator.nullable=Nullable
+HTMLDocGenerator.original_function_para=Original Function Parameters:
+HTMLDocGenerator.output=OUTPUT(S)
+HTMLDocGenerator.precision=Precision
+HTMLDocGenerator.project_description=Project Description
+HTMLDocGenerator.project_name=Project Name
+HTMLDocGenerator.prompt=Prompt
+HTMLDocGenerator.properties=Properties
+HTMLDocGenerator.purpose=Purpose
+HTMLDocGenerator.row_default=Default
+HTMLDocGenerator.row_functions=Functions
+HTMLDocGenerator.row_generator_info=Row generator information for
+HTMLDocGenerator.row_parameters=Parameters
+HTMLDocGenerator.schema_for=Schema for
+HTMLDocGenerator.source=Source
+HTMLDocGenerator.source_code=Source Code
+HTMLDocGenerator.stats_logs=Stats & Logs
+HTMLDocGenerator.status=Status
+HTMLDocGenerator.summary=Summary
+HTMLDocGenerator.tmap.constraint.entries=Constraint Table Entries
+HTMLDocGenerator.tmap.isinnerjoin=isInnerJoin
+HTMLDocGenerator.tmap.expressionfilter=expressionFilter
+HTMLDocGenerator.tmap.isnullable=isNullable
+HTMLDocGenerator.tmap.isreject=isReject
+HTMLDocGenerator.tmap.isrejectinner=isRejectInnerJoin
+HTMLDocGenerator.tmap.matching.mode=Matching-mode
+HTMLDocGenerator.type=Type
+HTMLDocGenerator.unique_name=UNIQUE NAME
+HTMLDocGenerator.value=Value
+HTMLDocGenerator.values=Values
+HTMLDocGenerator.version=Version

i18n/plugins/org.talend.designer.xmlmap.nl/src/main/java/messages_fr.properties

@@ -21,3 +21,5 @@ InsertNewColumnCommand_createNew=Cr\u00e9er une nouvelle colonne
 InsertNewColumn_existed=Le nom de la colonne existe d\u00e9j\u00e0.
 InsertNewColumnCommand_message=Saisissez un nom de colonne valide
 InsertNewColumn_invalid="Le nom de la colonne {0} est invalide."
+HTMLDocGenerator.content=contenu
+HTMLDocGenerator.row_functions=Fonctions

i18n/plugins/org.talend.designer.xmlmap.nl/src/main/java/messages_ja.properties

@@ -21,6 +21,78 @@ EntryContentProposal.xPath=Xpath:
 InsertNewColumnCommand_createNew=\u65B0\u898F\u30AB\u30E9\u30E0\u3092\u4F5C\u6210
 InsertNewColumn_existed=\u3059\u3067\u306B\u5B58\u5728\u3059\u308B\u30AB\u30E9\u30E0\u540D\u3067\u3059\u3002
 InsertNewColumnCommand_message=\u6B63\u3057\u3044\u30AB\u30E9\u30E0\u540D\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044
-InsertNewColumn_invalid="\u30AB\u30E9\u30E0\u540D{0}\u306F\u4E0D\u6B63\u3067\u3059\uFF01"
+InsertNewColumn_invalid=\"\u30AB\u30E9\u30E0\u540D{0}\u306F\u4E0D\u6B63\u3067\u3059\uFF01\"
 InputTreeGlobalMapKeysTable.expressionTitle=\u5F0F
 InputTreeGlobalMapKeysTable.globalMapKeyTitle=\u30B0\u30ED\u30FC\u30D0\u30EB\u30DE\u30C3\u30D7\u30AD\u30FC
+HTMLDocGenerator_generate_document=\u751F\u6210\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8
+HTMLDocGenerator.author=\u4F5C\u6210\u8005
+HTMLDocGenerator.author1=\u4F5C\u6210\u8005
+HTMLDocGenerator.column=\u30AB\u30E9\u30E0
+HTMLDocGenerator.comment=\u30B3\u30E1\u30F3\u30C8
+HTMLDocGenerator.component=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\uFF1A
+HTMLDocGenerator.component_description=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u8AAC\u660E
+HTMLDocGenerator.component_list=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
+HTMLDocGenerator.component_name=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u540D
+HTMLDocGenerator.component_parameters=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF:
+HTMLDocGenerator.component_type=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30BF\u30A4\u30D7
+HTMLDocGenerator.content=\u30B3\u30F3\u30C6\u30F3\u30C4
+HTMLDocGenerator.context=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8:
+HTMLDocGenerator.context_list=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u4E00\u89A7
+HTMLDocGenerator.creation=\u4F5C\u6210
+HTMLDocGenerator.description=\u8AAC\u660E
+HTMLDocGenerator.ended=\u7D42\u4E86
+HTMLDocGenerator.extra_settings=\u8FFD\u52A0\u8A2D\u5B9A
+HTMLDocGenerator.generation_date=\u751F\u6210\u65E5
+HTMLDocGenerator.input=\u5165\u529B
+HTMLDocGenerator.job_description=\u8AAC\u660E
+HTMLDocGenerator.job_preview_picture=\u30D7\u30EC\u30D3\u30E5\u30FC\u753B\u50CF
+HTMLDocGenerator.job_settings=\u57FA\u672C\u8A2D\u5B9A
+HTMLDocGenerator.key=\u30AD\u30FC
+HTMLDocGenerator.label=\u30E9\u30D9\u30EB
+HTMLDocGenerator.language=\u8A00\u8A9E
+HTMLDocGenerator.length=\u9577\u3055
+HTMLDocGenerator.mapper.alias=\u30A8\u30A4\u30EA\u30A2\u30B9
+HTMLDocGenerator.mapper.entries=\u30AB\u30B9\u30BF\u30E0\u6761\u4EF6\u30A8\u30F3\u30C8\u30EA
+HTMLDocGenerator.mapper.expression=\u5F0F
+HTMLDocGenerator.mapper.iaminimized=\u6700\u5C0F\u5316
+HTMLDocGenerator.mapper.isjoin=\u7D50\u5408
+HTMLDocGenerator.mapper.join.type=\u7D50\u5408\u30BF\u30A4\u30D7
+HTMLDocGenerator.mapper.metadatatable.entries=\u30E1\u30BF\u30C7\u30FC\u30BF\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA
+HTMLDocGenerator.mapper.operator=\u6F14\u7B97\u5B50
+HTMLDocGenerator.mapper.table.for=\u30DE\u30C3\u30D1\u30FC\u30C6\u30FC\u30D6\u30EB
+HTMLDocGenerator.mapper.table.name=\u30C6\u30FC\u30D6\u30EB\u540D
+HTMLDocGenerator.mapper.table.properties=\u30DE\u30C3\u30D1\u30FC\u30C6\u30FC\u30D6\u30EB\u30D7\u30ED\u30D1\u30C6\u30A3
+HTMLDocGenerator.modification=\u5909\u66F4
+HTMLDocGenerator.name=\u540D\u524D
+HTMLDocGenerator.need_prompt=\u30D7\u30ED\u30F3\u30D7\u30C8?
+HTMLDocGenerator.nullable=NULL\u53EF\u80FD
+HTMLDocGenerator.original_function_para=\u30AA\u30EA\u30B8\u30CA\u30EB\u30D5\u30A1\u30F3\u30AF\u30B7\u30E7\u30F3\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC:
+HTMLDocGenerator.output=\u51FA\u529B
+HTMLDocGenerator.precision=\u7CBE\u5EA6
+HTMLDocGenerator.project_description=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u8AAC\u660E
+HTMLDocGenerator.project_name=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D
+HTMLDocGenerator.prompt=\u30D7\u30ED\u30F3\u30D7\u30C8
+HTMLDocGenerator.properties=\u30D7\u30ED\u30D1\u30C6\u30A3
+HTMLDocGenerator.purpose=\u76EE\u7684
+HTMLDocGenerator.row_default=\u30C7\u30D5\u30A9\u30EB\u30C8
+HTMLDocGenerator.row_functions=\u95A2\u6570
+HTMLDocGenerator.row_generator_info=\u884C\u30B8\u30A7\u30CD\u30EC\u30FC\u30BF\u30FC\u60C5\u5831
+HTMLDocGenerator.row_parameters=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+HTMLDocGenerator.schema_for=\u30B9\u30AD\u30FC\u30DE
+HTMLDocGenerator.source=\u30BD\u30FC\u30B9
+HTMLDocGenerator.source_code=\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9
+HTMLDocGenerator.stats_logs=\u7D71\u8A08&\u30ED\u30B0
+HTMLDocGenerator.status=\u30B9\u30C6\u30FC\u30BF\u30B9
+HTMLDocGenerator.summary=\u6982\u8981
+HTMLDocGenerator.tmap.constraint.entries=\u5236\u7D04\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA
+HTMLDocGenerator.tmap.isinnerjoin=\u5185\u90E8\u7D50\u5408
+HTMLDocGenerator.tmap.expressionfilter=\u5F0F\u30D5\u30A3\u30EB\u30BF\u30FC
+HTMLDocGenerator.tmap.isnullable=NULL\u53EF\u80FD
+HTMLDocGenerator.tmap.isreject=\u30EA\u30B8\u30A7\u30AF\u30C8
+HTMLDocGenerator.tmap.isrejectinner=\u5185\u90E8\u7D50\u5408\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
+HTMLDocGenerator.tmap.matching.mode=\u30DE\u30C3\u30C1\u30F3\u30B0\u30E2\u30FC\u30C9
+HTMLDocGenerator.type=\u30BF\u30A4\u30D7
+HTMLDocGenerator.unique_name=\u30E6\u30CB\u30FC\u30AF\u306A\u540D\u524D
+HTMLDocGenerator.value=\u5024
+HTMLDocGenerator.values=\u5024
+HTMLDocGenerator.version=\u30D0\u30FC\u30B8\u30E7\u30F3

i18n/plugins/org.talend.designer.xmlmap.nl/src/main/java/messages_zh_CN.properties

@@ -24,3 +24,75 @@ InsertNewColumnCommand_message=\u8BF7\u8F93\u5165\u6709\u6548\u7684\u5217\u540D
 InsertNewColumn_invalid=\u201C\u5217\u540D\u79F0{0}\u65E0\u6548\uFF01\u201D
 InputTreeGlobalMapKeysTable.expressionTitle=\u8868\u8FBE\u5F0F
 InputTreeGlobalMapKeysTable.globalMapKeyTitle=GlobalMap\u5173\u952E
+HTMLDocGenerator_generate_document=\u751F\u6210\u7684\u6587\u6863
+HTMLDocGenerator.author=AUTHOR
+HTMLDocGenerator.author1=\u4F5C\u8005
+HTMLDocGenerator.column=\u5217
+HTMLDocGenerator.comment=\u6CE8\u91CA
+HTMLDocGenerator.component=\u7EC4\u4EF6:
+HTMLDocGenerator.component_description=\u7EC4\u4EF6\u63CF\u8FF0
+HTMLDocGenerator.component_list=\u7EC4\u4EF6\u5217\u8868
+HTMLDocGenerator.component_name=\u7EC4\u4EF6\u540D
+HTMLDocGenerator.component_parameters=\u7EC4\u4EF6\u53C2\u6570:
+HTMLDocGenerator.component_type=\u7EC4\u4EF6\u7C7B\u578B
+HTMLDocGenerator.content=\u5185\u5BB9
+HTMLDocGenerator.context=\u4E0A\u4E0B\u6587:
+HTMLDocGenerator.context_list=\u4E0A\u4E0B\u6587\u5217\u8868
+HTMLDocGenerator.creation=\u521B\u5EFA
+HTMLDocGenerator.description=\u63CF\u8FF0
+HTMLDocGenerator.ended=\u7ED3\u675F
+HTMLDocGenerator.extra_settings=\u989D\u5916\u8BBE\u7F6E
+HTMLDocGenerator.generation_date=\u751F\u6210\u65E5\u671F
+HTMLDocGenerator.input=\u8F93\u5165
+HTMLDocGenerator.job_description=\u63CF\u8FF0
+HTMLDocGenerator.job_preview_picture=\u9884\u89C8\u56FE\u7247
+HTMLDocGenerator.job_settings=\u8BBE\u7F6E
+HTMLDocGenerator.key=\u952E
+HTMLDocGenerator.label=\u6807\u7B7E
+HTMLDocGenerator.language=\u8BED\u8A00
+HTMLDocGenerator.length=\u957F\u5EA6
+HTMLDocGenerator.mapper.alias=\u522B\u540D
+HTMLDocGenerator.mapper.entries=\u81EA\u5B9A\u4E49\u6761\u4EF6\u6761\u76EE
+HTMLDocGenerator.mapper.expression=\u8868\u8FBE\u5F0F
+HTMLDocGenerator.mapper.iaminimized=isMinimized
+HTMLDocGenerator.mapper.isjoin=isJoin
+HTMLDocGenerator.mapper.join.type=\u8054\u63A5\u7C7B\u578B
+HTMLDocGenerator.mapper.metadatatable.entries=\u5143\u6570\u636E\u8868\u6761\u76EE
+HTMLDocGenerator.mapper.operator=\u64CD\u4F5C\u7B26
+HTMLDocGenerator.mapper.table.for=\u7528\u4E8E\u4EE5\u4E0B\u9879\u7684\u6620\u5C04\u5668\u8868:
+HTMLDocGenerator.mapper.table.name=\u8868\u540D
+HTMLDocGenerator.mapper.table.properties=\u6620\u5C04\u5668\u8868\u5C5E\u6027
+HTMLDocGenerator.modification=\u4FEE\u6539
+HTMLDocGenerator.name=\u540D\u79F0
+HTMLDocGenerator.need_prompt=\u9700\u8981\u63D0\u793A\uFF1F
+HTMLDocGenerator.nullable=\u53EF\u4E3A Null
+HTMLDocGenerator.original_function_para=\u539F\u59CB\u51FD\u6570\u53C2\u6570:
+HTMLDocGenerator.output=\u8F93\u51FA
+HTMLDocGenerator.precision=\u7CBE\u5EA6
+HTMLDocGenerator.project_description=\u5DE5\u7A0B\u63CF\u8FF0
+HTMLDocGenerator.project_name=\u5DE5\u7A0B\u540D
+HTMLDocGenerator.prompt=\u63D0\u793A
+HTMLDocGenerator.properties=\u5C5E\u6027
+HTMLDocGenerator.purpose=\u76EE\u7684
+HTMLDocGenerator.row_default=\u9ED8\u8BA4
+HTMLDocGenerator.row_functions=\u51FD\u6570
+HTMLDocGenerator.row_generator_info=\u7528\u4E8E\u4EE5\u4E0B\u9879\u7684\u884C\u751F\u6210\u5668\u4FE1\u606F:
+HTMLDocGenerator.row_parameters=\u53C2\u6570
+HTMLDocGenerator.schema_for=\u7528\u4E8E\u4EE5\u4E0B\u9879\u7684 Schema:
+HTMLDocGenerator.source=\u6E90
+HTMLDocGenerator.source_code=\u6E90\u4EE3\u7801
+HTMLDocGenerator.stats_logs=\u7EDF\u8BA1\u4FE1\u606F\u548C\u65E5\u5FD7
+HTMLDocGenerator.status=\u72B6\u6001
+HTMLDocGenerator.summary=\u6982\u8981
+HTMLDocGenerator.tmap.constraint.entries=\u7EA6\u675F\u8868\u6761\u76EE
+HTMLDocGenerator.tmap.isinnerjoin=isInnerJoin
+HTMLDocGenerator.tmap.expressionfilter=expressionFilter
+HTMLDocGenerator.tmap.isnullable=isNullable
+HTMLDocGenerator.tmap.isreject=isReject
+HTMLDocGenerator.tmap.isrejectinner=isRejectInnerJoin
+HTMLDocGenerator.tmap.matching.mode=\u5339\u914D\u6A21\u5F0F
+HTMLDocGenerator.type=\u7C7B\u578B
+HTMLDocGenerator.unique_name=\u552F\u4E00\u540D\u5B57
+HTMLDocGenerator.value=\u503C
+HTMLDocGenerator.values=\u503C
+HTMLDocGenerator.version=\u7248\u672C

i18n/plugins/org.talend.expressionbuilder.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.expressionbuilder.nl</artifactId>

i18n/plugins/org.talend.presentation.onboarding.resource.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>

i18n/plugins/org.talend.presentation.onboarding.resource.tos.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>

i18n/plugins/org.talend.repository.ftp.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.ftp.nl</artifactId>

i18n/plugins/org.talend.repository.json.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.json.nl</artifactId>

i18n/plugins/org.talend.repository.nl/plugin_en.properties

@@ -85,3 +85,4 @@ projectSetting.projectRefSettingPage=Reference Projects
 ProjectSetting.groupId=Deployment GroupId
 projectSetting.deploymentConfiguration=Deployment Configuration
 projectsetting.Audit=Audit
+projectsetting.RepositoryShare=Repository Share

i18n/plugins/org.talend.repository.nl/plugin_ja.properties

@@ -20,8 +20,8 @@ importProjectsAction.title=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30A4\u30F
 migrationtask.RenametMapPersistentMigrationTask.title=tMapPersistent\u3092 tMap\u306B\u30EA\u30CD\u30FC\u30E0\u3057\u3066\u304F\u3060\u3055\u3044
 migrationtask.renametDbInputToOracle.title=tDBxxTotOraclexx\u3092\u30EA\u30CD\u30FC\u30E0\u3057\u3066\u304F\u3060\u3055\u3044
 migrationtask.UpgradetAdvancedFileOutputXMLMigrationTask.title=tAdvancedFileOutputXML\u306E\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u66F4\u65B0\u3057\u3066\u304F\u3060\u3055\u3044
-migrationtask.changetUniqRowLinks.description=\u3059\u3079\u3066\u306E tUniqRow \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30EA\u30F3\u30AF\u30BF\u30A4\u30D7\u3092 "Main" \u304B\u3089 "Unique"\u3000\u306B\u5909\u66F4
-migrationtask.AddPerlRefArrayPointer2.desc=\u65E2\u5B58\u306E Talend\u63A5\u7D9A\u3068\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u5BFE\u3057\u3066\u3001\u69CB\u6587 "$xxx["\u3092 "$xxx->["\u3067\u3001\u69CB\u6587 "@xxx"\u3092 "@$xxx" \u3067\u7F6E\u63DB\u3057\u3066\u304F\u3060\u3055\u3044\u3000
+migrationtask.changetUniqRowLinks.description=\u3059\u3079\u3066\u306E tUniqRow \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30EA\u30F3\u30AF\u30BF\u30A4\u30D7\u3092 \"Main\" \u304B\u3089 \"Unique\"\u3000\u306B\u5909\u66F4
+migrationtask.AddPerlRefArrayPointer2.desc=\u65E2\u5B58\u306E Talend\u63A5\u7D9A\u3068\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u5BFE\u3057\u3066\u3001\u69CB\u6587 \"$xxx[\"\u3092 \"$xxx->[\"\u3067\u3001\u69CB\u6587 \"@xxx\"\u3092 \"@$xxx\" \u3067\u7F6E\u63DB\u3057\u3066\u304F\u3060\u3055\u3044\u3000
 migrationtask.renametDbInputToPostgresql.description=PostgreSQL\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u63A5\u7D9A\u3057\u3066\u3044\u308B\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u6C4E\u7528\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u76F8\u5F53\u3059\u308B PostgreSQL\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u79FB\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 migrationtask.AddPerlRefArrayPointer2.title=ref\u914D\u5217\u306E\u30DD\u30A4\u30F3\u30BF\u3068\u30C6\u30AD\u30B9\u30C8\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u542B\u3080unreference\u914D\u5217\u3092\u8FFD\u52A0\u3057\u3066\u304F\u3060\u3055\u3044
 migrationtask.AddQuotesToModuleList.desc=\u5FC5\u8981\u306A\u3089\u3070\u3001\u5F15\u7528\u7B26\u3092\u30E2\u30B8\u30E5\u30FC\u30EB\u30EA\u30B9\u30C8\u306B\u8FFD\u52A0\u3057\u3066\u304F\u3060\u3055\u3044
@@ -54,7 +54,7 @@ migrationtask.ReplaceMultiFlowBytReplicate.desc=Multi-flow\u3092tReplicate\u306B
 migrationtask.upgradetWarntDiePriority.description=\u30C6\u30AD\u30B9\u30C8\u30D5\u30A3\u30FC\u30EB\u30C9\u304B\u3089\u30C0\u30A4\u30A2\u30ED\u30B0\u30D5\u30A3\u30FC\u30EB\u30C9\u3078\u5207\u308A\u66FF\u3048\u308B\u30D7\u30E9\u30A4\u30AA\u30EA\u30C6\u30A3\u3092\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 migrationtask.renameFlowMeterCatcher.description=\u3059\u3079\u3066\u306E tMetterCatcher\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092 tFlowMeterCatcher\u306B\u30EA\u30CD\u30FC\u30E0\u3057\u3066\u304F\u3060\u3055\u3044
 providerName=www.example.org
-migrationtask.AddPerlRefArrayPointer.desc=\u65E2\u5B58\u306E Talend\u63A5\u7D9A\u3068\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u5BFE\u3057\u3066\u3001\u69CB\u6587 "$xxx["\u3092 "$xxx->["\u3067\u3001\u69CB\u6587 "@xxx"\u3092 "@$xxx" \u3067\u7F6E\u63DB\u3057\u3066\u304F\u3060\u3055\u3044\u3000
+migrationtask.AddPerlRefArrayPointer.desc=\u65E2\u5B58\u306E Talend\u63A5\u7D9A\u3068\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u5BFE\u3057\u3066\u3001\u69CB\u6587 \"$xxx[\"\u3092 \"$xxx->[\"\u3067\u3001\u69CB\u6587 \"@xxx\"\u3092 \"@$xxx\" \u3067\u7F6E\u63DB\u3057\u3066\u304F\u3060\u3055\u3044\u3000
 projectsetting.General=\u4E00\u822C\u60C5\u5831
 projectsetting.Designer=\u30C7\u30B6\u30A4\u30CA\u30FC
 projectsetting.VersionManagement=\u30D0\u30FC\u30B8\u30E7\u30F3\u7BA1\u7406
@@ -85,3 +85,4 @@ projectSetting.projectRefSettingPage=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u53C2\
 ProjectSetting.groupId=\u30C7\u30D7\u30ED\u30A4GroupId
 projectSetting.deploymentConfiguration=\u30C7\u30D7\u30ED\u30A4\u8A2D\u5B9A
 projectsetting.Audit=\u76E3\u67FB
+projectsetting.RepositoryShare=\u30EA\u30DD\u30B8\u30C8\u30EA\u5171\u6709

i18n/plugins/org.talend.repository.nl/plugin_zh_CN.properties

@@ -85,3 +85,4 @@ projectSetting.projectRefSettingPage=\u5F15\u7528\u5DE5\u7A0B
 ProjectSetting.groupId=\u90E8\u7F72 GroupId
 projectSetting.deploymentConfiguration=\u90E8\u7F72\u914D\u7F6E
 projectsetting.Audit=\u5BA1\u8BA1
+projectsetting.RepositoryShare=\u5B58\u50A8\u5E93\u5171\u4EAB

i18n/plugins/org.talend.repository.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.nl</artifactId>

i18n/plugins/org.talend.repository.nl/src/main/java/messages_en.properties

@@ -885,7 +885,7 @@ VersionManagementDialog.inValidVersionWarning=Invalid version pattern
 VersionManagementDialog.applyVersion=Apply version
 VersionManagementDialog.useJobVersion=Use job versions.
 JavaVersionProjectSettingPage.versionLabel=JDK Compiler compliance level:
-BuildJobManager.mavenErrorMessage=Job was not built successfully, please check the logs for more details available on the workspace/.Java/lastGenerated.log
+BuildJobManager.mavenErrorMessage=Job was not built successfully, please check the logs for more details available on {0}
 VersionManagementDialog.projectVersion=Project Version
 VersionManagementDialog.useSnapshot=Use snapshot
 VersionManagementDialog.applyDetail=Apply
@@ -972,3 +972,22 @@ AuditProjectSettingPage.history.historyGenerateButton=Generate
 AuditProjectSettingPage.generate.title=Generate Audit Report
 AuditProjectSettingPage.generate.successful=Generated report successfully.\n\nPlease check here\:\"{0}\".
 AuditProjectSettingPage.generate.failed=Generated report failed, please check the audit configuration.
+JavaJobScriptsExportWSWizardPage.IMAGE=Docker Image
+JavaJobScriptsExportWSWizardPage.DOCKER.optionGroup=Docker Options
+JavaJobScriptsExportWSWizardPage.DOCKER.dockerHost=Docker host
+JavaJobScriptsExportWSWizardPage.DOCKER.localHost=Local
+JavaJobScriptsExportWSWizardPage.DOCKER.remoteHost=Remote
+JavaJobScriptsExportWSWizardPage.DOCKER.registryLabel=Registry
+JavaJobScriptsExportWSWizardPage.DOCKER.registryUsername=Username
+JavaJobScriptsExportWSWizardPage.DOCKER.registryPassword=Password
+JavaJobScriptsExportWSWizardPage.DOCKER.imageLabel=Image name
+JavaJobScriptsExportWSWizardPage.DOCKER.tagLabel=Image tag
+JavaJobScriptsExportWSWizardPage.DOCKER.errorMsg={0} can not be empty.
+LoginProjectPage.cloud.apac=Cloud APAC
+ArtifactRepositoryShareSettingPage.enableShareLabel=Propagate components update to Artifact Repository:
+ArtifactRepositoryShareSettingPage.repositoryIdLabel=Repository Id:
+ArtifactRepositoryShareSettingPage.checkLabel=Check connection
+ArtifactRepositoryShareSettingPage.showWarnDialogWhenInstallingFeatures=Show warn dialog when installing component
+ArtifactRepositoryShareSettingPage.autoCheckUpdate=Check update automatically
+ArtifactRepositoryShareSettingPage.checkUpdatePerDays=Check update frequency(days)
+ArtifactRepositoryShareSettingPage.checkUpdatePerDays.error=Please input an interger between {0} and {1} for [{2}]

i18n/plugins/org.talend.repository.nl/src/main/java/messages_ja.properties

@@ -80,7 +80,7 @@ ConfigExternalJarPage.required.label=\u30E9\u30A4\u30D6\u30E9\u30EA\u30D5\u30A1\
 FileStep2.splitwayRecordForJavaFID=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u524D\u306E\u884C\u3092\u5206\u5272
 NewProjectWizard.failureText=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
 FileStep1.filepath=\u30D5\u30A1\u30A4\u30EB
-DatabaseTableForm.connectionFailure=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A\u306E\u5931\u6557\uFF1A"\u30B9\u30AD\u30FC\u30DE\u306E\u53D6\u5F97"\u304C\u7121\u52B9\u3067\u3059\u3002\u72B6\u6CC1\u3092\u56DE\u5FA9\u3059\u308B\u305F\u3081\u306B"\u63A5\u7D9A\u306E\u78BA\u8A8D"\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+DatabaseTableForm.connectionFailure=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A\u306E\u5931\u6557\uFF1A\"\u30B9\u30AD\u30FC\u30DE\u306E\u53D6\u5F97\"\u304C\u7121\u52B9\u3067\u3059\u3002\u72B6\u6CC1\u3092\u56DE\u5FA9\u3059\u308B\u305F\u3081\u306B\"\u63A5\u7D9A\u306E\u78BA\u8A8D\"\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 SelectorTableForm.ColumnNumber=\u30AB\u30E9\u30E0\u30CA\u30F3\u30D0\u30FC
 CommonWizard.persistenceException=\u30C7\u30FC\u30BF\u30A8\u30E9\u30FC\u3078\u306E\u30A2\u30AF\u30BB\u30B9
 JavaJobScriptsExportWSWizardPage.AxisLib=Axis 1.4 Lib
@@ -439,7 +439,7 @@ EDemoProjectFileType.unknowType=\u4E0D\u660E\u306A\u30D5\u30A1\u30A4\u30EB\u30BF
 EditPropertiesAction.renameError={0}\u304B\u3089{1}\u3078\u306E\u30EA\u30CD\u30FC\u30E0\u3067\u30A8\u30E9\u30FC
 EditPropertiesAction.warning=\u8B66\u544A
 ExportItemUtil.cannotCreate={0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
-ExportItemUtil.cannotCreateDir=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA'{0}'\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
+ExportItemUtil.cannotCreateDir=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\'{0}\'\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
 ExportProjectsAsAction.createLiberariesLink=\u5916\u90E8\u30E9\u30A4\u30D6\u30E9\u30EA\u306E\u30EA\u30F3\u30AF\u306E\u4F5C\u6210
 ExportProjectsAsAction.processProject=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u51E6\u7406
 ExtractionFieldsWithXPathEditorView.columnName=\u30AB\u30E9\u30E0\u540D
@@ -466,7 +466,7 @@ ProjectSettingDialog.Title=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u8A2D\u5B9
 RegexpFileStep2Form.onlyNumber=\u6570\u5024\u306E\u307F\u53EF\u80FD\u3067\u3059\u3002
 RegexpFileStep2Form.output=\u51FA\u529B
 RegexpFileStep2Form.preview=\u30D7\u30EC\u30D3\u30E5\u30FC
-ReplaceMultiFlowBytReplicateMigrationTask.componentNotExist=\u30B8\u30E7\u30D6 \\"{1}\\" \u306B\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 "{0}\\" \u306F\u5B58\u5728\u3057\u3066\u3044\u307E\u305B\u3093
+ReplaceMultiFlowBytReplicateMigrationTask.componentNotExist=\u30B8\u30E7\u30D6 \\\\\"{1}\\\\\" \u306B\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 \"{0}\\\\\" \u306F\u5B58\u5728\u3057\u3066\u3044\u307E\u305B\u3093
 RepositoryPreferencePage.ReferenceProjectMerged=\u53C2\u7167\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30DE\u30FC\u30B8
 RepositoryReviewDialog.0=\u4E0D\u6B63\u306A\u5F15\u6570\uFF1A{0}
 RepositoryReviewDialog.jobNameFormat=\u30B8\u30E7\u30D6\u540D\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u307E\u305F\u306F\u30D1\u30BF\u30FC\u30F3(*,?):
@@ -497,7 +497,7 @@ EbcdicForm.dataNotExist=\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u
 EbcdicForm.dataNull=\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9\u3092\u6307\u5B9A\u3057\u3066\u4E0B\u3055\u3044
 LoginComposite.DIFFERENT_WORKSPACE=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u304C\u5909\u66F4\u3055\u308C\u307E\u3057\u305F\u3002\u518D\u8D77\u52D5\u3057\u3066\u304F\u3060\u3055\u3044
 LoginComposite.RESTART=\u518D\u8D77\u52D5
-SAPSelectorForm.connectionFailure=SAP\u63A5\u7D9A\u5931\u6557\uFF1A"\u30B9\u30AD\u30FC\u30DE\u306E\u56DE\u5FA9"\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002"\u63A5\u7D9A\u306E\u78BA\u8A8D"\u3092\u62BC\u3057\u3066\u72B6\u6CC1\u3092\u5FA9\u5143\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+SAPSelectorForm.connectionFailure=SAP\u63A5\u7D9A\u5931\u6557\uFF1A\"\u30B9\u30AD\u30FC\u30DE\u306E\u56DE\u5FA9\"\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\"\u63A5\u7D9A\u306E\u78BA\u8A8D\"\u3092\u62BC\u3057\u3066\u72B6\u6CC1\u3092\u5FA9\u5143\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 MultiSchemasUI.useMultiSchemabtn=\u8907\u6570\u306E\u533A\u5207\u308A\u8A18\u53F7\u306E\u4F7F\u7528
 MultiSchemasUI.keyValues=\u30AD\u30FC\u30D0\u30EA\u30E5\u30FC
 MultiSchemasUI.keyIndex=\u30AD\u30FC\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
@@ -675,7 +675,7 @@ LoginComposite.projectTitleTemp=\u65B0\u898F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
 LoginComposite.buttons.advanced=\u8A73\u7D30...
 LoginComposite.buttons.changeButton=\u5909\u66F4
 LoginComposite.label.workspace=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9
-TOSLoginComposite.welcomeTitle={0} \u3078\u3088\u3046\u3053\u305D\uFF01\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u9078\u629E\u3059\u308B\u304B\n\u65B0\u898F\u306B\u4F5C\u6210\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+TOSLoginComposite.welcomeTitle={0} \u3078\u3088\u3046\u3053\u305D\uFF01\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u9078\u629E\u3059\u308B\u304B\\n\u65B0\u898F\u306B\u4F5C\u6210\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 TOSLoginComposite.projectLabel=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\uFF1A
 TOSLoginComposite.openButton=\u958B\u304F
 TOSLoginComposite.deleteButton=\u524A\u9664\u2026
@@ -820,7 +820,7 @@ JobScriptsExportWizardPage.executeTests=\u30C6\u30B9\u30C8\u306E\u5B9F\u884C
 JobScriptsExportWizardPage.addTestSources=\u30C6\u30B9\u30C8\u30BD\u30FC\u30B9\u306E\u8FFD\u52A0
 JobScriptsExportWizardPage.includeLibs=\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u542B\u3081\u308B
 LoginHelper.errorTitle=\u30A8\u30E9\u30FC
-LoginHelper.branchChanged=\u30D6\u30E9\u30F3\u30C1\u304C\u5909\u66F4\u3055\u308C\u3066\u3044\u307E\u3059\uFF01 \n\u78BA\u8A8D\u306E\u4E0A\u3001\u624B\u52D5\u3067\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u4E0B\u3055\u3044
+LoginHelper.branchChanged=\u30D6\u30E9\u30F3\u30C1\u304C\u5909\u66F4\u3055\u308C\u3066\u3044\u307E\u3059\uFF01 \\n\u78BA\u8A8D\u306E\u4E0A\u3001\u624B\u52D5\u3067\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u4E0B\u3055\u3044
 LoginAgreementPage.title=\u30E6\u30FC\u30B6\u30FC\u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u540C\u610F\uFF1A
 LoginAgreementPage.accept=\u627F\u8A8D
 LoginProjectPage.title=\u63A5\u7D9A\u30EA\u30DD\u30B8\u30C8\u30EA\uFF1A
@@ -833,7 +833,7 @@ LoginProjectPage.alwaysAskMe.toolTip=Preference Page: Talend\u306B\u3082\u8A2D\u
 LoginProjectPage.previous=\u524D\u3078
 LoginProjectPage.finish=\u5B8C\u4E86
 LoginProjectPage.remote=\u30EA\u30E2\u30FC\u30C8
-LoginProjectPage.local=Local
+LoginProjectPage.local=\u30ED\u30FC\u30AB\u30EB
 LoginProjectPage.restart=\u518D\u8D77\u52D5
 LoginProjectPage.update=\u66F4\u65B0
 LoginProjectPage.details=\u8A73\u7D30
@@ -872,7 +872,7 @@ AutoConversionTypesEditor.table.column.sourceDataType=\u30BD\u30FC\u30B9\u30C7\u
 AutoConversionTypesEditor.table.column.targetDataType=\u30BF\u30FC\u30B2\u30C3\u30C8\u30C7\u30FC\u30BF\u578B
 AutoConversionTypesEditor.table.column.conversionFunction=\u578B\u5909\u63DB\u30D5\u30A1\u30F3\u30AF\u30B7\u30E7\u30F3
 AutoConversionTypesEditor.doStore.title=\u81EA\u52D5\u30C7\u30FC\u30BF\u578B\u5909\u63DBXML\u30D5\u30A1\u30A4\u30EB
-AutoConversionTypesEditor.Label.messages=\u6CE8\uFF09\u81EA\u52D5\u578B\u5909\u63DB\u6A5F\u80FD\u306F\u3001\u6A19\u6E96\u30B8\u30E7\u30D6\u306EtMap\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n\u3053\u306E\u6A5F\u80FD\u306F\u3001\u6A5F\u80FD\u3092\u6709\u52B9\u5316\u3057\u305F\u4EE5\u964D\u306B\u8FFD\u52A0\u3055\u308C\u305FtMap\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3067\u306E\u307F\u6709\u52B9\u5316\u3055\u308C\u307E\u3059\u3002\n\n\u4EE5\u4E0B\u306E\u8A2D\u5B9A\u306F\u6A19\u6E96\u306E\u578B\u5909\u63DB\u5B9A\u7FA9\u3092\u4E0A\u66F8\u304D\u3057\u307E\u3059\u3002\n
+AutoConversionTypesEditor.Label.messages=\u6CE8\uFF09\u81EA\u52D5\u578B\u5909\u63DB\u6A5F\u80FD\u306F\u3001\u6A19\u6E96\u30B8\u30E7\u30D6\u306EtMap\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\\n\u3053\u306E\u6A5F\u80FD\u306F\u3001\u6A5F\u80FD\u3092\u6709\u52B9\u5316\u3057\u305F\u4EE5\u964D\u306B\u8FFD\u52A0\u3055\u308C\u305FtMap\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3067\u306E\u307F\u6709\u52B9\u5316\u3055\u308C\u307E\u3059\u3002\\n\\n\u4EE5\u4E0B\u306E\u8A2D\u5B9A\u306F\u6A19\u6E96\u306E\u578B\u5909\u63DB\u5B9A\u7FA9\u3092\u4E0A\u66F8\u304D\u3057\u307E\u3059\u3002\\n
 LoginProjectPage.fetchLicense.job=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8{0}\u306E\u30E9\u30A4\u30BB\u30F3\u30B9\u3092\u30D5\u30A7\u30C3\u30C1\u4E2D\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u4E0B\u3055\u3044...
 LoginProjectPage.fetchLicense.error.title=\u30A8\u30E9\u30FC\u767A\u751F
 LoginProjectPage.fetchLicense.error.msg=\u9078\u629E\u3057\u305F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30E9\u30A4\u30BB\u30F3\u30B9\u3092\u30D5\u30A7\u30C3\u30C1\u3059\u308B\u3068\u304D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
@@ -885,7 +885,7 @@ VersionManagementDialog.inValidVersionWarning=\u7121\u52B9\u306A\u30D0\u30FC\u30
 VersionManagementDialog.applyVersion=\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u9069\u7528
 VersionManagementDialog.useJobVersion=\u30B8\u30E7\u30D6\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 JavaVersionProjectSettingPage.versionLabel=JDK\u30B3\u30F3\u30D1\u30A4\u30E9\u306E\u30B3\u30F3\u30D7\u30E9\u30A4\u30A2\u30F3\u30B9\u30EC\u30D9\u30EB:
-BuildJobManager.mavenErrorMessage=\u30B8\u30E7\u30D6\u306E\u30D3\u30EB\u30C9\u304C\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u8A73\u7D30\u306F\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB(workspace/.Java/lastGenerated.log)\u3092\u53C2\u7167\u3057\u3066\u4E0B\u3055\u3044\u3002
+BuildJobManager.mavenErrorMessage=\u30B8\u30E7\u30D6\u306E\u30D3\u30EB\u30C9\u304C\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u8A73\u7D30\u306F\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB({0})\u3092\u53C2\u7167\u3057\u3066\u4E0B\u3055\u3044\u3002
 VersionManagementDialog.projectVersion=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30D0\u30FC\u30B8\u30E7\u30F3
 VersionManagementDialog.useSnapshot=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u306E\u4F7F\u7528
 VersionManagementDialog.applyDetail=\u9069\u7528
@@ -914,7 +914,7 @@ RepoReferenceProjectSetupAction.TitleReferenceChanged=\u53C2\u7167\u30D7\u30ED\u
 RepoReferenceProjectSetupAction.MsgReferenceChanged=Studio\u306F\u73FE\u5728\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306B\u518D\u30ED\u30B0\u30A4\u30F3\u3057\u3001\u65B0\u898F\u53C2\u7167\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u8A2D\u5B9A\u3092\u9069\u7528\u3057\u307E\u3059\u3002
 RepoReferenceProjectSetupAction.TaskRelogin=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306B\u518D\u30ED\u30B0\u30A4\u30F3\u4E2D:
 RepoReferenceProjectSetupAction.TaskLogoff=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304B\u3089\u30ED\u30B0\u30AA\u30D5\u4E2D
-RepoReferenceProjectSetupAction.TaskLogon=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8"{0}"\u306B\u30ED\u30B0\u30A4\u30F3\u4E2D
+RepoReferenceProjectSetupAction.TaskLogon=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\"{0}\"\u306B\u30ED\u30B0\u30A4\u30F3\u4E2D
 ReferenceProjectSetupPage.Title=\u53C2\u7167\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u8A2D\u5B9A
 ReferenceProjectSetupPage.TitleReadOnly=\u53C2\u7167\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u8A2D\u5B9A(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)
 ReferenceProjectSetupPage.ListGroup=\u73FE\u5728\u306E\u53C2\u7167
@@ -952,5 +952,42 @@ ReferenceProjectSetupPage.ErrorMissingReferencedProject=\u53C2\u7167\u30D7\u30ED
 MavenGroupIdProjectSettingPage.skipGroupIdLabel=\u30A2\u30A4\u30C6\u30E0\u306B\u30D5\u30A9\u30EB\u30C0\u30FC\u304C\u3042\u308B\u5834\u5408\u306F\u3001\u30D9\u30FC\u30B9groupID\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u307E\u3059
 AuditProjectSettingPage.selectAuditReportFolder=\u76E3\u67FB\u30EC\u30DD\u30FC\u30C8\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044\uFF01
 AuditProjectSettingPage.generateAuditReportProgressBar=\u76E3\u67FB\u30EC\u30DD\u30FC\u30C8\u3092\u751F\u6210\u4E2D\u3067\u3059\uFF01
+LimitRESTRequestJobChecker.limit_ESBJobForOSGI=[ESB\u7528\u306EOSGI\u30D0\u30F3\u30C9\u30EB]\u30BF\u30A4\u30D7\u3092\u4F7F\u7528\u3057\u3066ESB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306A\u3057\u306E\u30B8\u30E7\u30D6\u3092\u30D3\u30EB\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+AuditProjectSettingPage.generateButtonText=\u76E3\u67FB\u30EC\u30DD\u30FC\u30C8\u306E\u751F\u6210
+AuditProjectSettingPage.savedInDBButtonText=\u30EC\u30DD\u30FC\u30C8\u3092\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u4FDD\u5B58
+AuditProjectSettingPage.DBConfig.title=\u76E3\u67FBDB\u306E\u8A2D\u5B9A
+AuditProjectSettingPage.DBConfig.dbType=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30BF\u30A4\u30D7
+AuditProjectSettingPage.DBConfig.dbTypeTip=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30BF\u30A4\u30D7\u306F\u63A5\u7D9A\u6587\u5B57\u304A\u3088\u3073\u30C9\u30E9\u30A4\u30D0\u30FC\u3092\u5B9A\u7FA9\u3057\u307E\u3059\u3002
+AuditProjectSettingPage.DBConfig.dbVersion=\u30D0\u30FC\u30B8\u30E7\u30F3
+AuditProjectSettingPage.DBConfig.dbVersionTip=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044
+AuditProjectSettingPage.DBConfig.Driver=\u30C9\u30E9\u30A4\u30D0\u30FC
+AuditProjectSettingPage.DBConfig.Url=URL
 AuditProjectSettingPage.DBConfig.Username=\u30E6\u30FC\u30B6\u30FC\u540D
 AuditProjectSettingPage.DBConfig.Password=\u30D1\u30B9\u30EF\u30FC\u30C9
+AuditProjectSettingPage.DBConfig.CheckButtonText=\u63A5\u7D9A\u78BA\u8A8D
+AuditProjectSettingPage.history.label=\u5C65\u6B74\u304B\u3089\u518D\u751F\u6210
+AuditProjectSettingPage.history.labelTip=\u8A73\u7D30\u8A2D\u5B9A\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u5C65\u6B74\u304B\u3089\u30EC\u30DD\u30FC\u30C8\u3092\u751F\u6210\u3067\u304D\u308B\u3088\u3046\u306B\u306A\u308A\u307E\u3059\u3002
+AuditProjectSettingPage.history.refreshButton=\u66F4\u65B0
+AuditProjectSettingPage.history.historyGenerateButton=\u751F\u6210
+AuditProjectSettingPage.generate.title=\u76E3\u67FB\u30EC\u30DD\u30FC\u30C8\u306E\u751F\u6210
+AuditProjectSettingPage.generate.successful=\u30EC\u30DD\u30FC\u30C8\u306E\u751F\u6210\u306B\u6210\u529F\u3057\u307E\u3057\u305F\u3002\u3053\u3053\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044:\"{0}\"\u3002
+AuditProjectSettingPage.generate.failed=\u30EC\u30DD\u30FC\u30C8\u306E\u751F\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u76E3\u67FB\u8A2D\u5B9A\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002
+JavaJobScriptsExportWSWizardPage.IMAGE=Docker\u30A4\u30E1\u30FC\u30B8
+JavaJobScriptsExportWSWizardPage.DOCKER.optionGroup=Docker\u30AA\u30D7\u30B7\u30E7\u30F3
+JavaJobScriptsExportWSWizardPage.DOCKER.dockerHost=Docker\u30DB\u30B9\u30C8
+JavaJobScriptsExportWSWizardPage.DOCKER.localHost=\u30ED\u30FC\u30AB\u30EB
+JavaJobScriptsExportWSWizardPage.DOCKER.remoteHost=\u30EA\u30E2\u30FC\u30C8
+JavaJobScriptsExportWSWizardPage.DOCKER.registryLabel=\u30EC\u30B8\u30B9\u30C8\u30EA\u30FC
+JavaJobScriptsExportWSWizardPage.DOCKER.registryUsername=\u30E6\u30FC\u30B6\u30FC\u540D
+JavaJobScriptsExportWSWizardPage.DOCKER.registryPassword=\u30D1\u30B9\u30EF\u30FC\u30C9
+JavaJobScriptsExportWSWizardPage.DOCKER.imageLabel=\u30A4\u30E1\u30FC\u30B8\u540D
+JavaJobScriptsExportWSWizardPage.DOCKER.tagLabel=\u30A4\u30E1\u30FC\u30B8\u30BF\u30B0
+JavaJobScriptsExportWSWizardPage.DOCKER.errorMsg={0}\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044\u3002
+LoginProjectPage.cloud.apac=Cloud APAC
+ArtifactRepositoryShareSettingPage.enableShareLabel=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u66F4\u65B0\u3092\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u30EA\u30DD\u30B8\u30C8\u30EA\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8:
+ArtifactRepositoryShareSettingPage.repositoryIdLabel=\u30EA\u30DD\u30B8\u30C8\u30EAID:
+ArtifactRepositoryShareSettingPage.checkLabel=\u63A5\u7D9A\u78BA\u8A8D
+ArtifactRepositoryShareSettingPage.showWarnDialogWhenInstallingFeatures=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6642\u306B\u8B66\u544A\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u8868\u793A\u3059\u308B
+ArtifactRepositoryShareSettingPage.autoCheckUpdate=\u66F4\u65B0\u3092\u81EA\u52D5\u7684\u306B\u78BA\u8A8D
+ArtifactRepositoryShareSettingPage.checkUpdatePerDays=\u66F4\u65B0\u983B\u5EA6(\u65E5)\u3092\u78BA\u8A8D
+ArtifactRepositoryShareSettingPage.checkUpdatePerDays.error=[{2}]\u306B{0}\u304B\u3089{1}\u306E\u9593\u306E\u6574\u6570\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044

i18n/plugins/org.talend.repository.nl/src/main/java/messages_zh_CN.properties

@@ -2,7 +2,6 @@ ExtractDocumentationAction.fileErrorTitle=\u6587\u4EF6\u9519\u8BEF
 CreateFileRegexpAction.action.editTitle=\u7f16\u8f91 regex \u6587\u4ef6
 VersionManagementDialog.RemoveTip=\u5220\u9664\u9879\u76EE
 CreateRoutineAction.toolTipText.createRoutine=\u521b\u5efa\u4e8b\u52a1
-FileStep3.groupMetadata=\u67B6\u6784
 RegexpFileWizard.windowTitleCreate=\u65b0 RegEx \u6587\u4ef6
 LicenseWizard.footer=\u53c2\u7167  http://gnu.org \u83b7\u53d6\u66f4\u591a\u8be6\u7ec6\u5185\u5bb9\u3002
 StoppablePreviewLoader.inforLabelText.previewInterrupted=\u9884\u89c8\u7ec8\u65ad
@@ -64,7 +63,6 @@ JobScriptsExportWizardPage.contextPerlScripts=\u73af\u5883\u811a\u672c
 FileStep2.escapeChar=\u7f16\u7801\u5b57\u7b26
 ImportProjectAsWizardPage.form.selectArchive=\u9009\u62e9\u5b58\u6863\u6587\u4ef6
 StatusEditor.labelColumnTitle=\u6807\u7B7E
-DatabaseTableForm.groupMetaData=\u67B6\u6784
 CreateSalesforceSchemaAction.action.editTitle=\u7F16\u8F91Salesforce schema
 CreateFileExcelAction.action.editTitle=\u7F16\u8F91Excel\u6587\u4EF6
 FileStep.moduleFailureEnd=\u6ca1\u6709\u5b89\u88c5
@@ -91,7 +89,7 @@ FileStep3.guessIsDone=\u8ba1\u7b97\u6210\u529f
 FileStep2.fieldSeparatorAlert=\u987b\u6307\u5b9a\u5b57\u6bb5\u5206\u9694\u7b26\u3002\u5206\u9694\u7b26\u53ea\u80fd\u662f\u6570\u5b57\uff0c\u9017\u53f7\u548c\u5f00\u59cb\u3002
 JavaJobScriptsExportWSWizardPage.ApplyToChildren=\u66f4\u65b0\u5b50\u7c7b
 DocumentationPreferencePage.sourceCodeToHTML=\u4EE3\u7801\u5230HTML
-FileStep2.previewFailure=\u9884\u89c8\u9519\u8bef\u3002\u987b\u6539\u53d8\u4e00\u4e9b\u8bbe\u7f6e\u3002 \n\u6ce8\u610f\uff1a\u9884\u89c8\u9519\u8bef\u53ef\u80fd\u662f\u56e0\u4e3a\u9519\u8bef\u7684\u7f16\u7801\u8bbe\u7f6e\u9020\u6210\u7684\u3002
+FileStep2.previewFailure=\u9884\u89c8\u9519\u8bef\u3002\u987b\u6539\u53d8\u4e00\u4e9b\u8bbe\u7f6e\u3002 \\n\u6ce8\u610f\uff1a\u9884\u89c8\u9519\u8bef\u53ef\u80fd\u662f\u56e0\u4e3a\u9519\u8bef\u7684\u7f16\u7801\u8bbe\u7f6e\u9020\u6210\u7684\u3002
 CreateFileLdifAction.action.createTitle=\u521b\u5efaldif\u6587\u4ef6
 DatabaseTableForm.type=\u7c7b\u578b
 ConnectionsListComposite.groupText.connection=\u8fde\u63a5
@@ -109,7 +107,7 @@ FileStep3.informationLabel=\u70b9\u51fb\u8ba1\u7b97\u8ddf\u636e\u5f53\u524d\u8bb
 LicenseWizard.title=\u8bb8\u53ef\u8bf4\u660e
 ImportProjectAsWizardPage.title=\u5bfc\u5165\u9879\u76ee
 FileStep3.guessFailure=\u8ba1\u7b97\u5931\u8d25
-ConfigExternalPerlModulePage.description.label=\u63cf\u8ff0
+ConfigExternalPerlModulePage.description.label=\u63CF\u8FF0
 FileStep3.guessTip=\u70b9\u51fb\u66f4\u65b0\u9884\u89c8
 NewProjectWizard.error.languageNotSupported=\u8bed\u8a00{0}\u53ea\u7528\u4e8e\u5f00\u53d1
 StatusDialog.labelText.label=\u6807\u7b7e\uff1a
@@ -182,7 +180,7 @@ CreateFileDelimitedAction.action.openTitle=\u6253\u5f00\u6587\u4ef6\u5206\u9694\
 VersionManagementDialog.Items=\u9879\u76EE
 ConfigRoutineLibraryAction.actionLabel=\u914d\u7f6eRoutine\u5e93\u6587\u4ef6
 DatabaseTableForm.connectionFailureTip=\u6570\u636e\u5e93\u8fde\u63a5\u5931\u8d25\uff0c\u8bf7\u68c0\u67e5\u6570\u636e\u5e93\u8bbe\u7f6e\u6216\u4e0e\u6570\u636e\u5e93\u7ba1\u7406\u5458\u8054\u7cfb\u3002
-DatabaseTableForm.tableTip=\u9009\u62e9\u4e00\u4e2a\u8868\u683c\u4f7f\u7528 \u53d6\u56de \u6309\u94ae \u6216\u8005 \u624b\u52a8\u8bbe\u7f6e Schema
+DatabaseTableForm.tableTip=\u9009\u62E9\u4E00\u4E2A\u8868\u683C\u4F7F\u7528 \u53D6\u56DE \u6309\u94AE \u6216\u8005 \u624B\u52A8\u8BBE\u7F6E Schema
 DocumentationPage.browseBtnText.browse=\u9884\u89c8...
 StatusDialog.errorMessage.codeLetters=\u4ee3\u7801\u5fc5\u987b\u5305\u542b3\u4e2a\u5b57\u7b26\u3002
 JavaJobScriptsExportWSWizardPage.WEBXML=web.xml
@@ -213,7 +211,7 @@ ImportProjectAsWizardPage.error.message=\u95ee\u9898\u521b\u5efa
 JobScriptsExportWizardPage.shellLauncher=\u5185\u6838\u542f\u52a8
 FileStep1.nameAlertIllegalChar=\u6587\u4ef6\u540d\u5305\u542b\u4e0d\u5408\u6cd5\u5b57\u7b26
 SelectorTableForm.groupTableSettings=\u9009\u62e9 Schema \u521b\u5efa
-DatabaseTableForm.tableNoExist=\u6570\u636e\u5e93\u8fde\u63a5\u6210\u529f\u4f46\u662f\u5b58\u5728\u4e00\u4e9b\u8868\u65e0\u6cd5\u4f7f\u7528\u201c\u53d6\u56de Shema\u201d\u3002\n\u4f7f\u7528SGBD\u521b\u5efa\u4e00\u4e2a\u8868\u5e76\u70b9\u51fa \u68c0\u67e5\u8fde\u63a5 \u91cd\u7f6e\u72b6\u6001\u3002
+DatabaseTableForm.tableNoExist=\u6570\u636e\u5e93\u8fde\u63a5\u6210\u529f\u4f46\u662f\u5b58\u5728\u4e00\u4e9b\u8868\u65e0\u6cd5\u4f7f\u7528\u201c\u53d6\u56de Shema\u201d\u3002\\n\u4f7f\u7528SGBD\u521b\u5efa\u4e00\u4e2a\u8868\u5e76\u70b9\u51fa \u68c0\u67e5\u8fde\u63a5 \u91cd\u7f6e\u72b6\u6001\u3002
 StatusDialog.labelText.code=\u4ee3\u7801\uff1a
 CreateFileExcelAction.action.createTitle=\u521B\u5EFAExcel\u6587\u4EF6
 EditRoutineAction.text.editRoutine=\u7f16\u8f91\u4e8b\u52a1
@@ -261,7 +259,7 @@ DatabaseTableForm.AddTable=\u52a0\u5165 Schema
 LoginComposite.connections=\u8fde\u63a5
 CreateFileDelimitedAction.action.createTitle=\u521b\u5efa\u5206\u9694\u5f0f\u6587\u4ef6
 DatabaseTableForm.retreiveButtonUse=\u4f7f\u7528\u201c\u53d6\u56de Schema\u201d\u6309\u94ae,\u7528\u57fa\u4e8e\u8868\u683c\u7684 Schema \u66ff\u6362\u5f53\u524dSchema
-VersionManagementDialog.ConfirmMessage=\u5C06\u5168\u90E8\u9009\u62E9\u9879\u66F4\u65B0\u81F3\u7248\u672C{0}\uFF1F\r\n
+VersionManagementDialog.ConfirmMessage=\u5C06\u5168\u90E8\u9009\u62E9\u9879\u66F4\u65B0\u81F3\u7248\u672C{0}\uFF1F
 FileStep2.refreshPreview=\u66f4\u65b0\u9884\u89c8
 PurposeStatusSection.statusLabel=\u72B6\u6001
 StatusPreferencePage.docStatusLabel=\u6587\u6863\u72b6\u6001
@@ -339,7 +337,6 @@ StatusEditor.codeColumnTitle=\u4ee3\u7801
 connections.form.field.password=\u7528\u6237\u53e3\u4ee4
 DatabaseTableForm.comment=\u6ce8\u91ca
 NewProjectWizardPage.illegalCharacter=\u5de5\u7a0b\u540d\u5305\u542b\u4e0d\u5408\u6cd5\u5b57\u7b26
-DatabaseTableForm.navigatorTree=\u67B6\u6784
 LoginComposite.buttons.importProject.desc=\u5BFC\u5165\u5DF2\u6709\u9879\u76EE
 FileStep2.encodingTip=\u7f16\u7801
 XmlToXPathLinker.Loop=\u521b\u5efa\u5faa\u73af\u8fde\u63a5...
@@ -373,13 +370,13 @@ ConnectionsListComposite.comleteColumnTitle.complete=\u5b8c\u6210
 ExtractDocumentationAction.text.saveAs=\u53e6\u5b58\u4e3a
 ExportProjectsAsAction.actionTitle=\u5bfc\u51faTalend\u9879\u76ee\u5230\u538b\u7f29\u5305
 FileStep3.guess=\u8ba1\u7b97
-ConfigExternalJarPage.description.label=\u63cf\u8ff0
+ConfigExternalJarPage.description.label=\u63CF\u8FF0
 LoginComposite.manageConnectionsToolTipHint=\u8fde\u63a5\u7ba1\u7406
 FileStep1.groupFileLocationSettings=\u6587\u4ef6\u8def\u5f84\u8bbe\u7f6e
 UpdateDocumentationAction.updateDocActionTipText.updateDoc=\u66f4\u65b0\u6587\u6863
 OpenDocumentationAction.openDocAction.openDoc=\u6253\u5f00\u6587\u6863
 ExtractionFieldsWithXPathEditorView.columnTitle.xPath=\u76f8\u5bf9\u6216\u7edd\u5bf9\u8def\u5f84
-FileStep2.noresult=\u5f53\u524d\u8bbe\u7f6e\u6ca1\u6709\u7ed3\u679c
+FileStep2.noresult=\u5F53\u524D\u8BBE\u7F6E\u6CA1\u6709\u7ED3\u679C
 ConnectionsListButtonsToolBar.newConnectionLabel=<\u65b0\u8fde\u63a5>
 FileStep3.guessFailureTip2=\u5728\u9884\u89c8\u6b65\u9aa42\u7684\u57fa\u7840\u4e0a\u8ba1\u7b97
 SelectDeleteProjectDialog.Title=\u9009\u62E9\u5DE5\u7A0B
@@ -436,14 +433,14 @@ CreateWSDLSchemaAction.editWSDL=\u7F16\u8F91WSDL schema
 CreateWSDLSchemaAction.openWSDL=\u6253\u5F00 WSDL schema
 DatabaseForm.selectJar=\u9009\u62E9jar\u6587\u4EF6
 EDemoProjectFileType.unknowType=\u672A\u77E5\u6587\u4EF6\u7C7B\u578B
-EditPropertiesAction.renameError=\u547D\u540D\u4ECE{0} \u5230{1}\u9519\u8BEF\!
+EditPropertiesAction.renameError=\u547D\u540D\u4ECE{0} \u5230{1}\u9519\u8BEF\\!
 EditPropertiesAction.warning=\u8B66\u544A
 ExportItemUtil.cannotCreate=\u65E0\u6CD5\u521B\u5EFA
 ExportItemUtil.cannotCreateDir=\u65E0\u6CD5\u521B\u5EFA\u8DEF\u5F84
 ExportProjectsAsAction.createLiberariesLink=\u521B\u5EFA\u5916\u90E8\u5E93\u94FE\u63A5
 ExportProjectsAsAction.processProject=\u9879\u76EE\u8FDB\u7A0B
 ExtractionFieldsWithXPathEditorView.columnName=\u5217\u540D
-ExtractionFieldsWithXPathEditorView.exist=\ \u5DF2\u5B58\u5728.
+ExtractionFieldsWithXPathEditorView.exist=\\ \u5DF2\u5B58\u5728.
 FileStep2Form.onlyNumber=\u53EA\u5141\u8BB8\u6570\u5B57\u3002
 FileStep2Form.output=\u6807\u51c6\u8f93\u51fa
 FileStep2Form.preview=\u9884\u89c8
@@ -526,9 +523,9 @@ ContextExportType_NullCannotBeMapped=Null\u503C\u4E0D\u80FD\u6620\u5C04\u5230\u4
 ContextExportDialog_ContextsExport=\u73AF\u5883\u5BFC\u51FA
 ContextExportDialog_ContextsExportDesc=\u5B9A\u4E49\u7684\u4E0A\u4E0B\u6587\u7684\u65B9\u5F0F\u5C06\u88AB\u5BFC\u51FA\u5230\u751F\u6210\u7684WSDL\u4E2D\u3002
 ContextExportDialog_ExportMode=\u5BFC\u51FA\u6A21\u5F0F
-ContextExportDialog_FileAttachmentNotSupported=\\u662F\u4E00\u4E2A\u5B57\u7B26\u4E32\u5185\u5BB9. \u4E0D\u652F\u6301\u6587\u4EF6\u9644\u4EF6\u6A21\u5F0F.
+ContextExportDialog_FileAttachmentNotSupported=\\\u662F\u4E00\u4E2A\u5B57\u7B26\u4E32\u5185\u5BB9. \u4E0D\u652F\u6301\u6587\u4EF6\u9644\u4EF6\u6A21\u5F0F.
 ContextExportDialog_Name=\u4f5c\u4e1a\u540d
-ContextExportDialog_StringAttachmentNotSupported=\\u662F\u4E00\u4E2A\u6587\u4EF6\u5185\u5BB9\u3002.\u4E0D\u652F\u6301\u5B57\u7B26\u4E32\u9644\u4EF6\u6A21\u5F0F.
+ContextExportDialog_StringAttachmentNotSupported=\\\u662F\u4E00\u4E2A\u6587\u4EF6\u5185\u5BB9\u3002.\u4E0D\u652F\u6301\u5B57\u7B26\u4E32\u9644\u4EF6\u6A21\u5F0F.
 ContextExportDialog_XsdType=XSD\u7C7B\u578B
 PaletteSettingPage.paletteSettings=\u8C03\u8272\u677F\u8BBE\u7F6E
 PaletteSettingPage.selection1=\u60A8\u9009\u4E3A\u9690\u85CF\u7684\u67D0\u4E9B\u7EC4\u4EF6\u5DF2\u5728\u6B64\u5DE5\u7A0B\u4E2D\u4F7F\u7528\uFF0C\u56E0\u6B64\u5B83\u4EEC\u5FC5\u987B\u53EF\u89C1\u3002
@@ -806,7 +803,7 @@ WorkbenchMessages.ExportWizard_title=\u51FA\u53E3
 JavaJobScriptsExportWSWizardPage.banServiceJob=\u670D\u52A1\u4F5C\u4E1A\u4E0D\u80FD\u72EC\u7ACB\u6784\u5EFA\uFF0C\u800C\u662F\u7528\u5206\u914D\u7684\u670D\u52A1\u8282\u70B9\u5BFC\u51FA\u3002
 LimitRESTRequestJobChecker.limit_tRESTRequest=ESB\u4F5C\u4E1A\u53EA\u80FD\u4F7F\u7528[OSGI Bundle for ESB]\u7C7B\u578B\u6784\u5EFA\u201C{0}\u201D\u3002
 LimitESBConsumerJobChecker.limit_tRESTClient_tESBConsumer=\u53EA\u80FD\u4F7F\u7528[\u72EC\u7ACB\u4F5C\u4E1A]\uFF0C[OSGI Bundle for ESB]\u4E4B\u4E00\u6784\u5EFAESB\u4F5C\u4E1A\u5305\u542B\u201C{0}\u201D\u3002
-LimitESBConsumerJobChecker.limitFeaturesWithStandalone.locator=\t\n\n\u5728\u4F7F\u7528[\u72EC\u7ACB\u4F5C\u4E1A]\u6784\u5EFA\u65F6\uFF0CESB\u4F5C\u4E1A\u5305\u542B\u201C{0}\u201D\u4E0D\u5E94\u6307\u5B9A\u529F\u80FD\u670D\u52A1\u5B9A\u4F4D\u5668
+LimitESBConsumerJobChecker.limitFeaturesWithStandalone.locator=\u5728\u4F7F\u7528[\u72EC\u7ACB\u4F5C\u4E1A]\u6784\u5EFA\u65F6\uFF0CESB\u4F5C\u4E1A\u5305\u542B\u201C{0}\u201D\u4E0D\u5E94\u6307\u5B9A\u529F\u80FD\u670D\u52A1\u5B9A\u4F4D\u5668
 LimitESBConsumerJobChecker.limitFeaturesWithStandalone.SAM=\u5728\u4F7F\u7528[\u72EC\u7ACB\u4F5C\u4E1A]\u6784\u5EFA\u65F6\uFF0CESB\u4F5C\u4E1A\u5305\u542B\u201C{0}\u201D\u4E0D\u5E94\u6307\u5B9A\u529F\u80FD\u670D\u52A1\u6CE8\u518C\u8868
 LimitESBConsumerJobChecker.limitFeaturesWithStandalone.SR=\u5728\u4F7F\u7528[\u72EC\u7ACB\u4F5C\u4E1A]\u6784\u5EFA\u65F6\uFF0CESB\u4F5C\u4E1A\u5305\u542B\u201C{0}\u201D\u4E0D\u5E94\u6307\u5B9A\u529F\u80FD\u670D\u52A1\u6CE8\u518C\u8868
 DataTransferMessages.ArchiveExport_selectDestinationTitle=\u5BFC\u51FA\u5230\u5B58\u6863\u6587\u4EF6
@@ -880,12 +877,12 @@ LoginProjectPage.fetchLicense.error.failed=\u6293\u53D6\u8BB8\u53EF\u8BC1\u5931\
 VersionManagementDialog.selectAll=\u9009\u62E9\u6240\u6709
 VersionManagementDialog.valueWarning=\u503C\u65E0\u6548
 VersionManagementDialog.WarningTitle2=\u8B66\u544A
-VersionManagementDialog.openedInEditorMessage=\u6761\u76EE:  {0}\n \u5728\u7F16\u8F91\u5668\u4E2D\u6253\u5F00\uFF0C\u5728\u70B9\u51FBOK\u540E\u4FDD\u5B58\u3002
+VersionManagementDialog.openedInEditorMessage=\u6761\u76EE:  {0}\\n \u5728\u7F16\u8F91\u5668\u4E2D\u6253\u5F00\uFF0C\u5728\u70B9\u51FBOK\u540E\u4FDD\u5B58\u3002
 VersionManagementDialog.inValidVersionWarning=\u975E\u6CD5\u7684\u7248\u672C\u6A21\u5F0F
 VersionManagementDialog.applyVersion=\u5E94\u7528\u7248\u672C
 VersionManagementDialog.useJobVersion=\u4F7F\u7528\u4F5C\u4E1A\u7248\u672C
 JavaVersionProjectSettingPage.versionLabel=JDK \u7F16\u8BD1\u5668\u5408\u89C4\u6027\u7EA7\u522B:
-BuildJobManager.mavenErrorMessage=\u4F5C\u4E1A\u672A\u6210\u529F\u6784\u5EFA\uFF0C\u8BF7\u68C0\u67E5\u65E5\u5FD7\u4EE5\u4E86\u89E3\u5DE5\u4F5C\u7A7A\u95F4/ .Java / lastGenerated.log\u4E0A\u7684\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F
+BuildJobManager.mavenErrorMessage=\u4F5C\u4E1A\u672A\u6210\u529F\u6784\u5EFA\uFF0C\u8BF7\u68C0\u67E5\u65E5\u5FD7\u4EE5\u4E86\u89E3\u5DE5\u4F5C\u7A7A\u95F4{0}\u4E0A\u7684\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F
 VersionManagementDialog.projectVersion=\u5DE5\u7A0B\u7248\u672C
 VersionManagementDialog.useSnapshot=\u4F7F\u7528\u5FEB\u7167
 VersionManagementDialog.applyDetail=\u5E94\u7528
@@ -952,3 +949,42 @@ ReferenceProjectSetupPage.ErrorMissingReferencedProject=\u7F3A\u5C11\u5F15\u7528
 MavenGroupIdProjectSettingPage.skipGroupIdLabel=\u5982\u679C\u9879\u76EE\u5177\u6709\u6587\u4EF6\u5939\uFF0C\u5219\u8DF3\u8FC7\u57FA\u672C groupID
 AuditProjectSettingPage.selectAuditReportFolder=\u8BF7\u9009\u62E9\u4E00\u4E2A\u751F\u6210\u5BA1\u8BA1\u62A5\u544A\u6587\u4EF6\u5939\uFF01
 AuditProjectSettingPage.generateAuditReportProgressBar=\u751F\u6210\u5BA1\u8BA1\u62A5\u544A\uFF01
+LimitRESTRequestJobChecker.limit_ESBJobForOSGI=\u65E0\u6CD5\u4F7F\u7528 [OSGI Bundle For ESB] \u7C7B\u578B\u6784\u5EFA\u4E0D\u542B ESB \u7EC4\u4EF6\u7684\u4F5C\u4E1A\u3002
+AuditProjectSettingPage.generateButtonText=\u751F\u6210\u5BA1\u8BA1\u62A5\u544A
+AuditProjectSettingPage.savedInDBButtonText=\u5728\u6570\u636E\u5E93\u4E2D\u4FDD\u5B58\u62A5\u544A
+AuditProjectSettingPage.DBConfig.title=\u5BA1\u8BA1\u6570\u636E\u5E93\u914D\u7F6E
+AuditProjectSettingPage.DBConfig.dbType=\u6570\u636E\u5E93\u7C7B\u578B
+AuditProjectSettingPage.DBConfig.dbTypeTip=\u6570\u636E\u5E93\u7C7B\u578B\u5B9A\u4E49\u8FDE\u63A5\u5B57\u7B26\u4E32\u548C\u9A71\u52A8\u7A0B\u5E8F
+AuditProjectSettingPage.DBConfig.dbVersion=\u7248\u672C
+AuditProjectSettingPage.DBConfig.dbVersionTip=\u8BF7\u9009\u62E9\u6570\u636E\u5E93\u7248\u672C
+AuditProjectSettingPage.DBConfig.Driver=\u9A71\u52A8\u7A0B\u5E8F
+AuditProjectSettingPage.DBConfig.Url=URL
+AuditProjectSettingPage.DBConfig.Username=\u7528\u6237\u540D
+AuditProjectSettingPage.DBConfig.Password=\u5BC6\u7801
+AuditProjectSettingPage.DBConfig.CheckButtonText=\u68C0\u67E5\u8FDE\u63A5
+AuditProjectSettingPage.history.label=\u4ECE\u5386\u53F2\u8BB0\u5F55\u91CD\u65B0\u751F\u6210
+AuditProjectSettingPage.history.labelTip=\u9009\u62E9\u9AD8\u7EA7\u8BBE\u7F6E\uFF0C\u4FBF\u6709\u53EF\u80FD\u4ECE\u5386\u53F2\u8BB0\u5F55\u751F\u6210\u62A5\u544A\u3002
+AuditProjectSettingPage.history.refreshButton=\u5237\u65B0
+AuditProjectSettingPage.history.historyGenerateButton=\u751F\u6210
+AuditProjectSettingPage.generate.title=\u751F\u6210\u5BA1\u8BA1\u62A5\u544A
+AuditProjectSettingPage.generate.successful=\u6210\u529F\u751F\u6210\u62A5\u544A\u3002\u8BF7\u68C0\u67E5\u6B64\u5904:\"{0}\"\u3002
+AuditProjectSettingPage.generate.failed=\u751F\u6210\u62A5\u544A\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u5BA1\u8BA1\u914D\u7F6E\u3002
+JavaJobScriptsExportWSWizardPage.IMAGE=Docker \u6620\u50CF
+JavaJobScriptsExportWSWizardPage.DOCKER.optionGroup=Docker \u9009\u9879
+JavaJobScriptsExportWSWizardPage.DOCKER.dockerHost=Docker \u4E3B\u673A
+JavaJobScriptsExportWSWizardPage.DOCKER.localHost=\u672C\u5730
+JavaJobScriptsExportWSWizardPage.DOCKER.remoteHost=\u8FDC\u7A0B
+JavaJobScriptsExportWSWizardPage.DOCKER.registryLabel=Registry
+JavaJobScriptsExportWSWizardPage.DOCKER.registryUsername=\u7528\u6237\u540D
+JavaJobScriptsExportWSWizardPage.DOCKER.registryPassword=\u5BC6\u7801
+JavaJobScriptsExportWSWizardPage.DOCKER.imageLabel=\u6620\u50CF\u540D\u79F0
+JavaJobScriptsExportWSWizardPage.DOCKER.tagLabel=\u6620\u50CF\u6807\u8BB0
+JavaJobScriptsExportWSWizardPage.DOCKER.errorMsg={0} \u4E0D\u80FD\u4E3A\u7A7A\u3002
+LoginProjectPage.cloud.apac=APAC \u4E91
+ArtifactRepositoryShareSettingPage.enableShareLabel=\u5C06\u7EC4\u4EF6\u66F4\u65B0\u4F20\u64AD\u5230\u6784\u4EF6\u5E93:
+ArtifactRepositoryShareSettingPage.repositoryIdLabel=\u5B58\u50A8\u5E93 ID:
+ArtifactRepositoryShareSettingPage.checkLabel=\u68C0\u67E5\u8FDE\u63A5
+ArtifactRepositoryShareSettingPage.showWarnDialogWhenInstallingFeatures=\u5B89\u88C5\u7EC4\u4EF6\u65F6\u663E\u793A\u8B66\u544A\u5BF9\u8BDD\u6846
+ArtifactRepositoryShareSettingPage.autoCheckUpdate=\u81EA\u52A8\u68C0\u67E5\u66F4\u65B0
+ArtifactRepositoryShareSettingPage.checkUpdatePerDays=\u68C0\u67E5\u66F4\u65B0\u9891\u7387(\u5929)
+ArtifactRepositoryShareSettingPage.checkUpdatePerDays.error=\u8BF7\u4E3A [{2}] \u8F93\u5165\u4E00\u4E2A {0} \u548C {1} \u4E4B\u95F4\u7684\u6574\u6570

i18n/plugins/org.talend.repository.view.di.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.view.di.nl</artifactId>

i18n/plugins/org.talend.sbi.engines.client.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sbi.engines.client.nl</artifactId>

i18n/plugins/org.talend.sbi.engines.client.nl/src/messages_ja.properties

@@ -42,3 +42,4 @@ DataTransferMessages.ArchiveExport_exportTitle=\u30A2\u30FC\u30AB\u30A4\u30D6\u3
 DataTransferMessages.ZipExport_mustBeFile=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u306E\u30C7\u30B9\u30C6\u30A3\u30CD\u30FC\u30B7\u30E7\u30F3\u306B\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u306F\u306A\u304F\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u3066\u4E0B\u3055\u3044\u3002
 DataTransferMessages.ZipExport_alreadyExistsError=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u306E\u30C7\u30B9\u30C6\u30A3\u30CD\u30FC\u30B7\u30E7\u30F3\u306F\u65E2\u306B\u5B58\u5728\u3057\u3001\u4E0A\u66F8\u304D\u3067\u304D\u307E\u305B\u3093\u3002
 DataTransferMessages.ArchiveExport_destinationLabel=\u30D5\u30A1\u30A4\u30EB\u3092&\u30A2\u30FC\u30AB\u30A4\u30D6\u3059\u308B\u306B\u306F:
+SpagoBiPreferencePage.technicalStatusLabel.Deprecated=SpagoBI\u30B5\u30FC\u30D0\u30FC(\u975E\u63A8\u5968)

i18n/plugins/org.talend.sbi.engines.client.nl/src/messages_zh_CN.properties

@@ -37,8 +37,9 @@ SpagoBITalendEngineClient.4=/
 SpagoBITalendEngineClient.5=\u4E25\u91CD\u534F\u8BAE\u51B2\u7A81\uFF1A{0}
 SpagoBITalendEngineClient.6=\u4E25\u91CD\u4F20\u8F93\u9519\u8BEF\uFF1A{0}
 SpagoBITalendEngineClient.serviceFailed=\u670D\u52A1\u5931\u8D25
-SpagoBITalendEngineClient.unsupportEngineer=\u4E0D\u652F\u6301\u7684\u673A\u5668\u7248\u672C\r\n
+SpagoBITalendEngineClient.unsupportEngineer=\u4E0D\u652F\u6301\u7684\u673A\u5668\u7248\u672C
 DataTransferMessages.ArchiveExport_exportTitle=\u5B58\u6863\u6587\u4EF6
 DataTransferMessages.ZipExport_mustBeFile=\u5BFC\u51FA\u76EE\u6807\u5FC5\u987B\u662F\u6587\u4EF6,\u4E0D\u80FD\u662F\u76EE\u5F55.
 DataTransferMessages.ZipExport_alreadyExistsError=\u5BFC\u51FA\u76EE\u6807\u5DF2\u5B58\u5728\u4E14\u4E0D\u80FD\u88AB\u8986\u76D6.
 DataTransferMessages.ArchiveExport_destinationLabel=\u76EE\u6807\u53CA\u5F52\u6863\u6587\u4EF6
+SpagoBiPreferencePage.technicalStatusLabel.Deprecated=SpagoBI \u670D\u52A1\u5668 (\u4E0D\u63A8\u8350\u4F7F\u7528)

i18n/plugins/org.talend.spagic.engines.client.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.spagic.engines.client.nl</artifactId>

i18n/plugins/org.talend.sqlbuilder.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sqlbuilder.nl</artifactId>

i18n/plugins/org.talend.sqlbuilder.nl/src/main/java/messages_ja.properties

@@ -61,7 +61,7 @@ Progress.Dictionary.Scanning=\u30AD\u30E3\u30C3\u30B7\u30E5\u3055\u308C\u305Fcon
 DB2ExplainPlanAction.logMessage5=sql\u5B9F\u884C\u30BF\u30D6\u306E\u4F5C\u6210\u30A8\u30E9\u30FC
 DB2ExplainPlanAction.logMessage4=DB2ExplainPlan\u30A2\u30AF\u30B7\u30E7\u30F3\u4F8B\u5916:
 DB2ExplainPlanAction.logMessage3=plan\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210\u30A8\u30E9\u30FC
-DB2ExplainPlanAction.logMessage2=\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u3092\u9589\u3058\u308B\u306E\u306B\u5931\u6557: 
+DB2ExplainPlanAction.logMessage2=\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u3092\u9589\u3058\u308B\u306E\u306B\u5931\u6557:
 DB2ExplainPlanAction.logMessage1=SessionTreeNode\u306E\u53D6\u5F97\u306B\u5931\u6557
 db2.editor.actions.explain=DB2 Explain Plan\u3092\u8868\u793A
 SQLBuilderRepositoryNodeManager.exceptionMessage=\u30D5\u30A9\u30EB\u30C0\u30FC\u306E\u30EA\u30DD\u30B8\u30C8\u30EA\u30CE\u30FC\u30C9\u306F\u3001\u3053\u308C\u3092\u547C\u3073\u51FA\u305B\u307E\u305B\u3093\u3002
@@ -525,7 +525,7 @@ DatabaseDetailView.Tab.ColumnInfo=\u30AB\u30E9\u30E0
 DatabaseDetailView.Tab.ConnectionInfo.DatabaseProductName=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u88FD\u54C1\u540D
 DatabaseDetailView.Tab.Indexes.status=\u30A4\u30F3\u30C7\u30AF\u30B9:
 GenerateSelectSQLAction.textCenerateSelectStatement=SELECT\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u3092\u751F\u6210\u4E2D
-EMFRepositoryNodeManager.Notice.info3=\u30B0\u30E9\u30D5\u30A3\u30AB\u30EBSQL\u30A8\u30C7\u30A3\u30BF\u306F'select'\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u306E\u307F\u6271\u3048\u307E\u3059\u3002
+EMFRepositoryNodeManager.Notice.info3=\u30B0\u30E9\u30D5\u30A3\u30AB\u30EBSQL\u30A8\u30C7\u30A3\u30BF\u306F\'select\'\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u306E\u307F\u6271\u3048\u307E\u3059\u3002
 EMFRepositoryNodeManager.Notice.info2=\u30B0\u30E9\u30D5\u30A3\u30AB\u30EBSQL\u30A8\u30C7\u30A3\u30BF\u3067\u306F\u6700\u521D\u306E\uFF11\u6587\u3057\u304B\u6271\u3048\u307E\u305B\u3093\u3002\u7D9A\u3051\u307E\u3059\u304B\uFF1F
 DatabaseDetailView.Tab.ConnectionInfo.DriverMajor=\u30C9\u30E9\u30A4\u30D0\u306E\u30E1\u30B8\u30E3\u30FC\u30D0\u30FC\u30B8\u30E7\u30F3
 SQLBuilderTabComposite.Notice.title=\u30CE\u30FC\u30C8
@@ -533,7 +533,7 @@ SQLResultsView.ConnectionWait=\u63A5\u7D9A\u4E2D\u3067\u3059...
 DatabaseStructureView.synonym=\u540C\u7FA9\u8A9E
 Refresh=\u66F4\u65B0
 SQLEditorProposalAdapter.updateFilter=\u521D\u671F\u30D5\u30A3\u30EB\u30BF {0} \u3092\u66F4\u65B0
-SQLEditorProposalUtil.needChanged=\u30A8\u30A4\u30EA\u30A2\u30B9: {0}\n\u3000\u8AAC\u660E: \u3053\u308C\u306F {1}\u3000\u306E\u30A8\u30A4\u30EA\u30A2\u30B9\u3067\u3059
+SQLEditorProposalUtil.needChanged=\u30A8\u30A4\u30EA\u30A2\u30B9: {0}\\n\u3000\u8AAC\u660E: \u3053\u308C\u306F {1}\u3000\u306E\u30A8\u30A4\u30EA\u30A2\u30B9\u3067\u3059
 SqlEditDialog.language=tsql
 ContextModeSessionSwitcher.buttonText=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30E2\u30FC\u30C9
 SqlBuilderPreferencePage.sql=DB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30AF\u30A8\u30EA\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3057\u307E\u3059 (\u7279\u5B9A\u306E\u30AF\u30A8\u30EA\u306B\u5BFE\u3059\u308B\u8B66\u544A\u3092\u6709\u52B9\u306B\u3057\u307E\u3059)

i18n/plugins/org.talend.sqlbuilder.nl/src/main/java/messages_zh_CN.properties

@@ -59,7 +59,7 @@ DatabaseDetailView.NoSelection=\u9009\u4E2D\u6570\u636E\u5E93\u7ED3\u6784\u89C6\
 db2.editor.actions.explain.notFound=\u6CA1\u6709\u627E\u5230\u8BA1\u5212\u8868\u3002\u60F3\u8981\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u8BA1\u5212\u8868\u4E48\uFF1F
 Progress.Dictionary.Scanning=\u6B63\u5728\u626B\u63CF\u7F13\u5B58\u7684\u5185\u5BB9\u52A9\u624B\u6570\u636E
 DB2ExplainPlanAction.logMessage5=\u521B\u5EFASQL\u6267\u884C\u6807\u7B7E\u9519\u8BEF
-DB2ExplainPlanAction.logMessage4=DB2ExplainPlan\u6267\u884C\u5F02\u5E38: 
+DB2ExplainPlanAction.logMessage4=DB2ExplainPlan\u6267\u884C\u5F02\u5E38:
 DB2ExplainPlanAction.logMessage3=\u521B\u5EFA\u8BA1\u5212\u8868\u9519\u8BEF
 DB2ExplainPlanAction.logMessage2=\u5173\u95ED\u6307\u4EE4\u5931\u8D25:
 DB2ExplainPlanAction.logMessage1=\u83B7\u53D6SessionTreeNode\u5931\u8D25
@@ -480,7 +480,7 @@ EMFRepositoryNodeManager.Notice.info=\u4F60\u5FC5\u987B\u8F93\u5165\u81F3\u5C11\
 OracleExplainPlanAction.logMessage2=\u521B\u5EFA\u8BA1\u5212\u8868\u65F6\u51FA\u9519
 OracleExplainPlanAction.logMessage1=\u83B7\u53D6TreeNode \u4F1A\u8BDD\u5931\u8D25
 Images.ColumnNodeIcon=icons/columns.gif
-SQLBuilderDialog.SaveAllQueries.Info= \u8981\u4FDD\u5B58\u6240\u6709\u4FEE\u6539\u7684\u67E5\u8BE2\u5417\uFF1F
+SQLBuilderDialog.SaveAllQueries.Info=\u8981\u4FDD\u5B58\u6240\u6709\u4FEE\u6539\u7684\u67E5\u8BE2\u5417\uFF1F
 SQLResultsView.Executing=\u6267\u884C ...
 DBTreeActionGroup.logMessage=\u4E0D\u80FD\u521B\u5EFAmenu action
 ConnectionInfoTab.logMessage123=\u83B7\u53D6\u5C5E\u6027storesLowerCaseIdentifiers \u51FA\u9519

main/features/org.talend.designer.business.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.feature</artifactId>

main/features/org.talend.designer.feature/feature.xml

@@ -181,6 +181,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
+         fragment="true"
          unpack="false"/>
 
    <plugin

main/features/org.talend.designer.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.feature</artifactId>

main/features/org.talend.rcp.branding.tos.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.feature</artifactId>

main/features/org.talend.rcp.branding.tos.test.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

main/features/org.talend.repository.feature/feature.xml

@@ -232,6 +232,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
+         fragment="true"
          unpack="false"/>
 
    <plugin

main/features/org.talend.repository.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.feature</artifactId>

main/features/org.talend.sbi.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sbi.feature</artifactId>

main/features/org.talend.spagic.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.spagic.feature</artifactId>

main/features/org.talend.tos.components.feature/feature.xml

@@ -244,7 +244,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"
          unpack="false"/>
 
    <plugin
@@ -252,7 +251,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"
          unpack="false"/>
 
    <plugin
@@ -260,7 +258,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"
          unpack="false"/>
 
    <plugin
@@ -268,7 +265,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"
          unpack="false"/>
 
    <plugin
@@ -276,7 +272,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"
          unpack="false"/>
 
    <plugin

main/features/org.talend.tos.components.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.components.feature</artifactId>

main/features/org.talend.tos.core.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.core.feature</artifactId>

main/features/org.talend.tos.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.feature</artifactId>

main/features/org.talend.tos.libraries.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.libraries.feature</artifactId>

main/plugins/org.talend.designer.abstractmap/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.abstractmap</artifactId>

main/plugins/org.talend.designer.alfrescooutput/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.alfrescooutput</artifactId>

main/plugins/org.talend.designer.business.diagram/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram</artifactId>

main/plugins/org.talend.designer.codegen/jet_stub/footer.javajet

@@ -506,7 +506,7 @@
             if (inContext == null) {
                 inContext = <%=className%>.class.getClassLoader().getResourceAsStream("config/contexts/" + contextStr + ".properties");
             }
-            if (inContext != null) {
+            if (inContext != null && context != null && context.isEmpty()) {
                 //defaultProps is in order to keep the original context value
                 defaultProps.load(inContext);
                 inContext.close();
@@ -526,7 +526,9 @@
 
 				}
             }
-            <% for (IContextParameter ctxParam :params)
+            <%
+            String warningMessageFormat = "Null value will be used for context parameter %s: %s";
+            for (IContextParameter ctxParam :params)
             {
 				%>
 				    context.setContextType("<%=ctxParam.getName()%>", "<%=ctxParam.getType()%>");
@@ -575,6 +577,17 @@
 
             }catch(ParseException e)
             {
+<%
+                if (isLog4jEnabled) {
+%>
+                    log.warn(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
+<%
+                } else {
+%>
+                    System.err.println(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
+<%
+                }
+%>
                 context.<%=ctxParam.getName()%>=null;
             }
               <%
@@ -593,6 +606,17 @@
              try{
                  context.<%=ctxParam.getName()%>=routines.system.ParserUtils.parseTo_<%=typeToGenerate%> (context.getProperty("<%=ctxParam.getName()%>"));
              }catch(NumberFormatException e){
+<%
+                if (isLog4jEnabled) {
+%>
+                    log.warn(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
+<%
+                } else {
+%>
+                    System.err.println(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
+<%
+                }
+%>
                  context.<%=ctxParam.getName()%>=null;
               }
              <%
@@ -1116,17 +1140,12 @@ if (execStat) {
 			if(conn_<%=hbaseComponent.getUniqueName()%> != null )
 	        {
 			<%
-				if((isCustom && isHadoop2) || (!isCustom && hbaseDistrib.doSupportNewHBaseAPI())) {
-				    if (!hbaseDistrib.doSupportHBase2x()) {
-			%>
-		                org.apache.hadoop.hbase.client.HConnection hConnection_<%=hbaseComponent.getUniqueName() %> = org.apache.hadoop.hbase.client.HConnectionManager.getConnection(conn_<%=hbaseComponent.getUniqueName() %>);
-		    <% } else { %>
-		                org.apache.hadoop.hbase.client.Connection hConnection_<%=hbaseComponent.getUniqueName() %> = org.apache.hadoop.hbase.client.ConnectionFactory.createConnection(conn_<%=hbaseComponent.getUniqueName() %>);
-		    <% } %>
+				if((isCustom && isHadoop2) || (!isCustom && hbaseDistrib.doSupportNewHBaseAPI())) {%>
+		        org.apache.hadoop.hbase.client.HConnection hConnection_<%=hbaseComponent.getUniqueName() %> = org.apache.hadoop.hbase.client.HConnectionManager.getConnection(conn_<%=hbaseComponent.getUniqueName() %>);
 		        if ((hConnection_<%=hbaseComponent.getUniqueName() %> != null) && (!hConnection_<%=hbaseComponent.getUniqueName() %>.isClosed())) {
 				    hConnection_<%=hbaseComponent.getUniqueName() %>.close();
 			}
-			<%} else if (!hbaseDistrib.doSupportHBase2x()) {%>
+			<%} else {%>
 				org.apache.hadoop.hbase.client.HConnectionManager.deleteConnection(conn_<%=hbaseComponent.getUniqueName() %>,true);
 			<%}%>
 			}

main/plugins/org.talend.designer.codegen/jet_stub/generic/component_main.javajet

@@ -89,7 +89,7 @@ if(hasInput){
                     if(!input_columnList.get(i).getTalendType().equals("id_Dynamic")) {
                     %>
                         if (incomingEnforcer_<%=cid%>.getDesignSchema().getField("<%=input_columnList.get(i)%>") == null){
-                            incomingEnforcer_<%=cid%>.addIncomingNodeField("<%=input_columnList.get(i)%>", <%=inputConn.getName()%>.<%=input_columnList.get(i)%>.getClass().getCanonicalName());
+                            incomingEnforcer_<%=cid%>.addIncomingNodeField("<%=input_columnList.get(i)%>", ((Object) <%=inputConn.getName()%>.<%=input_columnList.get(i)%>).getClass().getCanonicalName());
                             shouldCreateRuntimeSchemaForIncomingNode = true;
                         }
                     <%

main/plugins/org.talend.designer.codegen/jet_stub/header.javajet

@@ -312,7 +312,7 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
 		}
 %>
 	}
-	private ContextProperties context = new ContextProperties();
+	protected ContextProperties context = new ContextProperties(); // will be instanciated by MS.
 	public ContextProperties getContext() {
 		return this.context;
 	}

main/plugins/org.talend.designer.codegen/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.codegen</artifactId>

main/plugins/org.talend.designer.codegen/src/main/java/messages.properties

@@ -48,6 +48,7 @@ ComponentsFactory.componentNotFound=Component folder not found\:
 ComponentsFactory.load.components=Load Components...
 ComponentsFactory.parentNotRecompiled=Warning\: parents of *.inc.javajet are not recompiled \!
 ComponentsFactory.loadComponents.missingFolder=The folder "{0}" is missing in the plugin "{1}".
+ComponentsFactory.init.waitForFinish.timeout=Can't initialise ComponentsFactory, please try again.
 ComponentsLocalProviderService.componentLoadError=Component load error
 ComponentsLocalProviderService.talendExchangeError=Talend Exchange Error
 ComponentsPreferencePage.ButtonLabel0=Ok 

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/CodeGenerator.java

@@ -19,6 +19,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.emf.codegen.jet.JETException;
@@ -34,6 +35,7 @@ import org.talend.core.language.ECodeLanguage;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.components.IComponentFileNaming;
 import org.talend.core.model.components.IComponentsFactory;
+import org.talend.core.model.metadata.types.JavaTypesManager;
 import org.talend.core.model.process.EConnectionType;
 import org.talend.core.model.process.ElementParameterParser;
 import org.talend.core.model.process.IConnection;
@@ -43,9 +45,11 @@ import org.talend.core.model.process.IContextParameter;
 import org.talend.core.model.process.IElementParameter;
 import org.talend.core.model.process.INode;
 import org.talend.core.model.process.IProcess;
+import org.talend.core.model.process.IProcess2;
 import org.talend.core.model.temp.ECodePart;
 import org.talend.core.model.temp.ETypeGen;
 import org.talend.core.model.utils.NodeUtil;
+import org.talend.core.service.IResourcesDependenciesService;
 import org.talend.core.ui.branding.IBrandingService;
 import org.talend.core.ui.component.ComponentsFactoryProvider;
 import org.talend.designer.codegen.config.CloseBlocksCodeArgument;
@@ -340,6 +344,29 @@ public class CodeGenerator implements ICodeGenerator {
                             }
                         }
                         listParametersCopy.add(icp);
+                    } else if ((JavaTypesManager.RESOURCE.getId().equals(iContextParameter.getType())
+                            || JavaTypesManager.RESOURCE.getLabel().equals(iContextParameter.getType()))
+                            && StringUtils.isNotBlank(iContextParameter.getValue())) {
+                        if (GlobalServiceRegister.getDefault().isServiceRegistered(IResourcesDependenciesService.class)) {
+                            IContextParameter contextPar = iContextParameter.clone();
+                            IResourcesDependenciesService resourceService = (IResourcesDependenciesService) GlobalServiceRegister
+                                    .getDefault().getService(IResourcesDependenciesService.class);
+                            String resourcePathForContext = null;
+                            if (process instanceof IProcess2) {
+                                resourcePathForContext = resourceService.getResourcePathForContext(process,
+                                        contextPar.getValue());
+                            } else {
+                                // for PreviewFileInputContentDataProcess run
+                                resourcePathForContext = resourceService.getResourceItemFilePath(contextPar.getValue());
+                            }
+                            if (resourcePathForContext != null) {
+                                contextPar.setValue(resourcePathForContext);
+                            }
+                            listParametersCopy.add(contextPar);
+                        } else {
+                            listParametersCopy.add(iContextParameter);
+                        }
+
                     } else {
                         listParametersCopy.add(iContextParameter);
                     }

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/components/model/ComponentsFactory.java

@@ -30,6 +30,11 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
 import java.util.Set;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Level;
@@ -139,66 +144,119 @@ public class ComponentsFactory implements IComponentsFactory {
     private static boolean cleanDone = false;
 
     protected static Map<String, Map<String, Set<IComponent>>> componentNameMap;
+    
+    private AtomicBoolean isInitialising;
+    
+    private volatile Lock initialiseLock;
 
     public ComponentsFactory() {
+        isInitialising = new AtomicBoolean(false);
+        initialiseLock = new ReentrantLock();
     }
 
     private void init(boolean duringLogon) {
-        removeOldComponentsUserFolder(); // not used anymore
-        long startTime = System.currentTimeMillis();
-
-        // TimeMeasure.display = true;
-        // TimeMeasure.displaySteps = true;
-        // TimeMeasure.measureActive = true;
-        // TimeMeasure.begin("initComponents");
-        componentList = Collections.synchronizedSet(new HashSet<IComponent>());
-        customComponentList = new HashSet<IComponent>();
-        skeletonList = new ArrayList<String>();
-        userComponentList = new HashSet<IComponent>();
-        String installLocation = new Path(Platform.getConfigurationLocation().getURL().getPath()).toFile().getAbsolutePath();
-        componentToProviderMap = new HashMap<IComponent, AbstractComponentsProvider>();
-        boolean isNeedClean = !cleanDone && TalendCacheUtils.isSetCleanComponentCache();
-        cleanDone = true; // only check this parameter one time, or it will reinitialize things all the time...
-        isCreated = hasComponentFile(installLocation) && !isNeedClean;
-        ComponentsCache cache = ComponentManager.getComponentCache();
-        try {
-            if (isCreated) {
-                // if cache is created and empty, means we never loaded it before.
-                // if it was already loaded, then no need to go again, since it's a static variable, it's still in
-                // memory.
-                // it avoids to reload from disk again even more for commandline at each logon, since it's no use.
-                if (cache.getComponentEntryMap().isEmpty()) {
-                    ComponentsCache loadCache = loadComponentResource(installLocation);
-                    cache.getComponentEntryMap().putAll(loadCache.getComponentEntryMap());
-                }
-            } else {
-                cache.getComponentEntryMap().clear();
-            }
-        } catch (IOException e) {
-            ExceptionHandler.process(e);
-            cache.getComponentEntryMap().clear();
-            isCreated = false;
+        if (wait4InitialiseFinish()) {
+            return;
         }
+        try {
+            try {
+                initialiseLock.lock();
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            isInitialising.set(true);
+            removeOldComponentsUserFolder(); // not used anymore
+            long startTime = System.currentTimeMillis();
 
-        loadComponentsFromComponentsProviderExtension();
+            // TimeMeasure.display = true;
+            // TimeMeasure.displaySteps = true;
+            // TimeMeasure.measureActive = true;
+            // TimeMeasure.begin("initComponents");
+            componentList = Collections.synchronizedSet(new HashSet<IComponent>());
+            customComponentList = new HashSet<IComponent>();
+            skeletonList = new ArrayList<String>();
+            userComponentList = new HashSet<IComponent>();
+            String installLocation = new Path(Platform.getConfigurationLocation().getURL().getPath()).toFile().getAbsolutePath();
+            componentToProviderMap = new HashMap<IComponent, AbstractComponentsProvider>();
+            boolean isNeedClean = !cleanDone && TalendCacheUtils.isSetCleanComponentCache();
+            cleanDone = true; // only check this parameter one time, or it will reinitialize things all the time...
+            isCreated = hasComponentFile(installLocation) && !isNeedClean;
+            ComponentsCache cache = ComponentManager.getComponentCache();
+            try {
+                if (isCreated) {
+                    // if cache is created and empty, means we never loaded it before.
+                    // if it was already loaded, then no need to go again, since it's a static variable, it's still in
+                    // memory.
+                    // it avoids to reload from disk again even more for commandline at each logon, since it's no use.
+                    if (cache.getComponentEntryMap().isEmpty()) {
+                        ComponentsCache loadCache = loadComponentResource(installLocation);
+                        cache.getComponentEntryMap().putAll(loadCache.getComponentEntryMap());
+                    }
+                } else {
+                    cache.getComponentEntryMap().clear();
+                }
+            } catch (IOException e) {
+                ExceptionHandler.process(e);
+                cache.getComponentEntryMap().clear();
+                isCreated = false;
+            }
 
-        // TimeMeasure.step("initComponents", "loadComponentsFromProvider");
-        // 2.Load Component from extension point: component_definition
-        loadComponentsFromExtensions();
-        // TimeMeasure.step("initComponents", "loadComponentsFromExtension[joblets?]");
+            loadComponentsFromComponentsProviderExtension();
 
-        ComponentManager.saveResource(); // will save only if needed.
+            // TimeMeasure.step("initComponents", "loadComponentsFromProvider");
+            // 2.Load Component from extension point: component_definition
+            loadComponentsFromExtensions();
+            // TimeMeasure.step("initComponents", "loadComponentsFromExtension[joblets?]");
 
-        // init component name map, used to pick specified component immediately
-        initComponentNameMap();
+            ComponentManager.saveResource(); // will save only if needed.
 
-        // TimeMeasure.step("initComponents", "createCache");
-        log.debug(componentList.size() + " components loaded in " + (System.currentTimeMillis() - startTime) + " ms"); //$NON-NLS-1$ //$NON-NLS-2$
+            // init component name map, used to pick specified component immediately
+            initComponentNameMap();
 
-        // TimeMeasure.end("initComponents");
-        // TimeMeasure.display = false;
-        // TimeMeasure.displaySteps = false;
-        // TimeMeasure.measureActive = false;
+            // TimeMeasure.step("initComponents", "createCache");
+            log.debug(componentList.size() + " components loaded in " + (System.currentTimeMillis() - startTime) + " ms"); //$NON-NLS-1$ //$NON-NLS-2$
+
+            // TimeMeasure.end("initComponents");
+            // TimeMeasure.display = false;
+            // TimeMeasure.displaySteps = false;
+            // TimeMeasure.measureActive = false;
+        } finally {
+            isInitialising.set(false);
+            initialiseLock.unlock();
+        }
+    }
+
+    private boolean wait4InitialiseFinish() {
+        if (isInitialising.get()) {
+            try {
+                // wait for 10 min (10 * 60 seconds) by default
+                long timeout = 600L;
+                String timeoutStr = System.getProperty("studio.componentsFactory.init.timeout"); //$NON-NLS-1$
+                if (!StringUtils.isBlank(timeoutStr)) {
+                    try {
+                        timeout = Long.valueOf(timeoutStr);
+                    } catch (Exception e) {
+                        ExceptionHandler.process(e);
+                    }
+                }
+                if (initialiseLock.tryLock(timeout, TimeUnit.SECONDS)) {
+                    initialiseLock.unlock();
+                } else {
+                    // may be track in dead lock, throw exception to try to break dead lock
+                    throw new RuntimeException(Messages.getString("ComponentsFactory.init.waitForFinish.timeout")); //$NON-NLS-1$
+                }
+                // initialise successfully or not
+                return !isInitialising.get();
+            } catch (RuntimeException e) {
+                throw e;
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            } catch (Exception e) {
+                ExceptionHandler.process(e);
+            }
+        }
+        // initialise failed, still need to initialise
+        return false;
     }
 
     protected void initComponentNameMap() {
@@ -729,7 +787,8 @@ public class ComponentsFactory implements IComponentsFactory {
     }
 
     @Override
-    public synchronized int size() {
+    public int size() {
+        wait4InitialiseFinish();
         if (componentList == null) {
             init(false);
         }
@@ -737,7 +796,8 @@ public class ComponentsFactory implements IComponentsFactory {
     }
 
     @Override
-    public synchronized IComponent get(String name) {
+    public IComponent get(String name) {
+        wait4InitialiseFinish();
         if (componentList == null) {
             init(false);
         }
@@ -757,7 +817,8 @@ public class ComponentsFactory implements IComponentsFactory {
      * @see org.talend.core.model.components.IComponentsFactory#get(java.lang.String, java.lang.String)
      */
     @Override
-    public synchronized IComponent get(String name, String paletteType) {
+    public IComponent get(String name, String paletteType) {
+        wait4InitialiseFinish();
         if (componentList == null) {
             init(false);
         }
@@ -772,6 +833,7 @@ public class ComponentsFactory implements IComponentsFactory {
 
     @Override
     public IComponent getJobletComponent(String name, String paletteType) {
+        wait4InitialiseFinish();
         if (componentList == null) {
             init(false);
         }
@@ -799,6 +861,7 @@ public class ComponentsFactory implements IComponentsFactory {
     @Override
     public void initializeComponents(IProgressMonitor monitor) {
         this.monitor = monitor;
+        wait4InitialiseFinish();
         if (componentList == null) {
             init(false);
         }
@@ -809,6 +872,7 @@ public class ComponentsFactory implements IComponentsFactory {
     @Override
     public void initializeComponents(IProgressMonitor monitor, boolean duringLogon) {
         this.monitor = monitor;
+        wait4InitialiseFinish();
         if (componentList == null) {
             init(duringLogon);
         }
@@ -822,12 +886,18 @@ public class ComponentsFactory implements IComponentsFactory {
      * @see org.talend.core.model.components.IComponentsFactory#getComponents()
      */
     @Override
-    public synchronized Set<IComponent> getComponents() {
+    public Set<IComponent> getComponents() {
+        wait4InitialiseFinish();
         if (componentList == null) {
             init(false);
         }
         return componentList;
     }
+    
+    @Override
+    public boolean isInitialising() {
+        return isInitialising.get();
+    }
 
     @Override
     public Collection<IComponent> readComponents() {
@@ -840,7 +910,8 @@ public class ComponentsFactory implements IComponentsFactory {
     }
 
     @Override
-    public synchronized Map<String, Map<String, Set<IComponent>>> getComponentNameMap() {
+    public Map<String, Map<String, Set<IComponent>>> getComponentNameMap() {
+        wait4InitialiseFinish();
         if (componentNameMap == null) {
             init(false);
         }
@@ -848,7 +919,8 @@ public class ComponentsFactory implements IComponentsFactory {
     }
 
     @Override
-    public synchronized List<IComponent> getCustomComponents() {
+    public List<IComponent> getCustomComponents() {
+        wait4InitialiseFinish();
         if (customComponentList == null) {
             init(false);
         }
@@ -862,6 +934,7 @@ public class ComponentsFactory implements IComponentsFactory {
      */
     @Override
     public List<String> getSkeletons() {
+        wait4InitialiseFinish();
         if (skeletonList == null) {
             init(false);
         }
@@ -900,6 +973,7 @@ public class ComponentsFactory implements IComponentsFactory {
                 jobletService.clearSparkStreamingJobletComponent();
             }
         }
+        isInitialising.set(false);
     }
 
     @Override

main/plugins/org.talend.designer.components.exchange/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange</artifactId>

main/plugins/org.talend.designer.components.libs/libs_src/simpleexcel/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.talend.libraries</groupId>
-  <artifactId>simpleexcel-1.2-20171120</artifactId>
+  <artifactId>simpleexcel-2.0-20180927</artifactId>
   <version>6.0.0</version>
   <packaging>jar</packaging>
 

main/plugins/org.talend.designer.components.libs/libs_src/simpleexcel/src/main/java/com/talend/excel/xssf/event/ExcelReader.java

@@ -56,6 +56,8 @@ public class ExcelReader implements Callable {
 
     DefaultTalendSheetContentsHandler sheetContentsHandler = null;
 
+    private boolean includePhoneticRuns;
+
     public ExcelReader() {
         cache = DataBufferCache.getInstance();
         futureTask = new FutureTask(this);
@@ -98,6 +100,14 @@ public class ExcelReader implements Callable {
         sheetContentsHandler.stop();
     }
 
+    public boolean isIncludePhoneticRuns() {
+        return includePhoneticRuns;
+    }
+
+    public void setIncludePhoneticRuns(boolean includePhoneticRuns) {
+        this.includePhoneticRuns = includePhoneticRuns;
+    }
+
     /**
      * handle the exception in task. FutureTask.get() is a block method waiting for the Task over and it can throw the
      * exception in Task(Callable,Thread,Runnable)
@@ -119,7 +129,7 @@ public class ExcelReader implements Callable {
             XSSFReader r = new XSSFReader(pkg);
 
             StylesTable styles = r.getStylesTable();
-            ReadOnlySharedStringsTable strings = new ReadOnlySharedStringsTable(pkg);
+            ReadOnlySharedStringsTable strings = new ReadOnlySharedStringsTable(pkg, includePhoneticRuns);
             sheetContentsHandler = new DefaultTalendSheetContentsHandler(cache);
             DataFormatter formatter = new DataFormatter();
             boolean formulasNotResults = false;
@@ -132,15 +142,15 @@ public class ExcelReader implements Callable {
             XSSFReader.SheetIterator sheets = (XSSFReader.SheetIterator) r.getSheetsData();
             // List<InputStream> iss = new ArrayList<InputStream>();
             LinkedHashMap<String, InputStream> issmap = new LinkedHashMap<String, InputStream>();
-            List<String> allSheetNames= new ArrayList<String>();
+            List<String> allSheetNames = new ArrayList<String>();
             int sheetPosition = 0;
             while (sheets.hasNext()) {
                 InputStream sheet = sheets.next();
                 String sheetName = sheets.getSheetName();
-                if(allSheetNames.contains(sheetName)){
+                if (allSheetNames.contains(sheetName)) {
                     sheet.close();
                     continue;
-                }else{
+                } else {
                     allSheetNames.add(sheetName);
                 }
                 boolean match = false;

main/plugins/org.talend.designer.components.libs/libs_src/talend-codegen-utils/pom.xml

@@ -7,7 +7,7 @@
 	<groupId>org.talend.libraries</groupId>
 	<artifactId>talend-codegen-utils</artifactId>
 	<!-- release for revert version of library -->
-	<version>0.25.2</version>
+	<version>0.25.3</version>
 	<packaging>jar</packaging>
 	
 	<properties>

main/plugins/org.talend.designer.components.libs/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.libs</artifactId>

main/plugins/org.talend.designer.components.localprovider/components/tAS400Close/tAS400Close_messages_de.properties

@@ -1,3 +1,2 @@
-HELP=org.talend.help.tAS400Close
 LONG_NAME=Beendet die ausgew\u00e4hlte AS400 Datenbankverbindung.
 CONNECTION.NAME=Komponenten Liste

main/plugins/org.talend.designer.components.localprovider/components/tAS400Close/tAS400Close_messages_el.properties

@@ -1,3 +1,2 @@
-HELP=org.talend.help.tAS400Close
 LONG_NAME=\u039A\u03BB\u03B5\u03AF\u03BD\u03B5\u03B9 \u03BC\u03B9\u03B1 \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03B7 \u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7 AS400.
 CONNECTION.NAME=\u039B\u03AF\u03C3\u03C4\u03B1 \u03A3\u03C5\u03C3\u03C4\u03B1\u03C4\u03B9\u03BA\u03CE\u03BD \u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03C9\u03BD

main/plugins/org.talend.designer.components.localprovider/components/tAS400Close/tAS400Close_messages_fr.properties

@@ -1,3 +1,2 @@
-HELP=org.talend.help.tAS400Close
 LONG_NAME=Ferme une connexion AS400 s\u00e9lectionn\u00e9e.
 CONNECTION.NAME=Liste des composants

main/plugins/org.talend.designer.components.localprovider/components/tAS400Close/tAS400Close_messages_ja.properties

@@ -1,3 +1,2 @@
-HELP=org.talend.help.tAS400Close
 LONG_NAME=\u9078\u629E\u3055\u308C\u305FAS400\u63A5\u7D9A\u3092\u9589\u3058\u308B
 CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8

main/plugins/org.talend.designer.components.localprovider/components/tAS400Close/tAS400Close_messages_zh_CN.properties

@@ -1,3 +1,2 @@
-HELP=org.talend.help.tAS400Close
 LONG_NAME=\u5173\u95ED\u9009\u5B9A\u7684 AS400 \u8FDE\u63A5\u3002
 CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

main/plugins/org.talend.designer.components.localprovider/components/tAS400Commit/tAS400Commit_messages_de.properties

@@ -1,4 +1,3 @@
 CLOSE.NAME=Verbindung schlie\u00dfen
-HELP=org.talend.help.tAS400Commit
 LONG_NAME=Schlie\u00dft alle Transaktionen die noch nicht \u00fcbertragen wurden f\u00fcr die ausgew\u00e4hlte AS400 Verbindung ab
 CONNECTION.NAME=Komponenten Liste

main/plugins/org.talend.designer.components.localprovider/components/tAS400Commit/tAS400Commit_messages_el.properties

@@ -1,4 +1,3 @@
 CLOSE.NAME=\u039A\u03BB\u03B5\u03AF\u03C3\u03B9\u03BC\u03BF \u03A3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7\u03C2
-HELP=org.talend.help.tAS400Commit
 LONG_NAME=\u039F\u03BB\u03BF\u03BA\u03BB\u03B7\u03C1\u03CE\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C3\u03C5\u03BD\u03B1\u03BB\u03BB\u03B1\u03B3\u03AD\u03C2 \u03C0\u03BF\u03C5 \u03B4\u03B5\u03BD \u03AD\u03C7\u03BF\u03C5\u03BD \u03BF\u03BB\u03BF\u03BA\u03BB\u03B7\u03C1\u03C9\u03B8\u03B5\u03AF \u03C3\u03C4\u03B7\u03BD \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03B7 \u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7 AS400
 CONNECTION.NAME=\u039B\u03AF\u03C3\u03C4\u03B1 \u03A3\u03C5\u03C3\u03C4\u03B1\u03C4\u03B9\u03BA\u03CE\u03BD \u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03C9\u03BD

main/plugins/org.talend.designer.components.localprovider/components/tAS400Commit/tAS400Commit_messages_fr.properties

@@ -1,4 +1,3 @@
 CLOSE.NAME=Fermer la connexion
-HELP=org.talend.help.tAS400Commit
 LONG_NAME=Commite toutes les transactions qui n'ont pas encore \u00e9t\u00e9 commit\u00e9es dans la connexion AS400 s\u00e9lectionn\u00e9e
 CONNECTION.NAME=Liste des composants