fix(TPS-3950): update release note

* Fix multivalue body mail part processing

PATCH_RELEASE_NOTE.md

@@ -0,0 +1,68 @@
+---
+version: 7.0.1
+module: https://talend.poolparty.biz/coretaxonomy/42
+product:
+- https://talend.poolparty.biz/coretaxonomy/23
+---
+
+# TPS-3950
+
+| Info             | Value |
+| ---------------- | ---------------- |
+| Patch Name       | Patch\_20200427\_TPS-3950\_v1-7.0.1 |
+| Release Date     | 2020-04-27 |
+| Target Version   | 20180411\_1414-V7.0.1 |
+| Product affected | Talend Studio |
+
+## Introduction
+
+This is a self-contained patch.
+
+**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
+
+## Fixed issues
+
+This patch contains the following fixes:
+
+- TPS-3950 [7.0.1.] tfileinputmail will not process inline image (TDI-42549) (TDI-42634)
+
+## Prerequisites
+
+Consider the following requirements for your system:
+
+- Talend Studio 7.0.1 must be installed.
+
+
+## Installation
+
+### Installing the patch using Software update
+
+1) Logon TAC and switch to Configuration->Software Update, then enter the correct values and save referring to the documentation: https://help.talend.com/reader/f7Em9WV_cPm2RRywucSN0Q/j9x5iXV~vyxMlUafnDejaQ
+
+2) Switch to Software update page, where the new patch will be listed. The patch can be downloaded from here into the nexus repository.
+
+3) On Studio Side: Logon Studio with remote mode, on the logon page the Update button is displayed: click this button to install the patch.
+
+### Installing the patch using Talend Studio
+
+1) Create a folder named "patches" under your studio installer directory and copy the patch .zip file to this folder.
+
+2) Restart your studio: a window pops up, then click OK to install the patch, or restart the commandline and the patch will be installed automatically.
+
+### Installing the patch using Commandline
+
+Execute the following commands:
+
+1. Talend-Studio-win-x86_64.exe -nosplash -application org.talend.commandline.CommandLine -consoleLog -data commandline-workspace startServer -p 8002 --talendDebug
+2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
+3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}
+
+## Uninstallation
+Backup the Affected files list below. Uninstall the patch by restore the backup files.
+
+## Affected files for this patch
+
+The following files are installed by this patch:
+
+- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.0.1.20180411\_1414/components/tFileInputMail/tFileInputMail\_begin.javajet
+- {Talend\_Studio\_path}/plugins/org.talend.designer.components.localprovider\_7.0.1.20180411\_1414/components/tFileInputMail/tFileInputMail\_MIME.javajet

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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.abstractmap.nl</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.codegen.nl</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.core.nl</artifactId>

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

@@ -35,7 +35,6 @@ EParameterName.Level.Log.File=Level
 ToggleSubjobsAction.LABEL=Toggle Subjobs
 EParameterName.schemaOptions=Schema Options
 EParameterName.Purpose=Purpose
-EParameterName.Purpose=Purpose
 MultiPageEditorContributor.Grid=&Grid
 EParameterName.tableLogs=Logs Table
 SqlMemoController.QueryError.infoMsg=This query can not contain context parameters(like $_context) ,\n or this query has not been enclosed by {0} . Please correct.
@@ -144,7 +143,6 @@ NewProcessWizard.failureText=Job could not be saved
 ContextParameterPage.shouldPrompt=Prompt for value
 ContextParameterPage.prompt=Prompt
 EParameterName.Name=Name
-EParameterName.Name=Name
 EParameterName.onDatabaseFlag=On Databases
 ChangeMetadataCommand.messageDialog.propagate=Propagate
 ContextParameterPage.name=Name
@@ -226,7 +224,6 @@ TalendEditorContextMenuProvider.Trigger=Trigger
 ConnectionDeleteCommand.Label=Delete Connection
 Process.errorLoadingConnectionMessage=Some errors appear after the migration in the following connections, please check them: 
 EParameterName.Author=Author
-EParameterName.Author=Author
 EParameterName.componentName=Component Name
 SubjobBasicComposite.DialogTitle=Subjob Setting
 DesignerPreferencePage.SubjobColorLabel=Subjob Color
@@ -243,7 +240,6 @@ EParameterName.ConnectionFormat=Connection format
 ExecuteSystemCommandCommand.Title=Executed command 
 ChangeActivateStatusSubjobCommand.Label.DeactiveComplete=Deactivate all linked Subjobs
 EParameterName.Description=Description
-EParameterName.Description=Description
 Process.IfToUpgradeMetadata=The metadata used in the following component(s) has been modified.\nSelect the component(s) that you want to update from the repository.
 NewProcessWizard.title=New Job
 CheckController.decoration.description=Value taken from the repository
@@ -304,7 +300,6 @@ NoRepositoryDialog.Title=Error
 StatsAndLogsComposite.ReloadMessages=Current setting will be overwritten, do you want to continue?
 EParameterName.propertyType=Property Type
 EParameterName.Status=Status
-EParameterName.Status=Status
 EParameterName.Log.Db=Log to Database
 NodesPasteAction.paste=Paste
 TalendEditorPaletteFactory.Tools=Tools

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

@@ -35,7 +35,6 @@ EParameterName.Level.Log.File=Niveau
 ToggleSubjobsAction.LABEL=Supprimer le surlignage des sous-jobs
 EParameterName.schemaOptions=Options du sch<63>ma
 EParameterName.Purpose=Objectif
-EParameterName.Purpose=Objectif
 MultiPageEditorContributor.Grid=&Grille
 EParameterName.tableLogs=Table de logs
 SqlMemoController.QueryError.infoMsg=Cette requ<71>te ne peut contenir des param<61>tres de contexte (comme $_context) ,\n ou cette requ<71>te n'a pas <20>t<EFBFBD> entour<75>e de {0}. Merci de corriger.
@@ -142,7 +141,6 @@ NewProcessWizard.failureText=Le Job n'a pas pu
 ContextParameterPage.shouldPrompt=Invite pour une valeur
 ContextParameterPage.prompt=Invite
 EParameterName.Name=Nom
-EParameterName.Name=Nom
 EParameterName.onDatabaseFlag=Dans la base de donn<6E>es
 ChangeMetadataCommand.messageDialog.propagate=Propager
 ContextParameterPage.name=Nom
@@ -224,7 +222,6 @@ TalendEditorContextMenuProvider.Trigger=Trigger
 ConnectionDeleteCommand.Label=Supprimer une connexion
 Process.errorLoadingConnectionMessage=Des erreurs sont apparues apr<70>s la migration des connexions suivantes, merci de les v<>rifier \:
 EParameterName.Author=Cr<EFBFBD><EFBFBD> par :
-EParameterName.Author=Cr<EFBFBD><EFBFBD> par :
 EParameterName.componentName=Nom du composant
 SubjobBasicComposite.DialogTitle=Param<EFBFBD>tre du sous-job
 DesignerPreferencePage.SubjobColorLabel=Couleur d'un sous-job
@@ -241,7 +238,6 @@ EParameterName.ConnectionFormat=Format de connexion
 ExecuteSystemCommandCommand.Title=Commande ex<65>cut<75>e
 ChangeActivateStatusSubjobCommand.Label.DeactiveComplete=D<EFBFBD>sactiver les Sous-job li<6C>s
 EParameterName.Description=Description
-EParameterName.Description=Description
 Process.IfToUpgradeMetadata=La m<>tadonn<6E>e utilis<69>e dans le(s) composant(s) suivant(s) a <20>t<EFBFBD> modifi<66>e.\nS<6E>lectionnez le(s) composant(s) que vous voulez mettre <20> jour <20> partir du R<>f<EFBFBD>rentiel.
 NewProcessWizard.title=Nouveau Job
 CheckController.decoration.description=Valeur prise du r<>f<EFBFBD>rentiel
@@ -302,7 +298,6 @@ NoRepositoryDialog.Title=ERROR
 StatsAndLogsComposite.ReloadMessages=Les param<61>tres actuels seront <20>cras<61>s. Voulez-vous continuer ?
 EParameterName.propertyType=Type de propri<72>t<EFBFBD>
 EParameterName.Status=Statut
-EParameterName.Status=Statut
 EParameterName.Log.Db=Logger dans une base de donn<6E>es
 NodesPasteAction.paste=Coller
 TalendEditorPaletteFactory.Tools=Outils

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

@@ -35,7 +35,6 @@ EParameterName.Level.Log.File=\u30EC\u30D9\u30EB
 ToggleSubjobsAction.LABEL=\u30B5\u30D6\u30B8\u30E7\u30D6\u306E\u5207\u308A\u66FF\u3048
 EParameterName.schemaOptions=\u30B9\u30AD\u30FC\u30DE\u30AA\u30D7\u30B7\u30E7\u30F3
 EParameterName.Purpose=\u76EE\u7684
-EParameterName.Purpose=\u76EE\u7684
 MultiPageEditorContributor.Grid=\u30B0\u30EA\u30C3\u30C9 (&G)
 EParameterName.tableLogs=\u30E6\u30FC\u30B6\u30FC\u30ED\u30B0\u30C6\u30FC\u30D6\u30EB
 SqlMemoController.QueryError.infoMsg=\u3053\u306E\u30AF\u30A8\u30EA\u30FC\u306B\u306F\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC \uFF08$_context\u7B49\uFF09\u3092\u542B\u3080\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3001\n \u307E\u305F\u306F\u3001\u3053\u306E\u30AF\u30A8\u30EA\u306F {0} \u3067\u56F2\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u4FEE\u6B63\u3057\u3066\u304F\u3060\u3055\u3044\u3002
@@ -144,7 +143,6 @@ NewProcessWizard.failureText=\u30B8\u30E7\u30D6\u306F\u4FDD\u5B58\u3067\u304D\u3
 ContextParameterPage.shouldPrompt=\u30D7\u30ED\u30F3\u30D7\u30C8\u306E\u5024
 ContextParameterPage.prompt=\u30D7\u30ED\u30F3\u30D7\u30C8
 EParameterName.Name=\u540D\u524D
-EParameterName.Name=\u540D\u524D
 EParameterName.onDatabaseFlag=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3078\u51FA\u529B
 ChangeMetadataCommand.messageDialog.propagate=\u53CD\u6620
 ContextParameterPage.name=\u540D\u524D
@@ -226,7 +224,6 @@ TalendEditorContextMenuProvider.Trigger=\u30C8\u30EA\u30AC\u30FC
 ConnectionDeleteCommand.Label=\u63A5\u7D9A\u306E\u524A\u9664
 Process.errorLoadingConnectionMessage=\u4EE5\u4E0B\u306E\u63A5\u7D9A\u306B\u79FB\u884C\u5F8C\u3001\u3044\u304F\u3064\u304B\u306E\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3002\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044:\u3000
 EParameterName.Author=\u4F5C\u6210\u8005
-EParameterName.Author=\u4F5C\u6210\u8005
 EParameterName.componentName=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u540D
 SubjobBasicComposite.DialogTitle=\u30B5\u30D6\u30B8\u30E7\u30D6\u306E\u8A2D\u5B9A
 DesignerPreferencePage.SubjobColorLabel=\u30B5\u30D6\u30B8\u30E7\u30D6\u306E\u8272
@@ -243,7 +240,6 @@ 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
-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
 NewProcessWizard.title=\u65B0\u898F\u30B8\u30E7\u30D6
 CheckController.decoration.description=\u30EA\u30DD\u30B8\u30C8\u30EA\u304B\u3089\u53D6\u5F97\u3057\u305F\u5024
@@ -304,7 +300,6 @@ NoRepositoryDialog.Title=\u30A8\u30E9\u30FC
 StatsAndLogsComposite.ReloadMessages=\u73FE\u5728\u306E\u8A2D\u5B9A\u306F\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3001\u7D9A\u3051\u307E\u3059\u304B\uFF1F
 EParameterName.propertyType=Property Type (\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7)
 EParameterName.Status=\u30B9\u30C6\u30FC\u30BF\u30B9
-EParameterName.Status=\u30B9\u30C6\u30FC\u30BF\u30B9
 EParameterName.Log.Db=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30ED\u30B0\u3092\u51FA\u529B
 NodesPasteAction.paste=\u8CBC\u4ED8\u3051
 TalendEditorPaletteFactory.Tools=\u30C4\u30FC\u30EB

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

@@ -33,7 +33,6 @@ ActivateSubjobAction.DeactivateComplete=\u505C\u7528\u6240\u6709\u8FDE\u63A5\u76
 EParameterName.Level.Log.File=\u7EA7\u522B
 EParameterName.schemaOptions=Schema\u9009\u9879
 EParameterName.Purpose=\u76ee\u7684
-EParameterName.Purpose=\u76ee\u7684
 MultiPageEditorContributor.Grid=\u7f51\u683c(&G)
 EParameterName.tableLogs=\u65e5\u5fd7\u8868
 SqlMemoController.QueryError.infoMsg=\u67e5\u8be2\u8bed\u53e5\u4e0d\u80fd\u5305\u542b\u4e0a\u4e0b\u6587\u53c2\u6570\uff08\u50cf\uff1a $_context\uff09\uff0c\u6216\u8005\u67e5\u8be2\u8bed\u53e5\u6ca1\u6709\u62ec\u5728 {0} \u5b57\u7b26\u5185\u3002\u8bf7\u6539\u6b63\uff01
@@ -133,7 +132,6 @@ NewProcessWizard.failureText=\u4f5c\u4e1a\u4e0d\u80fd\u4fdd\u5b58
 ContextParameterPage.shouldPrompt=\u63d0\u793a\u503c
 ContextParameterPage.prompt=\u63d0\u793a
 EParameterName.Name=\u540d\u5b57
-EParameterName.Name=\u540d\u5b57
 EParameterName.onDatabaseFlag=\u8f93\u51fa\u5230\u6570\u636e\u5e93
 ChangeMetadataCommand.messageDialog.propagate=\u4f20\u64ad
 ContextParameterPage.name=\u540d\u5b57
@@ -211,7 +209,6 @@ TalendEditorContextMenuProvider.Trigger=\u89e6\u53d1\u5668
 ConnectionDeleteCommand.Label=\u5220\u9664\u8fde\u63a5
 Process.errorLoadingConnectionMessage=\u5728\u540e\u9762\u7684\u8fde\u63a5\u4e2d\u79fb\u52a8\u51fa\u73b0\u9519\u8bef\uff0c\u8bf7\u68c0\u67e5\uff1a
 EParameterName.Author=\u4f5c\u8005
-EParameterName.Author=\u4f5c\u8005
 EParameterName.componentName=\u7ec4\u4ef6\u540d
 SubjobBasicComposite.DialogTitle=\u5B50\u4F5C\u4E1A\u8BBE\u7F6E
 DesignerPreferencePage.SubjobColorLabel=\u5B50\u4F5C\u4E1A\u989C\u8272
@@ -228,7 +225,6 @@ 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
-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
 NewProcessWizard.title=\u65b0\u4f5c\u4e1a
 CheckController.decoration.description=\u4ece\u50a8\u5b58\u5e93\u4e2d\u83b7\u53d6\u7684\u503c
@@ -287,7 +283,6 @@ NoRepositoryDialog.Title=\u9519\u8BEF
 StatsAndLogsComposite.ReloadMessages=\u5F53\u524D\u8BBE\u7F6E\u5C06\u88AB\u8986\u76D6\uFF0C\u4ECD\u8981\u7EE7\u7EED\u5417\uFF1F
 EParameterName.propertyType=\u5c5e\u6027\u7c7b\u578b
 EParameterName.Status=\u72B6\u6001
-EParameterName.Status=\u72B6\u6001
 EParameterName.Log.Db=\u6570\u636e\u5e93\u8bb0\u5f55\u65e5\u5fd7
 NodesPasteAction.paste=\u7c98\u8d34
 TalendEditorPaletteFactory.Tools=\u5de5\u5177
@@ -421,6 +416,7 @@ PropertyTypeController.saveToMetadata=\u5C06\u5C5E\u6027\u4FDD\u5B58\u5230\u5143
 QueryTypeController.alert=\u8B66\u6212
 QueryTypeController.nothingToGuess=\u6CA1\u6709\u8981\u8BA1\u7B97\u7684\u3002
 ReloadFromProjectSettingsMessages=\u5F53\u524D\u8BBE\u7F6E\u5C06\u88AB\u8986\u76D6\uFF0C\u4ECD\u8981\u7EE7\u7EED\u5417\uFF1F
+SQLPatternComposite.add=\u6DFB\u52A0
 SQLPatternComposite.delete=\u5220\u9664
 SQLPatternComposite.down=\u5411\u4E0B
 SQLPatternComposite.forbidModification=\u7981\u6B62\u4FEE\u6539\u7CFB\u7EDFsql\u6A21\u677F\uFF0C\u60A8\u60F3\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u5417\uFF1F

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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.dbmap.nl</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.documentation.nl</artifactId>

i18n/plugins/org.talend.designer.documentation.nl/src/org/talend/designer/documentation/i18/messages_en.properties

@@ -1,6 +1,5 @@
 HTMLDocGenerator_Precision=Precision
 HTMLDocGenerator_Author=Author
-HTMLDocGenerator_Author=Author
 HTMLDocGenerator_Column=Column
 HTMLDocGenerator_Comment=Comment
 HTMLDocGenerator_Component=Component

i18n/plugins/org.talend.designer.documentation.nl/src/org/talend/designer/documentation/i18/messages_fr.properties

@@ -1,6 +1,5 @@
 HTMLDocGenerator_Precision=Precision
 HTMLDocGenerator_Author=Auteur
-HTMLDocGenerator_Author=Auteur
 HTMLDocGenerator_Column=Colonne
 HTMLDocGenerator_Comment=Commentaire
 HTMLDocGenerator_Component=Composant

i18n/plugins/org.talend.designer.documentation.nl/src/org/talend/designer/documentation/i18/messages_ja.properties

@@ -1,6 +1,5 @@
 HTMLDocGenerator_Precision=\u7CBE\u5EA6
 HTMLDocGenerator_Author=\u4F5C\u6210\u8005
-HTMLDocGenerator_Author=\u4F5C\u6210\u8005
 HTMLDocGenerator_Column=\u30AB\u30E9\u30E0
 HTMLDocGenerator_Comment=\u30B3\u30E1\u30F3\u30C8
 HTMLDocGenerator_Component=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8

i18n/plugins/org.talend.designer.documentation.nl/src/org/talend/designer/documentation/i18/messages_zh_CN.properties

@@ -1,6 +1,5 @@
 HTMLDocGenerator_Precision=\u7CBE\u5EA6
 HTMLDocGenerator_Author=\u4F5C\u8005
-HTMLDocGenerator_Author=\u4F5C\u8005
 HTMLDocGenerator_Column=\u5217
 HTMLDocGenerator_Comment=\u5217\u6CE8\u91CA
 HTMLDocGenerator_Component=\u7EC4\u4EF6

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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.fileoutputxml.nl</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.mapper.nl</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.job.nl</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.rowgenerator.nl</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.runprocess.nl</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.xmlmap.nl</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.expressionbuilder.nl</artifactId>

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

@@ -1,4 +1,5 @@
 ExpressionComposite.expression=\u8868\u8FBE\u5F0F
+TestComposite.add=\u589E\u52A0
 ExpressionFileOperation.value=\u53C2\u6570\u503C
 ExpressionFileOperation.content=\u5185\u5BB9
 ExpressionFileOperation.nullable=\u662F\u5426\u4E3A\u7A7A

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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.json.nl</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.nl</artifactId>

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

@@ -176,7 +176,6 @@ connections.form.malformedField.username=The username must be a valid email.
 ImportProjectAsWizardPage.error.zip=Wrong archive file
 FileStep2.fieldSeparatorNotFinishByComma=The Field Separator doesn't finish by comma
 JobScriptsExportWizardPage.ExportJob=Export job to an archive file on the local file system.
-JobScriptsExportWizardPage.ExportJob=Export job to an archive file on the local file system.
 ImportDemoProjectPage.message=Select one of the available demo projects.
 DatabaseTableForm.nameAlert=A schema has an empty name. It has to be specified
 CreateFileDelimitedAction.action.openTitle=Open file delimited
@@ -551,7 +550,6 @@ AddListDialog.CHECKSIZE=Please check the size of the array\!
 AddListDialog.Error=Error
 AddListDialog.INPUTINDEX=please set index of current array
 WebServiceUI.Add_list_element=Add list element
-WebServiceUI.Add_list_element=Add list element
 WebServiceUI.COLUMN=Column
 WebServiceUI.Denormalize=Denormalize
 WebServiceUI.ELEMENT=Element

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

@@ -176,7 +176,6 @@ connections.form.malformedField.username=L'e-mail de connexion doit
 ImportProjectAsWizardPage.error.zip=Mauvais fichier archive
 FileStep2.fieldSeparatorNotFinishByComma=Le s<>parateur de champ ne finit par par une virgule
 JobScriptsExportWizardPage.ExportJob=Exporter les Jobs vers une archive sur le syst<73>me de fichier local.
-JobScriptsExportWizardPage.ExportJob=Exporter les Jobs vers une archive sur le syst<73>me de fichier local.
 ImportDemoProjectPage.message=S<EFBFBD>lectionnez un des projets D<>mo disponibles.
 DatabaseTableForm.nameAlert=Un sch<63>ma contient un nom vide. Il doit <20>tre sp<73>cifi<66>.
 CreateFileDelimitedAction.action.openTitle=Ouvrir un fichier d<>limit<69>
@@ -550,7 +549,6 @@ AddListDialog.CHECKSIZE=Veuillez v
 AddListDialog.Error=ERROR
 AddListDialog.INPUTINDEX=Veuillez d<>finir l'index de la collection courante.
 WebServiceUI.Add_list_element=Ajouter un <20>l<EFBFBD>ment <20> la liste
-WebServiceUI.Add_list_element=Ajouter un <20>l<EFBFBD>ment <20> la liste
 WebServiceUI.COLUMN=Colonne
 WebServiceUI.Denormalize=D<EFBFBD>normaliser
 WebServiceUI.ELEMENT=El<EFBFBD>ment

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

@@ -176,7 +176,6 @@ connections.form.malformedField.username=\u30E6\u30FC\u30B6\u30FC\u540D\u306F\u6
 ImportProjectAsWizardPage.error.zip=\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
 FileStep2.fieldSeparatorNotFinishByComma=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u8A18\u53F7\u306F\u30AB\u30F3\u30DE\u3067\u7D42\u4E86\u3057\u3066\u306F\u3044\u3051\u307E\u305B\u3093\u3002
 JobScriptsExportWizardPage.ExportJob=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u306B\u30B8\u30E7\u30D6\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
-JobScriptsExportWizardPage.ExportJob=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u306B\u30B8\u30E7\u30D6\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ImportDemoProjectPage.message=\u30C7\u30E2\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u3072\u3068\u3064\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044
 DatabaseTableForm.nameAlert=\u30B9\u30AD\u30FC\u30DE\u540D\u304C\u7A7A\u3067\u3059\u3002\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 CreateFileDelimitedAction.action.openTitle=\u533A\u5207\u308A\u8A18\u53F7\u4ED8\u304D\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F
@@ -551,7 +550,6 @@ AddListDialog.CHECKSIZE=\u914D\u5217\u306E\u30B5\u30A4\u30BA\u3092\u78BA\u8A8D\u
 AddListDialog.Error=\u30A8\u30E9\u30FC
 AddListDialog.INPUTINDEX=\u73FE\u5728\u306E\u914D\u5217\u306B\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 WebServiceUI.Add_list_element=\u30EA\u30B9\u30C8\u8981\u7D20\u306E\u8FFD\u52A0
-WebServiceUI.Add_list_element=\u30EA\u30B9\u30C8\u8981\u7D20\u306E\u8FFD\u52A0
 WebServiceUI.COLUMN=\u30AB\u30E9\u30E0
 WebServiceUI.Denormalize=\u975E\u6B63\u898F\u5316
 WebServiceUI.ELEMENT=\u30E2\u30B8\u30E5\u30FC\u30EB

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

@@ -170,7 +170,6 @@ connections.form.malformedField.username=E-mail \u5fc5\u987b\u4e3a\u53ef\u7528\u
 ImportProjectAsWizardPage.error.zip=\u9519\u8bef\u7684\u5b58\u6863\u6587\u4ef6
 FileStep2.fieldSeparatorNotFinishByComma=\u5b57\u6bb5\u5206\u9694\u7b26\u4e0d\u662f\u4ee5\u9017\u53f7\u7ed3\u675f
 JobScriptsExportWizardPage.ExportJob=\u5bfc\u51fa\u4f5c\u4e1a\u811a\u672c\u5230\u4e00\u4e2a\u672c\u5730\u6587\u4ef6\u7cfb\u7edf\u7684\u538b\u7f29\u6587\u4ef6\u4e2d\u3002
-JobScriptsExportWizardPage.ExportJob=\u5bfc\u51fa\u4f5c\u4e1a\u811a\u672c\u5230\u4e00\u4e2a\u672c\u5730\u6587\u4ef6\u7cfb\u7edf\u7684\u538b\u7f29\u6587\u4ef6\u4e2d\u3002
 ImportDemoProjectPage.message=\u9009\u62e9\u4e00\u4e2a\u6709\u6548\u7684\u793a\u4f8b\u5de5\u7a0b.
 DatabaseTableForm.nameAlert=Schema \u540d\u4e0d\u80fd\u4e3a\u7a7a\uff0c\u987b\u88ab\u6307\u5b9a
 CreateFileDelimitedAction.action.openTitle=\u6253\u5f00\u6587\u4ef6\u5206\u9694\u7b26
@@ -487,6 +486,7 @@ ContextExportDialog_StringAttachmentNotSupported=\\u662F\u4E00\u4E2A\u6587\u4EF6
 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
 AbstractCreateTableAction.retrieveForbidden=\u68C0\u7D22\u88AB\u7981\u6B62
+AbstractCreateTableAction.retrieveForbidden.Message=\u8BE5\u6570\u636E\u5E93\u4E2D\u6CA1\u6709\u8868\u683C
 SelectDatabaseJarDialog.add=\u589E\u52A0
 SelectDatabaseJarDialog.delete=\u5220\u9664
 SelectDatabaseJarDialog.warningTitle=\u8B66\u544A
@@ -497,7 +497,6 @@ AddListDialog.CHECKSIZE=\u8BF7\u68C0\u67E5\u6570\u7EC4\u7684\u5927\u5C0F\uFF01
 AddListDialog.CHECKSIZE=\u8BF7\u68C0\u67E5\u6570\u7EC4\u7684\u5927\u5C0F\uFF01
 AddListDialog.Error=\u9519\u8BEF
 AddListDialog.INPUTINDEX=\u8BF7\u8BBE\u7F6E\u5F53\u524D\u6570\u7EC4\u7684\u7D22\u5F15
-WebServiceUI.Add_list_element=\u6DFB\u52A0\u5217\u8868\u5143\u7D20
 WebServiceUI.Add_list_element=\u6DFB\u52A0\u5217\u8868\u5143\u7D20
 WebServiceUI.COLUMN=\u5217
 WebServiceUI.Denormalize=\u975E\u89C4\u8303\u5316

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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sbi.engines.client.nl</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sqlbuilder.nl</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.feature</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.spagic.feature</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.components.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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.codegen</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange</artifactId>

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.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.libs</artifactId>

main/plugins/org.talend.designer.components.localprovider/components/tFileInputMail/tFileInputMail_MIME.javajet

@@ -66,25 +66,28 @@
 			}
 		}
 		DecodeString_<%=cid%> decode_<%=cid%> = new DecodeString_<%=cid%>();
+
 		try{
 			fileInput<%=cid%> = new java.io.FileInputStream(<%=filename %>);
 			javax.mail.Session session_<%=cid %> = javax.mail.Session.getInstance(System.getProperties(), null);
-		    javax.mail.internet.MimeMessage msg_<%=cid %> = new javax.mail.internet.MimeMessage(session_<%=cid %>, fileInput<%=cid%>);
+			javax.mail.internet.MimeMessage msg_<%=cid %> = new javax.mail.internet.MimeMessage(session_<%=cid %>, fileInput<%=cid%>);
 			java.util.List<String> list_<%=cid %> = new java.util.ArrayList<String>();
-		
-			for (int i_<%=cid %> =0;i_<%=cid %> < mailParts_<%=cid %>.length;i_<%=cid %>++) {				
-			String part_<%=cid %> = mailParts_<%=cid %>[i_<%=cid %>];
-	       	String sep_<%=cid%>= mailSeparator_<%=cid %>[i_<%=cid %>];
-		        if(part_<%=cid %>.equalsIgnoreCase("body")) {        
+
+			for (int i_<%=cid %> = 0; i_<%=cid %> < mailParts_<%=cid %>.length; i_<%=cid %>++) {
+				String part_<%=cid %> = mailParts_<%=cid %>[i_<%=cid %>];
+				String sep_<%=cid%>= mailSeparator_<%=cid %>[i_<%=cid %>];
+				if(part_<%=cid %>.equalsIgnoreCase("body")) {
+					boolean multiValueBody_<%=cid%> = ("true").equals(mailChecked_<%=cid %>[i_<%=cid%>]);
 					if(msg_<%=cid %>.isMimeType("multipart/*")) {
 						javax.mail.Multipart mp<%=cid%> = (javax.mail.Multipart) msg_<%=cid %>.getContent();
-	             		for (int i = 0; i < mp<%=cid%>.getCount(); i++) {
-	                 		javax.mail.BodyPart mpart<%=cid%> = mp<%=cid%>.getBodyPart(i);
-	                 		String disposition<%=cid%> = mpart<%=cid%>.getDisposition();
-	                 		if (!((disposition<%=cid%> != null) && ((disposition<%=cid%>
-	                            .equals(javax.mail.Part.ATTACHMENT)) || (disposition<%=cid%>.equals(javax.mail.Part.INLINE))))) {   
-	                    		// the following extract the body part(text/plain + text/html)
-	                    		try{
+						StringBuilder body_<%=cid %> = new StringBuilder();
+						for (int i = 0; i < mp<%=cid%>.getCount(); i++) {
+							javax.mail.BodyPart mpart<%=cid%> = mp<%=cid%>.getBodyPart(i);
+							String disposition<%=cid%> = mpart<%=cid%>.getDisposition();
+							if (!((disposition<%=cid%> != null) && ((disposition<%=cid%>
+								.equals(javax.mail.Part.ATTACHMENT)) || (disposition<%=cid%>.equals(javax.mail.Part.INLINE))))) {
+								// the following extract the body part(text/plain + text/html)
+								try{
 									Object content_<%=cid %> = mpart<%=cid %>.getContent();
 									if (content_<%=cid %> instanceof javax.mail.internet.MimeMultipart) {
 										javax.mail.internet.MimeMultipart mimeMultipart_<%=cid %> = (javax.mail.internet.MimeMultipart) content_<%=cid %>;
@@ -99,130 +102,152 @@
 												for(int j_<%=cid %>_body = 0; j_<%=cid %>_body < mimeMultipart_<%=cid %>_body.getCount(); j_<%=cid %>_body++){
 													javax.mail.BodyPart bodyPart_<%=cid %>_body = mimeMultipart_<%=cid %>_body.getBodyPart(j_<%=cid %>_body);
 													if (bodyPart_<%=cid %>_body.isMimeType("text/*")) {
-														list_<%=cid %>.add(bodyPart_<%=cid %>_body.getContent().toString());
+														if(multiValueBody_<%=cid%>) {
+															body_<%=cid %>.append(bodyPart_<%=cid %>_body.getContent().toString()).append(sep_<%=cid%>);
+														} else {
+															list_<%=cid %>.add(bodyPart_<%=cid %>_body.getContent().toString());
+														}
 													} else {
 														System.out.println("Ignore the part " + bodyPart_<%=cid %>_body.getContentType());
 													}
 												}
 											}else{
 												if (bodyPart_<%=cid %>.isMimeType("text/*")) {
-													list_<%=cid %>.add(bodyPart_<%=cid %>.getContent().toString());
+													if(multiValueBody_<%=cid%>) {
+														body_<%=cid %>.append(bodyPart_<%=cid %>.getContent().toString()).append(sep_<%=cid%>);
+													} else {
+														list_<%=cid %>.add(bodyPart_<%=cid %>.getContent().toString());
+													}
 												} else {
 													System.out.println("Ignore the part " + bodyPart_<%=cid %>.getContentType());
 												}
 											}
 										}
 									} else {    
-										list_<%=cid %>.add(mpart<%=cid%>.getContent().toString());
+										if(multiValueBody_<%=cid%>) {
+											body_<%=cid %>.append(mpart<%=cid%>.getContent().toString()).append(sep_<%=cid%>);
+										} else {
+											list_<%=cid %>.add(mpart<%=cid%>.getContent().toString());
+										}
 									}    
 								}catch (java.io.UnsupportedEncodingException e){
 									java.io.ByteArrayOutputStream bao_<%=cid%> = new java.io.ByteArrayOutputStream();
 									mpart<%=cid %>.writeTo(bao_<%=cid%>);
-									list_<%=cid %>.add(bao_<%=cid%>.toString());
+									if(multiValueBody_<%=cid%>) {
+										body_<%=cid %>.append(bao_<%=cid%>.toString()).append(sep_<%=cid%>);
+									} else {
+										list_<%=cid %>.add(bao_<%=cid%>.toString());
+									}
 									<%if(isLog4jEnabled){%>
 										log.warn("<%=cid%> - " + bao_<%=cid%>.toString());
 									<%}%>
 								}
 								<%
-				 				//both attachment and message context in the email,bug TDI-19065
+								//both attachment and message context in the email,bug TDI-19065
 								%>
 							}else if(disposition<%=cid%> != null && disposition<%=cid%>.equals(javax.mail.Part.INLINE)){
-								list_<%=cid %>.add(mpart<%=cid%>.getContent().toString());
-					 		}
+								if(multiValueBody_<%=cid%>) {
+									body_<%=cid %>.append(mpart<%=cid%>.getContent().toString()).append(sep_<%=cid%>);
+								} else {
+									list_<%=cid %>.add(mpart<%=cid%>.getContent().toString());
+								}
+							}
+						}
+						if(multiValueBody_<%=cid%>) {
+							list_<%=cid %>.add(body_<%=cid %>.toString());
 						}
 					} else {
 						java.io.InputStream in_<%=cid %> = msg_<%=cid %>.getInputStream();
-	     		    	byte[] buffer_<%=cid %> = new byte[1024];
-		     		    int length_<%=cid %> = 0;
-		     		    java.io.ByteArrayOutputStream baos_<%=cid %> =  new java.io.ByteArrayOutputStream();
-		     		    while ((length_<%=cid %> = in_<%=cid %>.read(buffer_<%=cid %>, 0, 1024)) != -1) {
-		     		        baos_<%=cid %>.write(buffer_<%=cid %>, 0, length_<%=cid %>);
-		     		    }
-		     		    String contentType_<%=cid%> = msg_<%=cid%>.getContentType();
-		     		    String charsetName_<%=cid%> = "";
-		     		    if(contentType_<%=cid%>!=null && contentType_<%=cid%>.trim().length()>0){
-		     		    	javax.mail.internet.ContentType cy_<%=cid%>  = new javax.mail.internet.ContentType(contentType_<%=cid%>);
-		     		    	charsetName_<%=cid%> = cy_<%=cid%>.getParameter("charset");
-		     		    }
-		     		    if(charsetName_<%=cid%>!=null && charsetName_<%=cid%>.length()>0){
-		     		    	list_<%=cid %>.add(baos_<%=cid %>.toString(charsetName_<%=cid%>));
-		     		    }else{
-		     		    	list_<%=cid %>.add(baos_<%=cid %>.toString());
-		     		    }
-		     		    in_<%=cid %>.close();
-		     		    baos_<%=cid %>.close();
+						byte[] buffer_<%=cid %> = new byte[1024];
+						int length_<%=cid %> = 0;
+						java.io.ByteArrayOutputStream baos_<%=cid %> =  new java.io.ByteArrayOutputStream();
+						while ((length_<%=cid %> = in_<%=cid %>.read(buffer_<%=cid %>, 0, 1024)) != -1) {
+							baos_<%=cid %>.write(buffer_<%=cid %>, 0, length_<%=cid %>);
+						}
+						String contentType_<%=cid%> = msg_<%=cid%>.getContentType();
+						String charsetName_<%=cid%> = "";
+						if(contentType_<%=cid%>!=null && contentType_<%=cid%>.trim().length()>0){
+							javax.mail.internet.ContentType cy_<%=cid%>  = new javax.mail.internet.ContentType(contentType_<%=cid%>);
+							charsetName_<%=cid%> = cy_<%=cid%>.getParameter("charset");
+						}
+						if(charsetName_<%=cid%>!=null && charsetName_<%=cid%>.length()>0){
+							list_<%=cid %>.add(baos_<%=cid %>.toString(charsetName_<%=cid%>));
+						}else{
+							list_<%=cid %>.add(baos_<%=cid %>.toString());
+						}
+						in_<%=cid %>.close();
+						baos_<%=cid %>.close();
 					}
-	        	}else if(part_<%=cid %>.equalsIgnoreCase("header")){
-		            java.util.Enumeration em = msg_<%=cid %>.getAllHeaderLines();
-		            int em_count=0;
-		            
-		            String tempStr_<%=cid %>="";
-		            
+				}else if(part_<%=cid %>.equalsIgnoreCase("header")){
+					java.util.Enumeration em = msg_<%=cid %>.getAllHeaderLines();
+					int em_count=0;
+
+					String tempStr_<%=cid %>="";
+
 					while (em.hasMoreElements()) {
 						tempStr_<%=cid %> = tempStr_<%=cid %> + (String) em.nextElement() + sep_<%=cid%> ;
 					}
 					list_<%=cid%>.add(decode_<%=cid%>.decode(tempStr_<%=cid%>));
-	        	}else{
-		        	if(("true").equals(mailChecked_<%=cid %>[i_<%=cid%>])){   
+				} else {
+					if(("true").equals(mailChecked_<%=cid %>[i_<%=cid%>])){
 						String[] sa_<%=cid%> = msg_<%=cid %>.getHeader(part_<%=cid%>);
 						String tempStr_<%=cid%>="";
 						for(int i=0;i<sa_<%=cid%>.length;i++){
 							tempStr_<%=cid%>=tempStr_<%=cid%>+sa_<%=cid%>[i] + sep_<%=cid%>;
 						}
 						list_<%=cid%>.add(decode_<%=cid%>.decode(tempStr_<%=cid%>));
-		        	}else{ 
-			           String content_<%=cid %> = msg_<%=cid %>.getHeader(part_<%=cid %>, null);
-			           list_<%=cid %>.add(decode_<%=cid%>.decode(content_<%=cid %>));
-		           	}    
-		        }   
-		 	}   
-	
-
-	
-			//attachment Deal
-			if(msg_<%=cid %>.isMimeType("multipart/*")){
-	 	    	javax.mail.Multipart mp<%=cid%> = (javax.mail.Multipart) msg_<%=cid %>.getContent();
-	 	    	String attachfileName<%=cid%> = "";
-	 	    	String path<%=cid%> = "";
-	 	    	java.io.BufferedOutputStream out<%=cid%> = null;
-	 	    	java.io.BufferedInputStream in<%=cid%> = null;
-	            for (int i = 0; i < mp<%=cid%>.getCount(); i++) {
-	                javax.mail.BodyPart mpart<%=cid%> = mp<%=cid%>.getBodyPart(i);
-	                String disposition<%=cid%> = mpart<%=cid%>.getDisposition();
-					<%
-			    	// fixed bug TDI-8586,to deal with attachments download
-					%>                
-	                if (mpart<%=cid%>.getFileName()!=null
-	                    && ((disposition<%=cid%> != null && (disposition<%=cid%>.equals(javax.mail.Part.ATTACHMENT) || disposition<%=cid%>.equals(javax.mail.Part.INLINE)))
-						||  disposition<%=cid%>==null)) {	<%// TDI-29179 %>
-	        	        attachfileName<%=cid%> = mpart<%=cid%>.getFileName();
-	                    attachfileName<%=cid%> = javax.mail.internet.MimeUtility.decodeText(attachfileName<%=cid%>);
-	                   
-	                    
-						if(!(<%=directory%>).endsWith("/")){
-	           				path<%=cid%> = <%=directory%> + "/";
-	        			}else{
-							path<%=cid%> =<%=directory%>;
-						}
-	                    path<%=cid%> = path<%=cid%> + attachfileName<%=cid%>;
-	                    <% if(isLog4jEnabled){ %>
-		                    	log.info("<%= cid %> - Extracted attachment: '"+attachfileName<%=cid%>+"'.");
-	                    <% } %>
-	                    java.io.File attachFile  = new java.io.File(path<%=cid%>);
-	                    out<%=cid%> = new java.io.BufferedOutputStream(new java.io.FileOutputStream(attachFile));
-	                    in<%=cid%> = new java.io.BufferedInputStream(mpart<%=cid%>.getInputStream());
-	                    int buffer<%=cid%> = 0;
-	                    while ((buffer<%=cid%> = in<%=cid%>.read()) != -1) {
-	                           out<%=cid%>.write(buffer<%=cid%>);
-	                           out<%=cid%>.flush();
-						}   
-	                    out<%=cid%>.close();
-	                    in<%=cid%>.close();    
-	                }
-	            }
+					}else{
+					   String content_<%=cid %> = msg_<%=cid %>.getHeader(part_<%=cid %>, null);
+					   list_<%=cid %>.add(decode_<%=cid%>.decode(content_<%=cid %>));
+					}
+				}
 			}
- 	         
- 	          
+
+            //attachment Deal
+            class MessagePartProcessor {
+                void saveAttachment(javax.mail.Part mpart) throws IOException, javax.mail.MessagingException {
+                    if (mpart.getFileName() != null && (
+                            mpart.getDisposition() == null ||
+                            (mpart.getDisposition().equals(javax.mail.Part.ATTACHMENT) || mpart.getDisposition().equals(javax.mail.Part.INLINE))
+                    )) {
+                        String attachFileName = javax.mail.internet.MimeUtility.decodeText(mpart.getFileName());
+
+                        String path = <%=directory%>;
+                        if(!path.endsWith("/")){
+                            path = path + "/";
+                        }
+                        path = path + attachFileName;
+                        <% if(isLog4jEnabled){ %>
+                                log.info("<%= cid %> - Extracted attachment: '" + attachFileName + "'.");
+                        <% } %>
+
+                        java.io.File attachFile = new java.io.File(path);
+                        java.io.BufferedOutputStream out = new java.io.BufferedOutputStream(new java.io.FileOutputStream(attachFile));
+                        java.io.BufferedInputStream in = new java.io.BufferedInputStream(mpart.getInputStream());
+                        int buffer = 0;
+                        while ((buffer = in.read()) != -1) {
+                            out.write(buffer);
+                            out.flush();
+                        }
+                        out.close();
+                        in.close();
+                    }
+                }
+
+                // recursively process body parts
+                void processPart(javax.mail.Part part) throws javax.mail.MessagingException, IOException {
+                    if (part.isMimeType("multipart/*")) {
+                        javax.mail.Multipart multipartContent = (javax.mail.Multipart) part.getContent();
+                        for (int i = 0; i < multipartContent.getCount(); i++) {
+                            javax.mail.Part mpart = multipartContent.getBodyPart(i);
+                            saveAttachment(mpart);
+                            processPart(mpart);
+                        }
+                    }
+                }
+            }
+            new MessagePartProcessor().processPart(msg_<%=cid %>);
+
 			// for output
 			<%
 			List< ? extends IConnection> conns = node.getOutgoingSortedConnections();
@@ -282,10 +307,10 @@
 						for (int i=1;i<conns.size();i++) {
 							IConnection conn2 = conns.get(i);
 							if ((conn2.getName().compareTo(firstConnName)!=0)&&(conn2.getLineStyle().hasConnectionCategory(IConnectionCategory.DATA))) {
-				    			for (IMetadataColumn column: metadata.getListColumns()) {%>
-	      							<%=conn2.getName() %>.<%=column.getLabel() %> = <%=firstConnName %>.<%=column.getLabel() %>;
-				 				<%
-					 			}
+								for (IMetadataColumn column: metadata.getListColumns()) {%>
+									<%=conn2.getName() %>.<%=column.getLabel() %> = <%=firstConnName %>.<%=column.getLabel() %>;
+								<%
+								}
 							}
 						}
 					}

main/plugins/org.talend.designer.components.localprovider/components/tFileInputMail/tFileInputMail_begin.javajet

@@ -37,6 +37,17 @@ if ((metadatas!=null)&&(metadatas.size()>0)) {
 		}else{
 			globalMap.put("<%=cid %>_EXPORTED_FILE_PATH",<%=directory%>);
 		}
+
+		// create output directory if not exists
+		String path = <%=directory%>;
+		if(!path.endsWith("/")){
+			path = path + "/";
+		}
+		java.io.File outputDir = new java.io.File(path);
+		if (!outputDir.exists()) {
+			outputDir.mkdirs();
+		}
+
 		boolean hasData_<%=cid%> = false;
 		<%
 		if("MIME".equals(mailType)) {

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputLDIF/tFileOutputLDIF_messages_zh_CN.properties

@@ -1,6 +1,8 @@
+CHANGES.ITEM.ADD=\u6DFB\u52A0
 CHANGES.ITEM.DELETE=\u5220\u9664
 CHANGES.ITEM.REPLACE=\u66ff\u4ee3
 CHANGES.NAME=\u6539\u53D8\u5C5E\u6027
+CHANGETYPE.ITEM.ADD=\u6DFB\u52A0
 CHANGETYPE.ITEM.DELETE=\u5220\u9664
 CHANGETYPE.ITEM.MODIFY=\u4FEE\u6539
 CHANGETYPE.NAME=\u53D8\u6362\u7C7B\u578B
@@ -21,6 +23,7 @@ MULTIVALUECOLUMNS.ITEM.SEPARATOR=\u5206\u9694\u7B26
 MODIFYCONFIG.ITEM.COLUMN=\u663E\u793A\u5217
 MODIFYCONFIG.ITEM.OPERATION=\u64CD\u4F5C
 MODIFYCONFIG.ITEM.SEPARATOR=\u5206\u9694\u7B26
+MODIFYCONFIG.ITEM.OPERATION.ITEM.ADD=\u6DFB\u52A0
 MODIFYCONFIG.ITEM.OPERATION.ITEM.DELETE=\u5220\u9664
 MODIFYCONFIG.ITEM.OPERATION.ITEM.REPLACE=\u66ff\u4ee3
 MODIFYCONFIG.ITEM.OPERATION.ITEM.NONE=\u65e0

main/plugins/org.talend.designer.components.localprovider/components/tLDAPOutput/tLDAPOutput_messages_zh_CN.properties

@@ -6,6 +6,7 @@ ALIASES.ITEM.SEARCHING=\u641C\u7D22
 ALIASES.NAME=\u522b\u540d\u590d\u5f15\u7528
 BASEDN.NAME=\u6839DN
 HOST.NAME=\u4e3b\u673a
+INSERT_MODE.ITEM.ADD=\u6DFB\u52A0
 INSERT_MODE.ITEM.DELETE=\u5220\u9664
 INSERT_MODE.ITEM.INSERT=\u63D2\u5165
 INSERT_MODE.ITEM.INSERT_UPDATA=\u63d2\u5165\u6216\u66f4\u65b0
@@ -25,6 +26,7 @@ DN_COLUMN_NAME.NAME=DN\u5217\u540D\u79F0
 ATTRIBUTE_OPTIONS.NAME=\u5C5E\u6027\u9009\u9879
 ATTRIBUTE_OPTIONS.ITEM.ATTRIBUTE_NAME=\u5C5E\u6027\u540D
 ATTRIBUTE_OPTIONS.ITEM.ATTRIBUTE_OPTION=\u9009\u9879
+ATTRIBUTE_OPTIONS.ITEM.ATTRIBUTE_OPTION.ITEM.ADD=\u6DFB\u52A0
 ATTRIBUTE_OPTIONS.ITEM.ATTRIBUTE_OPTION.ITEM.REPLACE=\u66ff\u4ee3
 ATTRIBUTE_OPTIONS.ITEM.ATTRIBUTE_OPTION.ITEM.REMOVE_ATTRIBUTE=\u5220\u9664\u5C5E\u6027
 ATTRIBUTE_OPTIONS.ITEM.ATTRIBUTE_OPTION.ITEM.REMOVE_VALUE=\u5220\u9664\u503C

main/plugins/org.talend.designer.components.localprovider/components/tPaloDimension/tPaloDimension_messages_zh_CN.properties

@@ -27,6 +27,7 @@ ELEMENT_HIERACHIE.ITEM.ELEMENT_TYPE=\u5143\u7D20\u7C7B\u578B
 ELEMENT_HIERACHIE.ITEM.ELEMENT_TYPE.ITEM.ELEMENT_NUMERIC=\u6570\u503C
 ELEMENT_HIERACHIE.ITEM.ELEMENT_TYPE.ITEM.ELEMENT_STRING=\u6587\u672c
 ELEMENT_HIERACHIE.ITEM.CREATION_MODE=\u521B\u5EFA\u6A21\u5F0F
+ELEMENT_HIERACHIE.ITEM.CREATION_MODE.ITEM.MODE_ADD=\u589E\u52A0
 ELEMENT_HIERACHIE.ITEM.CREATION_MODE.ITEM.MODE_FORCE_ADD=\u5F3A\u5236\u6DFB\u52A0
 ELEMENT_HIERACHIE.ITEM.CREATION_MODE.ITEM.MODE_UPDATE=\u66F4\u65B0
 ELEMENT_HIERACHIE.ITEM.CREATION_MODE.ITEM.MODE_ADD_OR_UPDATE=\u6DFB\u52A0\u6216\u66F4\u65B0
@@ -35,6 +36,7 @@ ELEMENT_TYPE.NAME=\u5143\u7D20\u7684\u7C7B\u578B
 ELEMENT_TYPE.ITEM.ELEMENT_NUMERIC=\u6570\u503C
 ELEMENT_TYPE.ITEM.ELEMENT_STRING=\u6587\u672c
 CREATION_MODE.NAME=\u521B\u5EFA\u6A21\u5F0F
+CREATION_MODE.ITEM.MODE_ADD=\u589E\u52A0
 CREATION_MODE.ITEM.MODE_FORCE_ADD=\u5F3A\u5236\u6DFB\u52A0
 CREATION_MODE.ITEM.MODE_UPDATE=\u66F4\u65B0
 CREATION_MODE.ITEM.MODE_ADD_OR_UPDATE=\u6DFB\u52A0\u6216\u66F4\u65B0

main/plugins/org.talend.designer.components.localprovider/components/tPaloOutputMulti/tPaloOutputMulti_messages_zh_CN.properties

@@ -13,6 +13,7 @@ COMMITSIZE.NAME=\u63D0\u4EA4\u5927\u5C0F
 SPLASH_MODE.ITEM.PALO_SPLASH_DISABLE=\u7981\u7528
 SPLASH_MODE.ITEM.PALO_SPLASH_DEFAULT=\u65e0
 SPLASH_MODE.ITEM.PALO_SPLASH_BASE_SET=\u8BBE\u7F6E
+SPLASH_MODE.ITEM.PALO_SPLASH_BASE_ADD=\u589E\u52A0
 ADDVALUES.NAME=\u6DFB\u52A0\u503C
 DEPLOY_PALO_LIBS.NAME=\u90E8\u7F72Palo\u5E93
 DIE_ON_ERROR.NAME=\u9519\u8bef\u65f6\u7ec8\u6b62

main/plugins/org.talend.designer.components.localprovider/components/tS3Connection/tS3Connection_messages_zh_CN.properties

@@ -25,6 +25,7 @@ ENCODING.NAME=\u7F16\u7801
 ENCRYPTED_KEY_CMK.NAME=\u4E3B\u952E
 ENCRYPTED_KEY_BASE64.NAME=\u4E3B\u952E
 ENCRYPTED_KEY_X509.NAME=\u5BC6\u94A5\u6587\u4EF6
+ENCRYPT.NAME=\u52A0\u5BC6
 ALGORITHM_SYMMETRIC_MASTER_KEY.ITEM.AES=AES
 ALGORITHM_ASYMMETRIC_MASTER_KEY.ITEM.RSA=RSA
 ALGORITHM_ASYMMETRIC_MASTER_KEY.ITEM.DSA=DSA

main/plugins/org.talend.designer.components.localprovider/components/tS3Get/tS3Get_messages_zh_CN.properties

@@ -33,6 +33,7 @@ ENCODING.NAME=\u7F16\u7801
 ENCRYPTED_KEY_CMK.NAME=\u4E3B\u952E
 ENCRYPTED_KEY_BASE64.NAME=\u4E3B\u952E
 ENCRYPTED_KEY_X509.NAME=\u5BC6\u94A5\u6587\u4EF6
+ENCRYPT.NAME=\u52A0\u5BC6
 ALGORITHM_SYMMETRIC_MASTER_KEY.ITEM.AES=AES
 ALGORITHM_ASYMMETRIC_MASTER_KEY.ITEM.RSA=RSA
 ALGORITHM_ASYMMETRIC_MASTER_KEY.ITEM.DSA=DSA

main/plugins/org.talend.designer.components.localprovider/components/tS3Put/tS3Put_messages_zh_CN.properties

@@ -4,6 +4,7 @@ CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
 ACCESS_KEY.NAME=\u8BBF\u95EE\u5BC6\u94A5
 BUCKET.NAME=\u6876
 KEY.NAME=\u4E3B\u952E
+FILE.NAME=\u6587\u4EF6
 CONFIG_CLIENT.NAME=\u914D\u7F6E\u5BA2\u6237\u7AEF
 CONNECTION_CONFIG.NAME=\u8FDE\u63A5
 CLIENT_CONFIG.NAME=\u5BA2\u6237\u7AEF\u914D\u7F6E\u7684\u8FDE\u63A5
@@ -32,6 +33,7 @@ ENCODING.NAME=\u7F16\u7801
 ENCRYPTED_KEY_CMK.NAME=\u4E3B\u952E
 ENCRYPTED_KEY_BASE64.NAME=\u4E3B\u952E
 ENCRYPTED_KEY_X509.NAME=\u5BC6\u94A5\u6587\u4EF6
+ENCRYPT.NAME=\u52A0\u5BC6
 ALGORITHM_SYMMETRIC_MASTER_KEY.ITEM.AES=AES
 ALGORITHM_ASYMMETRIC_MASTER_KEY.ITEM.RSA=RSA
 ALGORITHM_ASYMMETRIC_MASTER_KEY.ITEM.DSA=DSA

main/plugins/org.talend.designer.components.localprovider/components/tSQLDWHBulkExec/tSQLDWHBulkExec_begin.javajet

@@ -24,9 +24,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 
     String storageType = ElementParameterParser.getValue(node, "__AZURE_STORAGE__");
     String accountName = ElementParameterParser.getValue(node, "__ACCOUNT_NAME__");
-    String accountSecret = ElementParameterParser.getValue(node, "__SECRET_KEY__");
     
-    String principalKey = ElementParameterParser.getValue(node, "__PRINCIPAL_KEY__");
     String clientId = ElementParameterParser.getValue(node, "__CLIENT_ID__");
     String oauthEndpoint = ElementParameterParser.getValue(node, "__ENDPOINT__");    
     
@@ -140,7 +138,6 @@ skeleton="../templates/db_output_bulk.skeleton"
     
     String randomIdentifier_<%=cid%> = java.util.UUID.randomUUID().toString().replaceAll("-","");
     
-    String azureAccessKey_<%=cid%> = "";
     String azureCredIdentity_<%=cid%> = "";
     String azureCredName_<%=cid%> = "";
     String azureContainer_<%=cid%> = "";    
@@ -156,15 +153,30 @@ skeleton="../templates/db_output_bulk.skeleton"
     String oauthEndpoint_<%=cid%> = <%=oauthEndpoint%>;
     
 <%
+    String passwordFieldName = "";
+    if ("ADLS".equals(storageType)) {
+        passwordFieldName = "__PRINCIPAL_KEY__";
+    }else{
+        passwordFieldName = "__SECRET_KEY__";
+    }
+    if (ElementParameterParser.canEncrypt(node, passwordFieldName)) {
+%> 
+        final String azureAccessKey_<%=cid%> = routines.system.PasswordEncryptUtil.decryptPassword(<%=ElementParameterParser.getEncryptedValue(node, passwordFieldName)%>);
+<%
+    } else {
+        
+%>
+        final String azureAccessKey_<%=cid%> = <%= ElementParameterParser.getValue(node, passwordFieldName)%>; 
+<%
+    }
+     
     if ("ADLS".equals(storageType)) {
 %>
-        azureAccessKey_<%=cid%> = <%=principalKey%>;
         azureCredIdentity_<%=cid%> = clientId_<%=cid%> + "@" + oauthEndpoint_<%=cid%>;
         azureCredName_<%=cid%> = "talend_ADLCredential_" + randomIdentifier_<%=cid%>;
 <%
     } else {
 %>
-        azureAccessKey_<%=cid%> = <%=accountSecret%>;
         azureCredIdentity_<%=cid%> = "talend";
         azureCredName_<%=cid%> = "talend_AzureStorageCredential_" + randomIdentifier_<%=cid%>;
         azureContainer_<%=cid%> = <%=container%>;
@@ -178,9 +190,6 @@ skeleton="../templates/db_output_bulk.skeleton"
     
     String azureFileLoadType_<%=cid%> = "<%=loadFileFormat%>";
     
-
-
-    String externalTableRejectOptions_<%=cid%> = "";
     String dwDistributionOptions_<%=cid%> = "";
     String dwTableOptions_<%=cid%> = "";
     String dwPartition_<%=cid%> = "";
@@ -238,7 +247,7 @@ skeleton="../templates/db_output_bulk.skeleton"
         dbUser_<%=cid %> = <%=dbuser%>;
 
 <%
-        String passwordFieldName = "__PASS__";
+        passwordFieldName = "__PASS__";
 %>
 
         <%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
@@ -276,7 +285,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 <%
     if(isEnabledExtTableOptions){
 %>
-        externalTableRejectOptions_<%=cid%> = "REJECT_TYPE = <%=rejectType%>" + ",REJECT_VALUE = " + <%=rejectValue%>;
+        String externalTableRejectOptions_<%=cid%> = "REJECT_TYPE = <%=rejectType%>" + ",REJECT_VALUE = " + <%=rejectValue%>;
 <%
         if("Percentage".equals(rejectType)){
 %>
@@ -430,7 +439,15 @@ skeleton="../templates/db_output_bulk.skeleton"
             //CREATE EXTERNAL TABLE
             java.sql.Statement stmtCreateExt_<%=cid%> = conn_<%=cid%>.createStatement();
             <%dbLog.table().createTry(dbLog.var("ext_tableName"));%>
-            stmtCreateExt_<%=cid%>.execute("<%=manager.getCreateTableSQL(stmtStructure)%>)  WITH (LOCATION='/ " + azureFolder_<%=cid%> + "', DATA_SOURCE=" + azureExtDataSrc_<%=cid%> + ", FILE_FORMAT= " + azureExtFileFormat_<%=cid%> + "," + externalTableRejectOptions_<%=cid%> + ")");
+            stmtCreateExt_<%=cid%>.execute("<%=manager.getCreateTableSQL(stmtStructure)%>)  WITH (LOCATION='/ " + azureFolder_<%=cid%> + "', DATA_SOURCE=" + azureExtDataSrc_<%=cid%> + ", FILE_FORMAT= " + azureExtFileFormat_<%=cid%> 
+<%
+            if(isEnabledExtTableOptions){
+%> 
+            + "," + externalTableRejectOptions_<%=cid%> 
+<%
+            }
+%>  
+            + ")");
             <%dbLog.table().createDone(dbLog.var("ext_tableName"));%>
             stmtCreateExt_<%=cid%>.close();
 <%

main/plugins/org.talend.designer.components.localprovider/components/tSQLDWHBulkExec/tSQLDWHBulkExec_messages_ja.properties

@@ -1 +1,96 @@
 ACCOUNT_NAME.NAME=\u30A2\u30AB\u30A6\u30F3\u30C8\u540D
+AZURE_CONNECTION.NAME=Azure\u30B9\u30C8\u30EC\u30FC\u30B8\u63A5\u7D9A
+AZURE_LOCATION.NAME=Azure\u30B9\u30C8\u30EC\u30FC\u30B8\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3
+AZURE_STORAGE.ITEM.ADLS=Data Lake Store
+AZURE_STORAGE.ITEM.BLOB=Blob\u30B9\u30C8\u30EC\u30FC\u30B8
+AZURE_STORAGE.NAME=Azure\u30B9\u30C8\u30EC\u30FC\u30B8
+CLIENT_ID.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8ID
+COMPRESS.NAME=\u5727\u7E2E\u65B9\u5F0F
+COMPRESSION_ORC.ITEM.DEFAULT=\u30C7\u30D5\u30A9\u30EB\u30C8
+COMPRESSION_ORC.ITEM.SNAPPY=Snappy
+COMPRESSION_PARQUET.ITEM.GZIP=GZip
+COMPRESSION_PARQUET.ITEM.SNAPPY=Snappy
+COMPRESSION_RC.ITEM.DEFAULT=\u30C7\u30D5\u30A9\u30EB\u30C8
+COMPRESSION_TEXT.ITEM.DEFAULT=\u30C7\u30D5\u30A9\u30EB\u30C8
+COMPRESSION_TEXT.ITEM.GZIP=GZip
+CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
+CONTAINER.NAME=\u30B3\u30F3\u30C6\u30CA
+DATE_FORMAT.ITEM.NONE=\u306A\u3057
+DATE_FORMAT.ITEM.PATTERN=\u30D1\u30BF\u30FC\u30F3
+DATE_FORMAT.NAME=\u65E5\u4ED8\u306E\u5F62\u5F0F
+DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
+DBTABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
+DB_CONFIG.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u8A2D\u5B9A
+DB_SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
+DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u4E86
+DISTRIBUTION.ITEM.HASH=\u30CF\u30C3\u30B7\u30E5
+DISTRIBUTION.ITEM.REPLICATE=\u8907\u88FD
+DISTRIBUTION.ITEM.ROUND_ROBIN=\u30E9\u30A6\u30F3\u30C9\u30ED\u30D3\u30F3
+DISTRIBUTION.NAME=\u30C7\u30A3\u30B9\u30C8\u30EA\u30D3\u30E5\u30FC\u30B7\u30E7\u30F3\u30AA\u30D7\u30B7\u30E7\u30F3
+DISTRIBUTION_COLUMN_NAME.NAME=\u30C7\u30A3\u30B9\u30C8\u30EA\u30D3\u30E5\u30FC\u30B7\u30E7\u30F3\u30AB\u30E9\u30E0\u540D
+DRIVER.NAME=JDBC\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC
+DRIVER.ITEM.MSSQL_PROP=Microsoft
+DW_TABLE_PROPERTIES.NAME=Data Warehouse\u30C6\u30FC\u30D6\u30EB\u30D7\u30ED\u30D1\u30C6\u30A3
+ENDPOINT.NAME=OAuth 2.0\u30C8\u30FC\u30AF\u30F3\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8
+EXT_TABLE_OPTIONS.NAME=\u30C7\u30FC\u30BF\u30A4\u30F3\u30DD\u30FC\u30C8\u30EA\u30B8\u30A7\u30AF\u30C8\u30AA\u30D7\u30B7\u30E7\u30F3
+FIELDSEPARATOR.NAME=\u5217\u533A\u5207\u308A\u8A18\u53F7
+FILENAME.NAME=\u30ED\u30FC\u30AB\u30EB\u306E\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9
+HELP=org.talend.help.tSQLDWHBulkExec
+HOST.NAME=\u30DB\u30B9\u30C8
+IMPORT_TYPE.ITEM.DELIMITED_TEXT=\u533A\u5207\u308A\u8A18\u53F7\u4ED8\u304D\u30C6\u30AD\u30B9\u30C8
+IMPORT_TYPE.ITEM.HIVE_ORC=Hive ORC
+IMPORT_TYPE.ITEM.HIVE_RCFILE=Hive RCFile
+IMPORT_TYPE.ITEM.PARQUET=Parquet
+IMPORT_TYPE.NAME=\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F
+INDEX_COLUMNS.NAME=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30AB\u30E9\u30E0
+LOAD_DETAILS.NAME=\u30ED\u30FC\u30C9\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+LONG_NAME=PolyBase\u3092\u4F7F\u7528\u3057\u3066\u30C7\u30FC\u30BF\u3092Azure Data Warehouse\u306B\u30ED\u30FC\u30C9
+MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
+NB_LINE_INSERTED.NAME=\u633F\u5165\u884C\u6570
+PARTITION.NAME=\u30D1\u30FC\u30C6\u30A3\u30B7\u30E7\u30F3
+PARTITION_COLUMN_NAME.NAME=\u30D1\u30FC\u30C6\u30A3\u30B7\u30E7\u30F3\u30AB\u30E9\u30E0\u540D
+PARTITION_COLUMN_NAME_RANGE.ITEM.LEFT=\u5DE6
+PARTITION_COLUMN_NAME_RANGE.ITEM.RIGHT=\u53F3
+PARTITION_COLUMN_NAME_RANGE.NAME=\u7BC4\u56F2
+PARTITION_VALUES.NAME=\u5024\u306E\u30D1\u30FC\u30C6\u30A3\u30B7\u30E7\u30F3
+PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
+PORT.NAME=\u30DD\u30FC\u30C8
+PRINCIPAL_KEY.NAME=\u8A8D\u8A3C\u30AD\u30FC
+PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
+QUERY.NAME=\u30AF\u30A8\u30EA
+REJECT.LINK=\u30EA\u30B8\u30A7\u30AF\u30C8
+REJECT.MENU=\u30EA\u30B8\u30A7\u30AF\u30C8
+REJECT_SAMPLE_VALUE.NAME=\u30B5\u30F3\u30D7\u30EB\u5024\u3092\u30EA\u30B8\u30A7\u30AF\u30C8
+REJECT_TYPE.ITEM.Percentage=\u30D1\u30FC\u30BB\u30F3\u30C6\u30FC\u30B8
+REJECT_TYPE.ITEM.Value=\u5024
+REJECT_TYPE.NAME=\u30EA\u30B8\u30A7\u30AF\u30C8\u30BF\u30A4\u30D7
+REJECT_VALUE.NAME=\u5024\u3092\u30EA\u30B8\u30A7\u30AF\u30C8
+ROWSEPARATOR.NAME=\u884C\u533A\u5207\u308A
+SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
+SECRET_KEY.NAME=\u30A2\u30AF\u30BB\u30B9\u30AD\u30FC
+SERDE_METHOD.ITEM.COLUMNAR=\u67F1\u72B6
+SERDE_METHOD.ITEM.LAZY=\u30EC\u30A4\u30B8\u30FC\u30D0\u30A4\u30CA\u30EA
+SERDE_METHOD.NAME=Serde\u30E1\u30BD\u30C3\u30C9
+SQL_SYNTAX.NAME=Sql\u69CB\u6587
+STRING_QUOTE.NAME=\u5F15\u7528\u7B26
+TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
+TABLE_ACTION.ITEM.CLEAR=\u30C6\u30FC\u30D6\u30EB\u306E\u30AF\u30EA\u30A2
+TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
+TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
+TABLE_ACTION.ITEM.DROP_CREATE=\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210
+TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u30C6\u30FC\u30D6\u30EB\u304C\u3042\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u30C9\u30ED\u30C3\u30D7\u3057\u3066\u4F5C\u6210\u3057\u307E\u3059
+TABLE_ACTION.ITEM.NONE=\u306A\u3057
+TABLE_ACTION.ITEM.TRUNCATE=\u30C6\u30FC\u30D6\u30EB\u3092\u5207\u308A\u8A70\u3081\u308B
+TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3078\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
+TABLE_OPTION.ITEM.CLUSTERED_COLUMNSTORE_INDEX=\u30AF\u30E9\u30B9\u30BF\u30FC\u5316\u3055\u308C\u305F\u30AB\u30E9\u30E0\u30B9\u30C8\u30A2\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
+TABLE_OPTION.ITEM.CLUSTERED_INDEX=\u30AF\u30E9\u30B9\u30BF\u30FC\u5316\u3055\u308C\u305F\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
+TABLE_OPTION.ITEM.HEAP=\u30D2\u30FC\u30D7
+TABLE_OPTION.NAME=\u30C6\u30FC\u30D6\u30EB\u30AA\u30D7\u30B7\u30E7\u30F3
+TYPE.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C9\u30E9\u30A4\u30D0\u30FC
+USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
+USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
+USE_STRING_DELIMITER.NAME=\u5F15\u7528\u7B26
+USE_TYPE_DEFAULT.ITEM.FALSE=False
+USE_TYPE_DEFAULT.ITEM.TRUE=True
+USE_TYPE_DEFAULT.NAME=\u30BF\u30A4\u30D7\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u4F7F\u7528

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateAggregate/tSQLTemplateAggregate_messages_en.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=Encoding
 QUERY.NAME=Query
 DBD-ODBC.INFO=Required for ODBC-like connection
 DBD-MYSQL.INFO=Required for MySQL
-DBD-MYSQL.INFO=Required for MySQL
 NULL_CHAR.NAME=Null Char
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc driver)
 PASS.NAME=Password

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateAggregate/tSQLTemplateAggregate_messages_fr.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=Encodage
 QUERY.NAME=Requ<EFBFBD>te
 DBD-ODBC.INFO=Requis pour les connexions de type ODBC
 DBD-MYSQL.INFO=Requis pour MySQL
-DBD-MYSQL.INFO=Requis pour MySQL
 NULL_CHAR.NAME=Caract<EFBFBD>re Null
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (pilote Odbc)
 PASS.NAME=Mot de passe

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateAggregate/tSQLTemplateAggregate_messages_ja.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 QUERY.NAME=\u30AF\u30A8\u30EA
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u306B\u5FC5\u8981\u3067\u3059
 DBD-MYSQL.INFO=MySQL\u306B\u5FC5\u8981\u3067\u3059
-DBD-MYSQL.INFO=MySQL\u306B\u5FC5\u8981\u3067\u3059
 NULL_CHAR.NAME=Null\u6587\u5B57
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc\u30C9\u30E9\u30A4\u30D0\u30FC)
 PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateAggregate/tSQLTemplateAggregate_messages_zh_CN.properties

@@ -8,7 +8,6 @@ ENCODING.NAME=\u7f16\u7801
 QUERY.NAME=\u67E5\u8BE2
 DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
 DBD-MYSQL.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
-DBD-MYSQL.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
 NULL_CHAR.NAME=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc \u9A71\u52A8)
 PASS.NAME=\u5bc6\u7801

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateCommit/tSQLTemplateCommit_messages_en.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=Encoding
 QUERY.NAME=Query
 DBD-ODBC.INFO=Required for ODBC-like connection
 DBD-MYSQL.INFO=Required for MySQL
-DBD-MYSQL.INFO=Required for MySQL
 NULL_CHAR.NAME=Null Char
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc driver)
 PASS.NAME=Password

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateCommit/tSQLTemplateCommit_messages_fr.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=Encodage
 QUERY.NAME=Requ<EFBFBD>te
 DBD-ODBC.INFO=Requis pour les connexions de type ODBC
 DBD-MYSQL.INFO=Requis pour MySQL
-DBD-MYSQL.INFO=Requis pour MySQL
 NULL_CHAR.NAME=Caract<EFBFBD>re Null
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (pilote Odbc)
 PASS.NAME=Mot de passe

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateCommit/tSQLTemplateCommit_messages_ja.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 QUERY.NAME=\u30AF\u30A8\u30EA
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u306B\u5FC5\u8981\u3067\u3059
 DBD-MYSQL.INFO=MySQL\u306B\u5FC5\u8981\u3067\u3059
-DBD-MYSQL.INFO=MySQL\u306B\u5FC5\u8981\u3067\u3059
 NULL_CHAR.NAME=Null\u6587\u5B57
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc\u30C9\u30E9\u30A4\u30D0\u30FC)
 PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateCommit/tSQLTemplateCommit_messages_zh_CN.properties

@@ -8,7 +8,6 @@ ENCODING.NAME=\u7f16\u7801
 QUERY.NAME=\u67E5\u8BE2
 DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
 DBD-MYSQL.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
-DBD-MYSQL.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
 NULL_CHAR.NAME=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc \u9A71\u52A8)
 PASS.NAME=\u5bc6\u7801

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateFilterColumns/tSQLTemplateFilterColumns_messages_en.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=Encoding
 QUERY.NAME=Query
 DBD-ODBC.INFO=Required for ODBC-like connection
 DBD-MYSQL.INFO=Required for MySQL
-DBD-MYSQL.INFO=Required for MySQL
 NULL_CHAR.NAME=Null Char
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc driver)
 PASS.NAME=Password

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateFilterColumns/tSQLTemplateFilterColumns_messages_fr.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=Encodage
 QUERY.NAME=Requ<EFBFBD>te
 DBD-ODBC.INFO=Requis pour les connexions de type ODBC
 DBD-MYSQL.INFO=Requis pour MySQL
-DBD-MYSQL.INFO=Requis pour MySQL
 NULL_CHAR.NAME=Caract<EFBFBD>re Null
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (pilote Odbc)
 PASS.NAME=Mot de passe

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateFilterColumns/tSQLTemplateFilterColumns_messages_ja.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 QUERY.NAME=\u30AF\u30A8\u30EA
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u306B\u5FC5\u8981\u3067\u3059
 DBD-MYSQL.INFO=MySQL\u306B\u5FC5\u8981\u3067\u3059
-DBD-MYSQL.INFO=MySQL\u306B\u5FC5\u8981\u3067\u3059
 NULL_CHAR.NAME=Null\u6587\u5B57
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc\u30C9\u30E9\u30A4\u30D0\u30FC)
 PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateFilterColumns/tSQLTemplateFilterColumns_messages_zh_CN.properties

@@ -8,7 +8,6 @@ ENCODING.NAME=\u7f16\u7801
 QUERY.NAME=\u67E5\u8BE2
 DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
 DBD-MYSQL.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
-DBD-MYSQL.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
 NULL_CHAR.NAME=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc \u9A71\u52A8)
 PASS.NAME=\u5bc6\u7801

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateFilterRows/tSQLTemplateFilterRows_messages_en.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=Encoding
 QUERY.NAME=Query
 DBD-ODBC.INFO=Required for ODBC-like connection
 DBD-MYSQL.INFO=Required for MySQL
-DBD-MYSQL.INFO=Required for MySQL
 NULL_CHAR.NAME=Null Char
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc driver)
 PASS.NAME=Password

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateFilterRows/tSQLTemplateFilterRows_messages_fr.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=Encodage
 QUERY.NAME=Requ<EFBFBD>te
 DBD-ODBC.INFO=Requis pour les connexions de type ODBC
 DBD-MYSQL.INFO=Requis pour MySQL
-DBD-MYSQL.INFO=Requis pour MySQL
 NULL_CHAR.NAME=Caract<EFBFBD>re Null
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (pilote Odbc)
 PASS.NAME=Mot de passe

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateFilterRows/tSQLTemplateFilterRows_messages_ja.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 QUERY.NAME=\u30AF\u30A8\u30EA
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u306B\u5FC5\u8981\u3067\u3059
 DBD-MYSQL.INFO=MySQL\u306B\u5FC5\u8981\u3067\u3059
-DBD-MYSQL.INFO=MySQL\u306B\u5FC5\u8981\u3067\u3059
 NULL_CHAR.NAME=Null\u6587\u5B57
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc\u30C9\u30E9\u30A4\u30D0\u30FC)
 PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateFilterRows/tSQLTemplateFilterRows_messages_zh_CN.properties

@@ -8,7 +8,6 @@ ENCODING.NAME=\u7f16\u7801
 QUERY.NAME=\u67E5\u8BE2
 DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
 DBD-MYSQL.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
-DBD-MYSQL.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
 NULL_CHAR.NAME=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc \u9A71\u52A8)
 PASS.NAME=\u5bc6\u7801

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateMerge/tSQLTemplateMerge_messages_en.properties

@@ -6,7 +6,6 @@ QUERY.NAME=Query
 TYPE.NAME=Database Driver
 DBD-ODBC.INFO=Required for ODBC-like connection
 DBD-MYSQL.INFO=Required for MySQL
-DBD-MYSQL.INFO=Required for MySQL
 DBD-Pg.INFO=Required for PostgreSQL
 DBTYPE.NAME=Database Type
 DBTYPE.ITEM.AS400=AS400

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateMerge/tSQLTemplateMerge_messages_fr.properties

@@ -6,7 +6,6 @@ QUERY.NAME=Requ
 TYPE.NAME=Pilote de base de donn<6E>es
 DBD-ODBC.INFO=Requis pour les connexions de type ODBC
 DBD-MYSQL.INFO=Requis pour MySQL
-DBD-MYSQL.INFO=Requis pour MySQL
 DBD-Pg.INFO=Requis pour PostgreSQL
 DBTYPE.NAME=Type de base de donn<6E>es
 DBTYPE.ITEM.AS400=AS400

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateMerge/tSQLTemplateMerge_messages_ja.properties

@@ -6,7 +6,6 @@ QUERY.NAME=\u30AF\u30A8\u30EA
 TYPE.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C9\u30E9\u30A4\u30D0\u30FC
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u306B\u5FC5\u8981\u3067\u3059
 DBD-MYSQL.INFO=MySQL\u306B\u5FC5\u8981\u3067\u3059
-DBD-MYSQL.INFO=MySQL\u306B\u5FC5\u8981\u3067\u3059
 DBD-Pg.INFO=PostgreSQL\u306B\u5FC5\u8981\u3067\u3059
 DBTYPE.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u7A2E\u985E
 DBTYPE.ITEM.AS400=AS400

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateMerge/tSQLTemplateMerge_messages_zh_CN.properties

@@ -3,7 +3,6 @@ QUERY.NAME=\u67E5\u8BE2
 TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
 DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
 DBD-MYSQL.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
-DBD-MYSQL.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
 DBD-Pg.INFO=\u4e3aPostgreSQL\u6240\u5fc5\u9700
 DBTYPE.NAME=\u6570\u636E\u5E93\u7C7B\u578B
 DBTYPE.ITEM.DBORACLE=Oracle

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateRollback/tSQLTemplateRollback_messages_en.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=Encoding
 QUERY.NAME=Query
 DBD-ODBC.INFO=Required for ODBC-like connection
 DBD-MYSQL.INFO=Required for MySQL
-DBD-MYSQL.INFO=Required for MySQL
 NULL_CHAR.NAME=Null Char
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc driver)
 PASS.NAME=Password

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateRollback/tSQLTemplateRollback_messages_fr.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=Encodage
 QUERY.NAME=Requ<EFBFBD>te
 DBD-ODBC.INFO=Requis pour les connexions de type ODBC
 DBD-MYSQL.INFO=Requis pour MySQL
-DBD-MYSQL.INFO=Requis pour MySQL
 NULL_CHAR.NAME=Caract<EFBFBD>re Null
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (pilote Odbc)
 PASS.NAME=Mot de passe

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateRollback/tSQLTemplateRollback_messages_ja.properties

@@ -9,7 +9,6 @@ ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 QUERY.NAME=\u30AF\u30A8\u30EA
 DBD-ODBC.INFO=ODBC\u306E\u3088\u3046\u306A\u63A5\u7D9A\u306B\u5FC5\u8981\u3067\u3059
 DBD-MYSQL.INFO=MySQL\u306B\u5FC5\u8981\u3067\u3059
-DBD-MYSQL.INFO=MySQL\u306B\u5FC5\u8981\u3067\u3059
 NULL_CHAR.NAME=Null\u6587\u5B57
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc\u30C9\u30E9\u30A4\u30D0\u30FC)
 PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9

main/plugins/org.talend.designer.components.localprovider/components/tSQLTemplateRollback/tSQLTemplateRollback_messages_zh_CN.properties

@@ -8,7 +8,6 @@ ENCODING.NAME=\u7f16\u7801
 QUERY.NAME=\u67E5\u8BE2
 DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
 DBD-MYSQL.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
-DBD-MYSQL.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
 NULL_CHAR.NAME=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
 TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc \u9A71\u52A8)
 PASS.NAME=\u5bc6\u7801

main/plugins/org.talend.designer.components.localprovider/components/tSampleRow/tSampleRow_messages_zh_CN.properties

@@ -1,3 +1,4 @@
 LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+RANGE.NAME=\u8303\u56F4
 INCLUDE.NAME=\u5305\u62EC
 EXCLUDE.NAME=\u6392\u9664

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

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

main/plugins/org.talend.designer.core.generic/pom.xml

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

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

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

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/build/StandardJobOSGiBundleBuildProvider.java

@@ -47,7 +47,7 @@ public class StandardJobOSGiBundleBuildProvider extends RepositoryObjectTypeBuil
     private static final List<String> ESB_COMPONENTS;
     static {
         final List<String> esbComponents = Arrays.asList("tESBProviderRequest", "tRESTClient", "tRESTRequest", "tRESTResponse",
-                "tESBConsumer", "tESBProviderFault", "tESBProviderRequest", "tESBProviderResponse", "tRouteInput");
+                "tESBConsumer", "tESBProviderFault", "tESBProviderRequest", "tESBProviderResponse", "tRouteInput", "tREST");
         ESB_COMPONENTS = Collections.unmodifiableList(esbComponents);
     }
 

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/model/process/DataProcess.java

@@ -3346,9 +3346,9 @@ public class DataProcess implements IGeneratingProcess {
             jobletService = (IJobletProviderService) GlobalServiceRegister.getDefault().getService(
                 IJobletProviderService.class);
         }
-
         for (INode node : orginalList) {
-            if (ProcessorUtilities.isGeneratePomOnly() && jobletService.isJobletComponent(node)) {
+            if (ProcessorUtilities.isGeneratePomOnly() && jobletService != null
+                    && jobletService.isJobletComponent(node)) {
                 // skip any joblet contained during the pom generation
                 continue;
             }

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/utils/JavaProcessUtil.java

@@ -26,6 +26,8 @@ import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.talend.core.CorePlugin;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.ILibraryManagerService;
 import org.talend.core.hadoop.IHadoopClusterService;
 import org.talend.core.hadoop.repository.HadoopRepositoryUtil;
 import org.talend.core.model.general.ModuleNeeded;
@@ -438,6 +440,11 @@ public class JavaProcessUtil {
                                         String a = moduleName.replaceFirst("[.][^.]+$", "");
                                         mn.setMavenUri(
                                                 "mvn:org.talend.libraries/" + a + "/" + line.get("JAR_NEXUS_VERSION") + "/jar");
+
+                                        mn.setCustomMavenUri(mn.getMavenUri());
+                                        ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister
+                                                .getDefault().getService(ILibraryManagerService.class);
+                                        libManagerService.saveCustomMavenURIMap();
                                     }
                                     modulesNeeded.add(mn);
                                 }
@@ -498,7 +505,21 @@ public class JavaProcessUtil {
                                 if (isContextMode) {
                                     getModulesInTable(process, curParam, modulesNeeded);
                                 } else {
-                                    ModuleNeeded module = new ModuleNeeded(null, TalendTextUtils.removeQuotes(driverName), null, true);
+                                    ModuleNeeded module = null;
+
+                                    if (StringUtils.isNotBlank((String) map.get("JAR_NEXUS_VERSION"))) {
+                                        module = new ModuleNeeded(null, null, true,
+                                                "mvn:org.talend.libraries/"
+                                                        + TalendTextUtils.removeQuotes(driverName).replaceFirst("[.][^.]+$", "")
+                                                        + "/" + (String) map.get("JAR_NEXUS_VERSION") + "/jar");
+                                        module.setCustomMavenUri(module.getMavenUri());
+                                        ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister
+                                                .getDefault().getService(ILibraryManagerService.class);
+                                        libManagerService.saveCustomMavenURIMap();
+
+                                    } else {
+                                        module = new ModuleNeeded(null, TalendTextUtils.removeQuotes(driverName), null, true);
+                                    }
                                     modulesNeeded.add(module);
                                 }
                             }

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

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