TBD-2880:Remove deprecated hadoop version from wizard

This reverts commit ba43de3f78.

i18n/features/org.talend.babel.all.tos.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.babel.all.tos.feature"
       label="Babel feature with all languages for TOS"
-      version="6.0.0.qualifier">
+      version="6.1.1.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]

i18n/features/org.talend.babel.all.tos.feature/pom.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
 	<groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
-  <groupId>org.talend.studio</groupId>
+  
   <artifactId>org.talend.babel.all.tos.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>

i18n/plugins/org.talend.common.ui.runtime.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.common.ui.runtime.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.common.ui.runtime

i18n/plugins/org.talend.common.ui.runtime.nl/pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.common.ui.runtime.nl</artifactId>

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

@@ -69,7 +69,7 @@ ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30BF\u306F NULL\u5024\u
 ExceptionMessageDialog.Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
 ExceptionMessageDialog.log=\u30ED\u30B0
 ExceptionMessageDialog.No=\u3044\u3044\u3048
-ExceptionMessageDialog.OK=\u4E86\u89E3
+ExceptionMessageDialog.OK=OK
 ExceptionMessageDialog.Yes=\u306F\u3044
 ExportPushButton.ExportButton.Tip=\u3059\u3079\u3066\u306E\u884C\u3092XML\u30D5\u30A1\u30A4\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ExportPushButtonForExtendedTable.ErrorMsg.Text=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F

i18n/plugins/org.talend.commons.runtime.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.commons.runtime.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.commons.runtime

i18n/plugins/org.talend.commons.runtime.nl/pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.runtime.nl</artifactId>

i18n/plugins/org.talend.commons.ui.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Commons UI Nl Fragment
 Bundle-SymbolicName: org.talend.commons.ui.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.commons.ui
 Bundle-Vendor: .Talend SA.

i18n/plugins/org.talend.commons.ui.nl/pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.ui.nl</artifactId>

i18n/plugins/org.talend.core.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.core.nl Fragment
 Bundle-SymbolicName: org.talend.core.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.core
 Bundle-Localization: plugin

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.nl</artifactId>

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

@@ -310,5 +310,5 @@ ActionBarBuildHelper.CloseAllAction_text=C&lose All
 ActionBarBuildHelper.CloseAllAction_toolTip=Close All
 ActionBarBuildHelper.SaveAll_text=Sav&e All
 ActionBarBuildHelper.SaveAll_toolTip=Save All
-ContextOrderProperty.BuiltInComment=Build-in context variables
+ContextOrderProperty.BuiltInComment=Built-in context variables
 ContextOrderProperty.RepositoryComment=Context variables from repository context:

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

@@ -283,3 +283,4 @@ ConnectionParameterName.UserLabel=Utilisateur
 ConnectionParameterName.PasswordLabel=Mot de passe
 ConnectionParameterName.DbPathLabel=Chemin d'accès racine à la base de données
 ActionBarBuildHelper.CloseEditorAction_toolTip=Fermer
+ContextOrderProperty.BuiltInComment=Variables de contexte built-in

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

@@ -210,7 +210,7 @@ EComponentCategory_headerFooter=\u30D8\u30C3\u30C0\u30FC/\u30D5\u30C3\u30BF\u30F
 EComponentCategory_statsAndLogs=Stats & Logs
 EComponentCategory_svnHistory=SVN\u5C65\u6B74
 EComponentCategory_technical=\u6280\u8853
-EComponentCategory_view=\u8868\u793A
+EComponentCategory_view=\u8868\u793A
 InegerCellEditorListener.NegativeNumberMessage={0} \u306E\u5024\u306F\u8CA0\u6570\u306B\u3067\u304D\u307E\u305B\u3093\u3002
 InegerCellEditorListener.NumeralMessage={0} \u306B\u306F\u6570\u5024\u3092\u5165\u308C\u3066\u304F\u3060\u3055\u3044\u3002
 EComponentCategory_headerFooter=\u30D8\u30C3\u30C0\u30FC/\u30D5\u30C3\u30BF\u30FC
@@ -254,7 +254,7 @@ HTMLDocGenerator.mapper.table.properties=\u30DE\u30C3\u30D1\u30FC\u30C6\u30FC\u3
 HTMLDocGenerator.mapper.isjoin=\u30B8\u30E7\u30A4\u30F3
 HTMLDocGenerator.mapper.join.type=\u30B8\u30E7\u30A4\u30F3\u30BF\u30A4\u30D7
 HTMLDocGenerator.mapper.metadatatable.entries=\u30E1\u30BF\u30C7\u30FC\u30BF\u30C6\u30FC\u30D7\u30EB\u30A8\u30F3\u30C8\u30EA
-HTMLDocGenerator.mapper.operator=\u30AA\u30DA\u30EC\u30FC\u30BF
+HTMLDocGenerator.mapper.operator=\u30AA\u30DA\u30EC\u30FC\u30BF
 HTMLDocGenerator.mapper.table.for=\u30DE\u30C3\u30D1\u30FC\u30C6\u30FC\u30D6\u30EB
 HTMLDocGenerator.mapper.table.name=\u30C6\u30FC\u30D6\u30EB\u540D
 HTMLDocGenerator.mapper.table.properties=\u30DE\u30C3\u30D1\u30FC\u30C6\u30FC\u30D6\u30EB\u5C5E\u6027
@@ -275,7 +275,7 @@ HTMLDocGenerator.status=\u30B9\u30C6\u30FC\u30BF\u30B9
 HTMLDocGenerator.row_generator_info=\u30ED\u30A6\u30B8\u30A7\u30CD\u30EC\u30FC\u30BF\u60C5\u5831
 HTMLDocGenerator.row_parameters=\u30D1\u30E9\u30E1\u30FC\u30BF
 HTMLDocGenerator.schema_for=\u30B9\u30AD\u30FC\u30DE
-HTMLDocGenerator.source=\u30BD\u30FC\u30B9
+HTMLDocGenerator.source=\u30BD\u30FC\u30B9
 HTMLDocGenerator.source_code=\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9
 HTMLDocGenerator.stats_logs=\u30B9\u30C6\u30A4\u30BF\u30B9 (&A); Logs
 HTMLDocGenerator.status=\u30B9\u30C6\u30FC\u30BF\u30B9

i18n/plugins/org.talend.core.repository.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.core.repository.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.core.repository

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.repository.nl</artifactId>

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

@@ -99,7 +99,6 @@ DuplicateAction.cannotGenerateItem=Cannot generate pasted item label.
 DuplicateAction.dialog.message=Give name to new job
 DuplicateAction.dialog.title=Please input job name
 DuplicateAction.input.message=Input new name
-DuplicateAction.input.title=Please input new name
 DuplicateAction.thisText.duplicate=Duplicate
 DuplicateAction.NameEmptyError=Name is empty.
 DuplicateAction.NameFormatError=Name contains incorrect characters.
@@ -186,3 +185,5 @@ ProjectRepositoryNode.sapBapi=SAP Bapi
 ProjectRepositoryNode.sapFunctions.inputSchema=Input
 ProjectRepositoryNode.sapFunctions.outputSchema=Output
 ProjectRepositoryNode.sapTables=SAP Tables
+DuplicateAction.input.title.v2=Duplicate
+DuplicateAction.SameAsProjectname=Name is same as project name.

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

@@ -87,7 +87,6 @@ DuplicateAction.cannotGenerateItem=Impossible de cr
 DuplicateAction.dialog.message=Nommer le nouveau job
 DuplicateAction.dialog.title=Merci d'entrer un nom de Job
 DuplicateAction.input.message=Saisissez le nouveau nom
-DuplicateAction.input.title=Merci de saisir un nouveau nom
 DuplicateAction.thisText.duplicate=Dupliquer
 DuplicateAction.NameEmptyError=Le nom est vide.
 DuplicateAction.NameFormatError=Le nom contient des caractères incorrects.
@@ -164,3 +163,4 @@ RenameFolderAction.description=Renommer le dossier
 ProxyRepositoryFactory.projectCanNotOpen=Impossible d'ouvrir le projet. La tâche en erreur est {0}.
 ProjectRepositoryNode.sapBapi=SAP Bapi
 ProjectRepositoryNode.sapTables=Tables SAP
+DuplicateAction.input.title.v2=Duplicate

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

@@ -68,7 +68,6 @@ DuplicateAction.cannotGenerateItem=Impossibile generare  copia elemento
 DuplicateAction.dialog.message=Dai un nome al nuovo lavoro
 DuplicateAction.dialog.title=Inserire il nome del lavoro
 DuplicateAction.input.message=Inserisci un nuovo nome
-DuplicateAction.input.title=Per favore inserisci un nuovo nome
 DuplicateAction.thisText.duplicate=Duplica
 DuplicateAction.NameEmptyError=Il nome è vuoto.
 DuplicateAction.NameFormatError=Il nome contiene caratteri incorretti

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

@@ -97,7 +97,6 @@ DuplicateAction.cannotGenerateItem=\u30A2\u30A4\u30C6\u30E0\u306E\u30E9\u30D9\u3
 DuplicateAction.dialog.message=\u65B0\u898F\u30B8\u30E7\u30D6\u306B\u540D\u524D\u3092\u4ED8\u3051\u3066\u304F\u3060\u3055\u3044
 DuplicateAction.dialog.title=\u30B8\u30E7\u30D6\u540D\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044
 DuplicateAction.input.message=\u65B0\u3057\u3044\u540D\u524D\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044
-DuplicateAction.input.title=\u65B0\u898F\u540D\u79F0\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
 DuplicateAction.thisText.duplicate=\u8907\u88FD
 DuplicateAction.NameEmptyError=\u540D\u524D\u304C\u3042\u308A\u307E\u305B\u3093
 DuplicateAction.NameFormatError=\u540D\u524D\u306B\u4E0D\u6B63\u306A\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
@@ -180,3 +179,5 @@ RenameFolderAction.description=\u30D5\u30A9\u30EB\u30C0\u306E\u30EA\u30CD\u30FC\
 ProjectRepositoryNode.sapFunctions.inputSchema=\u30A4\u30F3\u30D7\u30C3\u30C8
 ProjectRepositoryNode.sapFunctions.outputSchema=\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8
 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

i18n/plugins/org.talend.core.runtime.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.core.runtime.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.core.runtime

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.runtime.nl</artifactId>

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

@@ -335,7 +335,7 @@ SelectRepositoryContextGroupDialog.Default=default
 SelectRepositoryContextGroupDialog.Messages=\ In the Job, add a nonexistent context group from the repository context
 SelectRepositoryContextGroupDialog.Title=Add Context Group
 TalendDataCollectorPreferencePage_EnableCapture=Enable capture
-TalendDataCollectorPreferencePage_Description=The Usage Data Collector collects information about how individuals are using the Talend products. The intent is to use this data to help users and organizations better understand how developers are using Talend products.
+TalendDataCollectorPreferencePage_Description=The Usage Data Collector collects information about how individuals are using the Talend products. The intent is to use this data to help Talend better understand how users and organizations are using Talend products.
 TalendDataCollectorPreviewPreferencePage_Description=The following Keys/Values have been captured by the Usage Data Collector.
 TalendDataCollectorPreviewPreferencePage_EmptyValue=<Empty>
 TalendDataCollectorPreviewPreferencePage_Key=Key
@@ -418,7 +418,6 @@ repository.tdqelement.businessrule=TDQ Business Rules
 repository.tdqelement.indicator=TDQ Indicators
 repository.tdqelement.pattern=TDQ Patterns
 EUpdateItemType.Property=Property
-EUpdateItemType.MapReduce=Map Reduce
 EUpdateItemType.Schema=Schema
 EUpdateItemType.SAPFunction=SAP Function
 EUpdateItemType.SAPIDoc=SAP IDoc
@@ -560,7 +559,7 @@ repository.systemIndicators.businessRules=Business Rules
 repository.systemIndicators.correlation=Correlation
 repository.systemIndicators.functionalDependency=Functional Dependency
 repository.systemIndicators.overview=Overview
-repository.systemIndicators.patternFinder=Pattern Finder
+repository.systemIndicators.patternFinder=Pattern Frequncey Statistics
 repository.systemIndicators.patternMatching=Pattern Matching
 repository.systemIndicators.rowComparison=Row Comparison
 repository.systemIndicators.simpleStatistics=Simple Statistics
@@ -587,3 +586,17 @@ ProgressMonitorDialogWithCancel.CheckingConnectionJob.waitingFinish=waiting {0}
 ProgressMonitorDialogWithCancel.CheckingConnectionJob.emptyWaitingfinish=waiting to finish...
 EComponentCategory.memoryRun=Memory Run
 EUpdateResult.JobUpdate=Update for job node
+EUpdateItemType.Batch=Batch
+EUpdateItemType.Streaming=Streaming
+UpdatesConstants.Storm=Storm
+UpdatesConstants.Spark=Spark
+UpdatesConstants.SparkStreaming=Spark_Streaming
+OverTimePopupDialogTask.title=Executing...
+OverTimePopupDialogTask.message=Executing task in background, please wait...
+OverTimePopupDialogTask.executeTimeout=Execute time out, Studio has tried to interrupt this checking action at background.
+OverTimePopupDialogTask.killed=Execution is killed
+OverTimePopupDialogTask.waitingFinishMessage.default=Can not interrupt the background task normally,\n
+OverTimePopupDialogTask.CheckingConnectionJob.waitingFinish=waiting {0} finish...
+OverTimePopupDialogTask.CheckingConnectionJob.emptyWaitingfinish=waiting to finish...
+EComponentCategory_gitHistory=Git History
+repository.gitroot=GIT

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

@@ -287,7 +287,7 @@ SelectRepositoryContextGroupDialog.Default=D
 SelectRepositoryContextGroupDialog.Messages=\ Ajoute le groupe de contextes inexistant au Job à partir du contexte du Référentiel
 SelectRepositoryContextGroupDialog.Title=Ajouter un groupe de contextes
 TalendDataCollectorPreferencePage_EnableCapture=Activer la capture
-TalendDataCollectorPreferencePage_Description=Le collecteur de données d'utilisation collecte des informations concernant la manière dont une personne utilise les produits Talend. L'objectif est, via ces données, d'aider les utilisateurs et les entreprises à comprendre comment les développeurs utilisent les produits Talend.
+TalendDataCollectorPreferencePage_Description=Le collecteur de données d'utilisation collecte des informations concernant la manière dont une personne utilise les produits Talend. L'objectif est, via ces données, d'aider Talend à comprendre comment les utilisateurs et les entreprises utilisent les produits Talend.
 TalendDataCollectorPreviewPreferencePage_Description=Les clés/valeurs suivantes ont été capturées par le collecteur de données d'utilisation.
 TalendDataCollectorPreviewPreferencePage_Key=Clé
 TalendDataCollectorPreviewPreferencePage_Value=Valeur
@@ -315,7 +315,7 @@ repository.documentation=Documentation
 repository.folder=Dossier
 repository.generated=Généré
 repository.jobdoc=Documentation des Jobs
-repository.joblet=Création de Joblets
+repository.joblet=Joblets
 repository.recyclebin=Corbeille
 repository.jobletdoc=Documentation des Joblets
 repository.joblets=Joblets
@@ -361,7 +361,6 @@ repository.tdqelement.businessrule=R
 repository.tdqelement.indicator=Indicateurs TDQ
 repository.tdqelement.pattern=Modèles TDQ
 EUpdateItemType.Property=Propriété
-EUpdateItemType.MapReduce=Map Reduce
 EUpdateItemType.Schema=Schéma
 EUpdateItemType.SAPFunction=Fonction SAP
 EUpdateItemType.SAPIDoc=SAP IDoc

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

@@ -102,12 +102,12 @@ EComponentCategory.basicRun=\u57FA\u672C\u5B9F\u884C
 EComponentCategory.breakpoint=\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8
 EComponentCategory.parallelization=\u4E26\u5217\u5316
 EComponentCategory.debugRun=\u30C7\u30D0\u30C3\u30B0\u5B9F\u884C
-EComponentCategory.targetExec=\u30BF\u30FC\u30B2\u30C3\u30C8\u306E\u5B9F\u884C
+EComponentCategory.targetExec=\u30EA\u30E2\u30FC\u30C8\u5B9F\u884C
 EComponentCategory.availableExtensions=\u5229\u7528\u53EF\u80FD\u306A\u62E1\u5F35\u6A5F\u80FD
 EComponentCategory.downloadedExtensions=\u62E1\u5F35\u6A5F\u80FD\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9
-EComponentCategory.myExtensions=\u81EA\u62E1\u5F35\u6A5F\u80FD
+EComponentCategory.myExtensions=\u30E6\u30FC\u30B6\u30FC\u62E1\u5F35\u6A5F\u80FD
 EComponentCategory.executeJob=\u30B8\u30E7\u30D6\u5B9F\u884C
-EComponentCategory.monitoring=\u30E2\u30CB\u30BF
+EComponentCategory.monitoring=\u30E2\u30CB\u30BF\u30FC
 EComponentCategory.hadoopConfig=Hadoop\u8A2D\u5B9A
 EConnectionType.iteratorMenu=\u53CD\u5FA9
 EConnectionType.lookupMenu=\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7
@@ -124,13 +124,13 @@ EConnectionType.mergeMenu=\u30DE\u30FC\u30B8
 EConnectionType.synchronize=\u540C\u671F
 EConnectionType.parallelize=\u4E26\u5217\u51E6\u7406\u3059\u308B
 EConnectionType.startsMenu=\u958B\u59CB
-EConnectionType.route=Route
+EConnectionType.route=\u30EB\u30FC\u30C8
 EConnectionType.when=When
 EConnectionType.otherwise=Otherwise
 EConnectionType.try=Try
 EConnectionType.catch=Catch
 EConnectionType.finally=Finally
-EConnectionType.endblock=Route
+EConnectionType.endblock=\u30EB\u30FC\u30C8
 EMetadataEncoding.Arabic=\u30A2\u30E9\u30D3\u30A2\u8A9E
 EMetadataEncoding.Big5=\u4E94\u5927\u56FD(\u7E41\u4F53\u5B57)
 EMetadataEncoding.Cyrillic=\u30AD\u30EA\u30EB
@@ -205,7 +205,7 @@ MetadataTableEditorView.DBTypeTitle=DB\u30BF\u30A4\u30D7
 MetadataTableEditorView.DefaultTitle=\u30C7\u30D5\u30A9\u30EB\u30C8
 MetadataTableEditorView.KeyTitle=\u30AD\u30FC
 MetadataTableEditorView.LengthTitle=\u9577\u3055
-MetadataTableEditorView.NullableTitle=\u30CC\u30EB\u53EF\u80FD
+MetadataTableEditorView.NullableTitle=NULL\u53EF\u80FD
 MetadataTableEditorView.PatternTitle=\u30D1\u30BF\u30FC\u30F3(Ctrl+Space available)
 MetadataTableEditorView.PrecisionTitle=\u7CBE\u5EA6
 MetadataTableEditorView.TypleTitle=\u30BF\u30A4\u30D7
@@ -399,7 +399,6 @@ repository.tdqelement.businessrule=TDQ Business Rules
 repository.tdqelement.indicator=TDQ Indicators
 repository.tdqelement.pattern=TDQ Patterns
 EUpdateItemType.Property=\u30D7\u30ED\u30D1\u30C6\u30A3
-EUpdateItemType.MapReduce=Map Reduce
 EUpdateItemType.Schema=\u30B9\u30AD\u30FC\u30DE
 EUpdateItemType.SAPFunction=SAP\u30D5\u30A1\u30F3\u30AF\u30B7\u30E7\u30F3
 EUpdateItemType.SAPIDoc=SAP iDoc
@@ -526,3 +525,15 @@ repository.SAPTable=SAP\u30C6\u30FC\u30D6\u30EB
 ProgressMonitorDialogWithCancel.executeMessage.default=\u5B9F\u884C\u4E2D...
 ProgressMonitorDialogWithCancel.CheckingConnectionJob.waitingFinish={0}\u306E\u7D42\u4E86\u3092\u304A\u5F85\u3061\u4E0B\u3055\u3044...
 ProgressMonitorDialogWithCancel.CheckingConnectionJob.emptyWaitingfinish=\u5C11\u3005\u304A\u5F85\u3061\u4E0B\u3055\u3044...
+EComponentCategory.memoryRun=\u30E1\u30E2\u30EA\u76E3\u8996
+EUpdateItemType.Batch=\u30D0\u30C3\u30C1
+EUpdateItemType.Streaming=\u30B9\u30C8\u30EA\u30FC\u30DF\u30F3\u30B0
+UpdatesConstants.Storm=Storm
+UpdatesConstants.Spark=Spark
+UpdatesConstants.SparkStreaming=Spark_Streaming
+OverTimePopupDialogTask.title=\u5B9F\u884C...
+OverTimePopupDialogTask.message=\u30BF\u30B9\u30AF\u3092\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u3067\u5B9F\u884C\u4E2D\u3067\u3059\u3001\u66AB\u304F\u304A\u5F85\u3061\u4E0B\u3055\u3044...
+OverTimePopupDialogTask.executeTimeout=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3057\u305F\u306E\u3067\u3001Studio\u306F\u30A2\u30AF\u30B7\u30E7\u30F3\u306E\u4E2D\u65AD\u3092\u8A66\u307F\u307E\u3059
+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...

i18n/plugins/org.talend.core.ui.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.core.ui.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.core.ui

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.ui.nl</artifactId>

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

@@ -490,7 +490,7 @@ EComponentCategory.availableExtensions=Available Extensions
 EComponentCategory.downloadedExtensions=Downloaded Extensions
 EComponentCategory.myExtensions=My Extensions
 TalendDataCollectorPreferencePage_EnableCapture=Enable capture
-TalendDataCollectorPreferencePage_Description=The Usage Data Collector collects information about how individuals are using the Talend products. The intent is to use this data to help users and organizations better understand how developers are using Talend products.
+TalendDataCollectorPreferencePage_Description=The Usage Data Collector collects information about how individuals are using the Talend products. The intent is to use this data to help Talend better understand how users and organizations are using Talend products.
 TalendDataCollectorPreviewPreferencePage_Description=The following Keys/Values have been captured by the Usage Data Collector.
 TalendDataCollectorPreviewPreferencePage_EmptyValue=<Empty>
 TalendDataCollectorPreviewPreferencePage_Key=Key

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

@@ -289,7 +289,7 @@ repository.documentation=Documentation
 repository.folder=Dossier
 repository.generated=Généré
 repository.jobdoc=Documentation des Jobs
-repository.joblet=Création de Joblets
+repository.joblet=Joblets
 repository.jobletdoc=Documentation des Joblets
 repository.joblets=Joblets
 repository.jobs=Jobs
@@ -453,7 +453,7 @@ EComponentCategory.availableExtensions=Extensions disponibles
 EComponentCategory.downloadedExtensions=Extensions téléchargées
 EComponentCategory.myExtensions=Mes extensions
 TalendDataCollectorPreferencePage_EnableCapture=Activer la capture
-TalendDataCollectorPreferencePage_Description=Le collecteur de données d'utilisation collecte des informations concernant la manière dont une personne utilise les produits Talend. L'objectif est, via ces données, d'aider les utilisateurs et les entreprises à comprendre comment les développeurs utilisent les produits Talend.
+TalendDataCollectorPreferencePage_Description=Le collecteur de données d'utilisation collecte des informations concernant la manière dont une personne utilise les produits Talend. L'objectif est, via ces données, d'aider Talend à comprendre comment les utilisateurs et les entreprises utilisent les produits Talend.
 TalendDataCollectorPreviewPreferencePage_Description=Les clés/valeurs suivantes ont été capturées par le collecteur de données d'utilisation.
 TalendDataCollectorPreviewPreferencePage_Key=Clé
 TalendDataCollectorPreviewPreferencePage_Value=Valeur
@@ -487,6 +487,7 @@ ContextRenameParameterCommand.renameParameter=Renommer le param
 ContextModifyCommand.label=Modifier le contexte
 ArchiveFileExportOperationFullPath.cannotCreateDir=Impossible de créer le répertoire '{0}'
 ContextValidator.ParameterNotValid=le nom du paramètre n'est pas valide
+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.choose.text=&Choisir
 WorkspaceMnu.choose.tooltip=Sélectionnez un autre répertoire Workspace
 WorkspaceMnu.restart.error.title=Propriété système manquante
@@ -496,3 +497,5 @@ WorkspaceDlg.Message=Le Studio Talend stocke vos donn
 WorkspaceDlg.workspace.label=Workspace
 WorkspaceDlg.browse.folder.title=Sélectionnez un répertoire Workspace
 WorkspaceDlg.use.this.as.default.cb.message=&Utiliser ce répertoire Workspace par défaut et ne plus demander
+CorePreferencePage.alwaysWelcome.v2=Toujours afficher la vue Bienvenue lors du démarrage
+CorePreferencePage.alwaysAskAtStartup=Toujours afficher la fenêtre des projets lors du démarrage

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

@@ -86,7 +86,7 @@ EComponentCategory.advancedSettings=\u8A73\u7D30\u8A2D\u5B9A
 EComponentCategory.basicRun=\u57FA\u672C\u5B9F\u884C
 EComponentCategory.breakpoint=\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8
 EComponentCategory.debugRun=\u30C7\u30D0\u30C3\u30B0\u5B9F\u884C
-EComponentCategory.targetExec=\u30BF\u30FC\u30B2\u30C3\u30C8\u306E\u5B9F\u884C
+EComponentCategory.targetExec=\u30EA\u30E2\u30FC\u30C8\u5B9F\u884C
 EConnectionType.iteratorMenu=\u53CD\u5FA9
 EConnectionType.lookupMenu=\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7
 EConnectionType.mainMenu=\u30E1\u30A4\u30F3
@@ -173,7 +173,7 @@ MetadataTableEditorView.DBTypeTitle=DB\u30BF\u30A4\u30D7
 MetadataTableEditorView.DefaultTitle=\u30C7\u30D5\u30A9\u30EB\u30C8
 MetadataTableEditorView.KeyTitle=\u30AD\u30FC
 MetadataTableEditorView.LengthTitle=\u9577\u3055
-MetadataTableEditorView.NullableTitle=\u30CC\u30EB\u53EF\u80FD
+MetadataTableEditorView.NullableTitle=NULL\u53EF\u80FD
 MetadataTableEditorView.PatternTitle=\u30D1\u30BF\u30FC\u30F3(Ctrl+Space available)
 MetadataTableEditorView.PrecisionTitle=\u7CBE\u5EA6
 MetadataTableEditorView.TypleTitle=\u30BF\u30A4\u30D7
@@ -449,7 +449,7 @@ EConnectionType.otherwise=Otherwise
 EConnectionType.try=Try
 EConnectionType.catch=Catch
 EConnectionType.finally=Finally
-EConnectionType.endblock=Route
+EConnectionType.endblock=\u30EB\u30FC\u30C8
 repository.code=\u30B3\u30FC\u30C9
 repository.service=\u30B5\u30FC\u30D3\u30B9
 ConnectionBean.Remote=\u30EA\u30E2\u30FC\u30C8
@@ -470,7 +470,7 @@ repository.servicesOperation=\u30aa\u30da\u30ec\u30fc\u30b7\u30e7\u30f3
 repository.servicesPort=\u30DD\u30FC\u30C8
 RepositoryUpdateManager.MessagesForTDQ=\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u5909\u66F4\u3092\u53CD\u6620\u3057\u307E\u3059\u304B\u3002 \n \u5931\u308F\u308C\u308B\u60C5\u5831\u306B\u4F9D\u5B58\u3057\u3066\u3044\u308B\u5206\u6790\u753B\u5B58\u5728\u3057\u307E\u3059\u3002\n \u3053\u306E\u51E6\u7406\u306B\u306F\u6642\u9593\u304C\u304B\u304B\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
 EComponentCategory.executeJob=\u30B8\u30E7\u30D6\u5B9F\u884C
-EComponentCategory.monitoring=\u30E2\u30CB\u30BF
+EComponentCategory.monitoring=\u30E2\u30CB\u30BF\u30FC
 BinRepositoryNode.label=\u3054\u307F\u7BB1
 EMetadataEncoding.Latin9=\u30E9\u30C6\u30F39
 HDFS=HDFS
@@ -497,4 +497,12 @@ MetadataExportXmlCommand.message=\u30D5\u30A1\u30A4\u30EB\u304C\u65E2\u306B\u5B5
 WorkbenchMessages.FilteredTree_ClearToolTip=\u30AF\u30EA\u30A2
 ContextTreeValuesComposite.Menu=\u30E1\u30CB\u30E5\u30FC
 ContextMissSettingComposite.installName=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB
+WorkspaceMnu.switch.text=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u5207\u63DB\u3048
+WorkspaceMnu.switch.tooltip=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u958B\u304F
+WorkspaceMnu.choose.tooltip=\u4ED6\u306E\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u9078\u629E
 WorkspaceMnu.restart.error.title=\u30B7\u30B9\u30C6\u30E0\u30D7\u30ED\u30D1\u30C6\u30A3\u304C\u3042\u308A\u307E\u305B\u3093
+WorkspaceDlg.title=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u9078\u629E
+WorkspaceDlg.workspace.label=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9
+WorkspaceDlg.browse.folder.title=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u9078\u629E
+CorePreferencePage.alwaysWelcome.v2=\u8D77\u52D5\u6642\u306B\u30A6\u30A7\u30EB\u30AB\u30E0\u753B\u9762\u3092\u8868\u793A
+CorePreferencePage.alwaysAskAtStartup=\u8D77\u52D5\u6642\u306B\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u8868\u793A

i18n/plugins/org.talend.cwm.mip.edit.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.cwm.mip.edit.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.cwm.mip.edit
 Bundle-Vendor: .Talend SA.

i18n/plugins/org.talend.cwm.mip.edit.nl/pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.cwm.mip.edit.nl</artifactId>

i18n/plugins/org.talend.cwm.mip.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.cwm.mip.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.cwm.mip
 Bundle-Vendor: .Talend SA.

i18n/plugins/org.talend.cwm.mip.nl/pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.cwm.mip.nl</artifactId>

i18n/plugins/org.talend.designer.maven.ui.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Designer Maven UI NL
 Bundle-SymbolicName: org.talend.designer.maven.ui.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.designer.maven.ui
 Bundle-Vendor: .Talend SA.
 Bundle-Localization: plugin

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

@@ -2,3 +2,9 @@ ProjectSettingPage_Build=Build
 ProjectSettingPage_Maven=Maven
 ProjectSettingPage_MavenDefault=Default
 ProjectSettingPage_MavenCustomSetup=Setup custom scripts by folder
+ProjectSettingPage_BuildDesc=Build settings
+ProjectSettingPage_MavenDesc=Maven Settings
+ProjectSettingPage_MavenDefaultDesc=The default setting for Maven scripts
+ProjectSettingPage_ProjectPom=Project
+ProjectSettingPage_ProjectPomDesc=Project POM settings
+ProjectSettingPage_MavenCustomSetupDesc=Setup custom maven scripts by folder

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

@@ -1 +1,4 @@
+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

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.ui.nl</artifactId>

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

@@ -4,3 +4,6 @@ FolderMavenSettingPage_DeleteButtonText=Delete Maven files
 FolderMavenSettingPage_CreatingMavenSettingPath=Path:
 FolderMavenSettingPage_CreatingMavenSettingErrorTitle=Error
 FolderMavenSettingPage_CreatingMavenSettingErrorMessage=Can\'t create the Maven setting files in this folder:
+ProjectPomProjectSettingPage_Titile=NOTE\: The modules and dependencies will be kept.
+ProjectPomProjectSettingPage_ConfirmTitle=Confirm
+ProjectPomProjectSettingPage_ConfirmMessage=Will apply and update for project POM with modifications immediately.

i18n/plugins/org.talend.help.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.help.Nl Fragment
 Bundle-SymbolicName: org.talend.help.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.help
 Bundle-Localization: plugin

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.help.nl</artifactId>

i18n/plugins/org.talend.helpers.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.helpers.nl Fragment
 Bundle-SymbolicName: org.talend.helpers.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.helpers
 Bundle-Vendor: .Talend SA.

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.helpers.nl</artifactId>

i18n/plugins/org.talend.librariesmanager.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.librariesmanager Nl Fragment
 Bundle-SymbolicName: org.talend.librariesmanager.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.librariesmanager
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.librariesmanager.nl</artifactId>

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

@@ -20,3 +20,5 @@ SpecificFilesUtils.operationCanceled=Operation is canceled during copying folder
 ModulesNeededProvider.ModulesForDBConnWizard=Required for using the DB Connection Wizard
 ModulesNeededProvider.unusedModule=User Unused Module
 modules.required=Required for using this component.
+ShareLibsJob.message=Share libraries from maven to {0} server
+ShareLibsJob.sharingLibraries=Sharing libraries : {0}

i18n/plugins/org.talend.librariesmanager.ui.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.librariesmanager.ui.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.librariesmanager.ui

i18n/plugins/org.talend.librariesmanager.ui.nl/pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.librariesmanager.ui.nl</artifactId>

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

@@ -81,3 +81,6 @@ AcceptModuleLicensesWizardPage.retrieveLicenses=Retrieving licenses...
 AcceptModuleLicensesWizardPage.rejectLicensesConfirmation.title=Confirmation
 AcceptModuleLicensesWizardPage.rejectLicensesConfirmation.msg=You have rejected the following licenses:\n{0}.\nAre you sure?
 ExternalModulesInstallDialog.networkUnavailable.msg=Network is unavailable, please fix it.
+ShareLibsJob.getFilesToShare=Collecting libraries to share
+ArtifactsDeployer.uploadJarEncounterMvnRepositroySameName.Title=The Upload Warning
+ArtifactsDeployer.uploadJarEncounterMvnRepositroySameName.MessageContent=The module {0} will overwrite the artifact {1} in local maven repository, Are you sure?

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

@@ -71,3 +71,4 @@ AcceptModuleLicensesWizardPage.retrieveLicenses=R
 AcceptModuleLicensesWizardPage.rejectLicensesConfirmation.title=Confirmation
 AcceptModuleLicensesWizardPage.rejectLicensesConfirmation.msg=Vous avez rejeté les licences suivantes:\n{0}.\nÊtes-vous sûr ?
 ExternalModulesInstallDialog.networkUnavailable.msg=Le réseau est indisponible, veuillez le rétablir
+ArtifactsDeployer.uploadJarEncounterMvnRepositroySameName.MessageContent=Le module {0} va écraser l'artefact {1} du référentiel Maven local. Continuer ?

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

@@ -67,3 +67,4 @@ AcceptModuleLicensesWizardPage.retrieveLicenses=\u30E9\u30A4\u30BB\u30F3\u30B9\u
 AcceptModuleLicensesWizardPage.rejectLicensesConfirmation.title=\u78BA\u8A8D
 AcceptModuleLicensesWizardPage.rejectLicensesConfirmation.msg=\u4EE5\u4E0B\u306E\u30E9\u30A4\u30BB\u30F3\u30B9\uFF1A{0}\u3078\u306E\u540C\u610F\u3092\u62D2\u5426\u3057\u307E\u3059\u304B\uFF1F
 ExternalModulesInstallDialog.networkUnavailable.msg=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u63A5\u7D9A\u51FA\u6765\u307E\u305B\u3093\u3002\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002
+ShareLibsJob.getFilesToShare=\u5171\u6709\u3059\u308B\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u53CE\u96C6

i18n/plugins/org.talend.metadata.managment.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.metadata.managment.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.metadata.managment

i18n/plugins/org.talend.metadata.managment.nl/pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.metadata.managment.nl</artifactId>

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

@@ -426,5 +426,8 @@ CheckConnection.CheckSchema.ProposeSchema.title=Replace the Schema to the Propos
 CheckConnection.CheckSchema.ProposeSchema.message=Could not find the schema [{0}] you filled from the Database,\nI guess you want to use [{1}]?
 NetezzaConnectionFiller.emptyCalalogName=Catalog name is empty\!
 DBConnectionFillerImpl.dbmsIdIsBlank=DBMS ID is blank\!
-EmbeddedHiveDataBaseMetadata.functionNotSupportMessage=Function not supported on windows!
+EmbeddedHiveDataBaseMetadata.functionNotSupportMessage=Embedded mode is not supported on Windows
 PropertiesWizardPage.SameAsProjectname=Name is same as project name.
+HiveConnectionManager.getConnection.timeout=Connection time out. (timeout can be configured in [Preferences/Talend/Performance>Connection timeout])
+HiveConnectionManager.getConnection.waitFinish=Can't interrupt the connection.\nWaiting [{0}] finish
+HiveConnectionManager.getConnection.waitFinish.empty=Can't interrupt the connection.\nWaiting it finish

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

@@ -352,3 +352,4 @@ 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.
 CheckConnection.CheckSchema.ProposeSchema.title=Remplacer le schéma par celui proposé ?
+EmbeddedHiveDataBaseMetadata.functionNotSupportMessage=La fonction n'est supportée que sous Windows.

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

@@ -100,7 +100,7 @@ EComponentCategory_view=\u8868\u793A
 EComponentCategory.basicRun=\u57FA\u672C\u5B9F\u884C
 EComponentCategory.breakpoint=\u30D6\u30EC\u30FC\u30AF\u30DD\u30A4\u30F3\u30C8
 EComponentCategory.debugRun=\u30C7\u30D0\u30C3\u30B0\u5B9F\u884C
-EComponentCategory.targetExec=\u30BF\u30FC\u30B2\u30C3\u30C8\u306E\u5B9F\u884C
+EComponentCategory.targetExec=\u30EA\u30E2\u30FC\u30C8\u5B9F\u884C
 EConnectionType.iteratorMenu=\u53CD\u5FA9
 EConnectionType.lookupMenu=\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7
 EConnectionType.mainMenu=\u30E1\u30A4\u30F3
@@ -188,7 +188,7 @@ MetadataTableEditorView.DBTypeTitle=DB\u30BF\u30A4\u30D7
 MetadataTableEditorView.DefaultTitle=\u30C7\u30D5\u30A9\u30EB\u30C8
 MetadataTableEditorView.KeyTitle=\u30AD\u30FC
 MetadataTableEditorView.LengthTitle=\u9577\u3055
-MetadataTableEditorView.NullableTitle=\u30CC\u30EB\u53EF\u80FD
+MetadataTableEditorView.NullableTitle=NULL\u53EF\u80FD
 MetadataTableEditorView.PatternTitle=\u30D1\u30BF\u30FC\u30F3(Ctrl+Space available)
 MetadataTableEditorView.PrecisionTitle=\u7CBE\u5EA6
 MetadataTableEditorView.TypleTitle=\u30BF\u30A4\u30D7

i18n/plugins/org.talend.metadata.managment.ui.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Metadata Managment UI Nl Fragment
 Bundle-SymbolicName: org.talend.metadata.managment.ui.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.metadata.managment.ui
 Bundle-Vendor: .Talend SA.

i18n/plugins/org.talend.metadata.managment.ui.nl/pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.metadata.managment.ui.nl</artifactId>

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

@@ -534,3 +534,4 @@ EditProcessPropertiesWizardPage.convert.button.name=Convert to Big Data Batch Jo
 PropertiesWizardPage.SameAsProjectname=Name is same as project name.
 PropertiesWizardPage.jobTypeLabel=Job Type
 PropertiesWizardPage.framework=Framework
+ContextAdaptConectionSelectPage.lackOfVariablesMsg=This context has <{0}> variables while the connection needs <{1}>.

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

@@ -499,3 +499,4 @@ HadoopPropertiesDialog.desc=Configuration des propri
 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

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

@@ -514,3 +514,4 @@ HadoopPropertiesDialog.title=Hadoop\u30D7\u30ED\u30D1\u30C6\u30A3
 HadoopPropertiesDialog.desc=Hadoop\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A
 HiveJDBCPropertiesDialog.title=Hive\u30D7\u30ED\u30D1\u30C6\u30A3
 HiveJDBCPropertiesDialog.desc=Hive\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A
+EditProcessPropertiesWizardPage.convert.button.name=\u30D3\u30C3\u30B0\u30C7\u30FC\u30BF\u30D0\u30C3\u30C1\u30B8\u30E7\u30D6\u3078\u30B3\u30F3\u30D0\u30FC\u30C8

i18n/plugins/org.talend.migrationTool.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MigrationTool Plug-in nl fragment
 Bundle-SymbolicName: org.talend.migrationTool.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.migrationTool

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.migrationTool.nl</artifactId>

i18n/plugins/org.talend.model.edit.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName Nl Fragment
 Bundle-SymbolicName: org.talend.model.edit.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.model.edit
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName

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

@@ -631,7 +631,7 @@ _UI_MetadataColumn_sourceType_feature=\u30BD\u30FC\u30B9\u30BF\u30A4\u30D7
 _UI_MetadataColumn_defaultValue_feature=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024
 _UI_MetadataColumn_talendType_feature=Talend\u30BF\u30A4\u30D7
 _UI_MetadataColumn_key_feature=\u30AD\u30FC
-_UI_MetadataColumn_nullable_feature=NULL\u5024\u53EF
+_UI_MetadataColumn_nullable_feature=NULL\u53EF\u80FD
 _UI_MetadataColumn_table_feature=\u30C6\u30FC\u30D6\u30EB \u30E1\u30BF\u30C7\u30FC\u30BF
 _UI_MetadataColumn_originalField_feature=\u5143\u306E\u30D5\u30A3\u30FC\u30EB\u30C9
 _UI_MetadataColumn_pattern_feature=\u30D1\u30BF\u30FC\u30F3
@@ -873,7 +873,7 @@ _UI_HL7FileNode_RelatedColumn_feature=\u95A2\u9023\u30AB\u30E9\u30E0
 _UI_HL7FileNode_Repeatable_feature=\u7E70\u308A\u8FD4\u3057\u53EF\u80FD
 _UI_TdColumn_sqlDataType_feature=SQL\u30C7\u30FC\u30BF\u578B
 _UI_TdSqlDataType_javaDataType_feature=Java\u30C7\u30FC\u30BF\u578B
-_UI_TdSqlDataType_nullable_feature=NULL\u5024\u53EF
+_UI_TdSqlDataType_nullable_feature=NULL\u53EF\u80FD
 _UI_TdSqlDataType_unsignedAttribute_feature=\u7B26\u53F7\u306A\u3057\u5C5E\u6027
 _UI_TdSqlDataType_caseSensitive_feature=\u5927\u6587\u5B57\u5C0F\u6587\u5B57\u3092\u533A\u5225
 _UI_TdSqlDataType_autoIncrement_feature=\u81EA\u52D5\u30A4\u30F3\u30AF\u30EA\u30E1\u30F3\u30C8
@@ -903,7 +903,7 @@ _UI_RowSeparator_Custom_String_literal=\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u658
 _UI_RowSeparator_Standart_EOL_literal=\u6A19\u6E96EOL
 _UI_MDMConnectionProtocol_HTTP_literal=http
 _UI_DevelopmentStatus_DRAFT_literal=\u4E0B\u66F8\u304D
-_UI_DevelopmentStatus_PROD_literal=\u751F\u7523
+_UI_DevelopmentStatus_PROD_literal=\u30D7\u30ED\u30C0\u30AF\u30B7\u30E7\u30F3
 _UI_ExecutionTriggerable_type=\u30C8\u30EA\u30AC\u30FC\u53EF\u80FD\u306A\u5B9F\u884C
 _UI_ExecutionPlan_type=\u30D7\u30E9\u30F3\u306E\u5B9F\u884C
 _UI_ExecutionPlanPart_type=\u30D7\u30E9\u30F3\u30D1\u30FC\u30C8\u306E\u5B9F\u884C
@@ -951,7 +951,7 @@ _UI_ExecutionPlanPartJobPrm_override_feature=\u30AA\u30FC\u30D0\u30FC\u30E9\u30A
 _UI_ExecutionPlanPartJobPrm_name_feature=\u540D\u524D
 _UI_ExecutionPlanPartJobPrm_customValue_feature=\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u306E\u5024
 _UI_ExecutionPlanPartJobPrm_partCustomValue_feature=\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u306E\u5024\u3092\u5206\u5272
-_UI_ExecutionTask_regenerateJobOnChange_feature=\u30B8\u30E7\u30D6\u3092\u5909\u66F4\u3057\u518D\u751F\u6210
+_UI_ExecutionTask_regenerateJobOnChange_feature=\u5909\u66F4\u6642\u306B\u30B8\u30E7\u30D6\u3092\u518D\u751F\u6210
 _UI_ExecutionTask_generatedJobVersion_feature=\u751F\u6210\u3055\u308C\u305F\u30B8\u30E7\u30D6\u30D0\u30FC\u30B8\u30E7\u30F3
 _UI_ExecutionTask_onUnknownStateJob_feature=\u4E0D\u660E\u72B6\u614B\u306E\u30B8\u30E7\u30D6
 _UI_ExecutionTask_useLatestVersion_feature=\u6700\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u4F7F\u7528

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

@@ -97,7 +97,9 @@ _UI_BusinessItem_vAlignment_feature=\u5782\u76F4\u5BF9\u9F50
 _UI_BusinessItem_hAlignment_feature=\u6C34\u5E73\u5BF9\u9F50
 _UI_Project_type=\u5de5\u7a0b
 _UI_Status_type=\u72B6\u6001
+_UI_ItemState_type=\u5B50\u9879\u6E05\u5355
 _UI_Property_type=\u5C5E\u6027
+_UI_LinkDocumentationItem_type=\u94FE\u63A5\u5B50\u6587\u6863
 _UI_BusinessProcessItem_type=\u4E1A\u52A1\u6D41\u7A0B\u9879\u76EE
 _UI_FileItem_type=\u6587\u4EF6\u9879
 _UI_ByteArray_type=\u5B57\u8282\u6570\u7EC4
@@ -106,10 +108,13 @@ _UI_ConnectionItem_type=\u8FDE\u63A5\u9879
 _UI_DelimitedFileConnectionItem_type=\u5206\u5272\u578B\u6587\u4EF6\u8FDE\u63A5\u9879
 _UI_CSVFileConnectionItem_type=VSV\u6587\u4EF6\u8FDE\u63A5\u9879
 _UI_DatabaseConnectionItem_type=\u6570\u636E\u5E93\u8FDE\u63A5\u9879
+_UI_LdifFileConnectionItem_type=Ldif\u6587\u4EF6\u5B50\u8FDE\u63A5
 _UI_User_type=\u7528\u6237
 _UI_Component_type=\u7EC4\u4EF6
 _UI_ContextItem_type=\u4E0A\u4E0B\u6587\u9879
 _UI_License_type=\u8bb8\u53ef\u8bf4\u660e
+_UI_GenericSchemaConnectionItem_type=\u901A\u7528\u7ED3\u6784\u5B50\u8FDE\u63A5
+_UI_LDAPSchemaConnectionItem_type=LDAP\u6A21\u5F0F\u5B50\u8FDE\u63A5
 _UI_DashboardConnection_type=\u4EEA\u8868\u76D8\u8FDE\u63A5
 _UI_ExecutionTask_type=\u6267\u884C\u4EFB\u52A1
 _UI_ExecutionTaskCmdPrm_type=\u6267\u884C\u4EFB\u52A1\u547D\u4EE4\u53C2\u6570
@@ -118,6 +123,9 @@ _UI_ExecutionVirtualServer_type=\u8FD0\u884C\u7684\u865A\u62DF\u670D\u52A1\u5668
 _UI_FileTrigger_type=\u6587\u4EF6\u89E6\u53D1\u5668
 _UI_Information_type=\u4FE1\u606F
 _UI_ComponentSetting_type=\u7EC4\u4EF6\u8BBE\u7F6E
+_UI_LinkRulesItem_type=\u94FE\u63A5\u5B50\u89C4\u5219
+_UI_ItemRelations_type=\u9879\u5173\u7CFB
+_UI_ItemRelation_type=\u9879\u5173\u7CFB
 _UI_Project_technicalStatus_feature=\u6280\u672f
 _UI_Project_documentationStatus_feature=\u6587\u6863\u72b6\u6001
 _UI_Project_id_feature=\u7EC4\u4EF6\u6807\u8BC6\u7B26
@@ -141,6 +149,9 @@ _UI_Status_label_feature=\u6807\u7B7E
 _UI_Status_code_feature=\u4ee3\u7801
 _UI_ItemState_path_feature=\u8DEF\u5F84
 _UI_ItemState_deleted_feature=\u5DF2\u5220\u9664
+_UI_ItemState_locked_feature=\u9501\u5B9A\u7684
+_UI_ItemState_lockDate_feature=\u9501\u5B9A\u65E5\u671F
+_UI_ItemState_commitDate_feature=\u63D0\u4EA4\u65E5\u671F
 _UI_Property_id_feature=\u7EC4\u4EF6\u6807\u8BC6\u7B26
 _UI_Property_label_feature=\u6807\u7B7E
 _UI_Property_purpose_feature=\u76EE\u7684
@@ -151,9 +162,12 @@ _UI_Property_version_feature=\u7248\u672C
 _UI_Property_author_feature=\u4F5C\u8005
 _UI_Property_informations_feature=\u4FE1\u606F
 _UI_Item_property_feature=\u5C5E\u6027
+_UI_Item_parent_feature=\u7236\u9879
 _UI_LinkDocumentationItem_name_feature=\u4f5c\u4e1a\u540d
+_UI_LinkDocumentationItem_extension_feature=\u6269\u5C55
 _UI_BusinessProcessItem_notation_feature=\u7B26\u53F7
 _UI_BusinessProcessItem_semantic_feature=\u8BED\u4E49
+_UI_BusinessProcessItem_notationHolder_feature=\u7B26\u53F7\u6240\u6709\u4EBA
 _UI_FileItem_name_feature=\u4f5c\u4e1a\u540d
 _UI_FileItem_content_feature=\u5185\u5BB9
 _UI_ByteArray_innerContent_feature=\u5185\u90E8\u5185\u5BB9
@@ -194,6 +208,9 @@ _UI_SpagoBiServer_port_feature=\u7aef\u53e3
 _UI_SpagoBiServer_login_feature=\u987b\u6307\u5b9a\u767b\u5f55
 _UI_SpagoBiServer_password_feature=\u5bc6\u7801
 _UI_License_license_feature=\u8bb8\u53ef\u8bf4\u660e
+_UI_License_customerName_feature=\u5BA2\u6237\u540D\u79F0
+_UI_License_params_feature=\u53C2\u6570
+_UI_License_token_feature=Token
 _UI_UserModuleAuthorization_user_feature=\u7528\u6237
 _UI_UserModuleAuthorization_type_feature=\u7C7B\u578B
 _UI_DashboardConnection_id_feature=\u7EC4\u4EF6\u6807\u8BC6\u7B26
@@ -313,6 +330,8 @@ _UI_UserRight_name_feature=\u4f5c\u4e1a\u540d
 _UI_UserRight_description_feature=\u5FC5\u8981\u7684
 _UI_SVGBusinessProcessItem_businessProcessItem_feature=\u4E1A\u52A1\u6D41\u7A0B\u9879\u76EE
 _UI_LinkRulesItem_name_feature=\u4f5c\u4e1a\u540d
+_UI_ItemRelations_baseItem_feature=\u57FA\u672C\u9879
+_UI_ItemRelations_relatedItems_feature=\u76F8\u5173\u7684\u9879
 _UI_ItemRelation_id_feature=\u7EC4\u4EF6\u6807\u8BC6\u7B26
 _UI_ItemRelation_version_feature=\u7248\u672C
 _UI_ItemRelation_type_feature=\u7C7B\u578B
@@ -325,14 +344,20 @@ _UI_Metadata_type=\u5143\u6570\u636E
 _UI_Connection_type=\u8FDE\u63A5
 _UI_MetadataColumn_type=\u5143\u6570\u636E\u5217
 _UI_AbstractMetadataObject_type= \u62BD\u8C61\u7684\u5143\u6570\u636E\u5BF9\u8C61
+_UI_MetadataTable_type=\u5143\u6570\u636E\u8868
 _UI_FileConnection_type=\u6587\u4EF6\u8FDE\u63A5
 _UI_DelimitedFileConnection_type=\u5206\u5272\u578B\u6587\u4EF6\u8FDE\u63A5
 _UI_DatabaseConnection_type=\u6570\u636E\u5E93\u8FDE\u63A5
+_UI_InputSAPFunctionParameterTable_type=\u8F93\u5165SAP\u529F\u80FD\u53C2\u6570\u8868
+_UI_LdifFileConnection_type=Ldif\u6587\u4EF6\u8FDE\u63A5
 _UI_FileExcelConnection_type=Excel\u6587\u4EF6\u8FDE\u63A5
+_UI_GenericSchemaConnection_type=\u901A\u7528\u7ED3\u6784\u8FDE\u63A5
+_UI_LDAPSchemaConnection_type=LDAP\u6A21\u5F0F\u8FDE\u63A5
 _UI_CDCConnection_type=CDC\u8FDE\u63A5
 _UI_CDCType_type=CDC\u7C7B\u578B
 _UI_Concept_type=\u6982\u5FF5
 _UI_ConceptTarget_type=\u6982\u5FF5\u76EE\u6807
+_UI_GenericPackage_type=\u901A\u7528\u5305
 _UI_Connection_version_feature=\u7248\u672C
 _UI_Connection_queries_feature=\u67E5\u8BE2
 _UI_Connection_ContextMode_feature=\u4E0A\u4E0B\u6587\u6A21\u578B
@@ -412,6 +437,7 @@ _UI_SAPFunctionParameterColumn_DataType_feature=\u6570\u636E\u7C7B\u578B
 _UI_SAPFunctionParameterColumn_Length_feature=\u957F\u5EA6
 _UI_SAPFunctionParameterColumn_Value_feature=\u503c
 _UI_SAPFunctionParameterTable_columns_feature=\u663E\u793A\u5217
+_UI_InputSAPFunctionParameterTable_functionUnit_feature=\u529F\u80FD\u5355\u5143
 _UI_XmlFileConnection_XsdFilePath_feature=XSD\u6587\u4EF6\u8DEF\u5F84
 _UI_XmlFileConnection_schema_feature=\u67B6\u6784
 _UI_XmlFileConnection_Encoding_feature=\u7f16\u7801
@@ -427,6 +453,7 @@ _UI_Query_value_feature=\u503c
 _UI_Query_contextMode_feature=\u4E0A\u4E0B\u6587\u6A21\u578B
 _UI_LdifFileConnection_value_feature=\u503c
 _UI_LdifFileConnection_FilePath_feature=\u6587\u4ef6\u8def\u5f84
+_UI_LdifFileConnection_LimitEntry_feature=\u8FDE\u63A5\u9650\u5236
 _UI_LdifFileConnection_Server_feature=\u670d\u52a1\u5668
 _UI_FileExcelConnection_SheetName_feature=\u5DE5\u4F5C\u7C3F\u540D\u79F0
 _UI_FileExcelConnection_sheetColumns_feature=\u5DE5\u4F5C\u7C3F\u5217
@@ -437,15 +464,20 @@ _UI_FileExcelConnection_decimalSeparator_feature=\u5c0f\u6570\u70b9
 _UI_FileExcelConnection_selectAllSheets_feature=\u9009\u62E9\u6240\u6709\u5DE5\u4F5C\u7C3F
 _UI_FileExcelConnection_sheetList_feature=Sheet\u5217\u8868
 _UI_XmlXPathLoopDescriptor_connection_feature=\u8FDE\u63A5
+_UI_GenericSchemaConnection_mappingTypeUsed_feature=\u4F7F\u7528\u7684\u6620\u5C04\u7C7B\u578B
+_UI_GenericSchemaConnection_mappingTypeId_feature=\u6620\u5C04\u7C7B\u578BId
 _UI_LDAPSchemaConnection_Host_feature=\u4e3b\u673a
 _UI_LDAPSchemaConnection_Port_feature=\u7aef\u53e3
 _UI_LDAPSchemaConnection_Protocol_feature=\u534f\u8bae
 _UI_LDAPSchemaConnection_Filter_feature=\u8FC7\u6EE4
 _UI_LDAPSchemaConnection_Separator_feature=\u5206\u9694\u7B26
+_UI_LDAPSchemaConnection_UseAdvanced_feature=\u9AD8\u7EA7\u5E94\u7528
 _UI_LDAPSchemaConnection_StorePath_feature=\u5B58\u50A8\u8DEF\u5F84
+_UI_LDAPSchemaConnection_UseAuthen_feature=\u4F7F\u7528\u8BA4\u8BC1
 _UI_LDAPSchemaConnection_LimitValue_feature=\u9650\u5236\u884C\u6570\u503C
 _UI_LDAPSchemaConnection_Value_feature=\u503c
 _UI_LDAPSchemaConnection_SavePassword_feature=\u4FDD\u5B58\u5BC6\u7801
+_UI_LDAPSchemaConnection_TimeOutLimit_feature=\u8D85\u65F6\u9650\u5236
 _UI_WSDLSchemaConnection_WSDL_feature=Web \u670D\u52A1
 _UI_WSDLSchemaConnection_Password_feature=\u5bc6\u7801
 _UI_WSDLSchemaConnection_proxyHost_feature=\u4EE3\u7406\u7684\u4E3B\u673A
@@ -504,6 +536,7 @@ _UI_DevelopmentStatus_DRAFT_literal=\u8349\u7A3F
 _UI_FieldSeparator_Comma_literal=\u9017\u53F7
 _UI_FieldSeparator_Space_literal=\u7A7A\u683C
 _UI_FieldSeparator_Custom_ANSI_literal=\u81EA\u5B9A\u4E49ANSI
+_UI_FieldSeparator_Custom_UTF8_literal=\u81EA\u5B9A\u4E49UTF-8
 _UI_FieldSeparator_Custom_RegExp_literal=\u81EA\u5B9A\u4E49\u6B63\u5219\u8868\u8FBE\u5F0F
 _UI_Escape_Delimited_literal=\u5206\u9694
 _UI_DevelopmentStatus_DRAFT_literal=\u8349\u7A3F
@@ -537,9 +570,11 @@ _UI_WSDLParameter_Element_feature=\u5143\u7D20
 _UI_TalendTrigger_executionTriggerable_feature=\u53EF\u89E6\u53D1\u5F0F\u8FD0\u884C
 _UI_ExecutionServer_timeoutUnknownState_feature=\u8D85\u65F6\u672A\u77E5\u72B6\u6001
 _UI_UserRoleReference_user_feature=\u7528\u6237
+_UI_WSDLParameter_type=WSDL \u53C2\u6570
 _UI_WSDLSchemaConnection_serverName_feature=\u670D\u52A1\u5668\u540D
 _UI_HL7Connection_outputFilePath_feature=\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84
 _UI_WSDLParameter_Element_feature=\u5143\u7D20
+_UI_WSDLParameter_Column_feature=\u5217
 _UI_WSDLParameter_Expression_feature=\u8868\u8FBE\u5F0F
 _UI_TdXmlSchema_xsdFilePath_feature=XSD\u6587\u4EF6\u8DEF\u5F84
 _UI_FTPConnectionItem_type=FTP\u8FDE\u63A5\u9879\u76EE
@@ -575,12 +610,26 @@ _UI_RuleType_REFERENCE_literal=\u5F15\u7528
 _UI_ConditionType_type=\u6761\u4EF6\u7C7B\u578B
 _UI_ConditionType_inputColumn_feature=\u8F93\u5165\u680F
 _UI_ConditionType_function_feature=\u529F\u80FD
+_UI_ConditionType_operator_feature=\u64CD\u4F5C\u7B26
+_UI_ConditionType_value_feature=\u503C
+_UI_ValidationRulesConnection_type_feature=\u7C7B\u578B
+_UI_RuleType_REFERENCE_literal=\u5F15\u7528
+_UI_RuleType_BASIC_literal=\u57FA\u672C\u7684
+_UI_RuleType_CUSTOM_literal=\u81EA\u5B9A\u4E49
+_UI_Function_Empty_literal=\u7a7a
+_UI_Function_Lower_Case_literal=\u5C0F\u5199\u5B57\u6BCD
 _UI_Function_Lower_Case_literal=\u5C0F\u5199\u5B57\u6BCD
 _UI_Function_Upper_Case_literal=\u5927\u5199\u5B57\u6BCD
 _UI_Function_Upper_Case_literal=\u5927\u5199\u5B57\u6BCD
+_UI_Function_Lower_Case_First_literal=\u4F18\u5148\u5C0F\u5199\u5B57\u6BCD
+_UI_Function_Lower_Case_First_literal=\u4F18\u5148\u5C0F\u5199\u5B57\u6BCD
+_UI_Function_Upper_Case_First_literal=\u4F18\u5148\u5927\u5199\u5B57\u6BCD
+_UI_Function_Upper_Case_First_literal=\u4F18\u5148\u5927\u5199\u5B57\u6BCD
+_UI_Function_Length_literal=\u957F\u5EA6
 _UI_Function_Match_literal=\u5339\u914D
 _UI_Operator_Equals_literal=\u7B49\u4E8E
 _UI_Operator_Not_Equal_To_literal=\u4E0D\u7B49\u4E8E
 _UI_Operator_Greater_Than_literal=\u5927\u4E8E
 _UI_Operator_Lower_Than_literal=\u5C0F\u4E8E
 _UI_Operator_Greater_Or_Equal_To_literal=\u5927\u4E8E\u7B49\u4E8E
+_UI_Operator_Lower_Or_Equal_To_literal=\u5C0F\u4E8E\u7B49\u4E8E

i18n/plugins/org.talend.model.edit.nl/pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.edit.nl</artifactId>

i18n/plugins/org.talend.model.migration.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.model.migration.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.model.migration

i18n/plugins/org.talend.model.migration.nl/pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.migration.nl</artifactId>

i18n/plugins/org.talend.model.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.model.Nl Fragment
 Bundle-SymbolicName: org.talend.model.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.model
 Bundle-Localization: plugin

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.nl</artifactId>

i18n/plugins/org.talend.presentation.onboarding.nl/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

i18n/plugins/org.talend.presentation.onboarding.nl/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.presentation.onboarding.nl</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

i18n/plugins/org.talend.presentation.onboarding.nl/META-INF/MANIFEST.MF

@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: NL
+Bundle-SymbolicName: org.talend.presentation.onboarding.nl
+Bundle-Version: 6.1.1.qualifier
+Fragment-Host: org.talend.presentation.onboarding

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

@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .

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

@@ -0,0 +1 @@
+Onboarding=Studio Quick Tour

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.1.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.presentation.onboarding.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -0,0 +1,16 @@
+onBoardingComposite.button.skip=CLOSE
+onBoardingComposite.button.skip.letMeTry=LET ME TRY
+onBoardingComposite.button.back=BACK
+onBoardingComposite.button.next=NEXT
+OnBoardingHtmlAction.OnBoardingManager.null=Can't find the OnBoardingManager
+OnBoardingManager.NPE.workbench=Can't find workbench
+OnBoardingManager.workbenchWindow.notFound=Not found active workbench window, use the first workbench window instead.
+OnBoardingManager.NPE.workbenchWindow=Can't find workbenchWindow
+OnBoardingManager.NPE.workbenchWindowShell=Can't find the shell of workbenchWindow
+OnBoardingHandler.confirm.title=Reset Perspective
+OnBoardingHandler.confirm.msg=To view the Studio Quick Tour, you first need to reset the perspective. Do you want to reset the perspective to its default values?
+OnBoardingResourceManager.convertData.invalidJsonInputType=Invalid input type, currently only support Json string / File / URL.
+OnBoardingResourceManager.addOnBoardingRegistedResource.docIdExists=Doc id [{0}] already exists when adding on-boarding resource, will overwrite it.
+OnBoardingJsonDoc.buildContentMap.perspIdExists=Perspective id [{0}] already exists when building perspective id maps, will overwrite it.
+OnBoardingManager.docId.null=DocId is not specified.
+OnBoardingManager.OnBoardingRegistedResource.notFound=Could not find the onBoardingRegistedResource with the specified docId, please regist it in the OnBoardingResourceManager of OnBoardingManager.

i18n/plugins/org.talend.rcp.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.rcp.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.rcp
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.nl</artifactId>

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

@@ -56,7 +56,6 @@ WelcomePageDynamicContentProvider.LatestItems.Title=Latest items
 WelcomePageDynamicContentProvider.LatestItemsJob.Title=Job
 WelcomePageDynamicContentProvider.LatestItemsBusinessModel.Title=Business Model
 WelcomePageDynamicContentProvider.LatestItemsAnalysis.Title=Analysis
-WelcomePageDynamicContentProvider.LatestItemsServices.Title=Services
 WelcomePageDynamicContentProvider.LatestItemsRoutes.Title=Routes
 WelcomePageDynamicContentProvider.CreateNewTitle=Create a new...
 WelcomePageDynamicContentProvider.CreateNewJobTitle=Job
@@ -109,3 +108,5 @@ Application.workspaceEmptyMessage=Workspace field must not be empty; enter a pat
 Application.workspaceInvalidTitle=Invalid Workspace
 Application.workspaceInvalidMessage=Selected workspace is not valid; choose a different one.
 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.

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

@@ -91,3 +91,5 @@ 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.
+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_ja.properties

@@ -95,4 +95,7 @@ DataTransferMessages.WizardProjectsImportPage_ArchiveSelectTitle=\u30A2\u30FC\u3
 DataTransferMessages.DataTransfer_browse=\u53C2\u7167...
 DataTransferMessages.ArchiveExport_selectDestinationTitle=\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 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
+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.registration.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.registration.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.registration

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.registration.nl</artifactId>

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

@@ -106,3 +106,4 @@ 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
 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/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.items.importexport.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.repository.items.importexport

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.items.importexport.nl</artifactId>

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

@@ -2,7 +2,15 @@ AbstractImportHandler_cannotImportMessage={0} \u30D7\u30ED\u30B8\u30A7\u30AF\u30
 AbstractImportHandler_persistenceException={0} \u306E\u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u3059\u3002
 AbstractImportHandler_unsupportItem=\u30A2\u30A4\u30C6\u30E0\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3067\u304D\u307E\u305B\u3093\u3002\u73FE\u5728\u4F7F\u7528\u3057\u3066\u3044\u308B\u88FD\u54C1\u306B\u9069\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3067\u3042\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 AbstractImportHandler_itemLocked=\u30A2\u30A4\u30C6\u30E0\u304C\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+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_importingItemsMessage=\u9805\u76EE\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u4E2D...
+ImportExportHandlersManager_populatingItemsMessage=\u30A2\u30A4\u30C6\u30E0\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u305B\u308B
+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...
+ImportBasicHandler_ErrorCreateEmfResource=EMF\u30EA\u30BD\u30FC\u30B9\u306E\u30ED\u30FC\u30C9\u304C\u5931\u6557\u3057\u307E\u3057\u305F\u3002
+ImportBasicHandler_MissingItemFile=\u30A2\u30A4\u30C6\u30E0\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+ImportBasicHandler_NotHrefCurrentItemFile=\u30A2\u30A4\u30C6\u30E0\u30D5\u30A1\u30A4\u30EB\u306B\u306F\u5E7E\u3064\u304B\u306E\u30A8\u30E9\u30FC\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u78BA\u8A8D\u3057\u3066\u30EA\u30AB\u30D0\u30EA\u3057\u3066\u4E0B\u3055\u3044\u3002
+ImportBasicHandler_LoadEMFResourceError={0};EMF\u30EA\u30BD\u30FC\u30B9\u306E\u30ED\u30FC\u30C9\u30A8\u30E9\u30FC;{1}
+AbstractImportHandler_nameUsed.differentRepositoryType=\u30A2\u30A4\u30C6\u30E0\u540D\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059\u3002\u3054\u307F\u7BB1\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002

i18n/plugins/org.talend.repository.items.importexport.ui.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.repository.items.importexport.ui.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.repository.items.importexport.ui

i18n/plugins/org.talend.repository.items.importexport.ui.nl/plugin_ja.properties

@@ -1,2 +1,2 @@
-ImportItemsAction_title=\u9805\u76EE\u306E\u30A4\u30F3\u30DD\u30FC\u30C8
-ExportItemsAction_title=\u9805\u76EE\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
+ImportItemsAction_title=\u30A2\u30A4\u30C6\u30E0\u306E\u30A4\u30F3\u30DD\u30FC\u30C8
+ExportItemsAction_title=\u30A2\u30A4\u30C6\u30E0\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8

i18n/plugins/org.talend.repository.items.importexport.ui.nl/pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>

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

@@ -1,10 +1,12 @@
 ImportItemsWizardPage_importDescription=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u53C8\u306FZIP\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30A2\u30A4\u30C6\u30E0\u3092\u30A4\u30F3\u30DD\u30FC\u30C8
 ImportItemsWizardPage_browseText=\u53C2\u7167...
 ImportItemsWizardPage_deselectAllButtonText=\u5168\u3066\u306E\u9078\u629E\u3092\u89E3\u9664
+ImportItemsWizardPage_fromExchangeText=Exchange\u304B\u3089
 ImportItemsWizardPage_fromExchangeToolTipText=Talend Exchange\u3092\u53C2\u7167
 ImportItemsWizardPage_messagesText=\u30A8\u30E9\u30FC\u53C8\u306F\u8B66\u544A
-ImportItemsWizardPage_overwriteItemsText=\u65E2\u5B58\u306E\u9805\u76EE\u3092\u4E0A\u66F8\u304D
+ImportItemsWizardPage_overwriteItemsText=\u65E2\u5B58\u306E\u30A2\u30A4\u30C6\u30E0\u3092\u4E0A\u66F8\u304D
 ImportItemsWizardPage_refreshButtonText=\u66F4\u65B0
+ImportItemsWizardPage_selectArchiveText=\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u306E\u9078\u629E\uFF1A
 ImportItemsWizardPage_selectButtonText=\u5168\u3066\u9078\u629E
 ImportItemsWizardPage_selectDirectoryText=\u30EB\u30FC\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u9078\u629E\uFF1A
 ImportItemsWizardPage_selectDirectoryDialogTitle=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B\u30EB\u30FC\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u6307\u5B9A
@@ -12,12 +14,18 @@ ImportItemsWizardPage_selectArchiveDialogTitle=\u30D7\u30ED\u30B8\u30A7\u30AF\u3
 ImportItemsWizardPage_expandAllButtonText=\u5168\u3066\u958B\u304F
 ImportItemsWizardPage_collapseAllButtonText=\u5168\u3066\u7573\u3080
 ImportItemsWizardPage_fromExchangeWarningTitle=\u8B66\u544A
+ImportItemsWizardPage_fromExchangeWarningMessage=Exchang\u304B\u3089\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u306F\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002
+ImportItemsWizardPage_noValidItemsInPathMessage=\u30A4\u30F3\u30DD\u30FC\u30C8\u3067\u304D\u308B\u30A2\u30A4\u30C6\u30E0\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u30A2\u30A4\u30C6\u30E0\u3092\u542B\u3080\u30D5\u30A1\u30A4\u30EB\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002
+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_TarImport_badFormat=\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u304C\u4E0D\u6B63\u306Atar\u30D5\u30A1\u30A4\u30EB\u3067\u3059\u3002
-ImportItemsWizardPage_ZipImport_badFormat=\u9078\u629E\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u306F\u6B63\u3057\u3044ZIP\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-ImportItemsAction_title=\u9805\u76EE\u306E\u30A4\u30F3\u30DD\u30FC\u30C8
+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
 ImportItemsWizardPage_noSelectedItemsMessages=\u30A2\u30A4\u30C6\u30E0\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044\u3002
-ShowErrorsDuringImportItemsDialog_title=\u9805\u76EE\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+ShowErrorsDuringImportItemsDialog_title=\u30A2\u30A4\u30C6\u30E0\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 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_ProgressDialog_ExecutingMessage=\u6E96\u5099\u4E2D...

i18n/plugins/org.talend.repository.localprovider.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Local repository Plug-in Nl Fragment
 Bundle-SymbolicName: org.talend.repository.localprovider.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.repository.localprovider
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.localprovider.nl</artifactId>

i18n/plugins/org.talend.repository.mdm.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.mdm.nl
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.1.qualifier
 Fragment-Host: org.talend.repository.mdm

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.mdm.nl</artifactId>

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

@@ -3,7 +3,6 @@ MDMOutputDragAndDropHandler_warn=\u062A\u062D\u0630\u064A\u0631
 MDMOutputSchemaForm_default_value=\u0627\u0644\u0642\u064A\u0645\u0629 \u0627\u0644\u0627\u0641\u062A\u0631\u0627\u0636\u064A\u0629
 MDMOutputSchemaForm_delete=\u062D\u0630\u0641
 SetNameForm_name=\u0627\u0644\u0627\u0633\u0645
-UniverseForm_select_version=\u0627\u062E\u062A\u0631 \u0625\u0635\u062F\u0627\u0631\u0627
 UniverseForm_version=\u0627\u0644\u0625\u0635\u062F\u0627\u0631
 FileStep3.metadataName=\u0627\u0644\u0627\u0633\u0645
 FileStep3.metadataComment=\u062A\u0639\u0644\u064A\u0642

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

@@ -30,8 +30,6 @@ MDMSchema2TreeLinker_loop_created=\u0394\u03B7\u03BC\u03B9\u03BF\u03C5\u03C1\u03
 SetNameForm_entity_illegal=\u03A4\u03BF \u03CC\u03BD\u03BF\u03BC\u03B1 \u03C4\u03B7\u03C2 \u03BF\u03BD\u03C4\u03CC\u03C4\u03B7\u03C4\u03B1\u03C2 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03C0\u03B1\u03C1\u03AC\u03BD\u03BF\u03BC\u03BF.
 SetNameForm_name=\u038C\u03BD\u03BF\u03BC\u03B1
 UniverseForm_data_container=\u03A5\u03C0\u03BF\u03B4\u03BF\u03C7\u03AD\u03B1\u03C2-\u0394\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03C9\u03BD
-UniverseForm_data_model=\u039C\u03BF\u03BD\u03C4\u03AD\u03BB\u03BF-\u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03C9\u03BD
-UniverseForm_select_version=\u0395\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE \u0388\u03BA\u03B4\u03BF\u03C3\u03B7\u03C2
 UniverseForm_version=\u0388\u03BA\u03B4\u03BF\u03C3\u03B7
 ExtractionLoopWithXPathEditorView.xPathColumnTitle.absXpathExpression=\u0391\u03C0\u03CC\u03BB\u03C5\u03C4\u03B7 \u03AD\u03BA\u03C6\u03C1\u03B1\u03C3\u03B7 XPath
 ExtractionFieldsWithXPathEditorView.columnTitle.xPath=\u03A3\u03C7\u03B5\u03C4\u03B9\u03BA\u03AE \u03AE \u03B1\u03C0\u03CC\u03BB\u03C5\u03C4\u03B7 \u03AD\u03BA\u03C6\u03C1\u03B1\u03C3\u03B7 XPath

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

@@ -59,8 +59,6 @@ SetNameForm_meta_null=Metadata name can not be null.
 SetNameForm_name=Name
 SetNameForm_select_entity=Select the entity
 UniverseForm_data_container=Data-Container
-UniverseForm_data_model=Data-model
-UniverseForm_select_version=Select Version
 UniverseForm_version=Version
 ExtractionLoopWithXPathEditorView.xPathColumnTitle.absXpathExpression=Absolute XPath expression
 ExtractionFieldsWithXPathEditorView.columnTitle.xPath=Relative or absolute XPath expression
@@ -113,3 +111,5 @@ MDMWizardConnection=MDM Connection
 MDMForm_connection_failure=Failed to connect to MDM, please change MDM settings.
 MDMForm_error_message=Error Message
 MDMForm_server_url=Server URL
+UniverseForm_data_model1=Data-Model
+UniverseForm_select_version1=Select