TUP-5410: added MS SQL proprietary driver support.

TBD-3987 fix: Impala:Cann't check successfully when I use custom hadoop

i18n/plugins/org.talend.common.ui.runtime.nl/src/main/java/org/talend/commons/ui/runtime/i18n/messages_fr.properties

@@ -2,7 +2,7 @@ AccessorUtils.Assert0=L'attribut 'BeanPropertyAccessors' de la colonne (nomm
 AccessorUtils.Assert1=L'attribut 'BeanPropertyAccessors' de la colonne (nommée'{0}' et ayant l'id '{1}') n'est pas configuré correctement ou le type de la valeur affectée n'est pas correct.
 AccessorUtils.isReq=\ est requis pour le bean (<B>).
 AddPushButton.AddButton.Tip=Ajouter
-AddAllPushButton.AddAllButton.Tip=Ajoute tout
+AddAllPushButton.AddAllButton.Tip=Ajouter tout
 CellEditorDialogBehavior.textContent=...
 ColorStyledText.RedoItem.Text=Répéter
 ColorStyledText.UndoItem.Text=Annuler
@@ -58,7 +58,7 @@ EventUtil.selection=S
 EventUtil.show=Afficher
 EventUtil.traverse=traverse
 EventUtil.typeNull=Null
-ExceptionHandler.Parameter.BeNull=le paramètre ex ne peut pas être vide
+ExceptionHandler.Parameter.BeNull=le paramètre ex ne peut être null
 ExceptionMessageDialog.Cancel=Annuler
 ExceptionMessageDialog.log=Fichier de log
 ExceptionMessageDialog.No=NO

i18n/plugins/org.talend.commons.runtime.nl/src/org/talend/commons/i18n/internal/messages_fr.properties

@@ -2,8 +2,9 @@ DatabaseContentRetriever.PRODUCTNAME=Nom de produit de la base de donn
 DatabaseContentRetriever.PRODUCTVERSION=Version du produit : 
 DB2ForZosResultSet.unknowCloumn=Argument invalide\: nom de colonne inconnu
 AbstractFakeResultSet.unknowCloumn=Argument invalide : {0} est un nom de colonne inconnu
+AbstractFakeResultSet.parameterIndexOutOfRange=Argument invalide\: index du paramètre {0} hors de la plage
 EntryLocation.returnTableName= {tableName={0}, columnName={1}}
-ExceptionHandler.Parameter.BeNull=le paramètre ex ne peut pas être vide
+ExceptionHandler.Parameter.BeNull=le paramètre ex ne peut être null
 ListenableList.IndexSameLength.Error=indexOrigin et indexDestination doivent avoir la même longueur
 ReflectionPropertyException.Access.ErrorMsg3=Une erreur est survenue lors de l'accès à {0} de la propriété ' de la propriété '{1}' de la classe '{2}'
 ResourceUtils.canMove1=Peut déplacer
@@ -38,3 +39,5 @@ XmlNodeRetriever.singleQuotes='
 XmlNodeRetriever.xPathExpression=Expression XPath = '
 VersionUtils.readPropertyFileError=Erreur de lecture de propriété dans le fichier talend.properties.
 AS400ResultSet.unknowCloumn=Argument invalide\: nom de colonne inconnu
+AS400ResultSet.parameterIndex=Argument invalide\: index du paramètre
+AS400ResultSet.outofRange=\ est hors de la plage.

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

@@ -45,7 +45,7 @@ ControlUtils.Unsupported1=Ce contr
 AccessorUtils.isReqValue=est requis pour la valeur (<V>), mais la valeur peut être adaptée avec le CellEditorValueAdapter.
 AccessorUtils.NoClassDef=ErreurClassDefNonTrouvé ({0}):
 ErrorDialogWidthDetailArea.ErrorMessage.Text=Message d'erreur
-ExceptionHandler.Parameter.BeNull=le paramètre ex ne peut pas être vide
+ExceptionHandler.Parameter.BeNull=le paramètre ex ne peut être null
 ModelSelectionDialog.Message=Choisissez une option, ou annulez
 TreeToTablesLinker.Type.Unsupported=Ce type de currentControl n'est pas supporté
 Mode.Mode.ToString=Mode [{0}]
@@ -129,3 +129,7 @@ StateComposite.SEL_JOBNAME=D
 StateComposite.STATE=Etat
 StateComposite.TABLE_SELECTION=Sélection de la table
 StateComposite.TEMPLATE_SELECTION=Sélection du modèle
+ArchiveDirectoryChooser.WizardProjectsImportPage_RootSelectTitle=Sélectionner réper&toire racine :
+ArchiveDirectoryChooser.WizardProjectsImportPage_ArchiveSelectTitle=Sélectionner fichier &archive :
+ArchiveDirectoryChooser.FileExport_selectDestinationMessage=Sélectionner un répertoire vers lequel exporter.
+ArchiveDirectoryChooser.ArchiveExport_description=Exporter les ressources vers un fichier archive dans le système de fichiers local.

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

@@ -312,3 +312,4 @@ ActionBarBuildHelper.SaveAll_text=Sav&e All
 ActionBarBuildHelper.SaveAll_toolTip=Save All
 ContextOrderProperty.BuiltInComment=Built-in context variables
 ContextOrderProperty.RepositoryComment=Context variables from repository context:
+ProcessorUtilities.nullProcess=The testCase process is null.

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

@@ -17,7 +17,7 @@ SelectRepositoryContextDialog.CollapseAll=R
 ERepositoryObjectType.FolderNotFound=Impossible de trouver le dossier pour le type {0}.
 CorePreferencePage.componentDefaultFileDirectory=Répertoire par défaut des composants
 SelectRepositoryContextDialog.ExistenceMessage=La variable "{0}" a existé dans le Job(Contexte : "{1}").
-CorePreferencePage.runInMultiThread=Execution multi thread (valeur par défaut lors de la création d'un job)
+CorePreferencePage.runInMultiThread=Exécution multi thread (valeur par défaut lors de la création d'un Job)
 MappingFileLoader.UndeclaredDbType="{0}" n'est pas un type de BdD déclaré pour le SGBD d'ID "{1}" dans le noeud : {2}
 EConnectionType.tableMenu=Table
 MappingFileLoader.UnbindedDbTypes=Dans le fichier de mapping d'ID "{1}" du SGBD , les types de BdD ci-dessous ne sont pas liés aux types Talend "{1}" : {2}
@@ -27,7 +27,7 @@ EConnectionType.runAfterMenu=Ex
 GlobalServiceRegister.ServiceNotRegistered=Le service {0} n'a pu être enregistré.
 ConextTemplateComposite.OrderText=Ordre d'origine
 SelectRepositoryContextDialog.Title=Sélectionne les variables du contexte
-EUpdateResult.Add=Ajouter depuis le référentiel
+EUpdateResult.Add=Ajouter au référentiel
 SelectRepositoryContextDialog.View=Voir...
 EUpdateResult.JobletUpdate=Mise à jour des joblets
 EConnectionType.onSubjobOkMenu=Sur Réussite du Sous-Job
@@ -96,7 +96,7 @@ ContextProcessSection.30=Ce nom existe d
 EUpdateItemType.Variable=Variable
 ContextProcessSection.29=ERROR
 CorePreferencePage.previewLimit=Aperçu limite
-ConextTemplateComposite.OrderMessages=Précisez si vous désirez réorganiser les variables.
+ConextTemplateComposite.OrderMessages=Si vous souhaitez réorganiser les variables, cela doit être sélectionné.
 SelectRepositoryContextDialog.DuplicationTitle=Avertissement de duplication !
 EUpdateItemType.Name=Nom
 ContextProcessSection.13=Nouveau nom pour le contexte {0}
@@ -114,7 +114,7 @@ EConnectionType.iteratorMenu=Iterate
 EMetadataEncoding.Arabic=Arabe
 EMetadataEncoding.Microsoft_Latin1=Microsoft (Latin-1)
 SelectRepositoryContextGroupDialog.Title=Ajouter un groupe de contextes
-MappingFileLoader.DbmsIdAlreadyExists=Un sgbd avec id "{0}" existe déjà!
+MappingFileLoader.DbmsIdAlreadyExists=Un SGBD d'ID "{0}" existe déjà.
 EConnectionType.runIfMenu=Run if
 VersionSection.ModificationDate=Date de modification
 MappingFileLoader.DbTypeAlreadyExists=Dans le mapping d'ID "{0}" du SGBD, le type de BdD "{1}" apparaît plus d'une fois dans le fichier "{2}" dans le noeud : {3} 
@@ -132,10 +132,10 @@ ECodeLanguage.unknowLanguage=Langage inconnu
 ExtractMetaDataUtils.noData=Aucune donnée trouvée
 JavaSimpleDateFormatProposalProvider.displaySingleQuote= " : Affiche un guillemet simple
 JavaSimpleDateFormatProposalProvider.quoteDisplayError=Deux apostrophes affichent uniquement une seule apostrophe
-JavaTypesManager.bigDecimal=BIGDECIMAL est le nombre :
-JavaTypesManager.integer=INTEGER est le nombre :
-JavaTypesManager.list=LIST est le nombre :
-JavaTypesManager.string=STRING est le nombre :
+JavaTypesManager.bigDecimal=BIGDECIMAL est un nombre :
+JavaTypesManager.integer=INTEGER est un nombre :
+JavaTypesManager.list=LIST est un nombre :
+JavaTypesManager.string=STRING est un nombre :
 MetadataTalendType.dbIdNotFound=Impossible de trouver le SGBD d'ID {0}.
 PatternCalendar.dateFormat="yyyy-MM-dd HH:mm:ss"
 PatternCalendar.example=Exemple :
@@ -283,4 +283,8 @@ ConnectionParameterName.UserLabel=Utilisateur
 ConnectionParameterName.PasswordLabel=Mot de passe
 ConnectionParameterName.DbPathLabel=Chemin d'accès racine à la base de données
 ActionBarBuildHelper.CloseEditorAction_toolTip=Fermer
+ActionBarBuildHelper.CloseAllAction_toolTip=Fermer tout
+ActionBarBuildHelper.SaveAll_text=Sauv&egarder tout
+ActionBarBuildHelper.SaveAll_toolTip=Sauvegarder tout
 ContextOrderProperty.BuiltInComment=Variables de contexte built-in
+ContextOrderProperty.RepositoryComment=Variables de contexte du contexte du référentiel :

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

@@ -294,3 +294,4 @@ ActionBarBuildHelper.CloseEditorAction_toolTip=\u30AF\u30ED\u30FC\u30BA
 ConnectionParameterName.HostLabel=\u30DB\u30B9\u30C8
 ConnectionParameterName.PortLabel=\u30DD\u30FC\u30C8
 ConnectionParameterName.UserLabel=\u30E6\u30FC\u30B6
+ConnectionParameterName.PasswordLabel=\u30D1\u30B9\u30EF\u30FC\u30C9

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

@@ -187,3 +187,10 @@ ProjectRepositoryNode.sapFunctions.outputSchema=Output
 ProjectRepositoryNode.sapTables=SAP Tables
 DuplicateAction.input.title.v2=Duplicate
 DuplicateAction.SameAsProjectname=Name is same as project name.
+DeleteAction.error.testCaseLockedOrOpenedObject.newMessage=The test case/cases of {0} is/are locked, so you can't delete it.\n If this object is opened ,you must close it before deletion.
+ProjectRepositoryNode.sapBWDataSource=SAP DataSource
+ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
+ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
+ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
+ConvertJobsUtil.warning.title=Warning
+ConvertJobsUtil.warning.message=The target framework is not fully supported for this release.

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

@@ -100,9 +100,10 @@ PasteObjectAction.error.title=Impossible de coller
 JobletReferenceDialog.DeletedInfor=dans la Corbeille
 JobletReferenceDialog.Messages=Impossible de supprimer certains joblets car ils sont référencés dans des Jobs.
 JobletReferenceDialog.NodeTotals=Totaux
+JobletReferenceDialog.NodeTotalsTip=Total des références des n\u0153uds
 JobletReferenceDialog.project=Project
 JobletReferenceDialog.ReferenceJob=Job de référence
-JobletReferenceDialog.Title=Echec de la suppression du joblet
+JobletReferenceDialog.Title=Échec de la suppression du Joblet
 ContextReferenceDialog.Title=Supprimer le groupe de contexte
 ContextReferenceDialog.Recycle=dans la Corbeille
 ContextReferenceDialog.ReferenceJob=Objets de référence
@@ -164,3 +165,5 @@ ProxyRepositoryFactory.projectCanNotOpen=Impossible d'ouvrir le projet. La t
 ProjectRepositoryNode.sapBapi=SAP Bapi
 ProjectRepositoryNode.sapTables=Tables SAP
 DuplicateAction.input.title.v2=Duplicate
+DeleteAction.error.testCaseLockedOrOpenedObject.newMessage=Les tests/scénarios de {0} sont verrouillés, vous ne pouvez les supprimer.\nSi cet objet est ouvert, fermez-le avant suppression.
+ConvertJobsUtil.warning.message=Le framework cible n'est pas totalement supporté dans cette version.

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

@@ -181,3 +181,4 @@ ProjectRepositoryNode.sapFunctions.outputSchema=\u30A2\u30A6\u30C8\u30D7\u30C3\u
 ProjectRepositoryNode.sapTables=SAP\u30C6\u30FC\u30D6\u30EB
 DuplicateAction.input.title.v2=\u91CD\u8907
 DuplicateAction.SameAsProjectname=\u540D\u524D\u304C\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D\u3092\u91CD\u8907\u3057\u307E\u3059
+DeleteAction.error.testCaseLockedOrOpenedObject.newMessage=\u30C6\u30B9\u30C8\u30B1\u30FC\u30B9\u53C8\u306F{0}\u306E\u30B1\u30FC\u30B9\u304C\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u308B\u306E\u3067\u524A\u9664\u51FA\u6765\u307E\u305B\u3093\u3002\u524A\u9664\u306E\u524D\u306B\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u9589\u3058\u3066\u4E0B\u3055\u3044\u3002

i18n/plugins/org.talend.core.runtime.nl/src/main/java/org/talend/core/runtime/i18n/messages_de.properties

@@ -80,7 +80,6 @@ EComponentCategory_version=Version
 EComponentCategory_view=View
 EComponentCategory.validationRules=Validierungsregeln
 EConnectionType.lookupMenu=Nachschlagen
-EConnectionType.mainMenu=Main
 EConnectionType.onComponentErrorMenu=Beim Komponenten Fehler
 EConnectionType.runAfterMenu=Ausführen nach
 EConnectionType.runIfMenu=Ausführen wenn
@@ -294,7 +293,6 @@ ConnectionBean.DefaultConnection=Standardverbindung
 OpenXSDFileDialog.cancel=Abbruch
 OpenXSDFileDialog.confirm=Bestätigen
 RepositoryContentProvider.repositoryLabel.Queries=Abfragen
-RepositoryContentProvider.repositoryLabel.sapFunction=SAP Funktionen
 repository.servicesPort=Port
 BinRepositoryNode.label=Papierkorb
 HadoopCustomVersionDialog.table.descColumn=Beschreibung

i18n/plugins/org.talend.core.runtime.nl/src/main/java/org/talend/core/runtime/i18n/messages_el.properties

@@ -80,7 +80,6 @@ EComponentCategory_version=\u0388\u03BA\u03B4\u03BF\u03C3\u03B7
 EComponentCategory_view=\u03A0\u03C1\u03BF\u03B2\u03BF\u03BB\u03AE
 EConnectionType.iteratorMenu=\u0395\u03C0\u03B1\u03BD\u03AC\u03BB\u03B7\u03C8\u03B7
 EConnectionType.lookupMenu=\u0394\u03B9\u03B5\u03C1\u03B5\u03CD\u03BD\u03B7\u03C3\u03B7
-EConnectionType.mainMenu=\u039A\u03CD\u03C1\u03B9\u03BF
 EConnectionType.onComponentErrorMenu=\u03A3\u03C6\u03AC\u03BB\u03BC\u03B1 \u03A3\u03B5 \u03A3\u03C5\u03C3\u03C4\u03B1\u03C4\u03B9\u03BA\u03CC \u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF
 EConnectionType.onComponentOkMenu=\u03A3\u03C5\u03C3\u03C4\u03B1\u03C4\u03B9\u03BA\u03CC \u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF Ok
 EConnectionType.onSubjobErrorMenu=\u03A3\u03C6\u03AC\u03BB\u03BC\u03B1 \u03A3\u03C4\u03B7\u03BD \u03A5\u03C0\u03BF\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1
@@ -331,7 +330,6 @@ OpenXSDFileDialog.confirm=\u0395\u03C0\u03B9\u03B2\u03B5\u03B2\u03B1\u03AF\u03C9
 OpenXSDFileDialog.fileName=\u038C\u03BD\u03BF\u03BC\u03B1 \u0391\u03C1\u03C7\u03B5\u03AF\u03BF\u03C5:
 OpenXSDFileDialog.xmlFileSelection=\u0395\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE \u03B5\u03BD\u03CC\u03C2 \u0391\u03C1\u03C7\u03B5\u03AF\u03BF\u03C5 XML \u03C0\u03C1\u03BF\u03C2 \u0395\u03C0\u03B9\u03BA\u03CD\u03C1\u03C9\u03C3\u03B7
 RepositoryContentProvider.repositoryLabel.Queries=\u0395\u03C1\u03C9\u03C4\u03AE\u03BC\u03B1\u03C4\u03B1
-RepositoryContentProvider.repositoryLabel.sapFunction=\u03A3\u03C5\u03BD\u03B1\u03C1\u03C4\u03AE\u03C3\u03B5\u03B9\u03C2 SAP
 repository.servicesOperation=\u039B\u03B5\u03B9\u03C4\u03BF\u03C5\u03C1\u03B3\u03AF\u03B1
 repository.servicesPort=\u0398\u03CD\u03C1\u03B1
 BinRepositoryNode.label=\u039A\u03AC\u03B4\u03BF\u03C2 \u03B1\u03BD\u03B1\u03BA\u03CD\u03BA\u03BB\u03C9\u03C3\u03B7\u03C2

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

@@ -111,7 +111,6 @@ EComponentCategory.monitoring=Monitoring
 EComponentCategory.hadoopConfig=Hadoop Configuration
 EConnectionType.iteratorMenu=Iterate
 EConnectionType.lookupMenu=Look Up
-EConnectionType.mainMenu=Main
 EConnectionType.onComponentErrorMenu=On Component Error
 EConnectionType.onComponentOkMenu=On Component Ok
 EConnectionType.onSubjobErrorMenu=On Subjob Error
@@ -497,7 +496,6 @@ OpenXSDFileDialog.fileName=File Name:
 OpenXSDFileDialog.xmlFileSelection=Select a XML File to Validate
 OpenXSDFileDialog.xmlSelectedOrNot=As you have selected a XSD metadata file, \n there should be a xml file to validate.
 RepositoryContentProvider.repositoryLabel.Queries=Queries
-RepositoryContentProvider.repositoryLabel.sapFunction=SAP Functions
 repository.routes=Routes
 repository.servicesOperation=Operation
 repository.servicesPort=Port
@@ -559,7 +557,7 @@ repository.systemIndicators.businessRules=Business Rules
 repository.systemIndicators.correlation=Correlation
 repository.systemIndicators.functionalDependency=Functional Dependency
 repository.systemIndicators.overview=Overview
-repository.systemIndicators.patternFinder=Pattern Frequency Statistics
+repository.systemIndicators.patternFinder=Pattern Frequncey Statistics
 repository.systemIndicators.patternMatching=Pattern Matching
 repository.systemIndicators.rowComparison=Row Comparison
 repository.systemIndicators.simpleStatistics=Simple Statistics
@@ -600,3 +598,14 @@ OverTimePopupDialogTask.CheckingConnectionJob.waitingFinish=waiting {0} finish..
 OverTimePopupDialogTask.CheckingConnectionJob.emptyWaitingfinish=waiting to finish...
 EComponentCategory_gitHistory=Git History
 repository.gitroot=GIT
+EComponentCategory.parameters=Parameters
+EComponentCategory.actionInputOutput=Input/Output Schema
+EConnectionType.RejectMenu=Reject
+RepositoryContentProvider.repositoryLabel.sapBapi=SAP Bapi
+RepositoryContentProvider.repositoryLabel.sapBapi.input=Input
+RepositoryContentProvider.repositoryLabel.sapBapi.output=Output
+RepositoryContentProvider.repositoryLabel.sapTable=SAP Tables
+RepositoryContentProvider.repositoryLabel.sapDataSource=SAP DataSource
+RepositoryContentProvider.repositoryLabel.sapDSO=SAP DSO
+RepositoryContentProvider.repositoryLabel.sapInfoCube=SAP InfoCube
+RepositoryContentProvider.repositoryLabel.sapInfoObject=SAP InfoObject

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

@@ -1,3 +1,4 @@
+AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2010, Talend Inc.\n//\n// Ce code source a été automatiquement généré par_{0}\n// / JobDesigner (CodeGenerator version {1})\n// Vous pouvez trouver plus d'informations à propos des produits Talend à www.talend.com.\n// Vous pouvez distribuer ce code suivant les termes de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
 AbstractComponentsProvider.folderNotExist=Le dossier {0} n'existe pas
 AbstractItemMigrationTask.taskFailed=La tâche de migration {0} a échoué sur l'élément {1}
 AdvancedSocketFactory.failedInitial=Erreur : impossible d'initialiser :
@@ -47,7 +48,7 @@ ContextProcessSection.ParameterNameIsNotValid=Le nom de param
 ContextProcessSection.RemoveInformation={0} est le contexte par défaut et ne peut être supprimé.
 ContextProcessSection.errorTitle=ERROR
 ConextTableValuesComposite.nameLabel=Nom
-ConextTemplateComposite.OrderMessages=Précisez si vous désirez réorganiser les variables.
+ConextTemplateComposite.OrderMessages=Si vous souhaitez réorganiser les variables, cela doit être sélectionné.
 ConextTemplateComposite.OrderText=Ordre d'origine
 ContextSetConfigurationDialog.nameNotValid=le nom est invalide
 ContextTemplateComposite.CommentLabel=Commentaire
@@ -67,7 +68,7 @@ CorePreferencePage.alwaysWelcome=Toujours afficher la vue de bienvenue au d
 CorePreferencePage.javaInterpreter=Interpréteur &Java
 CorePreferencePage.perlInterpreter=Interpréteur Perl
 CorePreferencePage.previewLimit=Aperçu limite
-CorePreferencePage.runInMultiThread=Execution multi thread (valeur par défaut lors de la création d'un job)
+CorePreferencePage.runInMultiThread=Exécution multi thread (valeur par défaut lors de la création d'un Job)
 CorePreferencePage.temporaryFiles=Fichiers &temporaires
 DbTableSelectorDialog.textContent=Choisir le nom de la table
 ECodeLanguage.unknowLanguage=Langage inconnu
@@ -103,7 +104,6 @@ EComponentCategory.monitoring=Monitoring
 EComponentCategory.hadoopConfig=Configuration de Hadoop
 EConnectionType.iteratorMenu=Iterate
 EConnectionType.lookupMenu=Look Up
-EConnectionType.mainMenu=Main
 EConnectionType.onComponentErrorMenu=On Component Error
 EConnectionType.onComponentOkMenu=On Component Ok
 EConnectionType.onSubjobErrorMenu=On Subjob Error
@@ -156,12 +156,14 @@ GlobalServiceRegister.ServiceNotRegistered=Le service {0} n'a pas
 GroupByContextAction.groupContext=Grouper par contexte
 GroupByVariableAction.groupVariable=Grouper par variable
 JavaSimpleDateFormatProposalProvider.quoteDisplayError=Deux apostrophes affichent uniquement une seule apostrophe
-JavaTypesManager.bigDecimal=BIGDECIMAL est le nombre :
-JavaTypesManager.integer=INTEGER est le nombre :
-JavaTypesManager.list=LIST est le nombre :
-JavaTypesManager.string=STRING est le nombre :
+JavaTypesManager.bigDecimal=BIGDECIMAL est un nombre :
+JavaTypesManager.integer=INTEGER est un nombre :
+JavaTypesManager.list=LIST est un nombre :
+JavaTypesManager.string=STRING est un nombre :
 LDAPCATruster.sslError1=Erreur SSL : échec de la vérification de la chaîne de certification du serveur.
 ListPreferencePage.RemoveButtonName=Remove
+LogImageCacheAction.CacheImage=Image du cache\:
+LogImageCacheAction.CacheImageDesc=Desc. de l'image du cache :
 MetadataDialog.CopyToInput.toolTipText=Copie  tout le schéma de sortie vers le schéma d'entrée
 MetadataDialog.CopySelectionToInput.toolTipText=Copie de colonnes de schéma de sortie vers schéma d'entrée
 MetadataDialog.CopyToOutput=Copie tout le schéma d'entrée vers le schéma de sortie
@@ -433,7 +435,6 @@ OpenXSDFileDialog.confirm=Confirmer
 OpenXSDFileDialog.fileName=Nom de fichier :
 OpenXSDFileDialog.xmlFileSelection=Sélectionner un fichier XML à valider
 RepositoryContentProvider.repositoryLabel.Queries=Requêtes
-RepositoryContentProvider.repositoryLabel.sapFunction=Fonctions SAP
 repository.routes=Routes
 repository.servicesOperation=Opération
 repository.servicesPort=Port
@@ -473,8 +474,24 @@ LibrariesListSelectionDialog.selectLibFromOS=S
 LibrariesListSelectionDialog.browseButton.text=Parcourir...
 LibrariesListSelectionDialog.deployLibs=Déployer les bibliothèques...
 GenerateSelectSQLAction.NewQuery=Nouvelle requête {0}
+AbstractBrandingService.routines_license_header_content2014=// ============================================================================\n//\n// Copyright (c) 2006-2014, Talend Inc.\n//\n// Ce code source a été automatiquement généré par_{0}\n// / JobDesigner (CodeGenerator version {1})\n// Vous pouvez trouver plus d'informations à propos des produits Talend à www.talend.com.\n// Vous pouvez distribuer ce code suivant les termes de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
 repository.systemIndicators.advancedStatistics=Statistiques avancées
+EUpdateItemType.MapPath=Chemin du mapping
+EUpdateResult.PathUpdate=Mise à jour du chemin du mapping
+AContextualAction.EditorManager_saveChangesQuestion=''{0}'" a été modifié. Sauvegarder ?
+AContextualAction.Save_Resource=Sauvegarder la ressource
 EComponentCategory.sparkConfig=Configuration Spark
 repository.SAPIDoc=SAP IDoc
 repository.SAPTable=Table SAP
 ProgressMonitorDialogWithCancel.executeMessage.default=Exécution...
+ProgressMonitorDialogWithCancel.CheckingConnectionJob.waitingFinish=en attente de la fin de {0}...
+ProgressMonitorDialogWithCancel.CheckingConnectionJob.emptyWaitingfinish=en attente de la fin...
+UpdatesConstants.Storm=Storm
+UpdatesConstants.SparkStreaming=Spark_Streaming
+OverTimePopupDialogTask.title=Exécution...
+OverTimePopupDialogTask.message=Tâche d'exécution en arrière plan, patientez...
+OverTimePopupDialogTask.killed=Exécution arrêtée
+EComponentCategory_gitHistory=Historique Git
+repository.gitroot=GIT
+EComponentCategory.actionInputOutput=Schéma d'entrée/de sortie
+RepositoryContentProvider.repositoryLabel.sapTable=Tables SAP

i18n/plugins/org.talend.core.runtime.nl/src/main/java/org/talend/core/runtime/i18n/messages_it.properties

@@ -99,7 +99,6 @@ EComponentCategory.myExtensions=Mie estensioni
 EComponentCategory.monitoring=Monitoraggio
 EConnectionType.iteratorMenu=Il codice sorgente è stato generato in automatico da {0}
 EConnectionType.lookupMenu=Look Up
-EConnectionType.mainMenu=Principale
 EConnectionType.onComponentErrorMenu=Su errore componente
 EConnectionType.onComponentOkMenu=Su componente OK
 EConnectionType.onSubjobErrorMenu=Su errore subjob
@@ -415,7 +414,6 @@ OpenXSDFileDialog.confirm=Conferma
 OpenXSDFileDialog.fileName=Nome file:
 OpenXSDFileDialog.xmlFileSelection=Seleziona un file XML da validare
 RepositoryContentProvider.repositoryLabel.Queries=Interrogazioni
-RepositoryContentProvider.repositoryLabel.sapFunction=Funzioni SAP
 repository.routes=Percorsi
 repository.servicesOperation=Operazione
 repository.servicesPort=Porta

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

@@ -111,7 +111,6 @@ EComponentCategory.monitoring=\u30E2\u30CB\u30BF\u30FC
 EComponentCategory.hadoopConfig=Hadoop\u8A2D\u5B9A
 EConnectionType.iteratorMenu=\u53CD\u5FA9
 EConnectionType.lookupMenu=\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7
-EConnectionType.mainMenu=\u30E1\u30A4\u30F3
 EConnectionType.onComponentErrorMenu=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u30A8\u30E9\u30FC\u306E\u5834\u5408
 EConnectionType.onComponentOkMenu=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304COK\u306E\u5834\u5408
 EConnectionType.onSubjobErrorMenu=\u30B5\u30D6\u30B8\u30E7\u30D6\u304C\u30A8\u30E9\u30FC\u306E\u5834\u5408
@@ -234,7 +233,7 @@ PaletteContentDialog.connection=\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u306E\u63A5
 PaletteContentDialog.hint=\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u306E\u30D2\u30F3\u30C8\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\:
 PaletteContentDialog.lable=\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u306E\u30E9\u30D9\u30EB\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\:
 Parameter.Comment=\u30B3\u30E1\u30F3\u30C8\uFF1A
-Parameter.Name=\u30D1\u30E9\u30E1\u30FC\u30BF\u540D
+Parameter.Name=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u540D
 Parameter.Value=\u5024\uFF1A
 PatternCalendar.dateFormat="yyyy-MM-dd HH\:mm\:ss"
 PatternCalendar.example=\u4F8B\:
@@ -462,7 +461,6 @@ OpenXSDFileDialog.confirm=\u78BA\u8A8D
 OpenXSDFileDialog.fileName=\u30D5\u30A1\u30A4\u30EB\u540D \:
 OpenXSDFileDialog.xmlFileSelection=\u691C\u8A3C\u7528XML\u30D5\u30A1\u30A4\u30EB\u306E\u9078\u629E
 RepositoryContentProvider.repositoryLabel.Queries=\u30AF\u30A8\u30EA
-RepositoryContentProvider.repositoryLabel.sapFunction=SAP\u30D5\u30A1\u30F3\u30AF\u30B7\u30E7\u30F3
 repository.routes=\u30EB\u30FC\u30C8
 repository.servicesOperation=\u30aa\u30da\u30ec\u30fc\u30b7\u30e7\u30f3
 repository.servicesPort=\u30DD\u30FC\u30C8
@@ -537,3 +535,7 @@ OverTimePopupDialogTask.executeTimeout=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u305
 OverTimePopupDialogTask.killed=\u5B9F\u884C\u3092\u4E2D\u6B62
 OverTimePopupDialogTask.waitingFinishMessage.default=\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u30BF\u30B9\u30AF\u3092\u4E2D\u65AD\u3067\u304D\u307E\u305B\u3093
 OverTimePopupDialogTask.CheckingConnectionJob.waitingFinish={0}\u306E\u7D42\u4E86\u3092\u5F85\u6A5F\u4E2D...
+EComponentCategory_gitHistory=GIT\u5C65\u6B74
+EComponentCategory.parameters=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+EComponentCategory.actionInputOutput=\u5165\u529B/\u51FA\u529B\u30B9\u30AD\u30FC\u30DE
+EConnectionType.RejectMenu=\u30EA\u30B8\u30A7\u30AF\u30C8

i18n/plugins/org.talend.core.runtime.nl/src/main/java/org/talend/core/runtime/i18n/messages_pl.properties

@@ -69,7 +69,6 @@ EComponentCategory_technical=Techniczne
 EComponentCategory_version=Wersja
 EComponentCategory_view=Widok
 EConnectionType.iteratorMenu=Iteracja
-EConnectionType.mainMenu=G\u0142ówny
 EConnectionType.onComponentErrorMenu=Po b\u0142\u0119dzie komponentu
 EConnectionType.onComponentOkMenu=Je\u015Bli komponent OK
 EConnectionType.runAfterMenu=Uruchom po

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

@@ -71,7 +71,6 @@ EComponentCategory_sqlTemplate=Template SQL
 EComponentCategory_technical=Técnico
 EComponentCategory_version=Versão
 EComponentCategory_view=Visão
-EConnectionType.mainMenu=Main
 EConnectionType.onComponentErrorMenu=Erro no componente
 EConnectionType.onComponentOkMenu=Componente ok
 EConnectionType.tableMenu=Tabela

i18n/plugins/org.talend.core.runtime.nl/src/main/java/org/talend/core/runtime/i18n/messages_slk.properties

@@ -23,7 +23,6 @@ EComponentCategory_main=Hlavn
 EComponentCategory_properties=Vlastnosti
 EComponentCategory_version=Verzia
 EComponentCategory_view=Poh\u013Ead
-EConnectionType.mainMenu=Hlavný
 EConnectionType.tableMenu=Tabu\u013Eka
 ExtractMetaDataFromDataBase.connectionSuccessful=Úspe\u0161né pripojenie
 ListPreferencePage.RemoveButtonName=Odstráni\u0165

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

@@ -77,7 +77,6 @@ EComponentCategory_view=\u89c6\u56fe
 EComponentCategory.advancedSettings=\u9AD8\u7EA7\u8BBE\u7F6E
 EConnectionType.iteratorMenu=\u8FED\u4EE3
 EConnectionType.lookupMenu=\u8ffd\u52a0\u5217
-EConnectionType.mainMenu=\u4E3B\u7EBF
 EConnectionType.onComponentErrorMenu=\u7EC4\u4EF6\u8FD0\u884C\u9519\u8BEF
 EConnectionType.onComponentOkMenu=\u7EC4\u4EF6\u8FD0\u884C\u6B63\u786E
 EConnectionType.onSubjobErrorMenu=\u5B50job\u9519\u8BEF

i18n/plugins/org.talend.core.ui.nl/plugin_fr.properties

@@ -1,4 +1,5 @@
 Metadata=Métadonnées
+TalendDataCollector=Collection des données d'utilisation
 TalendDataCollectorPreview=Aperçu
 TalendDataCollectorUploading=Chargement
 prefs=Talend

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

@@ -1,4 +1,5 @@
-AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2010, Talend Inc.\n//\n// Ce code source a été automatiquement généré par_{0}\n// / JobDesigner (CodeGenerator version {1})\n// Vous pouvez trouver plus d'informations à propos des produits Talend à www.talend.com.\n// Vous pouvez distribuer ce code suivant les termes de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
+AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2011, Talend Inc.\n//\n// Ce code source a été automatiquement généré par_{0}\n// / JobDesigner (CodeGenerator version {1})\n// Vous pouvez trouver plus d'informations à propos des produits Talend à www.talend.com.\n// Vous pouvez distribuer ce code suivant les termes de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
+AbstractBrandingService.routines_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2011, Talend Inc.\n//\n// Ce code source a été automatiquement généré par_{0}\n// / JobDesigner (CodeGenerator version {1})\n// Vous pouvez trouver plus d'informations à propos des produits Talend à www.talend.com.\n// Vous pouvez distribuer ce code suivant les termes de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
 AbstractComponentsProvider.folderNotExist=Le dossier {0} n'existe pas.
 AbstractItemMigrationTask.taskFailed=La tâche de migration {0} a échoué sur l'élément {1}
 AdvancedSocketFactory.failedInitial=Erreur. Impossible d'initialiser :
@@ -38,7 +39,7 @@ ContextProcessSection.ParameterNameIsNotValid=Le nom de param
 ContextProcessSection.RemoveInformation={0} est le contexte par défaut et ne peut être supprimé.
 ContextProcessSection.errorTitle=ERROR
 ConextTableValuesComposite.nameLabel=Nom
-ConextTemplateComposite.OrderMessages=Précisez si vous désirez réorganiser les variables.
+ConextTemplateComposite.OrderMessages=Si vous souhaitez réorganiser les variables, cela doit être sélectionné.
 ConextTemplateComposite.OrderText=Ordre d'origine
 ContextSetConfigurationDialog.nameNotValid=le nom est invalide
 ContextTemplateComposite.CommentLabel=Commentaire
@@ -57,7 +58,7 @@ CorePreferencePage.iReportPath=Chemin d'acc
 CorePreferencePage.javaInterpreter=Interpréteur &Java
 CorePreferencePage.perlInterpreter=Interpréteur Perl
 CorePreferencePage.previewLimit=Aperçu limite
-CorePreferencePage.runInMultiThread=Execution multi thread (valeur par défaut lors de la création d'un job)
+CorePreferencePage.runInMultiThread=Exécution multi thread (valeur par défaut lors de la création d'un Job)
 CorePreferencePage.temporaryFiles=Fichiers &temporaires
 DbTableSelectorDialog.textContent=Choisir le nom de la table
 ECodeLanguage.unknowLanguage=Langage inconnu
@@ -133,12 +134,14 @@ JavaGlobalVariableProposal.Description=Description\: {0}
 JavaGlobalVariableProposal.VariableName=\n\nNom de la variable\: {1}
 JavaSimpleDateFormatProposalProvider.displaySingleQuote=\ '' : affiche un guillemet simple
 JavaSimpleDateFormatProposalProvider.quoteDisplayError=Deux apostrophes affichent uniquement une seule apostrophe
-JavaTypesManager.bigDecimal=BIGDECIMAL est le nombre :
-JavaTypesManager.integer=INTEGER est le nombre :
-JavaTypesManager.list=LIST est le nombre :
-JavaTypesManager.string=STRING est le nombre :
+JavaTypesManager.bigDecimal=BIGDECIMAL est un nombre :
+JavaTypesManager.integer=INTEGER est un nombre :
+JavaTypesManager.list=LIST est un nombre :
+JavaTypesManager.string=STRING est un nombre :
 LDAPCATruster.sslError1=Erreur SSL : échec de la vérification de la chaîne de certification du serveur.
 ListPreferencePage.RemoveButtonName=Remove
+LogImageCacheAction.CacheImage=Image du cache :
+LogImageCacheAction.CacheImageDesc=Desc. de l'image du cache :
 MappingFileLoader.DbTypeAlreadyExists=Dans le mapping du SGBD d'ID "{0}", le type de base de données "{1}" apparaît plus d'une fois dans le fichier "{2}" au n\u0153ud\:{3}
 MappingFileLoader.DbmsIdAlreadyExists=Le SGBD d'ID "{0}" existe déjà.
 MappingFileLoader.InvalidTalendType="{0}" n'est pas un type Talend {1} valide pour le SGBD d'ID "{2}" au n\u0153ud\: {3}
@@ -472,6 +475,7 @@ EMetadataEncoding.Latin9=latin9
 HDFS=HDFS
 HCAT=HCAT
 MetadataTalendTypeEditor.column.Name=Fichier de mapping de métadonnées
+ConnectionParameters.exceptionMessage=Ceci est un référentiel, il ne peut appeler cette méthode.
 ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=Réinitialiser le type de la base de données
 CreateRuleDialog.conditionLabel=Condition
 CreateRuleDialog.groupLabel=Créer une règle
@@ -486,8 +490,14 @@ ContextRemoveParameterCommand.label=Supprimer le param
 ContextRenameParameterCommand.renameParameter=Renommer le paramètre
 ContextModifyCommand.label=Modifier le contexte
 ArchiveFileExportOperationFullPath.cannotCreateDir=Impossible de créer le répertoire '{0}'
+ContextTreeValuesComposite.Menu=Menu
+ContextMissSettingComposite.Title_Missing_jars_for_plugin=Bibliothèques tierces manquantes
+ContextNebulaComposite.ContextsUnAvailable=La vue Contextes n'est pas disponible.
 ContextValidator.ParameterNotValid=le nom du paramètre n'est pas valide
+ModuleListCellEditor.add=Ajouter
 ContextBuiltinToRepositoryCommand.addRelation=Une variable de contexte du même nom existe dans le référentiel. Votre variable built-in sera remplacée. Continuer ?
+WorkspaceMnu.switch.text=Changer de répertoire &Workspace
+WorkspaceMnu.switch.tooltip=Ouvrir le répertoire Workspace
 WorkspaceMnu.choose.text=&Choisir
 WorkspaceMnu.choose.tooltip=Sélectionnez un autre répertoire Workspace
 WorkspaceMnu.restart.error.title=Propriété système manquante

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

@@ -404,7 +404,7 @@ ModuleListCellEditor.title=\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9078\u629E
 MultiStringSelectionDialog.nameEmpty=\u540D\u524D\u304C\u7A7A\u3067\u3059
 PromptDialog.stringTip=\u5165\u529B\u30C6\u30AD\u30B9\u30C8\u306F\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3067\u56F2\u3080\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 ApplicationActionBarAdvisor.menuFileLabel=\u30d5\u30a1\u30a4\u30eb \uff08&F)
-ApplicationActionBarAdvisor.menuEditLabel=\u7de8\u96c6 \uff08&E)
+ApplicationActionBarAdvisor.menuEditLabel=\u7DE8\u96C6\uFF08&E)
 ApplicationActionBarAdvisor.navigateLabel=\u30ca\u30d3\u30b2\u30fc\u30c8 (&N)
 ApplicationActionBarAdvisor.gotoLabel=\u79fb\u52d5 (&G)
 ApplicationActionBarAdvisor.projectLabel=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 \uff08&P)

i18n/plugins/org.talend.designer.maven.ui.nl/plugin_fr.properties

@@ -0,0 +1,9 @@
+ProjectSettingPage_Build=Build
+ProjectSettingPage_Maven=Maven
+ProjectSettingPage_MavenCustomSetup=Configurer les scripts personnalisés par dossier
+ProjectSettingPage_BuildDesc=Paramètres du build
+ProjectSettingPage_MavenDesc=Paramètres Maven
+ProjectSettingPage_MavenDefaultDesc=Paramètres par défaut des scripts Maven
+ProjectSettingPage_ProjectPom=Projet
+ProjectSettingPage_ProjectPomDesc=Paramètres des POM du projet
+ProjectSettingPage_MavenCustomSetupDesc=Configurer les scripts Maven personnalisés par dossier

i18n/plugins/org.talend.designer.maven.ui.nl/plugin_ja.properties

@@ -1,4 +1,8 @@
 ProjectSettingPage_Build=\u30D3\u30EB\u30C9
 ProjectSettingPage_Maven=Maven
 ProjectSettingPage_MavenDefault=\u30C7\u30D5\u30A9\u30EB\u30C8
-ProjectSettingPage_MavenCustomSetup=\u30AB\u30B9\u30BF\u30E0\u30B9\u30AF\u30EA\u30D7\u30C8\u306E\u8A2D\u5B9A
+ProjectSettingPage_BuildDesc=\u30D3\u30EB\u30C9\u8A2D\u5B9A
+ProjectSettingPage_MavenDesc=Maven\u8A2D\u5B9A
+ProjectSettingPage_MavenDefaultDesc=Maven\u30B9\u30AF\u30EA\u30D7\u30C8\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A
+ProjectSettingPage_ProjectPom=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
+ProjectSettingPage_ProjectPomDesc=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8POM\u8A2D\u5B9A

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

@@ -0,0 +1,5 @@
+FolderMavenSettingPage_CreateButtonText=Créer les fichiers Maven
+FolderMavenSettingPage_DeleteButtonText=Supprimer les fichiers Maven
+FolderMavenSettingPage_CreatingMavenSettingPath=Chemin :
+ProjectPomProjectSettingPage_Titile=NOTE\: Les modules et les dépendances seront conservés.
+ProjectPomProjectSettingPage_ConfirmTitle=Confirmer

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

@@ -4,3 +4,4 @@ FolderMavenSettingPage_DeleteButtonText=Maven\u30D5\u30A1\u30A4\u30EB\u3092\u524
 FolderMavenSettingPage_CreatingMavenSettingPath=\u30D1\u30B9\uFF1A
 FolderMavenSettingPage_CreatingMavenSettingErrorTitle=\u30A8\u30E9\u30FC
 FolderMavenSettingPage_CreatingMavenSettingErrorMessage=\u3053\u306E\u30D5\u30A9\u30EB\u30C0\u30FC\u306B\u306FMaven\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u51FA\u6765\u307E\u305B\u3093\uFF1A
+ProjectPomProjectSettingPage_ConfirmTitle=\u78BA\u8A8D

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

@@ -1,2 +1,4 @@
 LogLoadedComponentsAction.componentLog=Composant \: {0}
 LogActiveContextsAction.activeContextLog=Contexte actif : {0}
+LogImageCacheAction.CacheImage=Image du cache :
+LogImageCacheAction.CacheImageDesc=Desc. de l'image du cache :

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

@@ -1,3 +1,5 @@
+AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2010, Talend Inc.\n//\n// Ce code source a été automatiquement généré par_{0}\n// / JobDesigner (CodeGenerator version {1})\n// Vous pouvez trouver plus d'informations à propos des produits Talend à www.talend.com.\n// Vous pouvez distribuer ce code suivant les termes de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
+AbstractBrandingService.routines_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2010, Talend Inc.\n//\n// Ce code source a été automatiquement généré par_{0}\n// / JobDesigner (CodeGenerator version {1})\n// Vous pouvez trouver plus d'informations à propos des produits Talend à www.talend.com.\n// Vous pouvez distribuer ce code suivant les termes de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
 AbstractComponentsProvider.folderNotExist=Le dossier {0} n'existe pas
 AbstractItemMigrationTask.taskFailed=La tâche de migration {0} a échoué sur l'élément {1}
 AdvancedSocketFactory.failedInitial=Erreur : impossible d'initialiser :
@@ -47,7 +49,7 @@ ContextProcessSection.ParameterNameIsNotValid=Le nom de param
 ContextProcessSection.RemoveInformation={0} est le contexte par défaut et ne peut être supprimé.
 ContextProcessSection.errorTitle=ERROR
 ConextTableValuesComposite.nameLabel=Nom
-ConextTemplateComposite.OrderMessages=Précisez si vous désirez réorganiser les variables.
+ConextTemplateComposite.OrderMessages=Si vous souhaitez réorganiser les variables, cela doit être sélectionné.
 ConextTemplateComposite.OrderText=Ordre d'origine
 ContextSetConfigurationDialog.nameNotValid=le nom est invalide
 ContextTemplateComposite.CommentLabel=Commentaire
@@ -67,7 +69,7 @@ CorePreferencePage.alwaysWelcome=Toujours afficher la vue de bienvenue au d
 CorePreferencePage.javaInterpreter=Interpréteur &Java
 CorePreferencePage.perlInterpreter=Interpréteur Perl
 CorePreferencePage.previewLimit=Aperçu limite
-CorePreferencePage.runInMultiThread=Execution multi thread (valeur par défaut lors de la création d'un job)
+CorePreferencePage.runInMultiThread=Exécution multi thread (valeur par défaut lors de la création d'un Job)
 CorePreferencePage.temporaryFiles=Fichiers &temporaires
 DbTableSelectorDialog.textContent=Choisir le nom de la table
 DqRepositoryViewService.NoSchemaGiven=Impossible de charger les vues. Aucun schéma donné.
@@ -140,12 +142,15 @@ GlobalServiceRegister.ServiceNotRegistered=Le service {0} n'a pas
 GroupByContextAction.groupContext=Grouper par contexte
 GroupByVariableAction.groupVariable=Grouper par variable
 JavaSimpleDateFormatProposalProvider.quoteDisplayError=Deux apostrophes affichent uniquement une seule apostrophe
-JavaTypesManager.bigDecimal=BIGDECIMAL est le nombre :
-JavaTypesManager.integer=INTEGER est le nombre :
-JavaTypesManager.list=LIST est le nombre :
-JavaTypesManager.string=STRING est le nombre :
+JavaSqlFactory.NoClassName=Aucun nom de classe pour trouver le pilote
+JavaTypesManager.bigDecimal=BIGDECIMAL est un nombre :
+JavaTypesManager.integer=INTEGER est un nombre :
+JavaTypesManager.list=LIST est un nombre :
+JavaTypesManager.string=STRING est un nombre :
 LDAPCATruster.sslError1=Erreur SSL : échec de la vérification de la chaîne de certification du serveur.
 ListPreferencePage.RemoveButtonName=Remove
+LogImageCacheAction.CacheImage=Image du cache :
+LogImageCacheAction.CacheImageDesc=Desc. de l'image du cache :
 MetadataDialog.CopyToInput.toolTipText=Copie  tout le schéma de sortie vers le schéma d'entrée
 MetadataDialog.CopySelectionToInput.toolTipText=Copie de colonnes de schéma de sortie vers schéma d'entrée
 MetadataDialog.CopyToOutput=Copie tout le schéma d'entrée vers le schéma de sortie
@@ -351,5 +356,11 @@ ExtractMetaDataUtils.missDriver.1=impossible de trouver la classe :
 ExtractMetaDataUtils.missDriver.2=pilote JDBC manquant :
 DqRepositoryViewService.NO_CATALOGS=Aucun catalogue donné. Impossible de retrouver les tables.
 DqRepositoryViewService.NONE_NULL_FUNCTION_NAME=Un nom fonctionnel ne doit pas être null.
+CommonWizard.exception=Exception
 CheckConnection.CheckSchema.ProposeSchema.title=Remplacer le schéma par celui proposé ?
+NetezzaConnectionFiller.emptyCalalogName=Le nom du catalogue est vide.
+DBConnectionFillerImpl.dbmsIdIsBlank=L'ID du SGBD est vide.
 EmbeddedHiveDataBaseMetadata.functionNotSupportMessage=La fonction n'est supportée que sous Windows.
+HiveConnectionManager.getConnection.timeout=Connexion suspendue. (La suspension peut être configurée dans [Préférences>Talend>Performances>Suspension de la connexion])
+HiveConnectionManager.getConnection.waitFinish=Impossible d'interrompre la connexion.\nEn attente que [{0}] se termine 
+HiveConnectionManager.getConnection.waitFinish.empty=Impossible d'interrompre la connexion.\nAttendez la fin.

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

@@ -217,7 +217,7 @@ NodeReturnProposal.Description=\u8AAC\u660E\: {0}
 PaletteContentDialog.connection=\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u306E\u63A5\u7D9A\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\:
 PaletteContentDialog.hint=\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u306E\u30D2\u30F3\u30C8\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\:
 PaletteContentDialog.lable=\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u306E\u30E9\u30D9\u30EB\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\:
-Parameter.Name=\u30D1\u30E9\u30E1\u30FC\u30BF\u540D
+Parameter.Name=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u540D
 PatternCalendar.dateFormat="yyyy-MM-dd HH\:mm\:ss"
 PatternCalendar.example=\u4F8B\:
 PatternCalendar.pattern=\u30D1\u30BF\u30FC\u30F3\:
@@ -375,3 +375,4 @@ OpenXSDFileDialog.xmlFileSelection=\u691C\u8A3C\u7528XML\u30D5\u30A1\u30A4\u30EB
 ExtractMetaDataUtils.missDriver.1=\u898B\u3064\u304B\u3089\u306A\u3044\u30AF\u30E9\u30B9\uFF1A
 ExtractMetaDataUtils.missDriver.2=JDBC\u30C9\u30E9\u30A4\u30D0\u304C\u3042\u308A\u307E\u305B\u3093
 CommonWizard.exception=\u4F8B\u5916
+EmbeddedHiveDataBaseMetadata.functionNotSupportMessage=\u57CB\u8FBC\u307F\u30E2\u30FC\u30C9\u306FWindows\u3067\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093

i18n/plugins/org.talend.metadata.managment.ui.nl/src/main/java/messages_fr.properties

@@ -214,6 +214,7 @@ FileStep2.fieldPositionNotFinishByComma=La position du champ ne doit pas se term
 FileStep2.fieldPositionNotValidate=La position du champ doit contenir uniquement des chiffres et des virgules. Les positions doivent être présentées en ordre ascendant.
 FileStep2.fieldPositionTip=Vous devez définir ici la position de chaque colonne. Les positions doivent être présentées dans l'ordre ascendant.
 FileStep2.fieldSeparator=Séparateur de champs
+FileStep2.fieldSeparatorAlert=Le séparateur de champs doit être spécifié. Il doit contenir uniquement des nombres, virgules, guillemets et caractères de début.
 FileStep2.fieldSeparatorDelimitedTip=Séparateur de champs
 FileStep2.fieldSeparatorIncomplete=Le séparateur de champs doit être renseigné
 FileStep2.fieldSeparatorNotFinishByComma=Le séparateur de champs ne se termine pas par une virgule
@@ -249,7 +250,7 @@ FileStep2.settingsIncomplete=Les param
 FileStep2.splitwayRecordForJavaFID=Découper la ligne avant le champ
 FileStep2.splitwayRecordForJavaFIDTip=Utile lorsque le séparateur de champs fait partie du séparateur de lignes.
 FileStep2.textEnclosure=Entourage du texte
-FileStep2.textEnclosureAlert=Le délimiteur de texte doit être spécifié
+FileStep2.textEnclosureAlert=L'entourage du texte doit être spécifié
 FileStep2.textEnclosureTip=Entourage du texte
 FileStep2.wait=Wait
 FileStep2Form.onlyNumber=Seuls les nombres sont autorisés
@@ -300,6 +301,7 @@ LDAPSchemaStep1Form.connnectionSuccessed=Connexion
 LDAPSchemaStep2Form.AuthenticationMethod=Méthode d'authentification
 LDAPSchemaStep2Form.AuthenticationParameter=Paramètre d'authentification
 LDAPSchemaStep2Form.BaseDN=Base DN
+LDAPSchemaStep2Form.BindPassword=Lier le mot de passe \:
 LDAPSchemaStep2Form.CheckAuthentication=Vérifier l'authentification
 LDAPSchemaStep2Form.FetchBaseDNs=Récupérer les DNs de la base
 LDAPSchemaStep2Form.GetBaseDNS=Récupérer les DNs de la base à partir de Root DSE
@@ -490,13 +492,23 @@ PropertiesWizardPage.button.name.conver=Convertir
 InegerCellEditorListener.NumeralMessage=Valeur d'entrée invalide
 EditProcessPropertiesWizard.wizardTitle=Editer les propriétés
 ContextSetsSelectionDialog.ReportMessages=Le rapport est en mode contexte.
+AbstractForm.SelectExistContext=Utiliser un contexte existant
+ContextModeSelectPage.contextModes=Créer un nouveau contexte ou réutiliser le contexte existant
+ContextModeSelectPage.createContext=Créer un nouveau contexte dans le référentiel
 ContextModeSelectPage.reuseContext=Réutiliser un contexte existant dans le référentiel
+ContextAdaptConectionSelectPage.selectOrCustomVariable=Sélectionnez un champ de connexion pour les variables de contexte existantes
+ContextAdaptConectionSelectPage.title=Sélectionnez les champs de connexion
+ContextAdaptConectionSelectPage.errorMsg=Sélectionnez le champ de connexion pour les variables de contexte
+ContextAdaptConectionSelectPage.duplicateErrorMsg=champ <{0}> en doublon, correspond à différentes variables de contexte
+ContextVariableValuePage.title=Modifier la valeur de la variable
 PropertiesDialog.title=Propriétés
 PropertiesDialog.desc=Configurations des propriétés
 PropertiesDialog.parentProperties.title=Propriétés parentes
+PropertiesDialog.statusLabel.empty=(Vide)
 HadoopPropertiesDialog.title=Propriétés Hadoop
 HadoopPropertiesDialog.desc=Configuration des propriétés Hadoop
 HadoopPropertiesDialog.parentProperties.title=Propriétés Hadoop parents
 HiveJDBCPropertiesDialog.title=Propriétés Hive
 HiveJDBCPropertiesDialog.desc=Configuration des propriétés Hive
 EditProcessPropertiesWizardPage.convert.button.name=Convertir en Job Big Data Batch
+ContextAdaptConectionSelectPage.lackOfVariablesMsg=Ce contexte a des variables <{0}> mais la connexion nécessite <{1}>.

i18n/plugins/org.talend.metadata.managment.ui.nl/src/main/java/messages_ja.properties

@@ -10,7 +10,7 @@ PropertiesWizardPage.EmptyPurposeWarning=\u76EE\u7684\u3092\u7A7A\u6B04\u306E\u3
 PropertiesWizardPage.ItemExistsError=\u3053\u306E\u30A2\u30A4\u30C6\u30E0\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u3054\u307F\u7BB1\u3092\u78BA\u8A8D\u3057\u3001\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u7A7A\u306B\u3057\u3066\u4E0B\u3055\u3044\u3002
 PropertiesWizardPage.KeywordsError=\u540D\u524D\u304C\u6709\u52B9\u306AID\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
 PropertiesWizardPage.Name=\u540D
-PropertiesWizardPage.NameEmptyError=\u540D\u524D\u304C\u7A7A\u3067\u3059\u3002
+PropertiesWizardPage.NameEmptyError=\u540D\u524D\u304C\u3042\u308A\u307E\u305B\u3093\u3002
 PropertiesWizardPage.NameFormatError=\u540D\u524D\u306B\u4E0D\u6B63\u306A\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
 PropertiesWizardPage.Path=\u30D1\u30B9
 PropertiesWizardPage.Purpose=\u76EE\u7684

i18n/plugins/org.talend.migrationTool.nl/src/messages_ja.properties

@@ -4,8 +4,10 @@ MigrationToolService.migrationCancel=\u79FB\u884C\u30BF\u30B9\u30AF\u304C {0} \u
 MigrationToolService.taskInProgress=\u79FB\u884C\u30BF\u30B9\u30AF {0} \u304C\u5B9F\u884C\u4E2D\u3067\u3059...
 MigrationToolService.taskNotExist=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5185\u306E\u30BF\u30B9\u30AF{0}\u306F\u3082\u3046\u5B58\u5728\u3057\u307E\u305B\u3093
 MigrationToolService.taskMonitor=\u9805\u76EE {1} \u306B\u79FB\u884C\u30BF\u30B9\u30AF {0} \u3092\u9069\u7528
-MigrationToolService.itemLogWarn=\u4E0D\u5B8C\u5168\u306A\u30A4\u30F3\u30DD\u30FC\u30C8\u9805\u76EE{0}\uFF08\u79FB\u884C\u30BF\u30B9\u30AF{1}\u306E\u5931\u6557\uFF09
-MigrationToolService.itemLogException=\u4E0D\u5B8C\u5168\u306A\u30A4\u30F3\u30DD\u30FC\u30C8\u9805\u76EE{0}\uFF08\u79FB\u884C\u30BF\u30B9\u30AF{1}\u306E\u5931\u6557\uFF09
+MigrationToolService.itemLogWarn=\u4E0D\u5B8C\u5168\u306A\u30A4\u30F3\u30DD\u30FC\u30C8\u30A2\u30A4\u30C6\u30E0{0}\uFF08\u79FB\u884C\u30BF\u30B9\u30AF{1}\u306E\u5931\u6557\uFF09
+MigrationToolService.itemLogException=\u4E0D\u5B8C\u5168\u306A\u30A4\u30F3\u30DD\u30FC\u30C8\u30A2\u30A4\u30C6\u30E0{0}\uFF08\u79FB\u884C\u30BF\u30B9\u30AF{1}\u306E\u5931\u6557\uFF09
 MigrationToolService.itemDeleteException=\u30A2\u30A4\u30C6\u30E0\uFF08"{0}"\uFF09\u304C\u524A\u9664\u51FA\u6765\u307E\u305B\u3093\u3002\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u7834\u640D\u3057\u3066\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
 MigrationToolService.taskVersionIsNull=\u30BF\u30B9\u30AF {0} \u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u304Cnull\u3067\u3059\u3001\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\uFF01
+MigrationToolService.taskBreaksIsNull=\u30BF\u30B9\u30AF{0}\u304Cnull\u3067\u3059\u3001\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\uFF01
 migrationTasksRecapDialog.descriptions=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306B\u79FB\u884C\u30BF\u30B9\u30AF\u304C\u9069\u7528\u3055\u308C\u307E\u3057\u305F\u3002 \n \u79FB\u884C\u30BF\u30B9\u30AF\u304C\u5931\u6557\u3057\u305F\u5834\u5408\u3001\u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002
+MigrationToolService.projectCanNotOpen=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u958B\u3051\u307E\u305B\u3093\u3002\u30DE\u30A4\u30B0\u30EC\u30FC\u30B7\u30E7\u30F3\u30BF\u30B9\u30AF\u306E\u8A2D\u5B9A\u306B\u8AA4\u308A\u304C\u3042\u308A\u307E\u3059\uFF1A{0}

i18n/plugins/org.talend.model.edit.nl/plugin_de.properties

@@ -234,6 +234,7 @@ _UI_ExecutionTask_active_feature=Aktiv
 _UI_ExecutionTask_generatedSvnRevision_feature=Generierte SVN Version
 _UI_ExecutionTask_status_feature=Status
 _UI_ExecutionTask_errorStatus_feature=Fehler Status
+_UI_ExecutionTask_lastRunDate_feature=Letzte Ausführung
 _UI_ExecutionTask_triggers_feature=Auslöser
 _UI_ExecutionTask_jobPrms_feature=Auftrags-PRMS
 _UI_ExecutionTask_jobId_feature=Auftrgas-ID
@@ -244,6 +245,7 @@ _UI_ExecutionTaskCmdPrm_active_feature=aktiv
 _UI_ExecutionTaskCmdPrm_parameter_feature=Parameter
 _UI_ExecutionTaskCmdPrm_description_feature=Beschreibung
 _UI_ExecutionTaskJobPrm_defaultValue_feature=Standardwert
+_UI_ExecutionTaskJobPrm_originalValue_feature=Originalwert
 _UI_TaskExecutionHistory_projectName_feature=Projektname
 _UI_TalendTrigger_active_feature=aktiv
 _UI_TalendTrigger_description_feature=Beschreibung
@@ -356,6 +358,9 @@ _UI_FileConnection_FilePath_feature=Dateipfad
 _UI_FileConnection_Format_feature=Format
 _UI_FileConnection_Encoding_feature=Encoding
 _UI_FileConnection_RowSeparatorType_feature=Zeilentrenner
+_UI_FileConnection_RowSeparatorValue_feature=Zeilentrennwert
+_UI_FileConnection_FooterValue_feature=Inhalt Fußzeile
+_UI_FileConnection_LimitValue_feature=Grenzwert
 _UI_FileConnection_RemoveEmptyRow_feature=Lösche die letzte Zeile
 _UI_FileConnection_EscapeChar_feature=Escape Char
 _UI_FileConnection_TextEnclosure_feature=Text Enclosure
@@ -513,6 +518,7 @@ _UI_ExecutionPlanPartCmdPrm_value_feature=Wert
 _UI_ExecutionPlanPartJobPrm_id_feature=ID
 _UI_ExecutionPlanPartJobPrm_override_feature=Überschreiben
 _UI_ExecutionPlanPartJobPrm_name_feature=Name
+_UI_ExecutionPlanPartJobPrm_customValue_feature=Benutzerdefinierter Wert
 _UI_ExecutionTask_generatedJobVersion_feature=Generierte Auftragsversion
 _UI_ExecutionTask_useLatestVersion_feature=letzte Version verwenden
 _UI_PlanExecutionHistory_currentLabel_feature=Aktueller Name
@@ -581,6 +587,8 @@ _UI_ValidationRulesConnection_conditions_feature=Bedingungen
 _UI_RuleType_REFERENCE_literal=Referenz
 _UI_RuleType_BASIC_literal=Einfach
 _UI_Function_Empty_literal=Leer
+_UI_Function_Lower_Case_literal=Kleinbuchstaben
+_UI_Function_Lower_Case_literal=Kleinbuchstaben
 _UI_Function_Length_literal=Länge
 _UI_Function_Match_literal=Übereinstimmung
 _UI_Operator_Equals_literal=Gleichheit

i18n/plugins/org.talend.model.edit.nl/plugin_fr.properties

@@ -7,12 +7,12 @@ providerName=.Talend SA.
 _UI_BusinessAssignation_talendItem_feature=Elément Talend
 _UI_TalendItem_repository_feature=Référentiel
 _UI_BusinessAssignation_comment_feature=Commentaire
-_UI_BusinessItemShape_incomingRelationships_feature=Relation entrante
+_UI_BusinessItemShape_incomingRelationships_feature=Relations entrantes
 _UI_TalendItem_type=Element Talend
 _UI_BusinessItem_type=Elément
 _UI_FileXmlMetadata_type=Métadonnées des fichiers XML
 _UI_BusinessProcess_businessZones_feature=Zones Business
-_UI_GenericSchemaMetadata_type=Schéma générique des Métadonnées
+_UI_GenericSchemaMetadata_type=Métadonnées de schéma générique
 _UI_BaseBusinessItemRelationship_type=Relation de l'Elément Business de base
 _UI_FileMetadata_type=Métadonnées des fichiers
 _UI_BusinessZone_parentEntity_feature=Entité Mère
@@ -30,7 +30,7 @@ _UI_BidirectionalBusinessItemRelationship_type=Relations d'affaires Bidirectionn
 _UI_TalendItem_version_feature=Version
 _UI_BaseBusinessItemRelationship_target_feature=Cible
 _UI_Documentation_type=Documentation
-_UI_BusinessItemShape_type=Forme de l'objet
+_UI_BusinessItemShape_type=Forme d'élément
 _UI_BusinessZoneRelationShip_businessProcess_feature=Business Model
 _UI_BusinessItem_name_feature=Nom
 _UI_DatabaseMetadata_type=Métadonnées des bases de données
@@ -38,7 +38,7 @@ _UI_BusinessAssignment_businessItem_feature=Objet Business
 _UI_Repository_type=Référentiel
 _UI_ActionBusinessItem_type=Elément Action
 _UI_BusinessZone_name_feature=Nom
-_UI_BusinessItemShape_outgoingRelationships_feature=Relation sortante
+_UI_BusinessItemShape_outgoingRelationships_feature=Relations sortantes
 _UI_GearBusinessItem_type=Moteur d'objets Business
 _UI_DecisionBusinessItem_type=Objet Décision Business
 _UI_Routine_type=Routine
@@ -64,7 +64,7 @@ _UI_BusinessItem_assignations_feature=Assignations
 _UI_BusinessAssignation_type=Affectation
 _UI_TalendItem_name_feature=Nom
 _UI_PropertyDescriptor_description=Le {0} de {1}
-_UI_BusinessItem_incomingRelationships_feature=Relation entrante
+_UI_BusinessItem_incomingRelationships_feature=Relations entrantes
 _UI_TableMetadata_type=Métadonnées des tables
 _UI_TalendItem_author_feature=Créé par :
 _UI_BusinessAssignment_talendItem_feature=Elément Talend
@@ -93,7 +93,7 @@ _UI_CreateChild_description=Cr
 _UI_BusinessZoneRelationShip_source_feature=Source
 _UI_CreateChild_text3={1}
 _UI_CreateChild_text2={1} {0}
-_UI_BusinessItem_outgoingRelationships_feature=Relation sortante
+_UI_BusinessItem_outgoingRelationships_feature=Relations sortantes
 _UI_FileLdifMetadata_type=Métadonnées des fichiers Ldif
 _UI_BusinessZoneRelationShip_target_feature=Cible
 _UI_SapFunctionMetadata_type=Métadonnée Fonction SAP
@@ -184,7 +184,7 @@ _UI_TDQItem_type=El
 _UI_TDQAnalysisItem_type=Elément d'analyse TDQ
 _UI_TDQReportItem_type=Elément de rapport TDQ
 _UI_TDQDBConnectionItem_type=Elément  de connexion TDQ
-_UI_TDQMDMConnectionItem_type=Elément de connexion TDQ MDM
+_UI_TDQMDMConnectionItem_type=Élément de connexion TDQ MDM
 _UI_TDQIndicatorItem_type=Elément d'indicateur TDQ
 _UI_TDQBusinessRuleItem_type=Elément de règle métier TDQ
 _UI_LinkRulesItem_type=Link Rules Item
@@ -421,8 +421,10 @@ _UI_TaskExecutionHistory_triggerType_feature=Type de d
 _UI_TaskExecutionHistory_triggerName_feature=Nom du déclencheur
 _UI_TaskExecutionHistory_triggerDescription_feature=Description du déclencheur
 _UI_TaskExecutionHistory_taskErrorStackTrace_feature=Trace de la pile de l'erreur de la tâche
+_UI_TaskExecutionHistory_idQuartzJob_feature=Id Quartz Job
 _UI_TaskExecutionHistory_idQuartzTrigger_feature=Id Quartz Trigger
 _UI_TaskExecutionHistory_lastJobGenerationDate_feature=Date de dernière génération du Job
+_UI_TaskExecutionHistory_jobArchiveFilename_feature=Job Archive Filename
 _UI_TaskExecutionHistory_fileTriggerFileMask_feature=Déclenchement fichier masque de fichier
 _UI_TaskExecutionHistory_fileTriggerFileName_feature=Déclencheur fichier nom de fichier
 _UI_TaskExecutionHistory_fileTriggerFolderPath_feature=Déclencheur fichier chemin d'accès au dossier
@@ -435,6 +437,7 @@ _UI_TaskExecutionHistory_adminJobEndDate_feature=Date de fin du Job admin
 _UI_TaskExecutionHistory_serverJobStartDate_feature=Server Job Start Date
 _UI_TaskExecutionHistory_serverJobEndDate_feature=Server Job End Date
 _UI_TaskExecutionHistory_idRemoteJob_feature=ID du Job distant
+_UI_TaskExecutionHistory_idRemoteJobExecution_feature=Id Remote Job Execution
 _UI_TaskExecutionHistory_requestId_feature=ID de la requête
 _UI_TaskExecutionHistory_resumingMode_feature=Resuming Mode
 _UI_TaskExecutionHistory_contextValues_feature=Valeurs de contexte
@@ -447,8 +450,9 @@ _UI_TalendTrigger_triggerType_feature=Type de d
 _UI_TalendTrigger_executionTask_feature=Exécution de tâche
 _UI_TalendTrigger_startTime_feature=Heure de début
 _UI_TalendTrigger_endTime_feature=Heure de fin
-_UI_TalendTrigger_previousFireTime_feature=Heure de déclenchement précédente
-_UI_TalendTrigger_finalFireTime_feature=Heure de déclenchement finale
+_UI_TalendTrigger_previousFireTime_feature=Heure du déclenchement précédent
+_UI_TalendTrigger_finalFireTime_feature=Heure du déclenchement final
+_UI_TalendTrigger_idQuartzTrigger_feature=Id Quartz Trigger
 _UI_TalendTrigger_resumePauseUpdated_feature=Resume Pause Updated
 _UI_TalendTrigger_previouslyPaused_feature=Précédemment mis en pause
 _UI_CronTalendTrigger_cronExpression_feature=Expression Cron
@@ -499,7 +503,7 @@ _UI_SoaOperation_project_feature=Project
 _UI_SoaOperation_context_feature=Contexte
 _UI_SoaOperation_jobVersion_feature=Version du Job
 _UI_SoaOperation_jobName_feature=Nom du Job
-_UI_SoaOperation_active_feature=actif
+_UI_SoaOperation_active_feature=Actif
 _UI_SoaOperation_lastScriptGenerationDate_feature=Last Script Generation Date
 _UI_SoaOperation_jobId_feature=ID du Job
 _UI_SoaOperation_applyContextToChildren_feature=Appliquer le contexte aux fils
@@ -913,6 +917,7 @@ _UI_ExecutionTriggerable_triggers_feature=D
 _UI_ExecutionTriggerable_status_feature=Statut
 _UI_ExecutionTriggerable_errorStatus_feature=Error Status
 _UI_ExecutionTriggerable_concurrentExecution_feature=Exécution simultanée
+_UI_ExecutionTriggerable_processingState_feature=Processing State
 _UI_ExecutionPlan_label_feature=Libellé
 _UI_ExecutionPlan_execPlanParts_feature=Exec Plan Parts
 _UI_ExecutionPlan_execPlanPrms_feature=Exec Plan Prms
@@ -1045,10 +1050,10 @@ _UI_RuleType_REFERENCE_literal=REFERENCE
 _UI_RuleType_BASIC_literal=BASIC
 _UI_RuleType_CUSTOM_literal=CUSTOM
 _UI_Function_Empty_literal=Vide
-_UI_Function_Lower_Case_literal=Minuscule
-_UI_Function_Lower_Case_literal=Minuscule
-_UI_Function_Upper_Case_literal=Majuscule
-_UI_Function_Upper_Case_literal=Majuscule
+_UI_Function_Lower_Case_literal=Minuscules
+_UI_Function_Lower_Case_literal=Minuscules
+_UI_Function_Upper_Case_literal=Majuscules
+_UI_Function_Upper_Case_literal=Majuscules
 _UI_Function_Lower_Case_First_literal=Lower_Case_First
 _UI_Function_Lower_Case_First_literal=Lower_Case_First
 _UI_Function_Upper_Case_First_literal=Upper_Case_First

i18n/plugins/org.talend.model.edit.nl/plugin_ja.properties

@@ -362,7 +362,7 @@ _UI_ExecutionTask_jobVersion_feature=\u30B8\u30E7\u30D6\u30D0\u30FC\u30B8\u30E7\
 _UI_ExecutionTask_active_feature=\u30A2\u30AF\u30C6\u30A3\u30D6
 _UI_ExecutionTask_idQuartzJob_feature=ID Quartz\u30B8\u30E7\u30D6
 _UI_ExecutionTask_lastScriptGenerationDate_feature=\u6700\u7D42\u30B8\u30E7\u30D6\u751F\u6210\u65E5\u4ED8
-_UI_ExecutionTask_generatedSvnRevision_feature=\u751F\u6210\u3055\u308C\u305FSVN\u30EA\u30D3\u30B8\u30E7\u30F3
+_UI_ExecutionTask_generatedSvnRevision_feature=SVN\u30EA\u30D3\u30B8\u30E7\u30F3
 _UI_ExecutionTask_idRemoteJob_feature=ID\u30EA\u30E2\u30FC\u30C8\u30B8\u30E7\u30D6
 _UI_ExecutionTask_idRemoteJobExecution_feature=ID\u30EA\u30E2\u30FC\u30C8\u30B8\u30E7\u30D6\u5B9F\u884C
 _UI_ExecutionTask_checksumArchive_feature=\u30C1\u30A7\u30C3\u30AF\u30B5\u30E0\u30A2\u30FC\u30AB\u30A4\u30D6
@@ -567,6 +567,7 @@ _UI_UserProjectAuthorizationType_ReadWrite_literal=\u8AAD\u307F\u53D6\u308A\u66F
 _UI_UserProjectAuthorizationType_ReadOnly_literal=\u8AAD\u307F\u53D6\u308A\u5C02\u7528
 _UI_UserModuleAuthorizationType_JobConductor_literal=Job\u30B3\u30F3\u30C0\u30AF\u30BF\u30FC
 _UI_UserModuleAuthorizationType_Dashboard_literal=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9
+_UI_InformationLevel_DEBUG_literal=\u30C7\u30D0\u30C3\u30B0
 _UI_InformationLevel_WARN_literal=WARN
 _UI_InformationLevel_ERROR_literal=ERROR
 _UI_Metadata_type=\u30E1\u30BF\u30C7\u30FC\u30BF
@@ -739,8 +740,8 @@ _UI_SAPFunctionParameterColumn_Length_feature=\u9577\u3055
 _UI_SAPFunctionParameterColumn_Value_feature=\u5024
 _UI_SAPFunctionParameterColumn_ParameterTable_feature=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30C6\u30FC\u30D6\u30EB
 _UI_SAPFunctionParameterTable_columns_feature=\u30AB\u30E9\u30E0
-_UI_InputSAPFunctionParameterTable_functionUnit_feature=\u30D5\u30A1\u30F3\u30AF\u30B7\u30E7\u30F3\u5358\u4F4D
-_UI_OutputSAPFunctionParameterTable_functionUnit_feature=\u30D5\u30A1\u30F3\u30AF\u30B7\u30E7\u30F3\u5358\u4F4D
+_UI_InputSAPFunctionParameterTable_functionUnit_feature=\u30D5\u30A1\u30F3\u30AF\u30B7\u30E7\u30F3\u30E6\u30CB\u30C3\u30C8
+_UI_OutputSAPFunctionParameterTable_functionUnit_feature=\u30D5\u30A1\u30F3\u30AF\u30B7\u30E7\u30F3\u30E6\u30CB\u30C3\u30C8
 _UI_RegexpFileConnection_FieldSeparatorType_feature=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u8A18\u53F7\u306E\u7A2E\u985E
 _UI_XmlFileConnection_XsdFilePath_feature=XSD\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9
 _UI_XmlFileConnection_XmlFilePath_feature=XML\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9

i18n/plugins/org.talend.presentation.onboarding.nl/plugin_ja.properties

@@ -0,0 +1 @@
+Onboarding=Studio\u30AF\u30A4\u30C3\u30AF\u30C4\u30A2\u30FC

i18n/plugins/org.talend.presentation.onboarding.nl/src/messages_fr.properties

@@ -0,0 +1,4 @@
+onBoardingComposite.button.skip=Fermer
+onBoardingComposite.button.skip.letMeTry=Essayer
+onBoardingComposite.button.back=Retour
+OnBoardingHandler.confirm.title=Réinitialiser la perspective

i18n/plugins/org.talend.presentation.onboarding.nl/src/messages_ja.properties

@@ -0,0 +1,15 @@
+onBoardingComposite.button.skip=\u9589\u3058\u308B
+onBoardingComposite.button.skip.letMeTry=\u59CB\u3081\u308B\uFF01
+onBoardingComposite.button.back=\u623B\u308B
+onBoardingComposite.button.next=\u6B21\u3078
+OnBoardingHtmlAction.OnBoardingManager.null=OnBoardingManager\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+OnBoardingManager.NPE.workbench=\u30EF\u30FC\u30AF\u30D9\u30F3\u30C1\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+OnBoardingManager.workbenchWindow.notFound=\u6709\u52B9\u306A\u30EF\u30FC\u30AF\u30D9\u30F3\u30C1\u30A6\u30A3\u30F3\u30C9\u30A6\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30EF\u30FC\u30AF\u30D9\u30F3\u30C1\u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+OnBoardingManager.NPE.workbenchWindow=workbenchWindow\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+OnBoardingManager.NPE.workbenchWindowShell=workbenchWindow\u306E\u30B7\u30A7\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+OnBoardingHandler.confirm.title=\u30D1\u30FC\u30B9\u30DA\u30AF\u30C6\u30A3\u30D6\u306E\u30EA\u30BB\u30C3\u30C8
+OnBoardingHandler.confirm.msg=Studio\u30AF\u30A4\u30C3\u30AF\u30C4\u30A2\u30FC\u3092\u8868\u793A\u3059\u308B\u305F\u3081\u306B\u3001\u5148\u305A\u306F\u30D1\u30FC\u30B9\u30DA\u30AF\u30C6\u30A3\u30D6\u3092\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u4E0B\u3055\u3044\u3002\u30D1\u30FC\u30B9\u30DA\u30AF\u30C6\u30A3\u30D6\u3092\u521D\u671F\u72B6\u614B\u306B\u30EA\u30BB\u30C3\u30C8\u3057\u307E\u3059\u304B\uFF1F
+OnBoardingResourceManager.convertData.invalidJsonInputType=\u4E0D\u6B63\u306A\u5165\u529B\u30BF\u30A4\u30D7\u3067\u3059\u3002\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u308B\u306E\u306F JSON string / file / URL \u306E\u307F\u3067\u3059\u3002
+OnBoardingResourceManager.addOnBoardingRegistedResource.docIdExists=Doc ID[{0}]\u306F\u30AA\u30F3\u30DC\u30FC\u30C7\u30A3\u30F3\u30B0\u30EA\u30BD\u30FC\u30B9\u306E\u8FFD\u52A0\u6642\u306B\u65E2\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\uFF1F
+OnBoardingJsonDoc.buildContentMap.perspIdExists=\u30D1\u30FC\u30B9\u30DA\u30AF\u30C6\u30A3\u30D6ID[{0}]\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u3001\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\uFF1F
+OnBoardingManager.docId.null=Docid\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002

i18n/plugins/org.talend.rcp.nl/src/main/java/messages_el.properties

@@ -13,12 +13,9 @@ Application.workspaceInUse=\u039F \u03A7\u03CE\u03C1\u03BF\u03C2 \u0395\u03C1\u0
 Application_workspaceInUseTitle=\u03A7\u03CE\u03C1\u03BF\u03C2 \u0395\u03C1\u03B3\u03B1\u03C3\u03AC\u03B9\u03C2 \u039C\u03B7 \u0394\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03BF\u03C2
 ExportCommandAction.refreshWorkspace=\u0391\u03BD\u03B1\u03BD\u03AD\u03C9\u03C3\u03B7 \u03C7\u03CE\u03C1\u03BF\u03C5 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2
 ApplicationWorkbenchWindowAdvisor.repositoryConnection=\u03A3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7
-ExportLogsWizardPage.addLog=\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7 \u03B1\u03C1\u03C7\u03B5\u03AF\u03C9\u03BD \u03BA\u03B1\u03C4\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE\u03C2
 ExportLogsWizardPage.error=\u03A3\u03C6\u03AC\u03BB\u03BC\u03B1
 ExportLogsWizardPage.errorMess=\u03A0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03B5\u03B9\u03C3\u03B1\u03C7\u03B8\u03B5\u03AF \u03C4\u03BF \u03BC\u03BF\u03BD\u03BF\u03C0\u03AC\u03C4\u03B9 \u03B5\u03BE\u03B1\u03B3\u03C9\u03B3\u03AE\u03C2 \u03AE \u03C4\u03BF \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF
 ExportLogsWizardPage.exportLog=\u0395\u03BE\u03B1\u03B3\u03C9\u03B3\u03AE \u03B9\u03C3\u03C4\u03BF\u03C1\u03B9\u03BA\u03BF\u03CD \u03C3\u03B5 \u03AD\u03BD\u03B1 \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF
-ExportLogsWizardPage.selectItem=\u0395\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE \u03B1\u03BD\u03C4\u03B9\u03BA\u03B5\u03B9\u03BC\u03AD\u03BD\u03C9\u03BD \u03C0\u03C1\u03BF\u03C2 \u03B5\u03BE\u03B1\u03B3\u03C9\u03B3\u03AE...
-ExportLogsWizardPage.sysConfig=\u03A0\u03B1\u03C1\u03B1\u03BC\u03B5\u03C4\u03C1\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7 \u03C3\u03C5\u03C3\u03C4\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2
 Application.workspaceNotExiste=\u039F \u03A7\u03CE\u03C1\u03BF\u03C2 \u0395\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 \u03B4\u03B5\u03BD \u03C5\u03C0\u03AC\u03C1\u03C7\u03B5\u03B9, \u03B4\u03B5 \u03BC\u03C0\u03BF\u03C1\u03BF\u03CD\u03BD \u03BD\u03B1 \u03BE\u03B5\u03BA\u03B9\u03BD\u03AE\u03C3\u03BF\u03C5\u03BD \u03C3\u03C4\u03B9\u03B3\u03BC\u03B9\u03CC\u03C4\u03C5\u03C0\u03B1 \u03C3\u03B5 \u03B1\u03C5\u03C4\u03CC \u03C4\u03BF \u03BC\u03BF\u03BD\u03BF\u03C0\u03AC\u03C4\u03B9.
 RegisterWizard.windowTitle={0} \u039A\u03B1\u03C4\u03B1\u03C7\u03CE\u03C1\u03B9\u03C3\u03B7
 tips.runJob=\u0395\u03BA\u03C4\u03AD\u03BB\u03B5\u03C3\u03B7 \u0395\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2

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

@@ -13,12 +13,9 @@ Application.workspaceInUse=Workspace in use, cannot start multiple instances at
 Application_workspaceInUseTitle=Workspace Unavailable
 ExportCommandAction.refreshWorkspace=Refresh workspace
 ApplicationWorkbenchWindowAdvisor.repositoryConnection=Connection
-ExportLogsWizardPage.addLog=Add logs
 ExportLogsWizardPage.error=Error
 ExportLogsWizardPage.errorMess=Must input the export path or archive file.
 ExportLogsWizardPage.exportLog=Export logs to an archive file
-ExportLogsWizardPage.selectItem=Select the items to export...
-ExportLogsWizardPage.sysConfig=System configuration
 Application.workspaceNotExiste=Workspace not exist, cannot start instances in this path.
 LinksToolbarItem_0=Learn from tutorials
 LinksToolbarItem_11=Upgrade to new version
@@ -110,3 +107,5 @@ Application.workspaceInvalidMessage=Selected workspace is not valid; choose a di
 SwitchProjectAction_actionLabel.v2=Switch &Project or Workspace...
 ApplicationWorkbenchWindowAdvisor.wrongJavaSetup=Wrong Java setup
 ApplicationWorkbenchWindowAdvisor.jdkRequired=A JDK is required to build Jobs. You can define which JDK to use in Window > Preferences > Java > Installed JREs.
+ExportLogsWizardPage.confirm=Warning
+ExportLogsWizardPage.confirmMsg=Warning: this file already exist, do you want to overwrite it?

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

@@ -12,12 +12,9 @@ Application.workspaceInUse=Espace de travail en cours d'utilisation, impossible
 Application_workspaceInUseTitle=Espace de travail non disponible
 ExportCommandAction.refreshWorkspace=Rafraîchir l'espace de travail
 ApplicationWorkbenchWindowAdvisor.repositoryConnection=Connexion
-ExportLogsWizardPage.addLog=Ajouter des logs
 ExportLogsWizardPage.error=ERROR
 ExportLogsWizardPage.errorMess=Vous devez créer le chemin d'export ou le chemin d'accès au fichier archive.
 ExportLogsWizardPage.exportLog=Exporter les logs dans un fichier archive.
-ExportLogsWizardPage.selectItem=Sélectionnez les éléments à exporter...
-ExportLogsWizardPage.sysConfig=Configuration du système
 Application.workspaceNotExiste=L'espace de travail n'existe pas, impossible de lancer des instances avec ce chemin d'accès.
 LinksToolbarItem_0=Apprenez avec les tutorials
 LinksToolbarItem_11=Mettre à jour la version
@@ -83,6 +80,9 @@ Application.WorkspaceInuseMessage=Ce workspace est d
 Application.WorkspaceInuseTitle=Erreur dans le workspace
 Application.doNotSupportJavaVersionYetPoweredbyTalend=Le studio ne supporte pas Java 8. La version recommandée de la JVM est la version 7. Consultez l'article suivant de la base de connaissances de Talend Help Center pour plus d'informations (nécessite un compte MyTalend) :
 Application.doNotSupportJavaVersionYetNoPoweredbyTalend=Le studio ne supporte pas Java 8. La version recommandée de la JVM est la version 7.
+ApplicationWorkbenchWindowAdvisor.PromptOnExitDialog_message0=Quitter l'application ?
+ApplicationWorkbenchWindowAdvisor.PromptOnExitDialog_shellTitle=Confirmer sortie
+DataTransferMessages.ArchiveExport_selectDestinationTitle=Exporter vers fichier archive
 Application_workspaceMandatoryTitle=Un répertoire Workspace est obligatoire.
 Application_workspaceMandatoryMessage=Le Studio Talend nécessite un Workspace valide. Redémarrez sans l'option @none.
 Application.WorkspaceCannotBeSetTitle=Impossible de créer le répertoire Worksapce
@@ -91,5 +91,6 @@ Application.workspaceEmptyTitle=Un r
 Application.workspaceEmptyMessage=Le champ Workspace ne doit pas être vide, saisissez un chemin d'accès pour continuer.
 Application.workspaceInvalidTitle=Workspace invalide
 Application.workspaceInvalidMessage=Le Workspace sélectionné est invalide, sélectionnez-en un autre.
+SwitchProjectAction_actionLabel.v2=Changer de &Projet ou de répertoire Workspace...
 ApplicationWorkbenchWindowAdvisor.wrongJavaSetup=Mauvaise configuration Java
 ApplicationWorkbenchWindowAdvisor.jdkRequired=Une JDK est requise pour construire les Jobs. Vous pouvez définir quelle JDK utiliser dans Window > Preferences > Java > Installed JREs.

i18n/plugins/org.talend.rcp.nl/src/main/java/messages_hr.properties

@@ -3,7 +3,6 @@ Application.workspaceInUse=Radni prostor se ve\u0107 koristi, nije mogu\u0107e i
 Application_workspaceInUseTitle=Workspace Unavailable
 ApplicationWorkbenchWindowAdvisor.repositoryConnection=Konekcija
 ExportLogsWizardPage.error=Gre\u0161ka
-ExportLogsWizardPage.selectItem=Ozna\u010Di stavke za eksport...
 WelcomePageDynamicContentProvider.LatestItemsJob.Title=Posao
 WelcomePageDynamicContentProvider.LatestItemsBusinessModel.Title=Poslovni model
 WelcomePageDynamicContentProvider.CreateNewJobTitle=Posao

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

@@ -13,12 +13,9 @@ Application.workspaceInUse=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u4F7
 Application_workspaceInUseTitle=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u304C\u5229\u7528\u3067\u304D\u307E\u305B\u3093
 ExportCommandAction.refreshWorkspace=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306E\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
 ApplicationWorkbenchWindowAdvisor.repositoryConnection=\u63A5\u7D9A
-ExportLogsWizardPage.addLog=\u30ED\u30B0\u306E\u8FFD\u52A0
 ExportLogsWizardPage.error=\u30A8\u30E9\u30FC
 ExportLogsWizardPage.errorMess=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u30D1\u30B9\u304B\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ExportLogsWizardPage.exportLog=\u30ED\u30B0\u3092\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
-ExportLogsWizardPage.selectItem=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u9078\u629E...
-ExportLogsWizardPage.sysConfig=\u30B7\u30B9\u30C6\u30E0\u8A2D\u5B9A
 Application.workspaceNotExiste=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u3053\u306E\u30D1\u30B9\u3067\u306F\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u958B\u59CB\u3067\u304D\u307E\u305B\u3093\u3002
 LinksToolbarItem_0=\u30C1\u30E5\u30FC\u30C8\u30EA\u30A2\u30EB\u304B\u3089\u5B66\u3076
 LinksToolbarItem_11=\u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u66F4\u65B0\u3059\u308B
@@ -97,5 +94,8 @@ DataTransferMessages.ArchiveExport_selectDestinationTitle=\u30A2\u30FC\u30AB\u30
 Application_workspaceMandatoryTitle=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306F\u5FC5\u9808\u3067\u3059\u3002
 Application_workspaceMandatoryMessage=Talend Studio\u306F\u6B63\u3057\u3044\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u5FC5\u8981\u3068\u3057\u307E\u3059\u3002\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4ED8\u3051\u305A\u306B\u518D\u8D77\u52D5\u3057\u3066\u4E0B\u3055\u3044\u3002
 Application.WorkspaceCannotBeSetTitle=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u304C\u4F5C\u6210\u51FA\u6765\u307E\u305B\u3093
+Application.workspaceEmptyTitle=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u6307\u5B9A\u3057\u3066\u4E0B\u3055\u3044
+Application.workspaceInvalidTitle=\u4E0D\u6B63\u306A\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9
+SwitchProjectAction_actionLabel.v2=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u53C8\u306F\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u5207\u63DB\u3048
 ApplicationWorkbenchWindowAdvisor.wrongJavaSetup=Java\u306E\u8A2D\u5B9A\u306B\u8AA4\u308A\u304C\u3042\u308A\u307E\u3059
 ApplicationWorkbenchWindowAdvisor.jdkRequired=\u30B8\u30E7\u30D6\u306E\u751F\u6210\u306B\u306FJDK\u304C\u5FC5\u9808\u3067\u3059\u3002[Window]->[Preferences]->[Java]\u3067\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002

i18n/plugins/org.talend.rcp.nl/src/main/java/messages_pl.properties

@@ -9,12 +9,9 @@ ApplicationActionBarAdvisor.save=zapis
 Application.workspaceInUse=Obszar roboczy w u\u017Cycie, nie mo\u017Cna uruchomi\u0107 kilku instancji w tym samym czasie
 Application_workspaceInUseTitle=Obszar roboczy niedost\u0119pny
 ApplicationWorkbenchWindowAdvisor.repositoryConnection=Po\u0142\u0105czenie
-ExportLogsWizardPage.addLog=Dodaj logi
 ExportLogsWizardPage.error=B\u0142\u0105d
 ExportLogsWizardPage.errorMess=Nale\u017Cy wprowadzi\u0107 \u015Bcie\u017Ck\u0119 eksportu lub plik archiwum.
 ExportLogsWizardPage.exportLog=Eksport logów do pliku archiwum.
-ExportLogsWizardPage.selectItem=Zaznacz elementy do eksportu...
-ExportLogsWizardPage.sysConfig=Konfiguracja systemu
 Application.workspaceNotExiste=Obszar roboczy nie istnieje, nie mo\u017Cna uruchomi\u0107 instancji z podanej \u015Bcie\u017Cki
 starting.intro10=Tabulator
 WelcomePageDynamicContentProvider.LatestItemsBusinessModel.Title=Model biznesowy

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

@@ -13,8 +13,6 @@ Application_workspaceInUseTitle=Workspace n
 ExportCommandAction.refreshWorkspace=Atualizar trabalho
 ApplicationWorkbenchWindowAdvisor.repositoryConnection=Ligação
 ExportLogsWizardPage.error=Erro
-ExportLogsWizardPage.selectItem=Selecione os itens para exportar...
-ExportLogsWizardPage.sysConfig=Configuração do sistema
 WelcomePageDynamicContentProvider.LatestItemsBusinessModel.Title=Modelo de Negócio
 WelcomePageDynamicContentProvider.CreateNewBusinessModelTitle=Modelo de Negócio
 WelcomePageDynamicContentProvider.DocumentationTitle=Documentação

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

@@ -11,8 +11,6 @@ Application_workspaceInUseTitle=\u0420\u0430\u0431\u043E\u0447\u0430\u044F \u043
 ExportCommandAction.refreshWorkspace=\u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0440\u0430\u0431\u043E\u0447\u0438\u0439 \u0441\u0442\u043E\u043B
 ApplicationWorkbenchWindowAdvisor.repositoryConnection=\u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435
 ExportLogsWizardPage.error=\u041E\u0448\u0438\u0431\u043A\u0430
-ExportLogsWizardPage.selectItem=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043E\u0431\u044A\u0435\u043A\u0442 \u0434\u043B\u044F \u044D\u043A\u0441\u043F\u043E\u0440\u0442\u0430...
-ExportLogsWizardPage.sysConfig=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u0441\u0438\u0441\u0442\u0435\u043C\u044B
 Application.workspaceNotExiste=\u0420\u0430\u0431\u043E\u0447\u0430\u044F \u043E\u0431\u043B\u0430\u0441\u0442\u044C \u043D\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442, \u043D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u044C \u0438\u0437 \u044D\u0442\u043E\u0433\u043E \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0430.
 tips.optionMenu=\u043E\u043F\u0446\u0438\u044F \u0432 \u043C\u0435\u043D\u044E
 tips.viewAndEdit=\u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u0438 \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0430 \u043A\u043E\u043C\u043F\u043E\u043D\u0435\u043D\u0442\u043E\u0432 \u0432\u0430\u0448\u0435\u0439 \u0437\u0430\u0434\u0430\u0447\u0438

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

@@ -62,3 +62,20 @@ TalendForgeDialog.newProjectTitle=Se connecter
 TalendForgeDialog.createLabel=Créer un compte
 TalendForgeDialog.userNameLabel=Utilisateur :
 TalendForgeDialog.countryLabel=Pays :
+TalendForgeDialog.labelMessageOnePart2=nouveaux composants et connecteurs
+TalendForgeDialog.labelMessageOnePart3=depuis Talend Exchange.
+TalendForgeDialog.labelMessageTwo1=Accéder au plus récent
+TalendForgeDialog.labelMessageTwo2=Documentation et articles techniques
+TalendForgeDialog.labelMessageTwo3=de la base de connaissances Talend.
+TalendForgeDialog.labelMessageThreeVer1=Consultez les derniers messages dans les
+TalendForgeDialog.labelMessageThreeVer2=Forums de discussion Talend.
+TalendForgeDialog.agreeButtonVer1=J'accepte les
+TalendForgeDialog.agreeButtonVer2=conditions d'utilisation de TalendForge
+TalendForgeDialog.createAccountButton.v1=Créer un compte
+TalendForgeDialog.skipButton.version1=Ignorer cette étape
+TalendForgeDialog.connectButton.v1=Me connecter à mon compte
+TalendForgeDialog.ConnectExistingButton=Se connecter à un compte existant
+TalendForgeDialog.CreateNewButton=Créer un nouveau compte
+TalendForgeDialog.form.passwordAgain.hint=Mot de passe à nouveau
+RegisterManagement.userNameOrEmailInDatabase=L'identifiant ou l'adresse e-mail existe déjà dans la base.
+TalendForgeDialog.labelTitle.Version1=Connectez votre Studio à TalendForge, la Communauté

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

@@ -105,5 +105,6 @@ TalendForgeDialog.CreateNewButton=\u65B0\u898F\u30A2\u30AB\u30A6\u30F3\u30C8\u30
 TalendForgeDialog.form.userName.hint=\u30E6\u30FC\u30B6\u30FC\u540D
 TalendForgeDialog.form.password.hint=\u30D1\u30B9\u30EF\u30FC\u30C9
 TalendForgeDialog.form.passwordAgain.hint=\u30D1\u30B9\u30EF\u30FC\u30C9\u518D\u5165\u529B
+RegisterManagement.userNameOrEmailInDatabase=\u30E6\u30FC\u30B6\u30FC\u540D\u53C8\u306Fe-mail\u30A2\u30C9\u30EC\u30B9\u304CDB\u5185\u3067\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002
 TalendForgeDialog.labelTitle.Version1=\u3042\u306A\u305F\u306EStudio\u3092Talend Forge\u306B\u63A5\u7D9A\u3057\u307E\u3057\u3087\u3046\uFF01
 TalendForgeDialog.labelTitle.Version2=\u30AA\u30F3\u30E9\u30A4\u30F3\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3

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

@@ -5,7 +5,7 @@ AbstractImportHandler_itemLocked=\u30A2\u30A4\u30C6\u30E0\u304C\u30ED\u30C3\u30A
 AbstractImportHandler_nameUsed=\u30A2\u30A4\u30C6\u30E0\u304C\u5B58\u5728\u3057\u307E\u3059\u3002\u3054\u307F\u7BB1\u3092\u78BA\u8A8D\u3057\u3066\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u7A7A\u306B\u3057\u3066\u4E0B\u3055\u3044\u3002
 AbstractImportHandler_importing=\u30A4\u30F3\u30DD\u30FC\u30C8 {0}
 AbstractImportHandler_projectNotFound=\u6307\u5B9A\u3055\u308C\u305F\u30D1\u30B9\u306B\u306F\u3001\u95A2\u9023\u3059\u308B\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
-ImportExportHandlersManager_populatingItemsMessage=\u30A2\u30A4\u30C6\u30E0\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u305B\u308B
+ImportExportHandlersManager_populatingItemsMessage=\u30A2\u30A4\u30C6\u30E0\u3092\u30A4\u30F3\u30DD\u30FC\u30C8
 ImportExportHandlersManager_importingItemsMessage=\u30A2\u30A4\u30C6\u30E0\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u4E2D...
 ImportExportHandlersManager_importingItemsError=\u30A4\u30F3\u30DD\u30FC\u30C8\u30A8\u30E9\u30FC
 ImportExportHandlersManager_deletingItemsMessage=\u30A2\u30A4\u30C6\u30E0\u3092\u524A\u9664...

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

@@ -19,6 +19,7 @@ ImportItemsWizardPage_noValidItemsInPathMessage=\u30A4\u30F3\u30DD\u30FC\u30C8\u
 ImportItemsWizardPage_searchingMessage=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u691C\u7D22
 ImportItemsWizardPage_errorTitle=\u30A8\u30E9\u30FC
 ImportItemsWizardPage_couldNotRead=\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093
+ImportItemsWizardPage_sameIdProblemMessage=\u6B21\u306E\uFF12\u3064\u306E\u30A2\u30A4\u30C6\u30E0\u306EID\u304C\u540C\u3058\u3067\u3059\u3002\u3072\u3068\u3064\u306E\u9078\u629E\u3092\u5916\u3057\u3066\u4E0B\u3055\u3044\uFF1A[{0}] [{1}]
 ImportItemsWizardPage_TarImport_badFormat=\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u4E0D\u6B63\u306Atar\u30D5\u30A1\u30A4\u30EB\u3067\u3059\u3002
 ImportItemsWizardPage_ZipImport_badFormat=\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u4E0D\u6B63\u306Azip\u30D5\u30A1\u30A4\u30EB\u3067\u3059\u3002
 ImportItemsAction_title=\u30A2\u30A4\u30C6\u30E0\u306E\u30A4\u30F3\u30DD\u30FC\u30C8
@@ -27,5 +28,5 @@ ShowErrorsDuringImportItemsDialog_title=\u30A2\u30A4\u30C6\u30E0\u306E\u30A4\u30
 ShowErrorsDuringImportItemsDialog_exportLogButton_title=\u30ED\u30B0\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ShowErrorsDuringImportItemsDialog_exportLogEntry=\u30ED\u30B0\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ShowErrorsDuringImportItemsDialog_confirmOverwrite_message=\u30D5\u30A1\u30A4\u30EB"{0}"\u304C\u5B58\u5728\u3057\u307E\u3059\u3002\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\uFF1F
-ImportItemsWizardPage_ErrorsMessage=\u30A2\u30A4\u30C6\u30E0'{0}'\u306B\u306F\u7570\u306A\u308B\u5834\u30B8\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059\u3002\u3054\u307F\u7BB1\u3092\u78BA\u8A8D\u3057\u3066\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u7A7A\u306B\u3057\u3066\u4E0B\u3055\u3044\u3002
+ImportItemsWizardPage_ErrorsMessage=\u30A2\u30A4\u30C6\u30E0'{0}'\u306B\u306F\u7570\u306A\u308B\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u5B58\u5728\u3057\u307E\u3059\u3002\u3054\u307F\u7BB1\u3092\u78BA\u8A8D\u3057\u3066\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u7A7A\u306B\u3057\u3066\u4E0B\u3055\u3044\u3002
 ImportItemsWizardPage_ProgressDialog_ExecutingMessage=\u6E96\u5099\u4E2D...

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

@@ -1,6 +1,6 @@
-LocalRepositoryFactory.logRetrievingFiles=A retrouvé les fichiers {0} en {1} sec
-LocalRepositoryFactory.illegalArgumentException03=Le texte ne peut être ni null ni vide 
-LocalRepositoryFactory.illegalArgumentException02=Le chemin ne peut pas être vide
-LocalRepositoryFactory.illegalArgumentException01=Le type ne peut pas être vide
+LocalRepositoryFactory.logRetrievingFiles=Récupération de {0} fichiers en {1} sec
+LocalRepositoryFactory.illegalArgumentException03=Le libellé ne peut être ni null ou vide 
+LocalRepositoryFactory.illegalArgumentException02=Le chemin ne peut pas être null
+LocalRepositoryFactory.illegalArgumentException01=Le type ne peut pas être null
 LocalRepositoryFactory.CannotLoadProperty=Le gestionnaire du référentiel local n'a pas pu charger
 LocalRepositoryFactory.UserLoginCannotBeNull=Le nom d'utilisateur ne peut être vide

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

@@ -32,6 +32,7 @@ MDMOutputSchemaForm_linker_source=Source du lien
 MDMOutputSchemaForm_no_link=Aucune source et cible liées
 MDMOutputSchemaForm_node_status=Statut du noeud
 MDMOutputSchemaForm_related_column=Colonne liée
+MDMOutputSchemaForm_remove_group=Supprimer l'élément de groupe
 MDMOutputSchemaForm_schema_list=Liste des schémas
 MDMOutputSchemaForm_schema_list_content=Vous pouvez éditer, ajouter et sauvegarder un schéma dans la vue Liste des schémas
 MDMOutputSchemaForm_schema_manage=Gestion du schéma
@@ -98,3 +99,4 @@ CommonWizard.nameAlreadyExist=Ce nom existe d
 FileStep3.itemAlert=Au moins un élément doit exister dans le schéma
 MDMWizardConnection=Connexion au MDM
 MDMForm_error_message=Message d'erreur
+UniverseForm_data_model1=Modèle de données

i18n/plugins/org.talend.repository.metadata.nl/plugin_ar.properties

@@ -1,4 +1,3 @@
 repository.metadataFileXml.alias=XML
-repository.metadataSalesforceSchema=Salesforce
 repository.metadataLDAPSchema=LDAP
 repository.metadataLDAPSchema.alias=LDAP

i18n/plugins/org.talend.repository.metadata.nl/plugin_de.properties

@@ -7,7 +7,6 @@ repository.metadataFileLdif=File ldif
 repository.metadataFileLdif.alias=LDIF
 repository.metadataFileExcel=Excel Datei
 repository.metadataFileExcel.alias=EXCEL
-repository.metadataSalesforceSchema=Salesforce
 repository.metadataSalesforceSchema.alias=Salesforce CRM
 repository.metadataLDAPSchema=LDAP
 repository.metadataLDAPSchema.alias=LDAP

i18n/plugins/org.talend.repository.metadata.nl/plugin_el.properties

@@ -8,7 +8,6 @@ repository.metadataFileLdif=\u0391\u03C1\u03C7\u03B5\u03AF\u03BF ldif
 repository.metadataFileLdif.alias=LDIF
 repository.metadataFileExcel=\u0391\u03C1\u03C7\u03B5\u03AF\u03BF Excel
 repository.metadataFileExcel.alias=EXCEL
-repository.metadataSalesforceSchema=Salesforce
 repository.metadataSalesforceSchema.alias=Salesforce CRM
 repository.metadataLDAPSchema=LDAP
 repository.metadataLDAPSchema.alias=LDAP

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

@@ -8,7 +8,6 @@ repository.metadataFileLdif=File ldif
 repository.metadataFileLdif.alias=LDIF
 repository.metadataFileExcel=File Excel
 repository.metadataFileExcel.alias=EXCEL
-repository.metadataSalesforceSchema=Salesforce
 repository.metadataSalesforceSchema.alias=Salesforce CRM
 repository.metadataLDAPSchema=LDAP
 repository.metadataLDAPSchema.alias=LDAP

i18n/plugins/org.talend.repository.metadata.nl/plugin_fr.properties

@@ -8,7 +8,6 @@ repository.metadataFileLdif=Fichier ldif
 repository.metadataFileLdif.alias=LDIF
 repository.metadataFileExcel=Fichier Excel
 repository.metadataFileExcel.alias=EXCEL
-repository.metadataSalesforceSchema=Salesforce
 repository.metadataSalesforceSchema.alias=Salesforce CRM
 repository.metadataLDAPSchema=LDAP
 repository.metadataLDAPSchema.alias=LDAP

i18n/plugins/org.talend.repository.metadata.nl/plugin_it.properties

@@ -8,7 +8,6 @@ repository.metadataFileLdif=File ldif
 repository.metadataFileLdif.alias=LDIF
 repository.metadataFileExcel=File Excel
 repository.metadataFileExcel.alias=EXCEL
-repository.metadataSalesforceSchema=Salesforce
 repository.metadataSalesforceSchema.alias=Salesforce CRM
 repository.metadataLDAPSchema=LDAP
 repository.metadataLDAPSchema.alias=LDAP

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

@@ -8,7 +8,6 @@ repository.metadataFileLdif=LDIF\u30D5\u30A1\u30A4\u30EB
 repository.metadataFileLdif.alias=LDIF
 repository.metadataFileExcel=Excel\u30D5\u30A1\u30A4\u30EB
 repository.metadataFileExcel.alias=EXCEL
-repository.metadataSalesforceSchema=Salesforce
 repository.metadataSalesforceSchema.alias=Salesforce CRM
 repository.metadataLDAPSchema=LDAP
 repository.metadataLDAPSchema.alias=LDAP

i18n/plugins/org.talend.repository.metadata.nl/plugin_ru.properties

@@ -1,5 +1,4 @@
 repository.metadataFileXml.alias=XML
-repository.metadataSalesforceSchema=Salesforce
 repository.metadataLDAPSchema=LDAP
 repository.metadataLDAPSchema.alias=LDAP
 repository.metadataWSDLSchema=WSDL

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

@@ -1098,9 +1098,6 @@ XmlFileStep2Form.Preview=Preview
 XmlFileStep2Form.Output=Output
 DatabaseForm.distribution.labelName=Distribution
 DatabaseForm.distribution.tips=Select a distribution.
-DatabaseForm.distribution.hortonWorks=HortonWorks
-DatabaseForm.distribution.apache=Apache
-DatabaseForm.distribution.cloudera=Cloudera
 DatabaseForm.hiveVersion.HDP=HDP_1_0
 DatabaseForm.hiveVersion.apache_0_20_203=Apache 0.20.203
 DatabaseForm.hiveVersion.apache_1_0_0=Apache 1.0.0
@@ -1205,3 +1202,4 @@ DatabaseForm.checkConnection.executeMessage=Checking connection...
 PropertiesWizardPage.SameAsProjectname=Name is same as project name.
 DatabaseForm.hiveExecution.group=Execution
 DatabaseForm.hiveExecution.engine=Execution engine
+SelectorTableForm.Failed=Failed

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

@@ -227,6 +227,7 @@ FileStep2.fieldPositionNotFinishByComma=La position du champ ne doit pas se term
 FileStep2.fieldPositionNotValidate=La position du champ doit contenir uniquement des chiffres et des virgules. Les positions doivent être présentées en ordre ascendant.
 FileStep2.fieldPositionTip=Définissez ici la position de chaque colonne. Les positions doivent être présentées en ordre ascendant.
 FileStep2.fieldSeparator=Séparateur de champs
+FileStep2.fieldSeparatorAlert=Le séparateur de champs doit être spécifié. Il doit contenir uniquement des nombres, virgules, guillemets et caractères de début.
 FileStep2.fieldSeparatorDelimitedTip=Séparateur de champs
 FileStep2.fieldSeparatorIncomplete=Le séparateur de champs doit être spécifié
 FileStep2.fieldSeparatorNotFinishByComma=Le séparateur de champs ne termine pas par une virgule
@@ -335,6 +336,7 @@ ItemsVersionChangedDialog.Title=Confirmer la nouvelle version des
 JavaJobScriptsExportWSWizardPage.actionRequest={0}_action_Requête
 JavaJobScriptsExportWSWizardPage.ApplyToChildren=Appliquer aux enfants
 JavaJobScriptsExportWSWizardPage.AxisLib=Axis 1.4 Lib
+JavaJobScriptsExportWSWizardPage.checkVersion=Trouvez-le dans votre version de JBoss ESB et ajoutez-le via la vue Module.\n
 JavaJobScriptsExportWSWizardPage.ExportType=Type d'export
 JavaJobScriptsExportWSWizardPage.ExportyLabel=Sélectionner le type d'export
 JavaJobScriptsExportWSWizardPage.ServerConfigFile=server-config.wsdd
@@ -350,7 +352,7 @@ JavaJobScriptsExportWSWizardPage.needOneJobSelected=Au moins un Job doit
 JavaJobScriptsExportWSWizardPage.queueName=Nom de la file de messages \:
 JavaJobScriptsExportWSWizardPage.singleJobExport=Ce type d'export supporte l'export d'un seul Job.
 JobJavaScriptsManager.exportJob=Exporter le Job :
-JobJavaScriptsWSManager.errorMessage=Echec du JAVA2WSDL, le fichier déployé .wsdd n'existe pas. Le fichier server-config.wsdd sera invalide.
+JobJavaScriptsWSManager.errorMessage=Échec de JAVA2WSDL, le fichier deploy.wsdd n'existe pas. Le fichier server-config.wsdd sera invalide.
 JobJavaScriptsWSManager.impClassNotSpecified=classe d'implémentation non spécifiée.
 JobPerlScriptsManager.allInterpreter=ALL
 JobPerlScriptsManager.exportJob=Exporter le Job :
@@ -399,7 +401,9 @@ ContextExportType_NullCannotBeMapped=Une valeur null ne peut
 ContextExportDialog_ContextsExport=Export de contextes
 ContextExportDialog_ContextsExportDesc=Définit comment les contextes seront exportés dans le WSDL généré.
 ContextExportDialog_ExportMode=Mode d'export
+ContextExportDialog_FileAttachmentNotSupported=\ est un contexte de chaîne. Les modes d'ajout de fichiers ne sont pas supportés.
 ContextExportDialog_Name=Nom
+ContextExportDialog_StringAttachmentNotSupported=\ est un contexte de fichier. Les modes d'ajout de fichiers ne sont pas supportés.
 ContextExportDialog_XsdType=Type de XSD
 LibraryField.descriptionColumn=Description
 LibraryField.moduleColumn=Module
@@ -448,7 +452,7 @@ LoginComposite.sharedRepositoryMessage=Besoin d'un r
 LoginComposite.Workspace_inuse=Workspace en cours d'utilisation, choisissez-en un autre.
 LoginComposite.TisWorkspace_welcome=Bienvenue dans {0}
 LoginComposite.welcomeTitle=Bienvenue dans Talend Open Studio
-LoginComposite.detailMessage=Avant de travailler avec Talend, vous devez créer un projet. \nVous pouvez commencer par un projet démo contenant des exemples utiles, ou \ncréez un projet vide.
+LoginComposite.detailMessage=Avant de travailler avec Talend, vous devez créer un projet. \nVous pouvez commencer par un projet démo contenant des exemples utiles, ou \ncréer un projet vide.
 LoginComposite.selectADemoProject=Sélectionner un projet Démo
 LoginComposite.projectTitleTemp=Créer un nouveau projet
 LoginComposite.buttons.advanced=Avancé...
@@ -656,6 +660,7 @@ MultiSchemasUI.keyIndex=Index des cl
 XmlFileSelectWizardPage.Input_XML=Entrée XML
 XmlFileSelectWizardPage.OutPut_XML=Sortie XML
 XmlFileOutputStep1Form.Encording=Encodage
+AddArrayIndexDialog.Input_Index=Saisissez l'index du tableau.
 AddArrayIndexDialog.Error=ERROR
 AddArrayIndexDialog.ArrayORElement=utiliser comme collection ou comme un élément :
 AddListDialog.Error=ERROR
@@ -804,7 +809,6 @@ DatabaseForm.local_service_name=Nom du service local
 DatabaseForm.sqlMode=Utiliser le mode SQL
 DatabaseForm.sqlSyntax=Syntaxe SQL
 DatabaseForm.stringConnection=Chaîne de caractères de connexion
-DatabaseForm.stringQuote=Séparateur de chaîne de caractères
 DatabaseForm.yes=Oui
 DatabaseTableFilterForm.allSynonyms=Tous les synonymes
 DatabaseTableFilterForm.edit=Editer...
@@ -894,6 +898,7 @@ LDAPSchemaStep1Form.connnectionSuccessed=Connexion
 LDAPSchemaStep2Form.AuthenticationMethod=Méthode d'authentification
 LDAPSchemaStep2Form.AuthenticationParameter=Paramètre d'authentification
 LDAPSchemaStep2Form.BaseDN=Base DN
+LDAPSchemaStep2Form.BindPassword=Lier le mot de passe \:
 LDAPSchemaStep2Form.CheckAuthentication=Vérifier l'authentification
 LDAPSchemaStep2Form.FetchBaseDNs=Récupérer les DNs de la base
 LDAPSchemaStep2Form.GetBaseDNS=Récupérer les DNs de la base à partir de Root DSE
@@ -1027,9 +1032,6 @@ XmlFileStep2Form.Fields_to_extract=Champs
 XmlFileStep2Form.Preview=Aperçu
 DatabaseForm.distribution.labelName=Distribution
 DatabaseForm.distribution.tips=Sélectionnez une distribution.
-DatabaseForm.distribution.hortonWorks=HortonWorks
-DatabaseForm.distribution.apache=Apache
-DatabaseForm.distribution.cloudera=Cloudera
 DatabaseForm.hiveVersion.HDP=HDP_1_0
 DatabaseForm.hiveVersion.apache_0_20_203=Apache 0.20.203
 DatabaseForm.hiveVersion.apache_1_0_0=Apache 1.0.0
@@ -1046,6 +1048,8 @@ DatabaseForm.hiveEmbedded.metastore.connURL=URL de connexion
 DatabaseForm.hiveEmbedded.metastoreInfo=Infos du metastore
 DatabaseForm.hiveEmbedded.metastore.connUserName=Identifiant de connexion
 DatabaseForm.hiveEmbedded.metastore.connPassword=Mot de passe de connexion
+DatabaseForm.hiveEmbedded.metastore.connDriverJar=Jar du pilote de connexion
+DatabaseForm.hiveEmbedded.metastore.connDriverName=Nom du pilote de connexion
 DatabaseForm.hbase.settings=Version
 DatabaseForm.hbase.distribution=Distribution
 DatabaseForm.hbase.distribution.tooltip=Configurer la distribution Hadoop
@@ -1077,9 +1081,11 @@ FileStep1.modeComboAlert=S
 DatabaseForm.hiveEmbedded.useKeyTab=Utiliser un Keytab pour l'authentification
 SalesforceStep1Form.Token=Propriétés du jeton
 webServiceUrlTextForOAuth=URL du Service Web
+DatabaseForm.selectDriverClass=Sélectionnez la classe du pilote
 SalesforceForm.needUsername=Le nom d'utilisateur est obligatoire
 SalesforceForm.needPassword=Le mot de passe est obligatoire
 DatabaseTableForm.doNotShowMessage=Ne plus afficher
+CreateTableAction.action.NotLockMessage=Cet élément n'est pas verrouillé. \nPour récupérer un schéma d'une base de données distante, vous devez d'abord verrouiller cette connexion. \nContinuer pour voir le schéma ?
 DatabaseForm.showContext=Plus d'options
 DatabaseForm.hideContext=Moins d'options
 DatabaseForm.impala.distribution.tooltip=Configurer la distribution Hadoop

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

@@ -509,7 +509,7 @@ MappingFileSelectDialog.selectMappingFile=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u
 MappingFileSelectDialog.setMessage=Talend\u306E\u30D7\u30EC\u30D5\u30A1\u30EC\u30F3\u30B9\u306E'Talend\u30BF\u30A4\u30D7\u306E\u30E1\u30BF\u30C7\u30FC\u30BF'\u30DA\u30FC\u30B8\u3067\u30DE\u30C3\u30D4\u30F3\u30B0\u30D5\u30A1\u30A4\u30EB\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u3059\u3002
 MoveObjectAction.0=[{0}] \u3092 {1}\u306B\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093
 NameSection.Name=\u540D
-NameSection.NameEmpty=\u540D\u524D\u304C\u3042\u308A\u307E\u305B\u3093
+NameSection.NameEmpty=\u540D\u524D\u304C\u7A7A\u3067\u3059\u3002
 NameSection.NameExist=\u540C\u3058\u540D\u524D\u306E\u9805\u76EE\u304C\u65E2\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059\u3002
 NameSection.NameIncorrect=\u540D\u524D\u306B\u4E0D\u6B63\u306A\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
 NewFolderWizard.description=\u30EA\u30DD\u30B8\u30C8\u30EA\u306B\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
@@ -658,7 +658,7 @@ connections.form.emptyField.username=\u30e6\u30fc\u30b6\u540d\u304c\u5fc5\u8981\
 connections.form.field.description=\u30B8\u30E7\u30D6\u8AAC\u660E
 connections.form.field.imcomplete=\u4E0D\u5B8C\u5168
 connections.form.field.name=\u540D\u524D
-connections.form.field.password=\u30E6\u30FC\u30B6\u30D1\u30B9\u30EF\u30FC\u30C9
+connections.form.field.password=\u30E6\u30FC\u30B6\u30FC\u30D1\u30B9\u30EF\u30FC\u30C9
 connections.form.field.repository=\u30ea\u30dd\u30b8\u30c8\u30ea
 connections.form.field.username=\u30e6\u30fc\u30b6\u306eE\u30e1\u30fc\u30eb
 connections.form.field.usernameNoMail=\u30E6\u30FC\u30B6\u30FC\u540D
@@ -690,10 +690,10 @@ WebServiceUI.Operation=\u30AA\u30DA\u30EC\u30FC\u30B7\u30E7\u30F3
 WebServiceUI.Port=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u540D\uFF1A
 WebServiceUI.ParameterTree=\u30D1\u30E9\u30E1\u30FC\u30BF\u30C4\u30EA\u30FC
 WebServiceUI.Remove_element=\u30A8\u30EC\u30E1\u30F3\u30C8\u3092\u524A\u9664
-ImportItemAction.Label=\u9805\u76EE\u306E\u30A4\u30F3\u30DD\u30FC\u30C8
-ImportItemUtil.itemLogException=\u4E0D\u5B8C\u5168\u306A\u30A4\u30F3\u30DD\u30FC\u30C8\u9805\u76EE{0}\uFF08\u79FB\u884C\u30BF\u30B9\u30AF{1}\u306E\u5931\u6557\uFF09
-ImportItemUtil.itemLogWarn=\u4E0D\u5B8C\u5168\u306A\u30A4\u30F3\u30DD\u30FC\u30C8\u9805\u76EE{0}\uFF08\u79FB\u884C\u30BF\u30B9\u30AF{1}\u306E\u5931\u6557\uFF09
-ImportItemUtil.message=\u9805\u76EE {0} \u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3067\u304D\u307E\u305B\u3093 -> \u4E0D\u660E\u306A\u30BF\u30B9\u30AF {1}
+ImportItemAction.Label=\u30A2\u30A4\u30C6\u30E0\u306E\u30A4\u30F3\u30DD\u30FC\u30C8
+ImportItemUtil.itemLogException=\u30A2\u30A4\u30C6\u30E0 {0} \u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u306F\u4E0D\u5B8C\u5168\u3067\u3059 (\u79FB\u884C\u30BF\u30B9\u30AF {1} \u306F\u5931\u6557\u3057\u307E\u3057\u305F\uFF09
+ImportItemUtil.itemLogWarn=\u30A2\u30A4\u30C6\u30E0 {0} \u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u306F\u4E0D\u5B8C\u5168\u3067\u3059 (\u79FB\u884C\u30BF\u30B9\u30AF {1} \u306F\u5931\u6557\u3057\u307E\u3057\u305F\uFF09
+ImportItemUtil.message=\u30A2\u30A4\u30C6\u30E0{0}\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3067\u304D\u307E\u305B\u3093->\u4E0D\u660E\u306A\u30BF\u30B9\u30AF{1}
 ImportItemUtil.persistenceException={0} \u306E\u65B0\u898F\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059
 ImportItemUtil.taskLogWarn=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5185\u306E\u30BF\u30B9\u30AF{0}\u306F\u3082\u3046\u5B58\u5728\u3057\u307E\u305B\u3093
 ImportItemUtil.taskMonitor=\u9805\u76EE {1} \u306B\u79FB\u884C\u30BF\u30B9\u30AF {0} \u3092\u9069\u7528
@@ -710,7 +710,7 @@ ImportItemWizardPage.ImportSelectedItems=\u9078\u629E\u3057\u305F\u30A2\u30A4\u3
 ImportItemWizardPage.ApplyMigrationTasks=\u79FB\u884C\u30BF\u30B9\u30AF\u3092\u5B9F\u65BD
 ImportItemWizardPage.browseTalend=Talend Exchange\u3092\u53C2\u7167
 ImportItemWizardPage.overwriteButtonText=\u30A2\u30A4\u30C6\u30E0\u3092\u4E0A\u66F8\u304D\u3059\u308B
-ExportItemAction.Label=\u9805\u76EE\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
+ExportItemAction.Label=\u30A2\u30A4\u30C6\u30E0\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ExportItemWizardPage.collapseBtnText=\u5168\u3066\u6298\u308A\u7573\u3080
 ExportItemWizardPage.description=\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u30A2\u30A4\u30C6\u30E0\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ExportItemWizardPage.expandBtnText=\u3059\u3079\u3066\u5C55\u958B
@@ -1069,9 +1069,6 @@ XmlFileStep2Form.Preview=\u30D7\u30EC\u30D3\u30E5\u30FC
 XmlFileStep2Form.Output=\u51FA\u529B
 DatabaseForm.distribution.labelName=\u30C7\u30A3\u30B9\u30C8\u30EA\u30D3\u30E5\u30FC\u30B7\u30E7\u30F3
 DatabaseForm.distribution.tips=\u5206\u985E\u3092\u9078\u629E
-DatabaseForm.distribution.hortonWorks=HortonWorks
-DatabaseForm.distribution.apache=Apache
-DatabaseForm.distribution.cloudera=Cloudera
 DatabaseForm.hiveVersion.HDP=HDP_1_0
 DatabaseForm.hiveVersion.apache_0_20_203=Apache 0.20.203
 DatabaseForm.hiveVersion.apache_1_0_0=Apache 1.0.0
@@ -1116,6 +1113,7 @@ DatabaseForm.helpInfo.installDriverLink.label=\u30C9\u30E9\u30A4\u30D0\u306E\u5C
 FileStep1.modeComboAlert=\u6B63\u3057\u3044\u5024\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044
 DatabaseForm.useYarn=Yarn\u3092\u4F7F\u7528
 DatabaseForm.resourceManager=\u30EA\u30BD\u30FC\u30B9\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC
+DatabaseForm.hiveEmbedded.password=\u30D1\u30B9\u30EF\u30FC\u30C9
 DatabaseForm.hiveEmbedded.useKeyTab=keytab\u3092\u4F7F\u7528
 SalesforceStep1Form.AuthParam=\u8A8D\u8A3C
 SalesforceStep1Form.authBtn=\u30ED\u30B0\u30A4\u30F3\u30BF\u30A4\u30D7
@@ -1131,3 +1129,4 @@ SalesforceForm.needPassword=\u30D1\u30B9\u30EF\u30FC\u30C9\u306F\u5FC5\u9808\u30
 CreateTableAction.action.Warning=\u8B66\u544A
 DatabaseForm.impala.settings=\u30D0\u30FC\u30B8\u30E7\u30F3
 DatabaseForm.impala.distribution.tooltip=Hadoop\u30C7\u30A3\u30B9\u30C8\u30EA\u30D3\u30E5\u30FC\u30B7\u30E7\u30F3\u3092\u8A2D\u5B9A
+DatabaseForm.impala.distributionAlert=\u30C7\u30A3\u30B9\u30C8\u30EA\u30D3\u30E5\u30FC\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u4E0B\u3055\u3044

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/image/ECoreImage.java

@@ -69,6 +69,7 @@ public enum ECoreImage implements IImage {
     PROCESS_BATCH_SPARK_ICON("/icons1/process_batch_spark.png"), //$NON-NLS-1$
     SERVICES_ICON("/icons1/services.png"), //$NON-NLS-1$
     JOBLET_ICON("/icons1/joblet_icon.png"), //$NON-NLS-1$
+    JOBLET_STANDARD_ICON("/icons1/joblet_standard.png"), //$NON-NLS-1$
     CONTEXT_ICON("/icons1/context_icon.png"), //$NON-NLS-1$
     CONTEXT_CONF_ICON("/icons1/context_conf_icon.gif"), //$NON-NLS-1$
     CONTEXT_WIZ("/icons1/context_wiz.png"), //$NON-NLS-1$

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractCheckDeleteItemReference.java

@@ -55,6 +55,23 @@ public abstract class AbstractCheckDeleteItemReference implements ICheckDeleteIt
 
         return refBeans;
     }
+    
+    @Override
+	public Set<ItemReferenceBean> getItemReferenceBeans(IRepositoryViewObject convertNode,
+            DeleteActionCache deleteActionCache) {
+        Set<ItemReferenceBean> refBeans = new HashSet<ItemReferenceBean>();
+
+        if (deleteActionCache == null) {
+            deleteActionCache = DeleteActionCache.getInstance();
+            deleteActionCache.createRecords();
+        }
+
+        if(convertNode!=null) {
+        	refBeans.addAll(checkItemReferenceBeans(factory, deleteActionCache, new RepositoryObject(convertNode.getProperty())));
+        }
+
+        return refBeans;
+    }
 
     /**
      * Find reference beans.

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/CheckJobletDeleteReference.java

@@ -79,6 +79,34 @@ public class CheckJobletDeleteReference extends AbstractCheckDeleteItemReference
     								list, label, version, type, isItemDeleted,
     								item, relations, refP,deleteActionCache);
                         }
+                        ERepositoryObjectType sparkType = ERepositoryObjectType.PROCESS_MR;
+                        if (sparkType != null) {
+                            List<IRepositoryViewObject> jobs = factory.getAll(refP, sparkType, true);
+                            checkRelationshipItems(factory, jobs, RelationshipItemBuilder.JOB_RELATION,
+    								list, label, version, type, isItemDeleted,
+    								item, relations, refP, deleteActionCache);
+                        }
+                        ERepositoryObjectType sparkJobletType = ERepositoryObjectType.SPARK_JOBLET;
+                        if (sparkJobletType != null) {
+                            List<IRepositoryViewObject> sparkJoblets = factory.getAll(refP, sparkJobletType, true);
+                            checkRelationshipItems(factory, sparkJoblets, RelationshipItemBuilder.JOBLET_RELATION,
+                                    list, label, version, type, isItemDeleted,
+                                    item, relations, refP,deleteActionCache);
+                        }
+                        ERepositoryObjectType streamingType = ERepositoryObjectType.PROCESS_STORM;
+                        if (streamingType != null) {
+                            List<IRepositoryViewObject> jobs = factory.getAll(refP, streamingType, true);
+                            checkRelationshipItems(factory, jobs, RelationshipItemBuilder.JOB_RELATION,
+    								list, label, version, type, isItemDeleted,
+    								item, relations, refP, deleteActionCache);
+                        }
+                        ERepositoryObjectType sparkStreamingJobletType = ERepositoryObjectType.SPARK_STREAMING_JOBLET;
+                        if (sparkStreamingJobletType != null) {
+                            List<IRepositoryViewObject> sparkStreamingJoblets = factory.getAll(refP, sparkStreamingJobletType, true);
+                            checkRelationshipItems(factory, sparkStreamingJoblets, RelationshipItemBuilder.JOBLET_RELATION,
+                                    list, label, version, type, isItemDeleted,
+                                    item, relations, refP,deleteActionCache);
+                        }
                         deleteActionCache.setProcessList(processes);
                         for (IProcess2 openedProcess : deleteActionCache.getOpenedProcessList()) {
                             for (INode node : openedProcess.getGraphicalNodes()) {

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/provider/ICheckDeleteItemReference.java

@@ -15,6 +15,7 @@ package org.talend.core.repository.model.provider;
 import java.util.List;
 import java.util.Set;
 
+import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.repository.model.ItemReferenceBean;
 import org.talend.core.repository.ui.actions.DeleteActionCache;
 import org.talend.repository.model.IRepositoryNode;
@@ -26,5 +27,8 @@ public interface ICheckDeleteItemReference {
 
     public Set<ItemReferenceBean> getItemReferenceBeans(List<? extends IRepositoryNode> deleteNodes,
             DeleteActionCache deleteActionCache);
+    
+    public Set<ItemReferenceBean> getItemReferenceBeans(IRepositoryViewObject convertNode,
+            DeleteActionCache deleteActionCache);
 
 }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/repositoryObject/QueryRepositoryObject.java

@@ -31,7 +31,6 @@ import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.repository.ISubRepositoryObject;
 import org.talend.cwm.helper.SubItemHelper;
 import org.talend.repository.model.IRepositoryNode;
-
 import orgomg.cwm.objectmodel.core.ModelElement;
 
 /**
@@ -48,6 +47,10 @@ public class QueryRepositoryObject extends org.talend.core.model.metadata.Query
         this.query = table;
     }
 
+    public IRepositoryViewObject getViewObject() {
+        return this.repObj;
+    }
+
     @Override
     public Property getProperty() {
         Property property = repObj.getProperty();

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/actions/CreateFolderAction.java

@@ -107,7 +107,7 @@ public class CreateFolderAction extends AContextualAction {
                 canWork = false;
                 break;
             case SYSTEM_FOLDER:
-                if (property == null || property.equals(ERepositoryObjectType.GENERATED)
+                if (property == null || property.equals(ERepositoryObjectType.GENERATED)|| property.equals(ERepositoryObjectType.JOBLET_DESIGNS)
                         || property.equals(ERepositoryObjectType.JOB_DOC) || property.equals(ERepositoryObjectType.JOBLET_DOC)
                         || ERepositoryObjectType.SQLPATTERNS.equals(property)
                         || ERepositoryObjectType.REFERENCED_PROJECTS.equals(property)

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/actions/DuplicateAction.java

@@ -235,7 +235,7 @@ public class DuplicateAction extends AContextualAction {
             jobNameValue = ""; //$NON-NLS-1$
         }
         //
-        if (item instanceof ProcessItem && PluginChecker.isTIS()) {
+        if (((item instanceof ProcessItem)||(item instanceof JobletProcessItem)) && PluginChecker.isTIS()) {
             DuplicateDialog jobNewNameDialog = new DuplicateDialog(sourceNode,
                     Messages.getString("DuplicateAction.input.title.v2"), //$NON-NLS-1$
                     Messages.getString("DuplicateAction.input.message"), jobNameValue, new IInputValidator() { //$NON-NLS-1$
@@ -441,7 +441,29 @@ public class DuplicateAction extends AContextualAction {
                     } catch (PersistenceException e1) {
                         return Messages.getString("DuplicateAction.ItemExistsError"); //$NON-NLS-1$
                     }
-                } else {
+                } else if (repositoryType == ERepositoryObjectType.JOBLET || repositoryType == ERepositoryObjectType.SPARK_JOBLET
+                        || repositoryType == ERepositoryObjectType.SPARK_STREAMING_JOBLET) {
+                    try {
+                        List<IRepositoryViewObject> listExistingObjects = repositoryFactory.getAll(ERepositoryObjectType.JOBLET,
+                                true, false);
+                        if (PluginChecker.isStormPluginLoader()) {
+                            listExistingObjects
+                                    .addAll(repositoryFactory.getAll(ERepositoryObjectType.SPARK_JOBLET, true, false));
+                        }
+                        if (PluginChecker.isMapReducePluginLoader()) {
+                            listExistingObjects.addAll(repositoryFactory.getAll(ERepositoryObjectType.SPARK_STREAMING_JOBLET, true, false));
+                        }
+
+                        Property property = ((RepositoryNode) selectionInClipboard.toArray()[0]).getObject().getProperty();
+                        if (property != null
+                                && (!repositoryFactory.isNameAvailable(property.getItem(), itemName, listExistingObjects) || itemName
+                                        .equals(property.getLabel()))) {
+                            return Messages.getString("DuplicateAction.ItemExistsError");//$NON-NLS-1$
+                        }
+                    } catch (PersistenceException e1) {
+                        return Messages.getString("DuplicateAction.ItemExistsError"); //$NON-NLS-1$
+                    }
+                }else {
                     boolean isTestContainer = false;
                     List<IRepositoryViewObject> testObjectList = new ArrayList<IRepositoryViewObject>();
                     if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/dialog/DuplicateDialog.java

@@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.talend.commons.ui.swt.formtools.LabelledCombo;
 import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.JobletProcessItem;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.repository.utils.ConvertJobsUtil;
@@ -89,13 +90,13 @@ public class DuplicateDialog extends CustomInputDialog {
         if (sourceNode != null) {
             // job type
             final Object contentType = sourceNode.getProperties(EProperties.CONTENT_TYPE);
-            if (contentType == ERepositoryObjectType.PROCESS) {
+            if (contentType == ERepositoryObjectType.PROCESS || contentType == ERepositoryObjectType.JOBLET) {
                 jobTypeValue = JobType.STANDARD.getDisplayName();
                 jobTypeCombo.setText(jobTypeValue);
-            } else if (contentType == ERepositoryObjectType.PROCESS_MR) {
+            } else if (contentType == ERepositoryObjectType.PROCESS_MR || contentType == ERepositoryObjectType.SPARK_JOBLET) {
                 jobTypeValue = JobType.BIGDATABATCH.getDisplayName();
                 jobTypeCombo.setText(jobTypeValue);
-            } else if (contentType == ERepositoryObjectType.PROCESS_STORM) {
+            } else if (contentType == ERepositoryObjectType.PROCESS_STORM || contentType == ERepositoryObjectType.SPARK_STREAMING_JOBLET) {
                 jobTypeValue = JobType.BIGDATASTREAMING.getDisplayName();
                 jobTypeCombo.setText(jobTypeValue);
             } else if (contentType == ERepositoryObjectType.PROCESS_ROUTE
@@ -142,18 +143,32 @@ public class DuplicateDialog extends CustomInputDialog {
     }
 
     private void updateJobFrameworkPart() {
+    	boolean isJoblet = false;
+    	if(sourceNode.getObject().getProperty().getItem() instanceof JobletProcessItem){
+    		isJoblet = true;
+    	}
         if (JobType.STANDARD.getDisplayName().equals(jobTypeValue)) {
             frameworkCombo.getCombo().setItems(new String[0]);
             frameworkCombo.setReadOnly(true);
         } else if (JobType.BIGDATABATCH.getDisplayName().equals(jobTypeValue)) {
-            String[] items = JobBatchFramework.getFrameworkToDispaly();
+        	String[] items = null;
+        	if(isJoblet){
+        		items = JobBatchFramework.getFrameworkToDispaly(JobBatchFramework.SPARKFRAMEWORK.getDisplayName());
+        	}else{
+        		items = JobBatchFramework.getFrameworkToDispaly();
+        	}
             frameworkCombo.getCombo().setItems(items);
             if (items.length > 0) {
                 frameworkCombo.getCombo().select(0);
             }
             frameworkCombo.setReadOnly(false);
         } else if (JobType.BIGDATASTREAMING.getDisplayName().equals(jobTypeValue)) {
-            String[] items = JobStreamingFramework.getFrameworkToDispaly();
+            String[] items = null;
+            if(isJoblet){
+            	items = JobStreamingFramework.getFrameworkToDispaly(JobStreamingFramework.SPARKSTREAMINGFRAMEWORK.getDisplayName());
+            }else{
+            	items = JobStreamingFramework.getFrameworkToDispaly();
+            }
             frameworkCombo.getCombo().setItems(items);
             if (items.length > 0) {
                 frameworkCombo.getCombo().select(0);

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/dialog/PastSelectorDialog.java

@@ -12,6 +12,7 @@
 // ============================================================================
 package org.talend.core.repository.ui.dialog;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -29,9 +30,13 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.repository.IRepositoryObject;
 import org.talend.core.model.repository.IRepositoryViewObject;
+import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.repository.model.RepositoryNode;
 import org.talend.repository.model.IRepositoryNode.EProperties;
 
@@ -51,6 +56,8 @@ public class PastSelectorDialog extends Dialog {
     private Button selectAll;
 
     private Button selectNone;
+    
+    private List<String> testParentVersions;
 
     /**
      * DOC talend PastSelectorDialog constructor comment.
@@ -62,6 +69,11 @@ public class PastSelectorDialog extends Dialog {
         setShellStyle(getShellStyle() | SWT.RESIZE);
         this.versions = versions;
         this.sourceNode = sourceNode;
+        init();
+    }
+    
+    private void init(){
+        this.testParentVersions = getTestParentVersionList();
     }
 
     @Override
@@ -96,9 +108,6 @@ public class PastSelectorDialog extends Dialog {
         modificationTime.setText("Modification Time");
 
         for (IRepositoryViewObject object : versions) {
-            // if (object.getVersion().equals(sourceNode.getObject().getVersion())) {
-            // continue;
-            // }
             TableItem item = new TableItem(table, SWT.NONE);
             item.setData(object);
             item.setText(0, object.getVersion());
@@ -106,6 +115,10 @@ public class PastSelectorDialog extends Dialog {
             if (object.getModificationDate() != null) {
                 item.setText(2, object.getModificationDate().toString());
             }
+            if(testParentVersions.contains(object.getVersion())){
+                item.setChecked(true);
+                selectedVersionItems.add(object);
+            }
         }
 
         Composite buttonContainer = new Composite(composite, SWT.NONE);
@@ -118,6 +131,7 @@ public class PastSelectorDialog extends Dialog {
         selectAll.setText("Select All");
         selectNone = new Button(buttonContainer, SWT.PUSH);
         selectNone.setText("Select None");
+        selectNone.setEnabled(this.testParentVersions.isEmpty());
 
         table.addSelectionListener(new SelectionAdapter() {
 
@@ -126,6 +140,11 @@ public class PastSelectorDialog extends Dialog {
                 if (e.detail == SWT.CHECK) {
                     TableItem tableItem = (TableItem) e.item;
                     Property property = ((IRepositoryObject) tableItem.getData()).getProperty();
+                    if(testParentVersions.contains(property.getVersion())){
+                        tableItem.setChecked(true);
+                        checkSelectedItems();
+                        return;
+                    }
                     if (property != null && property.getItem() != null) {
                         if (tableItem.getChecked()) {
                             // selectedVersionItems.add(property.getItem());
@@ -166,7 +185,6 @@ public class PastSelectorDialog extends Dialog {
             }
 
         });
-
         return composite;
     }
 
@@ -186,6 +204,32 @@ public class PastSelectorDialog extends Dialog {
     @Override
     protected void createButtonsForButtonBar(Composite parent) {
         super.createButtonsForButtonBar(parent);
-        this.getOKButton().setEnabled(false);
+        checkSelectedItems();
+    }
+    
+    private List<String> getTestParentVersionList(){
+        List<String> versionList = new ArrayList<String>();
+        if(sourceNode.getObject() == null){
+           return versionList; 
+        }
+        Item item = sourceNode.getObject().getProperty().getItem();
+        if (!(item instanceof ProcessItem)) {
+            return versionList;
+        }
+        ProcessItem processItem = (ProcessItem) item;
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
+            ITestContainerProviderService testContainerService = (ITestContainerProviderService) GlobalServiceRegister
+                    .getDefault().getService(ITestContainerProviderService.class);
+            if (testContainerService != null) {
+                if(!testContainerService.isDuplicateTestCaseOptionSelected()){
+                    return versionList;
+                }
+                List<ProcessItem> testsItems = testContainerService.getAllTestContainers(processItem);
+                for(ProcessItem testItem : testsItems){
+                    versionList.add(testContainerService.getParentVersion(testItem)); 
+                }
+            }
+        }
+        return versionList;
     }
 }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/ConvertJobsUtil.java

@@ -40,6 +40,7 @@ import org.talend.core.model.general.Project;
 import org.talend.core.model.process.IElementParameter;
 import org.talend.core.model.process.IProcess;
 import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.JobletProcessItem;
 import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.repository.ERepositoryObjectType;
@@ -171,6 +172,15 @@ public class ConvertJobsUtil {
             }
             return dispalyNames;
         }
+        
+        public static String[] getFrameworkToDispaly(String framework) {
+        	if(framework == null){
+        		return getFrameworkToDispaly();
+        	}
+            String[] dispalyNames = new String[1];
+            dispalyNames[0] = framework;
+            return dispalyNames;
+        }
     }
 
     public static enum JobBatchFramework {
@@ -201,6 +211,15 @@ public class ConvertJobsUtil {
             }
             return dispalyNames;
         }
+        
+        public static String[] getFrameworkToDispaly(String framework) {
+        	if(framework == null){
+        		return getFrameworkToDispaly();
+        	}
+            String[] dispalyNames = new String[1];
+            dispalyNames[0] = framework;
+            return dispalyNames;
+        }
     }
 
     public static enum Status {
@@ -254,6 +273,31 @@ public class ConvertJobsUtil {
             }
         }
     }
+    
+    public static void updateJobFrameworkPart(String jobTypeValue, CCombo frameworkCombo, boolean isJoblet) {
+    	if(!isJoblet){
+    		updateJobFrameworkPart(jobTypeValue, frameworkCombo);
+    		return;
+    	}
+        frameworkCombo.setEnabled(true);
+        if (JobType.STANDARD.getDisplayName().equals(jobTypeValue)) {
+            frameworkCombo.setItems(new String[0]);
+            frameworkCombo.setText("");//$NON-NLS-1$ 
+            frameworkCombo.setEnabled(false);
+        } else if (JobType.BIGDATABATCH.getDisplayName().equals(jobTypeValue)) {
+            String[] items = JobBatchFramework.getFrameworkToDispaly(JobBatchFramework.SPARKFRAMEWORK.getDisplayName());
+            frameworkCombo.setItems(items);
+            if (items.length > 0) {
+                frameworkCombo.select(0);
+            }
+        } else if (JobType.BIGDATASTREAMING.getDisplayName().equals(jobTypeValue)) {
+            String[] items = JobStreamingFramework.getFrameworkToDispaly(JobStreamingFramework.SPARKSTREAMINGFRAMEWORK.getDisplayName());
+            frameworkCombo.setItems(items);
+            if (items.length > 0) {
+                frameworkCombo.select(0);
+            }
+        }
+    }
 
     /**
      * get the target execution framework from the field in Job properties
@@ -304,6 +348,19 @@ public class ConvertJobsUtil {
             return new String[0];
         }
     }
+    
+    public static String[] getFrameworkItemsByJobType(String jobType, boolean isJoblet) {
+    	if(!isJoblet){
+    		return getFrameworkItemsByJobType(jobType);
+    	}
+        if (JobType.BIGDATABATCH.getDisplayName().equals(jobType)) {
+            return JobBatchFramework.getFrameworkToDispaly(JobBatchFramework.SPARKFRAMEWORK.getDisplayName());
+        } else if (JobType.BIGDATASTREAMING.getDisplayName().equals(jobType)) {
+            return JobStreamingFramework.getFrameworkToDispaly(JobStreamingFramework.SPARKSTREAMINGFRAMEWORK.getDisplayName());
+        } else {
+            return new String[0];
+        }
+    }
 
     public static boolean isNeedConvert(Item originalItem, String newJobTypeValue, String newFrameworkValue) {
         return isNeedConvert(originalItem, newJobTypeValue, newFrameworkValue, false);
@@ -395,6 +452,20 @@ public class ConvertJobsUtil {
 
     public static Item createOperation(final String newJobName, final String jobTypeValue, final String frameworkValue,
             final IRepositoryViewObject sourceObject) {
+        if (sourceObject == null || sourceObject.getProperty() == null || newJobName == null) {
+            return null;
+        }
+        Item item = sourceObject.getProperty().getItem();
+        if(item instanceof ProcessItem){
+            return createProcessOperation(newJobName, jobTypeValue,  frameworkValue, sourceObject);
+        }else if(item instanceof JobletProcessItem){
+            return createJobletOperation(newJobName, jobTypeValue,  frameworkValue, sourceObject);
+        }
+        return null;
+    }
+    
+    public static Item createProcessOperation(final String newJobName, final String jobTypeValue, final String frameworkValue,
+            final IRepositoryViewObject sourceObject) {
         IProcessConvertService converter = null;
         if (sourceObject == null || sourceObject.getProperty() == null || newJobName == null) {
             return null;
@@ -429,6 +500,43 @@ public class ConvertJobsUtil {
         }
         return null;
     }
+    
+    public static Item createJobletOperation(final String newJobName, final String jobTypeValue, final String frameworkValue,
+            final IRepositoryViewObject sourceObject) {
+        IProcessConvertService converter = null;
+        if (sourceObject == null || sourceObject.getProperty() == null || newJobName == null) {
+            return null;
+        }
+        Item item = sourceObject.getProperty().getItem();
+        if (JobType.STANDARD.getDisplayName().equals(jobTypeValue)) {
+            String sourceJobType = getJobTypeFromFramework(item);
+            if (JobType.BIGDATABATCH.getDisplayName().equals(sourceJobType)
+                    || ERepositoryObjectType.PROCESS_MR == sourceObject.getRepositoryObjectType()) {
+                converter = ProcessConvertManager.getInstance().extractConvertService(
+                        ProcessConverterType.CONVERTER_FOR_SPARK_JOBLET);
+            }else if(JobType.BIGDATASTREAMING.getDisplayName().equals(sourceJobType)
+                    || ERepositoryObjectType.PROCESS_STORM == sourceObject.getRepositoryObjectType()) {
+                converter = ProcessConvertManager.getInstance().extractConvertService(ProcessConverterType.CONVERTER_FOR_SPARK_STREAMING_JOBLET);
+            }
+            if (converter != null && converter instanceof IProcessConvertToAllTypeService) {
+                return ((IProcessConvertToAllTypeService) converter).convertToProcess(item, sourceObject, newJobName,
+                        jobTypeValue);
+            }
+        } else if (JobType.BIGDATABATCH.getDisplayName().equals(jobTypeValue)) {
+            converter = ProcessConvertManager.getInstance().extractConvertService(ProcessConverterType.CONVERTER_FOR_SPARK_JOBLET);
+            if (converter != null && converter instanceof IProcessConvertToAllTypeService) {
+                return ((IProcessConvertToAllTypeService) converter).convertToProcessBatch(item, sourceObject, newJobName,
+                        jobTypeValue, frameworkValue);
+            }
+        } else if (JobType.BIGDATASTREAMING.getDisplayName().equals(jobTypeValue)) {
+            converter = ProcessConvertManager.getInstance().extractConvertService(ProcessConverterType.CONVERTER_FOR_SPARK_STREAMING_JOBLET);
+            if (converter != null && converter instanceof IProcessConvertToAllTypeService) {
+                return ((IProcessConvertToAllTypeService) converter).convertToProcessStreaming(item, sourceObject, newJobName,
+                        jobTypeValue, frameworkValue);
+            }
+        } 
+        return null;
+    }
 
     public static boolean convert(String newJobName, String jobTypeValue, String frameworkValue,
             final IRepositoryViewObject sourceObject) throws CoreException {
@@ -533,6 +641,10 @@ public class ConvertJobsUtil {
                 return JobBatchFramework.getFrameworkToDispaly();
             } else if (repositoryObjectType.equals(ERepositoryObjectType.PROCESS_STORM)) {
                 return JobStreamingFramework.getFrameworkToDispaly();
+            }else if(repositoryObjectType.equals(ERepositoryObjectType.SPARK_JOBLET)){
+            	return JobBatchFramework.getFrameworkToDispaly(JobBatchFramework.SPARKFRAMEWORK.getDisplayName());
+            }else if(repositoryObjectType.equals(ERepositoryObjectType.SPARK_STREAMING_JOBLET)){
+            	return JobStreamingFramework.getFrameworkToDispaly(JobStreamingFramework.SPARKSTREAMINGFRAMEWORK.getDisplayName());
             }
         }
         return new String[0];

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/RepositoryNodeDeleteManager.java

@@ -27,6 +27,7 @@ import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.core.model.repository.ERepositoryObjectType;
+import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.repository.model.ItemReferenceBean;
 import org.talend.core.repository.model.provider.ICheckDeleteItemReference;
 import org.talend.core.repository.ui.actions.DeleteActionCache;
@@ -169,6 +170,89 @@ public class RepositoryNodeDeleteManager {
 
         return beans;
     }
+    
+    @SuppressWarnings("unchecked")
+    public List<ItemReferenceBean> getUnDeleteItems(IRepositoryViewObject convertNode,
+            DeleteActionCache deleteActionCache, boolean updateDelList) {
+        List<ItemReferenceBean> beans = new ArrayList<ItemReferenceBean>();
+        Set<ItemReferenceBean> refBeans = new HashSet<ItemReferenceBean>();
+        List<DeleteCheck> deleteChecks = new ArrayList<DeleteCheck>();
+
+        if (convertNode == null) {
+            return beans;
+        }
+
+        try {
+            for (IConfigurationElement element : configurationElements) {
+                ICheckDeleteItemReference checkDeleteItemReference = (ICheckDeleteItemReference) element
+                        .createExecutableExtension(ATT_CLASS);
+                String priorityStr = element.getAttribute(ATT_PRIORITY);
+                DeleteCheck.Priority priority = (priorityStr != null && priorityStr.length() > 0) ? DeleteCheck.Priority
+                        .valueOf(priorityStr.toUpperCase()) : DeleteCheck.Priority.NORMAL;
+                DeleteCheck deleteCheck = new DeleteCheck(checkDeleteItemReference, priority);
+                if (!deleteChecks.contains(deleteCheck)) {
+                    deleteChecks.add(deleteCheck);
+                }
+            }
+            sortDeleteChecks(deleteChecks);
+            for (DeleteCheck deleteCheck : deleteChecks) {
+                refBeans.addAll(deleteCheck.checkDeleteItemReference.getItemReferenceBeans(convertNode, deleteActionCache));
+            }
+
+            MultiKeyMap item2beansMap = new MultiKeyMap();
+            for (ItemReferenceBean refBean : refBeans) {
+                List<ItemReferenceBean> beansList = (List<ItemReferenceBean>) item2beansMap.get(refBean.getItemName(),
+                        refBean.getItemVersion(), refBean.getItemType());
+                if (beansList == null) {
+                    beansList = new ArrayList<ItemReferenceBean>();
+                    item2beansMap.put(refBean.getItemName(), refBean.getItemVersion(), refBean.getItemType(), beansList);
+                }
+                if (!beansList.contains(refBean)) {
+                    beansList.add(refBean);
+                }
+            }
+
+            Iterator it = item2beansMap.keySet().iterator();
+            while (it.hasNext()) {
+                Object obj = it.next();
+                if (obj instanceof MultiKey) {
+                    Object[] keys = ((MultiKey) obj).getKeys();
+                    if (keys.length >= 3) {
+                        String itemName = String.valueOf(keys[0]);
+                        String itemVersion = String.valueOf(keys[1]);
+                        ERepositoryObjectType itemType = (ERepositoryObjectType) keys[2];
+                        ItemReferenceBean parentBean = new ItemReferenceBean();
+                        parentBean.setItemName(itemName);
+                        parentBean.setItemVersion(itemVersion);
+                        parentBean.setItemType(itemType);
+                        parentBean.setHost(true);
+                        parentBean.addChildren((List<ItemReferenceBean>) item2beansMap.get(obj));
+                        beans.add(parentBean);
+                    }
+                }
+            }
+            sortReferenceBeans(beans);
+
+            if (updateDelList) {
+                List<String> unDeleteItemNames = new ArrayList<String>();
+                for (ItemReferenceBean bean : beans) {
+                    unDeleteItemNames.add(bean.getItemName());
+                }
+//                Iterator<? extends IRepositoryNode> nodeIter = deleteNodes.iterator();
+//                while (nodeIter.hasNext()) {
+//                    IRepositoryNode node = nodeIter.next();
+//                    Object label = node.getProperties(EProperties.LABEL);
+//                    if (unDeleteItemNames.contains(label)) {
+//                        nodeIter.remove();
+//                    }
+//                }
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+
+        return beans;
+    }
 
     private void sortDeleteChecks(List<DeleteCheck> deleteChecks) {
         Collections.sort(deleteChecks, new Comparator<DeleteCheck>() {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/PluginChecker.java

@@ -32,6 +32,10 @@ public class PluginChecker {
     private static final String DOCUMENTATION_PLUGIN_ID = "org.talend.repository.documentation"; //$NON-NLS-1$
 
     private static final String JOBLET_PLUGIN_ID = "org.talend.designer.joblet"; //$NON-NLS-1$
+    
+    private static final String SPARK_JOBLET_PLUGIN_ID = "org.talend.designer.sparkjoblet"; //$NON-NLS-1$
+    
+    private static final String SPARK_STREAMING_JOBLET_PLUGIN_ID = "org.talend.designer.sparkstreamingjoblet"; //$NON-NLS-1$
 
     private static final String WSDL_PLUGIN_ID = "org.talend.wsdl.advancement"; //$NON-NLS-1$
 
@@ -174,6 +178,24 @@ public class PluginChecker {
     public static boolean isJobLetPluginLoaded() {
         return isPluginLoaded(JOBLET_PLUGIN_ID);
     }
+    
+    /**
+     * DOC tang Comment method "isSparkJobLetPluginLoaded".
+     * 
+     * @return
+     */
+    public static boolean isSparkJobLetPluginLoaded() {
+        return isPluginLoaded(SPARK_JOBLET_PLUGIN_ID);
+    }
+    
+    /**
+     * DOC tang Comment method "isSparkStreamingJobLetPluginLoaded".
+     * 
+     * @return
+     */
+    public static boolean isSparkStreamingJobLetPluginLoaded() {
+        return isPluginLoaded(SPARK_STREAMING_JOBLET_PLUGIN_ID);
+    }
 
     /**
      * DOC qzhang Comment method "containJoblet".

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabase4DriverClassName.java

@@ -46,6 +46,7 @@ public enum EDatabase4DriverClassName {
     MSODBC(EDatabaseTypeName.MSODBC, "sun.jdbc.odbc.JdbcOdbcDriver"), //$NON-NLS-1$
     MSSQL(EDatabaseTypeName.MSSQL, "net.sourceforge.jtds.jdbc.Driver"), //$NON-NLS-1$
     MSSQL2(EDatabaseTypeName.MSSQL05_08, "com.microsoft.sqlserver.jdbc.SQLServerDriver"), //$NON-NLS-1$
+    MSSQL_PROPRIETARY(EDatabaseTypeName.MSSQL_PROPRIETARY, "com.microsoft.sqlserver.jdbc.SQLServerDriver"), //$NON-NLS-1$
 
     MYSQL(EDatabaseTypeName.MYSQL, "org.gjt.mm.mysql.Driver"), //$NON-NLS-1$
     MYSQL2(EDatabaseTypeName.MYSQL, "com.mysql.jdbc.Driver"), //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabaseTypeName.java

@@ -1,321 +1,323 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.database;
-
-import org.talend.core.model.metadata.builder.database.EDatabaseSchemaOrCatalogMapping;
-import org.talend.core.runtime.CoreRuntimePlugin;
-import org.talend.core.runtime.projectsetting.IProjectSettingPreferenceConstants;
-
-/**
- * qzhang class global comment. Detailled comment <br/>
- * 
- */
-public enum EDatabaseTypeName {
-    MYSQL(
-          "MySQL", "MySQL", Boolean.FALSE, "MYSQL", "MYSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    AMAZON_AURORA(
-                  "Amazon Aurora", "Amazon Aurora", Boolean.FALSE, "AMAZON_AURORA", "AMAZON_AURORA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    PSQL(
-         "PostgreSQL", "PostgreSQL", Boolean.TRUE, "POSTGRESQL", "POSTGRE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    PLUSPSQL(
-             "PostgresPlus", "PostgresPlus", Boolean.TRUE, "POSTGRESPLUS", "POSTGREPLUS", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    ORACLEFORSID(
-                 "ORACLE_SID", "Oracle with SID", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    ORACLESN(
-             "ORACLE_SERVICE_NAME", "Oracle with service name", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    ORACLE_OCI(
-               "ORACLE_OCI", "Oracle OCI", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    ORACLE_CUSTOM(
-                  "ORACLE_CUSTOM", "Oracle Custom", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$    
-    /**
-     * @deprecated odbc is not supported in java8
-     */
-    GODBC(
-          "Generic ODBC", "Generic ODBC (Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    /**
-     * @deprecated odbc is not supported in java8
-     */
-    MSODBC(
-           "Microsoft SQL (Odbc driver)", "Microsoft SQL Server (Odbc driver, Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    IBMDB2(
-           "IBM DB2", "IBM DB2", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    IBMDB2ZOS(
-              "IBM DB2 ZOS", "IBM DB2 ZOS", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    SYBASEASE(
-              "SybaseASE", "Sybase (ASE and IQ)", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    // this Sybase IQ not used.
-    SYBASEIQ(
-             "Sybase IQ", "Sybase IQ", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    MSSQL(
-          "MSSQL", "Microsoft SQL Server", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    MSSQL05_08(
-               "MSSQL", "Microsoft SQL Server 2005/2008", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    // this don't use in Branch 2.0
-    HSQLDB("HSQLDB", "HSQLDB", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    HSQLDB_SERVER(
-                  "HSQLDB Server", "HSQLDB Server", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    HSQLDB_WEBSERVER(
-                     "HSQLDB WebServer", "HSQLDB WebServer", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    HSQLDB_IN_PROGRESS(
-                       "HSQLDB In-Process", "HSQLDB In-Process", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    JAVADB("JavaDB", "JavaDB", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    INGRES(
-           "Ingres", "Ingres", Boolean.FALSE, "INGRES", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "INGRES"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    INTERBASE(
-              "Interbase", "Interbase", Boolean.FALSE, "INTERBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INTERBASE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    SQLITE("SQLite", "SQLite", Boolean.FALSE, "SQLITE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "SQLITE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    FIREBIRD(
-             "FireBird", "FireBird", Boolean.FALSE, "FIREBIRD", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "FIREBIRD"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    INFORMIX(
-             "Informix", "Informix", Boolean.TRUE, "INFORMIX", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INFORMIX"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VECTORWISE(
-               "VectorWise", "VectorWise", Boolean.FALSE, "VECTORWISE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$
-
-    ACCESS(
-           "Access", "Access", Boolean.FALSE, "ACCESS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Default_Name), // "ACCESS"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    TERADATA(
-             "Teradata", "Teradata", Boolean.TRUE, "TERADATA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "TERADATA"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    AS400("AS400", "AS400", Boolean.FALSE, "AS400", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Login), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    JAVADB_EMBEDED(
-                   "JavaDB Embeded", "JavaDB Embeded", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    JAVADB_JCCJDBC(
-                   "JavaDB JCCJDBC", "JavaDB JCCJDBC", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    JAVADB_DERBYCLIENT(
-                       "JavaDB DerbyClient", "JavaDB DerbyClient", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    VERTICA(
-            "Vertica", "Vertica", Boolean.TRUE, "VERTICA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    MAXDB("MAXDB", "MaxDB", Boolean.FALSE, "MAXDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    GREENPLUM(
-              "Greenplum", "Greenplum", Boolean.TRUE, "GREENPLUM", "GREENPLUM", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    PARACCEL(
-             "ParAccel", "ParAccel", Boolean.TRUE, "PARACCEL", "PARACCEL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    NETEZZA(
-            "Netezza", "Netezza", Boolean.FALSE, "NETEZZA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    SAS("SAS", "SAS", Boolean.TRUE, "SAS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    // General JDBC not support schema defalut
-    GENERAL_JDBC(
-                 "General JDBC", "General JDBC", Boolean.FALSE, "JDBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    EXASOL("Exasol", "Exasol", Boolean.TRUE, "Exasol", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    HIVE("Hive", "Hive", Boolean.FALSE, "HIVE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    SAPHana(
-            "SAPHana", "SAPHana", Boolean.TRUE, "SAPHANA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    H2("H2", "H2", Boolean.FALSE, "H2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    REDSHIFT(
-             "Redshift", "Redshift", Boolean.TRUE, "REDSHIFT", "REDSHIFT", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
-    IMPALA(
-           "IMPALA", "Impala", Boolean.TRUE, "IMPALA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-
-    HBASE(
-          "HBase", "HBase", Boolean.FALSE, "HBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    // displayName is used in Java code.
-    private String displayName;
-
-    private Boolean isNeedSchema;
-
-    // dbType is used in compnonent XML file.
-    private String dbType;
-
-    // product used for the mappings.
-    private String product;
-
-    // needs a mapping for bug 0004305
-    private String xmlType;
-
-    private boolean useProvider = false;
-
-    private EDatabaseSchemaOrCatalogMapping catalogMappingField;
-
-    private EDatabaseSchemaOrCatalogMapping schemaMappingField;
-
-    public EDatabaseSchemaOrCatalogMapping getCatalogMappingField() {
-        return this.catalogMappingField;
-    }
-
-    public EDatabaseSchemaOrCatalogMapping getSchemaMappingField() {
-        return this.schemaMappingField;
-    }
-
-    public String getDisplayName() {
-        return this.displayName;
-    }
-
-    public Boolean isNeedSchema() {
-        return this.isNeedSchema;
-    }
-
-    public String getXmlName() {
-        return this.dbType;
-    }
-
-    public String getProduct() {
-        return this.product;
-    }
-
-    public String getXMLType() {
-        return this.xmlType;
-    }
-
-    EDatabaseTypeName(String dbType, String displayName, Boolean isNeedSchema, String product,
-            EDatabaseSchemaOrCatalogMapping catalogMappingField, EDatabaseSchemaOrCatalogMapping schemaMappingField) {
-        this.displayName = displayName;
-        this.isNeedSchema = isNeedSchema;
-        this.dbType = dbType;
-        this.product = product;
-        this.xmlType = product;
-        this.catalogMappingField = catalogMappingField;
-        this.schemaMappingField = schemaMappingField;
-    }
-
-    EDatabaseTypeName(String dbType, String displayName, Boolean isNeedSchema, String product,
-            EDatabaseSchemaOrCatalogMapping catalogMappingField, EDatabaseSchemaOrCatalogMapping schemaMappingField,
-            boolean useProvider) {
-        this(dbType, displayName, isNeedSchema, product, catalogMappingField, schemaMappingField);
-        this.useProvider = useProvider;
-    }
-
-    EDatabaseTypeName(String dbType, String displayName, Boolean isNeedSchema, String product, String xmlType,
-            EDatabaseSchemaOrCatalogMapping catalogMappingField, EDatabaseSchemaOrCatalogMapping schemaMappingField) {
-        this.displayName = displayName;
-        this.isNeedSchema = isNeedSchema;
-        this.dbType = dbType;
-        this.product = product;
-        this.xmlType = xmlType;
-        this.catalogMappingField = catalogMappingField;
-        this.schemaMappingField = schemaMappingField;
-    }
-
-    public static EDatabaseTypeName getTypeFromDbType(String dbType) {
-        if (dbType == null) {
-            return getTypeFromDispalyNameOriginal(dbType);
-        }
-        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
-            if (typename.getXmlName().toUpperCase().equals(dbType.toUpperCase())) {
-                return typename;
-            }
-            if (typename.getProduct().toUpperCase().equals(dbType.toUpperCase())) {
-                return typename;
-            }
-        }
-        return getTypeFromDispalyNameOriginal(dbType);
-    }
-
-    public static EDatabaseTypeName getTypeFromDbType(String dbType, boolean isDefault) {
-        if (dbType == null) {
-            return getTypeFromDisplayNameOriginal(dbType, isDefault);
-        }
-        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
-            if (typename.getXmlName().toUpperCase().equals(dbType.toUpperCase())) {
-                return typename;
-            }
-            if (typename.getProduct().toUpperCase().equals(dbType.toUpperCase())) {
-                return typename;
-            }
-        }
-        return getTypeFromDisplayNameOriginal(dbType, isDefault);
-    }
-
-    public static EDatabaseTypeName getTypeFromDisplayName(String displayName) {
-        return getTypeFromDbType(displayName);
-    }
-
-    private static EDatabaseTypeName getTypeFromDispalyNameOriginal(String displayName) {
-        if (displayName == null) {
-            return MYSQL;
-        }
-        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
-            if (typename.getDisplayName().toLowerCase().equals(displayName.toLowerCase())) {
-                return typename;
-            }
-        }
-        return MYSQL;
-    }
-
-    public static EDatabaseTypeName getTypeFromDisplayName(String displayName, boolean isDefault) {
-        return getTypeFromDisplayNameOriginal(displayName, isDefault);
-    }
-
-    private static EDatabaseTypeName getTypeFromDisplayNameOriginal(String displayName, boolean isDefault) {
-        if (displayName == null && isDefault) {
-            return MYSQL;
-        } else if (displayName == null) {
-            return null;
-        }
-        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
-            if (typename.getDisplayName().toLowerCase().equals(displayName.toLowerCase())) {
-                return typename;
-            }
-        }
-        return isDefault ? MYSQL : null;
-    }
-
-    /**
-     * DOC zli Comment method "getTypeFromProductName".
-     * 
-     * @param productName
-     * @return
-     */
-    public static EDatabaseTypeName getTypeFromProductName(String productName) {
-        if (productName == null) {
-            return MYSQL;
-        }
-        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
-            if (typename.getProduct().equals(productName)) {
-                return typename;
-            }
-        }
-        return MYSQL;
-    }
-
-    /**
-     * This is only for the component type, not for the repository.
-     * 
-     * @param dbType
-     * @return
-     */
-    public static boolean supportDbType(String dbType) {
-        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
-            if (typename.getXmlName().equals(dbType)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean isUseProvider() {
-        return useProvider;
-    }
-
-    public boolean isSupport() {
-        boolean isSupport = true;
-
-        if (EDatabaseTypeName.GODBC == this || EDatabaseTypeName.MSODBC == this) {
-            boolean isSupportODBC = CoreRuntimePlugin.getInstance().getProjectPreferenceManager()
-                    .getBoolean(IProjectSettingPreferenceConstants.METADATA_DBCONNECTION_ODBC_ENABLE);
-            isSupport = isSupportODBC;
-        }
-
-        return isSupport;
-    }
-}
+// ============================================================================
+//
+// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.database;
+
+import org.talend.core.model.metadata.builder.database.EDatabaseSchemaOrCatalogMapping;
+import org.talend.core.runtime.CoreRuntimePlugin;
+import org.talend.core.runtime.projectsetting.IProjectSettingPreferenceConstants;
+
+/**
+ * qzhang class global comment. Detailled comment <br/>
+ * 
+ */
+public enum EDatabaseTypeName {
+    MYSQL(
+          "MySQL", "MySQL", Boolean.FALSE, "MYSQL", "MYSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    AMAZON_AURORA(
+                  "Amazon Aurora", "Amazon Aurora", Boolean.FALSE, "AMAZON_AURORA", "AMAZON_AURORA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    PSQL(
+         "PostgreSQL", "PostgreSQL", Boolean.TRUE, "POSTGRESQL", "POSTGRE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    PLUSPSQL(
+             "PostgresPlus", "PostgresPlus", Boolean.TRUE, "POSTGRESPLUS", "POSTGREPLUS", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    ORACLEFORSID(
+                 "ORACLE_SID", "Oracle with SID", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    ORACLESN(
+             "ORACLE_SERVICE_NAME", "Oracle with service name", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    ORACLE_OCI(
+               "ORACLE_OCI", "Oracle OCI", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    ORACLE_CUSTOM(
+                  "ORACLE_CUSTOM", "Oracle Custom", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$    
+    /**
+     * @deprecated odbc is not supported in java8
+     */
+    GODBC(
+          "Generic ODBC", "Generic ODBC (Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    /**
+     * @deprecated odbc is not supported in java8
+     */
+    MSODBC(
+           "Microsoft SQL (Odbc driver)", "Microsoft SQL Server (Odbc driver, Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    IBMDB2(
+           "IBM DB2", "IBM DB2", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    IBMDB2ZOS(
+              "IBM DB2 ZOS", "IBM DB2 ZOS", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    SYBASEASE(
+              "SybaseASE", "Sybase (ASE and IQ)", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    // this Sybase IQ not used.
+    SYBASEIQ(
+             "Sybase IQ", "Sybase IQ", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    MSSQL(
+          "MSSQL", "Microsoft SQL Server", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    MSSQL05_08(
+               "MSSQL", "Microsoft SQL Server 2005/2008", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    MSSQL_PROPRIETARY(
+            "MSSQL_PROPRIETARY", "Microsoft SQL Server(Proprietary Driver)", Boolean.TRUE, "SQL_SERVER", "MSSQL_PROPRIETARY", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema),
+    // this don't use in Branch 2.0
+    HSQLDB("HSQLDB", "HSQLDB", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    HSQLDB_SERVER(
+                  "HSQLDB Server", "HSQLDB Server", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    HSQLDB_WEBSERVER(
+                     "HSQLDB WebServer", "HSQLDB WebServer", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    HSQLDB_IN_PROGRESS(
+                       "HSQLDB In-Process", "HSQLDB In-Process", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    JAVADB("JavaDB", "JavaDB", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    INGRES(
+           "Ingres", "Ingres", Boolean.FALSE, "INGRES", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "INGRES"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    INTERBASE(
+              "Interbase", "Interbase", Boolean.FALSE, "INTERBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INTERBASE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    SQLITE("SQLite", "SQLite", Boolean.FALSE, "SQLITE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "SQLITE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    FIREBIRD(
+             "FireBird", "FireBird", Boolean.FALSE, "FIREBIRD", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "FIREBIRD"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    INFORMIX(
+             "Informix", "Informix", Boolean.TRUE, "INFORMIX", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INFORMIX"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VECTORWISE(
+               "VectorWise", "VectorWise", Boolean.FALSE, "VECTORWISE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$
+
+    ACCESS(
+           "Access", "Access", Boolean.FALSE, "ACCESS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Default_Name), // "ACCESS"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    TERADATA(
+             "Teradata", "Teradata", Boolean.TRUE, "TERADATA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "TERADATA"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    AS400("AS400", "AS400", Boolean.FALSE, "AS400", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Login), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    JAVADB_EMBEDED(
+                   "JavaDB Embeded", "JavaDB Embeded", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    JAVADB_JCCJDBC(
+                   "JavaDB JCCJDBC", "JavaDB JCCJDBC", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    JAVADB_DERBYCLIENT(
+                       "JavaDB DerbyClient", "JavaDB DerbyClient", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    VERTICA(
+            "Vertica", "Vertica", Boolean.TRUE, "VERTICA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    MAXDB("MAXDB", "MaxDB", Boolean.FALSE, "MAXDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    GREENPLUM(
+              "Greenplum", "Greenplum", Boolean.TRUE, "GREENPLUM", "GREENPLUM", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    PARACCEL(
+             "ParAccel", "ParAccel", Boolean.TRUE, "PARACCEL", "PARACCEL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    NETEZZA(
+            "Netezza", "Netezza", Boolean.FALSE, "NETEZZA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    SAS("SAS", "SAS", Boolean.TRUE, "SAS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    // General JDBC not support schema defalut
+    GENERAL_JDBC(
+                 "General JDBC", "General JDBC", Boolean.FALSE, "JDBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    EXASOL("Exasol", "Exasol", Boolean.TRUE, "Exasol", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    HIVE("Hive", "Hive", Boolean.FALSE, "HIVE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    SAPHana(
+            "SAPHana", "SAPHana", Boolean.TRUE, "SAPHANA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    H2("H2", "H2", Boolean.FALSE, "H2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    REDSHIFT(
+             "Redshift", "Redshift", Boolean.TRUE, "REDSHIFT", "REDSHIFT", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
+    IMPALA(
+           "IMPALA", "Impala", Boolean.TRUE, "IMPALA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
+
+    HBASE(
+          "HBase", "HBase", Boolean.FALSE, "HBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    // displayName is used in Java code.
+    private String displayName;
+
+    private Boolean isNeedSchema;
+
+    // dbType is used in compnonent XML file.
+    private String dbType;
+
+    // product used for the mappings.
+    private String product;
+
+    // needs a mapping for bug 0004305
+    private String xmlType;
+
+    private boolean useProvider = false;
+
+    private EDatabaseSchemaOrCatalogMapping catalogMappingField;
+
+    private EDatabaseSchemaOrCatalogMapping schemaMappingField;
+
+    public EDatabaseSchemaOrCatalogMapping getCatalogMappingField() {
+        return this.catalogMappingField;
+    }
+
+    public EDatabaseSchemaOrCatalogMapping getSchemaMappingField() {
+        return this.schemaMappingField;
+    }
+
+    public String getDisplayName() {
+        return this.displayName;
+    }
+
+    public Boolean isNeedSchema() {
+        return this.isNeedSchema;
+    }
+
+    public String getXmlName() {
+        return this.dbType;
+    }
+
+    public String getProduct() {
+        return this.product;
+    }
+
+    public String getXMLType() {
+        return this.xmlType;
+    }
+
+    EDatabaseTypeName(String dbType, String displayName, Boolean isNeedSchema, String product,
+            EDatabaseSchemaOrCatalogMapping catalogMappingField, EDatabaseSchemaOrCatalogMapping schemaMappingField) {
+        this.displayName = displayName;
+        this.isNeedSchema = isNeedSchema;
+        this.dbType = dbType;
+        this.product = product;
+        this.xmlType = product;
+        this.catalogMappingField = catalogMappingField;
+        this.schemaMappingField = schemaMappingField;
+    }
+
+    EDatabaseTypeName(String dbType, String displayName, Boolean isNeedSchema, String product,
+            EDatabaseSchemaOrCatalogMapping catalogMappingField, EDatabaseSchemaOrCatalogMapping schemaMappingField,
+            boolean useProvider) {
+        this(dbType, displayName, isNeedSchema, product, catalogMappingField, schemaMappingField);
+        this.useProvider = useProvider;
+    }
+
+    EDatabaseTypeName(String dbType, String displayName, Boolean isNeedSchema, String product, String xmlType,
+            EDatabaseSchemaOrCatalogMapping catalogMappingField, EDatabaseSchemaOrCatalogMapping schemaMappingField) {
+        this.displayName = displayName;
+        this.isNeedSchema = isNeedSchema;
+        this.dbType = dbType;
+        this.product = product;
+        this.xmlType = xmlType;
+        this.catalogMappingField = catalogMappingField;
+        this.schemaMappingField = schemaMappingField;
+    }
+
+    public static EDatabaseTypeName getTypeFromDbType(String dbType) {
+        if (dbType == null) {
+            return getTypeFromDispalyNameOriginal(dbType);
+        }
+        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
+            if (typename.getXmlName().toUpperCase().equals(dbType.toUpperCase())) {
+                return typename;
+            }
+            if (typename.getProduct().toUpperCase().equals(dbType.toUpperCase())) {
+                return typename;
+            }
+        }
+        return getTypeFromDispalyNameOriginal(dbType);
+    }
+
+    public static EDatabaseTypeName getTypeFromDbType(String dbType, boolean isDefault) {
+        if (dbType == null) {
+            return getTypeFromDisplayNameOriginal(dbType, isDefault);
+        }
+        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
+            if (typename.getXmlName().toUpperCase().equals(dbType.toUpperCase())) {
+                return typename;
+            }
+            if (typename.getProduct().toUpperCase().equals(dbType.toUpperCase())) {
+                return typename;
+            }
+        }
+        return getTypeFromDisplayNameOriginal(dbType, isDefault);
+    }
+
+    public static EDatabaseTypeName getTypeFromDisplayName(String displayName) {
+        return getTypeFromDbType(displayName);
+    }
+
+    private static EDatabaseTypeName getTypeFromDispalyNameOriginal(String displayName) {
+        if (displayName == null) {
+            return MYSQL;
+        }
+        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
+            if (typename.getDisplayName().toLowerCase().equals(displayName.toLowerCase())) {
+                return typename;
+            }
+        }
+        return MYSQL;
+    }
+
+    public static EDatabaseTypeName getTypeFromDisplayName(String displayName, boolean isDefault) {
+        return getTypeFromDisplayNameOriginal(displayName, isDefault);
+    }
+
+    private static EDatabaseTypeName getTypeFromDisplayNameOriginal(String displayName, boolean isDefault) {
+        if (displayName == null && isDefault) {
+            return MYSQL;
+        } else if (displayName == null) {
+            return null;
+        }
+        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
+            if (typename.getDisplayName().toLowerCase().equals(displayName.toLowerCase())) {
+                return typename;
+            }
+        }
+        return isDefault ? MYSQL : null;
+    }
+
+    /**
+     * DOC zli Comment method "getTypeFromProductName".
+     * 
+     * @param productName
+     * @return
+     */
+    public static EDatabaseTypeName getTypeFromProductName(String productName) {
+        if (productName == null) {
+            return MYSQL;
+        }
+        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
+            if (typename.getProduct().equals(productName)) {
+                return typename;
+            }
+        }
+        return MYSQL;
+    }
+
+    /**
+     * This is only for the component type, not for the repository.
+     * 
+     * @param dbType
+     * @return
+     */
+    public static boolean supportDbType(String dbType) {
+        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
+            if (typename.getXmlName().equals(dbType)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean isUseProvider() {
+        return useProvider;
+    }
+
+    public boolean isSupport() {
+        boolean isSupport = true;
+
+        if (EDatabaseTypeName.GODBC == this || EDatabaseTypeName.MSODBC == this) {
+            boolean isSupportODBC = CoreRuntimePlugin.getInstance().getProjectPreferenceManager()
+                    .getBoolean(IProjectSettingPreferenceConstants.METADATA_DBCONNECTION_ODBC_ENABLE);
+            isSupport = isSupportODBC;
+        }
+
+        return isSupport;
+    }
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/ConnParameterKeys.java

@@ -187,6 +187,10 @@ public class ConnParameterKeys {
 
     public static final String CONN_PARA_KEY_HBASE_PROPERTIES = "CONN_PARA_KEY_HBASE_PROPERTIES"; //$NON-NLS-1$
 
+    public static final String CONN_PARA_KEY_HBASE_SET_ZNODE_PARENT = "CONN_PARA_KEY_HBASE_SET_ZNODE_PARENT"; //$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_HBASE_ZNODE_PARENT = "CONN_PARA_KEY_HBASE_ZNODE_PARENT"; //$NON-NLS-1$
+
     public static final String CONN_PARA_KEY_HBASE_AUTHENTICATION_MASTERPRINCIPAL = "CONN_PARA_KEY_HBASE_AUTHENTICATION_MASTERPRINCIPAL";//$NON-NLS-1$
 
     public static final String CONN_PARA_KEY_HBASE_AUTHENTICATION_REGIONSERVERPRINCIPAL = "CONN_PARA_KEY_HBASE_AUTHENTICATION_REGIONSERVERPRINCIPAL";//$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/template/EDatabaseConnTemplate.java

@@ -73,6 +73,10 @@ public enum EDatabaseConnTemplate {
     MSSQL05_08(new DbConnStr(EDatabaseTypeName.MSSQL05_08, //
             "jdbc:sqlserver://<host>:<port>;DatabaseName=<sid>", //$NON-NLS-1$
             "1433")), //$NON-NLS-1$         
+    MSSQL_PROPRIETARY(new DbConnStr(EDatabaseTypeName.MSSQL_PROPRIETARY, 
+            "jdbc:sqlserver://<host>:<port>;DatabaseName=<sid>;<property>", //$NON-NLS-1$
+            "1433")),
+
 
     GODBC(new DbConnStr(EDatabaseTypeName.GODBC, //
             "jdbc:odbc:<datasource>")), //$NON-NLS-1$
@@ -345,6 +349,7 @@ public enum EDatabaseConnTemplate {
         if (template != null) {
             switch (template) {
             case MSSQL:
+            case MSSQL_PROPRIETARY:
             case INFORMIX:
             case MYSQL:
             case AMAZON_AURORA:
@@ -378,6 +383,7 @@ public enum EDatabaseConnTemplate {
             case INGRES:
             case INTERBASE:
             case MSSQL:
+            case MSSQL_PROPRIETARY:
             case INFORMIX:
             case TERADATA:
             case AS400:

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java

@@ -78,6 +78,7 @@ public enum EDatabaseVersion4Drivers {
     MSSQL(new DbVersion4Drivers(EDatabaseTypeName.MSSQL, "jtds-1.3.1-patch.jar")), //$NON-NLS-1$
     MSSQL_2012(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
             "Microsoft SQL Server 2012", "Microsoft SQL Server 2012", "jtds-1.3.1-patch.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    MSSQL_PROPRIETARY(new DbVersion4Drivers(EDatabaseTypeName.MSSQL_PROPRIETARY, "mssql-jdbc.jar")), //$NON-NLS-1$
 
     VERTICA_7(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.0.x", "VERTICA_7_0_X", "vertica-jdbc-7.0.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     VERTICA_6_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 6.1.x", "VERTICA_6_1_X", "vertica-jdk5-6.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -96,9 +97,11 @@ public enum EDatabaseVersion4Drivers {
     PLUSPSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL,
             "Prior to v9", "PRIOR_TO_V9", "postgresql-8.3-603.jdbc3.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9.X", "V9_X", "postgresql-9.4-1201.jdbc41.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    IBMDB2(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2, new String[] { "db2jcc.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
+    IBMDB2(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2,
+            new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
             "db2jcc_license_cisuz.jar" })), //$NON-NLS-1$ 
-    IBMDB2ZOS(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2ZOS, new String[] { "db2jcc.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
+    IBMDB2ZOS(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2ZOS,
+            new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
             "db2jcc_license_cisuz.jar" })), //$NON-NLS-1$ 
     SYBASEASE(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "jconn3.jar")), //$NON-NLS-1$ 
     SYBASEIQ(new DbVersion4Drivers(EDatabaseTypeName.SYBASEIQ, "jconn3.jar")), //$NON-NLS-1$ 
@@ -106,7 +109,7 @@ public enum EDatabaseVersion4Drivers {
     PARACCEL(new DbVersion4Drivers(EDatabaseTypeName.PARACCEL, "paraccel-jdbc.jar")), //$NON-NLS-1$
     VECTORWISE(new DbVersion4Drivers(EDatabaseTypeName.VECTORWISE, "iijdbc.jar")), //$NON-NLS-1$
 
-    EXASOL(new DbVersion4Drivers(EDatabaseTypeName.EXASOL, "exajdbc.jar")), //$NON-NLS-1$ 
+    EXASOL(new DbVersion4Drivers(EDatabaseTypeName.EXASOL, "exajdbc-5.0.12.jar")), //$NON-NLS-1$
     MAXDB(new DbVersion4Drivers(EDatabaseTypeName.MAXDB, "sapdbc.jar")), //$NON-NLS-1$
 
     INGRES(new DbVersion4Drivers(EDatabaseTypeName.INGRES, "iijdbc.jar")), //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/IHadoopClusterService.java

@@ -24,7 +24,6 @@ import org.talend.core.model.general.Project;
 import org.talend.core.model.metadata.builder.connection.Connection;
 import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
 import org.talend.core.model.process.IProcess;
-import org.talend.core.model.properties.ConnectionItem;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryTypeProcessor;
@@ -130,14 +129,14 @@ public interface IHadoopClusterService extends IService {
     /**
      * DOC ycbai Comment method "isInContextMode".
      * <p>
-     * Estimate whether or not the item is in context mode. <br>
+     * Estimate whether or not the connection is in context mode. <br>
      * Hadoop subconnections are in context mode even though it is not context mode itself if the hadoop cluster is in
      * context mode.
      * 
-     * @param connItem
+     * @param connection
      * @return
      */
-    public boolean isInContextMode(ConnectionItem connItem);
+    public boolean isInContextMode(Connection connection);
 
     /**
      * DOC ycbai Comment method "getSubitemIdsOfHadoopCluster".

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/components/IComponent.java

@@ -33,6 +33,10 @@ import org.talend.core.model.temp.ECodePart;
 public interface IComponent {
 
     String JOBLET_PID = "org.talend.designer.joblet"; //$NON-NLS-1$
+    
+    String SPARK_JOBLET_PID = "org.talend.designer.sparkjoblet"; //$NON-NLS-1$
+    
+    String SPARK_JOBLET_STREAMING_PID = "org.talend.designer.sparkstreamingjoblet"; //$NON-NLS-1$
 
     String PROP_NAME = "NAME"; //$NON-NLS-1$
 
@@ -46,7 +50,11 @@ public interface IComponent {
 
     String PROP_HELP = "HELP"; //$NON-NLS-1$
 
-    String FAMILY = "Joblets"; //$NON-NLS-1$
+    String JOBLET_FAMILY = "Joblets"; //$NON-NLS-1$
+    
+    String SPARK_JOBLET_FAMILY = "Spark Joblets"; //$NON-NLS-1$
+    
+    String SPARK_STREAMING_JOBLET_FAMILY = "Spark Streaming Joblets"; //$NON-NLS-1$
 
     public String getName();
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataToolHelper.java

@@ -42,6 +42,7 @@ import org.talend.commons.runtime.model.components.IComponentConstants;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.utils.data.list.UniqueStringGenerator;
+import org.talend.components.api.properties.ComponentProperties;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ICoreService;
 import org.talend.core.PluginChecker;
@@ -79,6 +80,7 @@ import org.talend.designer.core.model.utils.emf.talendfile.TalendFileFactory;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.IRepositoryService;
 import org.talend.repository.model.RepositoryConstants;
+
 import orgomg.cwm.objectmodel.core.TaggedValue;
 
 /**
@@ -1072,68 +1074,15 @@ public final class MetadataToolHelper {
     public static void initilializeSchemaFromElementParameters(IMetadataTable metadataTable,
             List<IElementParameter> elementParameters) {
         IElementParameter mappingParameter = getMappingParameter(elementParameters);
-        String uniqueName = null;
         for (int i = 0; i < elementParameters.size(); i++) {
             IElementParameter param = elementParameters.get(i);
-            if ((param.getFieldType().equals(EParameterFieldType.SCHEMA_TYPE) || param.getFieldType().equals(
-                    EParameterFieldType.SCHEMA_REFERENCE))
+            if ((param.getFieldType().equals(EParameterFieldType.SCHEMA_TYPE)
+                    || param.getFieldType().equals(EParameterFieldType.SCHEMA_REFERENCE))
                     && param.getContext().equals(metadataTable.getAttachedConnector())) {
                 if (param.getValue() instanceof IMetadataTable) {
-                    param.setValueToDefault(elementParameters);
-                    IMetadataTable table = (IMetadataTable) param.getValue();
-                    String metadataTableName = metadataTable.getTableName();
-                    if (mappingParameter != null) {
-                        if (mappingParameter.getValue() != null && (!mappingParameter.getValue().equals(""))) { //$NON-NLS-1$
-                            table.setDbms((String) mappingParameter.getValue());
-                        }
-                    }
-                    metadataTable.setReadOnly(table.isReadOnly());
-
-                    metadataTable.setReadOnlyColumnPosition(table.getReadOnlyColumnPosition());
-
-                    // if all the table is read only then remove all columns to
-                    // set the one defined in the emf component
-                    // if (metadataTable.isReadOnly()) {
-                    // metadataTable.getListColumns().clear();
-                    // }
-                    for (int k = 0; k < table.getListColumns().size(); k++) {
-                        IMetadataColumn newColumn = table.getListColumns().get(k);
-                        IElement element = param.getElement();
-                        IMetadataColumn oldColumn = metadataTable.getColumn(newColumn.getLabel());
-                        if (element instanceof INode && oldColumn == null) {
-                            INode node = (INode) element;
-                            if (node.getComponent().getName().equals("tGenKeyHadoop")) { //$NON-NLS-1$
-                                int lastIndexOf = node.getLabel().lastIndexOf("_"); //$NON-NLS-1$
-                                oldColumn = metadataTable
-                                        .getColumn(newColumn.getLabel() + node.getLabel().substring(lastIndexOf));
-                            }
-                        }
-
-                        boolean update = true;
-                        if (metadataTableName != null && !metadataTableName.equals(table.getTableName())) {
-                            update = newColumn.isCustom();
-                        }
-                        if (oldColumn != null && update) {
-                            // if column exists, then override read only /
-                            // custom
-                            oldColumn.setReadOnly(newColumn.isReadOnly());
-                            oldColumn.setCustom(newColumn.isCustom());
-                            oldColumn.setCustomId(newColumn.getCustomId());
-                            if (newColumn.isReadOnly()) { // if read only,
-                                // override
-                                // everything
-                                oldColumn.setKey(newColumn.isKey());
-                                oldColumn.setNullable(newColumn.isNullable());
-                                oldColumn.setLength(newColumn.getLength());
-                                oldColumn.setPrecision(newColumn.getPrecision());
-                                oldColumn.setPattern(newColumn.getPattern());
-                                oldColumn.setType(newColumn.getType());
-                                oldColumn.setTalendType(newColumn.getTalendType());
-                                oldColumn.setComment(newColumn.getComment());
-                            }
-                        }
-                    }
+                    initilializeSchema(metadataTable, elementParameters, mappingParameter, param);
                 } else if (param.getFieldType() == EParameterFieldType.SCHEMA_REFERENCE) {
+                    initilializeNewSchema(metadataTable, mappingParameter, param);
                     if (!param.getDefaultValues().isEmpty()) {
                         Schema schema = (Schema) param.getDefaultValues().get(0).getDefaultValue();
                         org.talend.core.model.metadata.builder.connection.MetadataTable defaultEmfTable = MetadataToolAvroHelper
@@ -1155,6 +1104,89 @@ public final class MetadataToolHelper {
         metadataTable.sortCustomColumns();
     }
 
+    public static void initilializeNewSchema(IMetadataTable metadataTable, IElementParameter mappingParameter,
+            IElementParameter param) {
+        Object value = param.getValue();
+        if (value instanceof String) {
+            IElement element = param.getElement();
+            if (element instanceof INode) {
+                INode node = (INode) element;
+                ComponentProperties properties = node.getComponentProperties();
+                if (properties != null) {
+                    Object schemaObj = properties.getValuedProperty(param.getName()).getValue();
+                    if (schemaObj instanceof Schema) {
+                        Schema schema = (Schema) schemaObj;
+                        org.talend.core.model.metadata.builder.connection.MetadataTable emfTable = MetadataToolAvroHelper
+                                .convertFromAvro(schema);
+                        IMetadataTable newTable = MetadataToolHelper.convert(emfTable);
+                        initilializeSchema(metadataTable, newTable, mappingParameter, node);
+                    }
+                }
+            }
+        }
+    }
+
+    public static void initilializeSchema(IMetadataTable metadataTable, List<IElementParameter> elementParameters,
+            IElementParameter mappingParameter, IElementParameter param) {
+        param.setValueToDefault(elementParameters);
+        IMetadataTable newTable = (IMetadataTable) param.getValue();
+        initilializeSchema(metadataTable, newTable, mappingParameter, param.getElement());
+    }
+
+    public static void initilializeSchema(IMetadataTable metadataTable, IMetadataTable newTable,
+            IElementParameter mappingParameter, IElement element) {
+        String metadataTableName = metadataTable.getTableName();
+        if (mappingParameter != null) {
+            if (mappingParameter.getValue() != null && (!mappingParameter.getValue().equals(""))) { //$NON-NLS-1$
+                newTable.setDbms((String) mappingParameter.getValue());
+            }
+        }
+        metadataTable.setReadOnly(newTable.isReadOnly());
+
+        metadataTable.setReadOnlyColumnPosition(newTable.getReadOnlyColumnPosition());
+
+        // if all the table is read only then remove all columns to
+        // set the one defined in the emf component
+        // if (metadataTable.isReadOnly()) {
+        // metadataTable.getListColumns().clear();
+        // }
+        for (int k = 0; k < newTable.getListColumns().size(); k++) {
+            IMetadataColumn newColumn = newTable.getListColumns().get(k);
+            IMetadataColumn oldColumn = metadataTable.getColumn(newColumn.getLabel());
+            if (element instanceof INode && oldColumn == null) {
+                INode node = (INode) element;
+                if (node.getComponent().getName().equals("tGenKeyHadoop")) { //$NON-NLS-1$
+                    int lastIndexOf = node.getLabel().lastIndexOf("_"); //$NON-NLS-1$
+                    oldColumn = metadataTable.getColumn(newColumn.getLabel() + node.getLabel().substring(lastIndexOf));
+                }
+            }
+
+            boolean update = true;
+            if (metadataTableName != null && !metadataTableName.equals(newTable.getTableName())) {
+                update = newColumn.isCustom();
+            }
+            if (oldColumn != null && update) {
+                // if column exists, then override read only /
+                // custom
+                oldColumn.setReadOnly(newColumn.isReadOnly());
+                oldColumn.setCustom(newColumn.isCustom());
+                oldColumn.setCustomId(newColumn.getCustomId());
+                if (newColumn.isReadOnly()) { // if read only,
+                    // override
+                    // everything
+                    oldColumn.setKey(newColumn.isKey());
+                    oldColumn.setNullable(newColumn.isNullable());
+                    oldColumn.setLength(newColumn.getLength());
+                    oldColumn.setPrecision(newColumn.getPrecision());
+                    oldColumn.setPattern(newColumn.getPattern());
+                    oldColumn.setType(newColumn.getType());
+                    oldColumn.setTalendType(newColumn.getTalendType());
+                    oldColumn.setComment(newColumn.getComment());
+                }
+            }
+        }
+    }
+
     public static IElementParameter getMappingParameter(List<IElementParameter> elementParameters) {
         for (int i = 0; i < elementParameters.size(); i++) {
             IElementParameter param = elementParameters.get(i);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/builder/ConvertionHelper.java

@@ -27,6 +27,7 @@ import org.talend.core.database.EDatabase4DriverClassName;
 import org.talend.core.database.EDatabaseTypeName;
 import org.talend.core.database.conn.template.EDatabaseConnTemplate;
 import org.talend.core.model.metadata.Dbms;
+import org.talend.core.model.metadata.DiSchemaConstants;
 import org.talend.core.model.metadata.IConvertionConstants;
 import org.talend.core.model.metadata.IMetadataColumn;
 import org.talend.core.model.metadata.IMetadataConnection;
@@ -46,7 +47,9 @@ import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.utils.KeywordsValidator;
 import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.cwm.helper.SAPBWTableHelper;
+import org.talend.cwm.helper.TaggedValueHelper;
 import org.talend.model.bridge.ReponsitoryContextBridge;
+
 import orgomg.cwm.objectmodel.core.TaggedValue;
 
 /**
@@ -549,6 +552,10 @@ public final class ConvertionHelper {
                 newColumn.setName(column.getOriginalDbColumnName());
             }
             // columns.add(convertToMetaDataColumn(column));
+            if (column.isReadOnly()) {
+                TaggedValue tv = TaggedValueHelper.createTaggedValue(DiSchemaConstants.TALEND6_IS_READ_ONLY, "true"); //$NON-NLS-1$
+                newColumn.getTaggedValue().add(tv);
+            }
         }
         result.getColumns().addAll(columns);
         return result;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java

@@ -83,7 +83,6 @@ import org.talend.core.model.process.IElementParameter;
 import org.talend.core.model.process.INode;
 import org.talend.core.model.repository.DragAndDropManager;
 import org.talend.core.model.update.UpdatesConstants;
-import org.talend.core.model.utils.ContextParameterUtils;
 import org.talend.core.model.utils.IDragAndDropServiceHandler;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.service.IMetadataManagmentService;
@@ -1446,6 +1445,15 @@ public class RepositoryToComponentProperty {
             return getAppropriateValue(connection, connection.getPort());
         }
 
+        if (value.equals("SET_ZNODE_PARENT")) {
+            return Boolean.valueOf(connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_SET_ZNODE_PARENT));
+        }
+
+        if (value.equals("ZNODE_PARENT")) {
+            String znodeParent = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_ZNODE_PARENT);
+            return getAppropriateValue(connection, znodeParent);
+        }
+
         if (value.equals("COLUMN_MAPPING")) { //$NON-NLS-1$
             return getColumnMappingValue(connection, table);
         }
@@ -1567,12 +1575,13 @@ public class RepositoryToComponentProperty {
     }
 
     private static boolean isContextMode(Connection connection, String value) {
-        if (connection == null || value == null) {
-            return false;
+        IMetadataManagmentUiService mmService = null;
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IMetadataManagmentUiService.class)) {
+            mmService = (IMetadataManagmentUiService) GlobalServiceRegister.getDefault()
+                    .getService(IMetadataManagmentUiService.class);
         }
-
-        if (connection.isContextMode() && ContextParameterUtils.isContainContextParam(value)) {
-            return true;
+        if (mmService != null) {
+            return mmService.isContextMode(connection, value);
         }
         return false;
     }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/EParameterFieldType.java

@@ -102,6 +102,7 @@ public enum EParameterFieldType {
     COMPONENT_REFERENCE, // ycbai added for generic wizard
     HIDDEN_TEXT, // hcyi added for generic wizard/component properties
     SCHEMA_REFERENCE, // hcyi added for component properties
+    JSON_TABLE, // ycbai added for generic wizard
 
     CAMPAIGN_CHOOSER, // pwlin added for TDS components
     ;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/relationship/RelationshipItemBuilder.java

@@ -826,6 +826,10 @@ public class RelationshipItemBuilder {
             return true;
         }else if(ERepositoryObjectType.JOBLET!=null && itemType == ERepositoryObjectType.JOBLET){
             return true;
+        }else if(ERepositoryObjectType.SPARK_JOBLET!=null && itemType == ERepositoryObjectType.SPARK_JOBLET){
+            return true;
+        }else if(ERepositoryObjectType.SPARK_STREAMING_JOBLET!=null && itemType == ERepositoryObjectType.SPARK_STREAMING_JOBLET){
+            return true;
         }
         return false;
     }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/ERepositoryObjectType.java

@@ -404,7 +404,13 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
      * <font color="red">This value may be <b>null</b> in TOS, <b>should add NPE check</b></font>
      */
     public final static ERepositoryObjectType JOBLET = ERepositoryObjectType.valueOf("JOBLET"); //$NON-NLS-1$
-
+    
+    public final static ERepositoryObjectType JOBLET_DESIGNS = ERepositoryObjectType.valueOf("JOBLET_DESIGNS"); //$NON-NLS-1$
+    
+    public final static ERepositoryObjectType SPARK_JOBLET = ERepositoryObjectType.valueOf("SPARK_JOBLET"); //$NON-NLS-1$
+    
+    public final static ERepositoryObjectType SPARK_STREAMING_JOBLET = ERepositoryObjectType.valueOf("SPARK_STREAMING_JOBLET"); //$NON-NLS-1$
+    
     public final static ERepositoryObjectType TEST_CONTAINER = ERepositoryObjectType.valueOf("TEST_CONTAINER"); //$NON-NLS-1$
 
     public final static ERepositoryObjectType CODE = ERepositoryObjectType.valueOf("CODE"); //$NON-NLS-1$
@@ -1374,4 +1380,19 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
 
         return allTypes;
     }
+    
+    public static List<ERepositoryObjectType> getAllTypesOfJoblet() {
+        List<ERepositoryObjectType> allTypes = new ArrayList<ERepositoryObjectType>();
+
+        if (ERepositoryObjectType.JOBLET != null) {
+            allTypes.add(ERepositoryObjectType.JOBLET);
+        }
+        if (ERepositoryObjectType.SPARK_JOBLET != null) {
+            allTypes.add(ERepositoryObjectType.SPARK_JOBLET);
+        }
+        if (ERepositoryObjectType.SPARK_STREAMING_JOBLET != null) {
+            allTypes.add(ERepositoryObjectType.SPARK_STREAMING_JOBLET);
+        }
+        return allTypes;
+    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/repository/RepositoryComponentManager.java

@@ -343,8 +343,9 @@ public final class RepositoryComponentManager {
         return null;
 
     }
+    
+    public static List<IComponent> filterNeededComponents(Item item, RepositoryNode seletetedNode, ERepositoryObjectType type, boolean isCurrentPeoject, String projectName) {
 
-    public static List<IComponent> filterNeededComponents(Item item, RepositoryNode seletetedNode, ERepositoryObjectType type) {
         if (!GlobalServiceRegister.getDefault().isServiceRegistered(IComponentsService.class)) {
             return Collections.emptyList();
         }
@@ -370,6 +371,10 @@ public final class RepositoryComponentManager {
                 if (repositoryType == null) {
                     continue;
                 }
+                if((type == ERepositoryObjectType.JOBLET || type == ERepositoryObjectType.SPARK_JOBLET 
+                		|| type == ERepositoryObjectType.SPARK_STREAMING_JOBLET ) && !isCurrentPeoject && projectName!=null){
+                	repositoryType = repositoryType +"_"+projectName;
+                }
                 if (!exceptedComponents.contains(component)
                         && filter.except(item, type, seletetedNode, component, repositoryType)) {
                     exceptedComponents.add(component);
@@ -385,6 +390,11 @@ public final class RepositoryComponentManager {
         neededComponents.removeAll(exceptedComponents);
 
         return sortFilteredComponnents(item, seletetedNode, type, neededComponents);
+    
+    }
+
+    public static List<IComponent> filterNeededComponents(Item item, RepositoryNode seletetedNode, ERepositoryObjectType type) {
+    	return filterNeededComponents(item, seletetedNode, type, true, null);
     }
 
     private static List<IComponent> sortFilteredComponnents(Item item, RepositoryNode seletetedNode, ERepositoryObjectType type,

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IMetadataManagmentUiService.java

@@ -30,4 +30,7 @@ public interface IMetadataManagmentUiService extends IService {
     public String getOriginalValue(ContextType contextType, final String value);
 
     public void openRepositoryContextWizard(RepositoryNode repositoryNode);
+
+    public boolean isContextMode(Connection connection, String value);
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/IJobletProviderService.java

@@ -45,6 +45,8 @@ import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
 public interface IJobletProviderService extends IService {
 
     public boolean isJobletComponent(INode node);
+    
+    public boolean isStandardJobletComponent(INode node);
 
     public boolean isJobletInOutComponent(INode node);
 
@@ -134,7 +136,9 @@ public interface IJobletProviderService extends IService {
 
     public void clearJobletComponent();
 
-    public IRepositoryEditorInput getJobletProcessEditorInput(JobletProcessItem processItem, boolean load, boolean lastVersion,
-            boolean readOnly) throws PersistenceException;
+    public IRepositoryEditorInput getJobletProcessEditorInput(JobletProcessItem processItem, Boolean load, Boolean lastVersion,
+            Boolean readOnly, Boolean openedInJob) throws PersistenceException;
+    
+    public boolean isJobletEditor(IEditorPart activeEditor);
 
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/ISparkJobletProviderService.java

@@ -0,0 +1,51 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.ui;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.ui.IEditorPart;
+import org.talend.commons.exception.PersistenceException;
+import org.talend.core.IService;
+import org.talend.core.model.components.IComponent;
+import org.talend.core.model.process.Element;
+import org.talend.core.model.process.INode;
+import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.JobletProcessItem;
+import org.talend.core.model.repository.IRepositoryEditorInput;
+
+/**
+ * DOC hwang  class global comment. Detailled comment
+ */
+public interface ISparkJobletProviderService extends IService{
+	
+	public boolean isSparkJobletEditor(IEditorPart activeEditor);
+    
+    public boolean isSparkJobletItem(Item item);
+
+    public boolean isSparkJobletComponent(INode node);
+    
+    public IComponent instanceSparkJobletComponent(Object execObj);
+    
+    public void clearSparkJobletComponent();
+    
+    public IComponent createSparkJobletComponent();
+    
+    public IComponent createSparkJobletInputOutputComponent(Object jobletNodeType);
+    
+    public Element createSparkJobletContainer(INode node);
+    
+    public IAdaptable createEditorPart(Object model);
+    
+    public IRepositoryEditorInput createJobletEditor(JobletProcessItem processItem, Boolean load, Boolean lastVersion, Boolean readonly,Boolean openedInJob) throws PersistenceException;
+    
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/ISparkStreamingJobletProviderService.java

@@ -0,0 +1,51 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.ui;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.ui.IEditorPart;
+import org.talend.commons.exception.PersistenceException;
+import org.talend.core.IService;
+import org.talend.core.model.components.IComponent;
+import org.talend.core.model.process.Element;
+import org.talend.core.model.process.INode;
+import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.JobletProcessItem;
+import org.talend.core.model.repository.IRepositoryEditorInput;
+
+/**
+ * DOC hwang  class global comment. Detailled comment
+ */
+public interface ISparkStreamingJobletProviderService extends IService{
+	
+	public boolean isSparkStreamingJobletEditor(IEditorPart activeEditor);
+    
+    public boolean isSparkStreamingJobletItem(Item item);
+
+    public boolean isSparkStreamingJobletComponent(INode node);
+    
+    public IComponent instanceSparkStreamingJobletComponent(Object execObj);
+    
+    public void clearSparkStreamingJobletComponent();
+    
+    public IComponent createSparkStreamingJobletComponent();
+    
+    public IComponent createSparkJobletInputOutputComponent(Object jobletNodeType);
+    
+    public Element createSparkStreamingJobletContainer(INode node);
+    
+    public IAdaptable createEditorPart(Object model);
+    
+    public IRepositoryEditorInput createJobletEditor(JobletProcessItem processItem, Boolean load, Boolean lastVersion, Boolean readonly,Boolean openedInJob) throws PersistenceException;
+    
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/images/RepositoryImageProvider.java

@@ -35,6 +35,8 @@ public class RepositoryImageProvider {
         } else if (type == ERepositoryObjectType.PROCESS) {
             return ECoreImage.PROCESS_ICON;
         } else if (type == ERepositoryObjectType.JOBLET) {
+            return ECoreImage.JOBLET_STANDARD_ICON;
+        } else if (type == ERepositoryObjectType.JOBLET_DESIGNS) {
             return ECoreImage.JOBLET_ICON;
         } else if (type == ERepositoryObjectType.CONTEXT) {
             return ECoreImage.CONTEXT_ICON;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/core/convert/ProcessConverterType.java

@@ -25,6 +25,8 @@ public enum ProcessConverterType {
 
     CONVERTER_FOR_MAPREDUCE("CONVERTER_FOR_MAPREDUCE"), //$NON-NLS-1$
     CONVERTER_FOR_JOBLET("CONVERTER_FOR_JOBLET"), //$NON-NLS-1$
+    CONVERTER_FOR_SPARK_JOBLET("CONVERTER_FOR_SPARK_JOBLET"), //$NON-NLS-1$
+    CONVERTER_FOR_SPARK_STREAMING_JOBLET("CONVERTER_FOR_SPARK_STREAMING_JOBLET"), //$NON-NLS-1$
     CONVERTER_FOR_STORM("CONVERTER_FOR_STORM"), //$NON-NLS-1$
     CONVERTER_FOR_ROUTE("CONVERTER_FOR_ROUTE");//$NON-NLS-1$
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/ItemCacheManager.java

@@ -145,7 +145,7 @@ public class ItemCacheManager {
         IProxyRepositoryFactory factory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
         try {
             IRepositoryViewObject object = factory.getLastVersion(project, jobletId);
-            if (object == null || object.getRepositoryObjectType() != ERepositoryObjectType.JOBLET) {
+            if (object == null || !(object.getProperty().getItem() instanceof JobletProcessItem)) {
                 return null;
             }
             lastVersionOfJoblet = (JobletProcessItem) object.getProperty().getItem();
@@ -182,12 +182,12 @@ public class ItemCacheManager {
 
         IProxyRepositoryFactory factory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
         try {
-
             List<IRepositoryViewObject> allVersions = factory.getAllVersion(project, jobletId, false);
             for (IRepositoryViewObject ro : allVersions) {
-                if (ro.getRepositoryObjectType() == ERepositoryObjectType.JOBLET) {
+                if (ro.getProperty().getItem() instanceof JobletProcessItem) {
                     if (ro.getVersion().equals(version)) {
                         selectedProcessItem = (JobletProcessItem) ro.getProperty().getItem();
+                        break;
                     }
                 }
             }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/component/ComponentPaletteUtilities.java

@@ -53,6 +53,10 @@ public class ComponentPaletteUtilities {
     // public static int histate = 0;
 
     private static boolean jobletFlag = false;
+    
+    private static boolean sparkJobletFlag = false;
+    
+    private static boolean sparkStreamingJobletFlag = false;
 
     public static int histate = 0;
 
@@ -71,6 +75,26 @@ public class ComponentPaletteUtilities {
             }
         }
     }
+    
+    private static void setExtraEntryVisible(ERepositoryObjectType itemType) {
+        boolean isJoblet = false;
+        jobletFlag = (itemType == ERepositoryObjectType.JOBLET);
+        sparkJobletFlag = (itemType == ERepositoryObjectType.SPARK_JOBLET);
+        sparkStreamingJobletFlag = (itemType == ERepositoryObjectType.SPARK_STREAMING_JOBLET);
+        isJoblet = (itemType == ERepositoryObjectType.JOBLET || itemType == ERepositoryObjectType.SPARK_JOBLET|| itemType == ERepositoryObjectType.SPARK_STREAMING_JOBLET);
+        if (extraPaletteEntry != null) {
+            for (PaletteEntry entry : extraPaletteEntry) {
+                if(entry instanceof TalendCreationToolEntry){
+                    ERepositoryObjectType type = ((TalendCreationToolEntry)entry).getRepositoryObjectType();
+                    if(type != null){
+                        entry.setVisible(type == itemType);
+                    }
+                }else{
+                    entry.setVisible(isJoblet);
+                }
+            }
+        }
+    }
 
     public static void setSkipUpdatePalette(boolean skipUpdatePalette) {
         ComponentPaletteUtilities.skipUpdatePalette = skipUpdatePalette;
@@ -78,7 +102,13 @@ public class ComponentPaletteUtilities {
 
     public static void updatePalette() {
         if (jobletFlag == true) {
-            setExtraEntryVisible(true);
+            setExtraEntryVisible(ERepositoryObjectType.JOBLET);
+        }
+        if(sparkJobletFlag == true){
+            setExtraEntryVisible(ERepositoryObjectType.SPARK_JOBLET);
+        }
+        if(sparkStreamingJobletFlag == true){
+            setExtraEntryVisible(ERepositoryObjectType.SPARK_STREAMING_JOBLET);
         }
         if (skipUpdatePalette) {
             return;
@@ -263,7 +293,7 @@ public class ComponentPaletteUtilities {
      */
     public static void updateFromRepositoryType(ERepositoryObjectType itemType) {
         updatePalette(faState);
-        setExtraEntryVisible(itemType.equals(ERepositoryObjectType.JOBLET));
+        setExtraEntryVisible(itemType);
     }
 
 }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/component/TalendCreationToolEntry.java

@@ -0,0 +1,45 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.ui.component;
+
+import org.eclipse.gef.palette.CreationToolEntry;
+import org.eclipse.gef.requests.CreationFactory;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.talend.core.model.repository.ERepositoryObjectType;
+
+/**
+ * DOC hwang  class global comment. Detailled comment
+ */
+public class TalendCreationToolEntry extends CreationToolEntry{
+    
+    private ERepositoryObjectType type;
+
+    /**
+     * DOC talend TalendCreationToolEntry constructor comment.
+     * @param label
+     * @param shortDesc
+     * @param factory
+     * @param iconSmall
+     * @param iconLarge
+     */
+    public TalendCreationToolEntry(String label, String shortDesc, CreationFactory factory, ImageDescriptor iconSmall,
+            ImageDescriptor iconLarge, ERepositoryObjectType type) {
+        super(label, shortDesc, factory, iconSmall, iconLarge);
+        this.type = type;
+    }
+    
+    public ERepositoryObjectType getRepositoryObjectType(){
+        return this.type;
+    }
+
+}

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/editor/CustomExternalActions.java

@@ -27,6 +27,10 @@ import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.service.IMRProcessService;
 import org.talend.core.service.IStormProcessService;
+import org.talend.core.ui.IJobletProviderService;
+import org.talend.core.ui.ISparkJobletProviderService;
+import org.talend.core.ui.ISparkStreamingJobletProviderService;
+import org.talend.designer.core.IDesignerCoreService;
 
 /**
  * DOC qzhang class global comment. Detailled comment
@@ -95,6 +99,42 @@ public abstract class CustomExternalActions extends SelectionAction {
         IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
         return mrService.isMapReduceEditor(activeEditor);
     }
+    
+    protected boolean isSParkJobletEditorActive() {
+        if (!GlobalServiceRegister.getDefault().isServiceRegistered(ISparkJobletProviderService.class)) {
+            return false;
+        }
+        ISparkJobletProviderService mrService = (ISparkJobletProviderService) GlobalServiceRegister.getDefault().getService(ISparkJobletProviderService.class);
+        if (mrService == null) {
+            return false;
+        }
+        IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+        return mrService.isSparkJobletEditor(activeEditor);
+    }
+    
+    protected boolean isStandardJobEditorActive() {
+        if (!GlobalServiceRegister.getDefault().isServiceRegistered(IDesignerCoreService.class)) {
+            return false;
+        }
+        IDesignerCoreService service = (IDesignerCoreService) GlobalServiceRegister.getDefault().getService(IDesignerCoreService.class);
+        if(service == null){
+            return false;
+        }
+        IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+        return service.isTalendEditor(activeEditor);
+    }
+    
+    protected boolean isStandardJobletEditorActive() {
+        if (!GlobalServiceRegister.getDefault().isServiceRegistered(IJobletProviderService.class)) {
+            return false;
+        }
+        IJobletProviderService service = (IJobletProviderService) GlobalServiceRegister.getDefault().getService(IJobletProviderService.class);
+        if(service == null){
+            return false;
+        }
+        IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+        return service.isJobletEditor(activeEditor);
+    }
 
     protected boolean isStormEditorActive() {
         if (!GlobalServiceRegister.getDefault().isServiceRegistered(IStormProcessService.class)) {
@@ -108,4 +148,17 @@ public abstract class CustomExternalActions extends SelectionAction {
         IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
         return mrService.isStormEditor(activeEditor);
     }
+    
+    protected boolean isSParkStreamingJobletEditorActive() {
+        if (!GlobalServiceRegister.getDefault().isServiceRegistered(ISparkStreamingJobletProviderService.class)) {
+            return false;
+        }
+        ISparkStreamingJobletProviderService mrService = (ISparkStreamingJobletProviderService) GlobalServiceRegister.getDefault().getService(
+        		ISparkStreamingJobletProviderService.class);
+        if (mrService == null) {
+            return false;
+        }
+        IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+        return mrService.isSparkStreamingJobletEditor(activeEditor);
+    }
 }