Fix missing uppercase

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

@@ -8,6 +8,7 @@
     <discovery label="Talend web site" url="http://www.talend.com"/> 
   </url>  
   <requires>
+    <import plugin="org.bouncycastle.bcprov" version="1.68.0" match="greaterOrEqual"/>
     <import plugin="com.fasterxml.jackson.core.jackson-databind" version="2.9.8" match="greaterOrEqual"/>
     <import plugin="jackson-core-asl" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="jackson-mapper-asl" version="0.0.0" match="greaterOrEqual"/>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.feature</artifactId>

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

@@ -21,7 +21,7 @@
     <import feature="org.eclipse.gef" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.eclipse.gmf.runtime.notation" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.eclipse.jdt" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.platform.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.platform" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.talend.tos.libraries.feature" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.talend.utils.feature" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="javax.activation" version="0.0.0" match="greaterOrEqual"/>

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

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

main/features/org.talend.fragment.jars.common.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.fragment.jars.common.feature</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.help.feature</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.jdbc.feature</artifactId>

main/features/org.talend.platform.feature/build.properties

@@ -1 +0,0 @@
-bin.includes = feature.xml

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

@@ -1,525 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.platform.feature"
-      label="Platform featrue"
-      version="8.0.1.qualifier"
-      provider-name=".Talend SA.">
-
-   <description url="http://www.talend.com/online/featuresdescription.html#platform-feature">
-      Complete description about this feature at http://www.talend.com/online/featuresdescription.html#platform-feature
-   </description>
-
-   <copyright url="http://www.talend.com/online/copyright.txt">
-      Copyright Talend 2006, 2007
-   </copyright>
-
-   <license>
-      The licence are describe in branding feature
-   </license>
-
-   <includes
-         id="org.eclipse.rcp"
-         version="4.20.0.v20210611-1600"/>
-
-   <includes
-         id="org.eclipse.equinox.p2.user.ui"
-         version="2.4.1200.v20210507-0825"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.help"
-         version="2.3.600.v20210611-1600"/>
-
-   <plugin
-         id="org.apache.ant"
-         download-size="3025"
-         install-size="3540"
-         version="1.10.10.v20210426-1926"/>
-
-   <plugin
-         id="org.eclipse.ant.core"
-         download-size="105"
-         install-size="186"
-         version="3.6.0.v20210415-1314"
-         unpack="false"/>
-
-   <plugin
-         id="com.jcraft.jsch"
-         download-size="297"
-         install-size="539"
-         version="0.1.55.v20190404-1902"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.compare.core"
-         download-size="66"
-         install-size="127"
-         version="3.6.1000.v20201020-1107"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.compare"
-         download-size="789"
-         install-size="1572"
-         version="3.8.0.v20210415-0713"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.compare.win32"
-         os="win32"
-         download-size="43"
-         install-size="77"
-         version="1.2.800.v20200127-1343"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filebuffers"
-         download-size="113"
-         install-size="244"
-         version="3.7.0.v20210512-1543"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem"
-         download-size="68"
-         install-size="128"
-         version="1.9.0.v20210419-1155"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.net"
-         download-size="64"
-         install-size="124"
-         version="1.3.1100.v20210424-0724"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.net.linux"
-         os="linux"
-         download-size="14"
-         install-size="22"
-         version="1.0.0.v20210424-0724"
-         fragment="true"
-         unpack="false"/>
-   
-   <plugin
-         id="org.eclipse.core.net.linux.x86_64"
-         os="linux"
-         arch="x86_64"
-         download-size="7"
-         install-size="11"
-         version="1.2.500.v20210510-1619"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.net.win32.x86_64"
-         os="win32"
-         arch="x86_64"
-         download-size="34"
-         install-size="63"
-         version="1.1.500.v20190925-1337"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.resources"
-         download-size="877"
-         install-size="1912"
-         version="3.15.0.v20210521-0722"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.util"
-         download-size="71"
-         install-size="148"
-         version="3.6.0.v20210212-1137"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.debug.core"
-         download-size="387"
-         install-size="807"
-         version="3.18.100.v20210511-0446"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.debug.ui"
-         download-size="2979"
-         install-size="6065"
-         version="3.15.0.v20210525-1810"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.e4.ui.ide"
-         download-size="11"
-         install-size="15"
-         version="3.15.200.v20210108-1832"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.event"
-         download-size="32"
-         install-size="58"
-         version="1.6.0.v20210212-1143"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ltk.core.refactoring"
-         download-size="335"
-         install-size="757"
-         version="3.11.400.v20210427-0555"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ltk.ui.refactoring"
-         download-size="461"
-         install-size="953"
-         version="3.11.400.v20210320-1132"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.platform"
-         download-size="637"
-         install-size="959"
-         version="4.20.0.v20210611-1600"/>
-
-   <plugin
-         id="org.eclipse.platform.doc.user"
-         download-size="6712"
-         install-size="9296"
-         version="4.20.0.v20210530-2150"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.search"
-         download-size="533"
-         install-size="1043"
-         version="3.13.200.v20210419-1029"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.text.quicksearch"
-         download-size="94"
-         install-size="184"
-         version="1.1.100.v20210426-1601"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.core"
-         download-size="395"
-         install-size="847"
-         version="3.9.0.v20210510-1748"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.ui"
-         download-size="1428"
-         install-size="3017"
-         version="3.9.0.v20210426-0837"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.text"
-         download-size="288"
-         install-size="577"
-         version="3.12.0.v20210512-1644"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jface.text"
-         download-size="1021"
-         install-size="2137"
-         version="3.18.0.v20210512-1640"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jsch.core"
-         download-size="40"
-         install-size="75"
-         version="1.3.900.v20200422-1935"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jsch.ui"
-         download-size="91"
-         install-size="180"
-         version="1.4.0.v20210426-0843"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.console"
-         download-size="205"
-         install-size="378"
-         version="3.11.0.v20210510-1914"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.intro"
-         download-size="337"
-         install-size="661"
-         version="3.6.200.v20210409-1747"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.intro.universal"
-         download-size="2144"
-         install-size="2741"
-         version="3.4.200.v20210409-1747"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.cheatsheets"
-         download-size="379"
-         install-size="733"
-         version="3.7.300.v20210507-0822"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.browser"
-         download-size="203"
-         install-size="337"
-         version="3.6.1100.v20210118-1327"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.genericeditor"
-         download-size="143"
-         install-size="341"
-         version="1.2.0.v20210129-1224"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.monitoring"
-         download-size="59"
-         install-size="110"
-         version="1.2.0.v20210111-1353"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.navigator"
-         download-size="416"
-         install-size="876"
-         version="3.10.100.v20210415-0924"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.navigator.resources"
-         download-size="169"
-         install-size="348"
-         version="3.8.100.v20210319-0848"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.net"
-         download-size="45"
-         install-size="84"
-         version="1.4.0.v20210426-0838"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.workbench.texteditor"
-         download-size="653"
-         install-size="1376"
-         version="3.16.100.v20210512-1009"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views"
-         download-size="104"
-         install-size="187"
-         version="3.11.0.v20210111-1351"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.editors"
-         download-size="607"
-         install-size="1344"
-         version="3.14.100.v20210513-1110"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.externaltools"
-         download-size="143"
-         install-size="275"
-         version="3.5.0.v20210510-1849"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.ide"
-         download-size="2421"
-         install-size="4780"
-         version="3.18.200.v20210523-1724"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.ide.application"
-         download-size="110"
-         install-size="214"
-         version="1.4.100.v20210506-1050"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.win32"
-         ws="win32"
-         download-size="22"
-         install-size="41"
-         version="3.4.400.v20200414-1247"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.linux.x86_64"
-         os="linux"
-         arch="x86_64"
-         download-size="11"
-         install-size="21"
-         version="1.2.300.v20180828-0158"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.macosx"
-         os="macosx"
-         download-size="25"
-         install-size="160"
-         version="1.3.300.v20210427-1937"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.resources.win32.x86_64"
-         os="win32"
-         arch="x86_64"
-         download-size="57"
-         install-size="109"
-         version="3.5.400.v20190812-0909"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.win32.x86_64"
-         os="win32"
-         arch="x86_64"
-         download-size="37"
-         install-size="73"
-         version="1.4.200.v20190812-0909"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.variables"
-         download-size="35"
-         install-size="64"
-         version="3.5.0.v20210510-1945"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.forms"
-         download-size="323"
-         install-size="642"
-         version="3.11.100.v20210108-1139"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views.properties.tabbed"
-         download-size="107"
-         install-size="217"
-         version="3.9.100.v20201223-1348"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security"
-         download-size="110"
-         install-size="230"
-         version="1.3.600.v20210126-1005"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security.ui"
-         download-size="167"
-         install-size="318"
-         version="1.3.0.v20210121-0947"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security.win32.x86_64"
-         os="win32"
-         arch="x86_64"
-         download-size="40"
-         install-size="74"
-         version="1.1.200.v20190812-0919"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security.macosx"
-         os="macosx"
-         download-size="28"
-         install-size="165"
-         version="1.101.400.v20210427-1958"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security.linux"
-         os="linux"
-         download-size="23"
-         install-size="35"
-         version="1.0.100.v20210419-1942"
-         fragment="true"
-         unpack="false"/>
-   
-   <plugin
-         id="org.eclipse.equinox.security.linux.x86_64"
-         os="linux"
-         arch="x86_64"
-         download-size="7"
-         install-size="11"
-         version="1.1.500.v20210125-1508"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.externaltools"
-         download-size="42"
-         install-size="80"
-         version="1.2.0.v20210510-1841"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.runtime"
-         download-size="69"
-         install-size="149"
-         version="3.22.0.v20210506-1025"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.intro.quicklinks"
-         download-size="23"
-         install-size="43"
-         version="1.1.100.v20210315-0954"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.genericeditor.diff.extension"
-         download-size="16"
-         install-size="23"
-         version="1.1.0.v20210426-0951"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.urischeme"
-         download-size="51"
-         install-size="98"
-         version="1.1.400.v20210407-1558"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views.log"
-         download-size="169"
-         install-size="292"
-         version="1.2.1500.v20210315-1034"
-         unpack="false"/>
-
-</feature>

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

@@ -1,12 +0,0 @@
-<?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>8.0.1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.platform.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.feature</artifactId>

main/features/org.talend.update.p2.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.update.p2.feature</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.updates.feature</artifactId>

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

@@ -5,7 +5,7 @@
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  
   <requires>
-    <import plugin="org.bouncycastle.bcprov" version="1.69.0" match="greaterOrEqual"/>
+    <import plugin="org.bouncycastle.bcprov" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="com.cedarsoftware.json-io" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.9.0" match="greaterOrEqual"/>
     <import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.8" match="greaterOrEqual"/>
@@ -20,7 +20,7 @@
     <import plugin="org.apache.servicemix.bundles.avro" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.junit" version="4.13.2" match="greaterOrEqual"/>
     <import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.slf4j.binding.log4j12" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.commons.configuration" version="2.0.0" match="greaterOrEqual"/>
   </requires>  
   <plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.utils.feature</artifactId>

main/plugins/org.talend.common.ui.runtime/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.common.ui.runtime</artifactId>

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

@@ -1,26 +1,23 @@
-AccessorUtils.Assert0=L'attribut 'BeanPropertyAccessors' de la colonne (nomm\u00E9e '{0}' et ayant l'id '{1}') n'est pas configur\u00E9 correctement.   {2} est requis pour le bean<B>
+AccessorUtils.Assert0=L'attribut 'BeanPropertyAccessors' de la colonne (nomm\u00E9e '{0}' et ayant l'id '{1}') n'est pas configur\u00E9 correctement. {2} est requis pour le bean 
 AccessorUtils.Assert1=L'attribut 'BeanPropertyAccessors' de la colonne (nomm\u00E9e'{0}' et ayant l'id '{1}') n'est pas configur\u00E9 correctement ou le type de la valeur affect\u00E9e n'est pas correct.
-AccessorUtils.NoClassDef=ErreurClassDefNonTrouv\u00E9e ({0}) : {1}
-AccessorUtils.isReq= est requis pour le bean (<B>).
-AccessorUtils.isReqValue= est requis pour la valeur (<V>), mais la valeur peut \u00EAtre adapt\u00E9e avec le CellEditorValueAdapter.
+AccessorUtils.isReq=\ est requis pour le bean (<B>).
 AddPushButton.AddButton.Tip=Ajouter
 AddAllPushButton.AddAllButton.Tip=Ajouter tout
 CellEditorDialogBehavior.textContent=...
-CellEditorValueAdapterFactory.valueNotStringType=La valeur du bean doit \u00EAtre une classe de type String.
-ColorStyledText.RedoItem.Text=R\u00E9p\u00E9ter
+ColorStyledText.RedoItem.Text=R\u00E9tablir
 ColorStyledText.UndoItem.Text=Annuler
 ColorStyledText.CopyItem.Text=Copier
 ColorStyledText.PasteItem.Text=Coller
-ColorStyledText.SelectAllItem.Text=Tout s\u00E9lectionner
+ColorStyledText.SelectAllItem.Text=S\u00E9lectionner tout
 ContentProposalAdapterExtended.close=Fermer
-ContentProposalAdapterExtended.closeFocusout=fermeture de focusout
-ControlUtils.Unsupported1=Ce contr\u00F4le ({0}) n'est pas support\u00E9. Ajoutez "Case" si vous souhaitez...
-CopyPushButton.CopyButton.Tip=Copier les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
+ContentProposalAdapterExtended.closeFocusout=Fermeture de focusout
+ControlUtils.Unsupported1=Ce contr\u00F4le ({0}) n'est pas support\u00E9, ajouter un "sinon" si vous voulez...
+CopyPushButton.CopyButton.Tip=Copie les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
 Curve2D.MaxNum.Be0=maximumSegments doit \u00EAtre positif ou 0
-Curve2D.MinNum.Be0=minimumSegements doit \u00EAtre positif ou 0
-DateDialog.textContent=S\u00E9lectionnez la date et l'heure
+Curve2D.MinNum.Be0=minimumSegments doit \u00EAtre positif ou 0
+DateDialog.textContent=S\u00E9lectionner Date et heure
 DefaultCellModifier.tableItemDispose=TableItem effac\u00E9
-DialogErrorForCellEditorListener.Error.MsgDialogTitle=Erreur
+DialogErrorForCellEditorListener.Error.MsgDialogTitle=ERROR
 ErrorDialogWidthDetailArea.ErrorMessage.Text=Message d'erreur
 ErrorDialogWidthDetailArea.ErrorMessage.ColumnText=La colonne ne peut \u00EAtre vide
 ErrorDialogWidthDetailArea.ErrorMessage.ColumnText.NotValid=L'entr\u00E9e '{0}' n'est pas valide, la valeur originale '{1}' sera utilis\u00E9e.
@@ -28,110 +25,96 @@ ErrorDialogWithContinue.setParameter=Configurer les param\u00E8tres et continuer
 EventUtil.activate=Activer
 EventUtil.arm=ARM
 EventUtil.close=Fermer
-EventUtil.collapse=R\u00E9duire
+EventUtil.collapse=r\u00E9duire
 EventUtil.deactivate=D\u00E9sactiver
-EventUtil.defaultSelection=S\u00E9lection par d\u00E9faut
-EventUtil.deiconify=d\u00E9siconifier
+EventUtil.defaultSelection=s\u00E9lection par d\u00E9faut
+EventUtil.deiconify=d\u00E9-ic\u00F4nifie
 EventUtil.detailNull=Null
-EventUtil.dispose=retirer
-EventUtil.dragDetect=d\u00E9tection de glissement
-EventUtil.expand=D\u00E9velopper
-EventUtil.focusIn=activation
-EventUtil.focusOut=d\u00E9sactivation
-EventUtil.hardKeyDown=touche fl\u00E8che bas
-EventUtil.hardKeyUp=touche fl\u00E8che haut
+EventUtil.dispose=Retirer
+EventUtil.dragDetect=D\u00E9tection de glissement
+EventUtil.expand=d\u00E9velopper
+EventUtil.focusIn=Activation
+EventUtil.focusOut=D\u00E9sactivation
+EventUtil.hardKeyDown=Touche fl\u00E8che bas
+EventUtil.hardKeyUp=Touche fl\u00E8che haut
 EventUtil.help=Aide
-EventUtil.hide=masquer
+EventUtil.hide=cacher
 EventUtil.iconify=ic\u00F4nifier
-EventUtil.keyDown=fl\u00E8che bas
-EventUtil.keyUp=fl\u00E8che haut
-EventUtil.menuDetect=d\u00E9tection du menu
+EventUtil.keyDown=Fl\u00E8che bas
+EventUtil.keyUp=Fl\u00E8che haut
+EventUtil.menuDetect=D\u00E9tection du menu
 EventUtil.modify=Modifier
 EventUtil.mouseDoubleClick=double-clic
-EventUtil.mouseDown=souris bas
-EventUtil.mouseEnter=souris entr\u00E9e
-EventUtil.mouseExit=souris sortie
-EventUtil.mouseHover=survoler avec la souris
-EventUtil.mouseMove=d\u00E9placement de la souris
-EventUtil.mouseUp=souris haut
+EventUtil.mouseDown=Souris bas
+EventUtil.mouseEnter=Souris Entr\u00E9e
+EventUtil.mouseExit=Souris sortie
+EventUtil.mouseHover=Survoler avec la souris
+EventUtil.mouseMove=D\u00E9placement de la souris
+EventUtil.mouseUp=Souris haut
 EventUtil.move=D\u00E9placer
 EventUtil.paint=peint
 EventUtil.resize=redimensionner
-EventUtil.selectedEqual=S\u00C9LECTIONN\u00C9=
 EventUtil.selection=S\u00E9lection
 EventUtil.show=Afficher
 EventUtil.traverse=traverse
 EventUtil.typeNull=Null
-EventUtil.UnknowDetail=valeur inconnue du d\u00E9tail de l'\u00E9v\u00E9nement :
-EventUtil.UnknowType=valeur inconnue du type d'\u00E9v\u00E9nement\u00A0:
-EventUtil.verify=v\u00E9rifier
 ExceptionHandler.Parameter.BeNull=le param\u00E8tre ex ne peut \u00EAtre null
 ExceptionMessageDialog.Cancel=Annuler
-ExceptionMessageDialog.log=log
-ExceptionMessageDialog.No=Non
+ExceptionMessageDialog.log=Fichier de log
+ExceptionMessageDialog.No=NO
 ExceptionMessageDialog.OK=OK
 ExceptionMessageDialog.Yes=Oui
 ExportPushButton.ExportButton.Tip=Exporte toutes les lignes dans un fichier XML
 ExportPushButtonForExtendedTable.ErrorMsg.Text=Une erreur est survenue
-ExtendedTableAddCommand.Add.Label=Ajouter une ou plusieurs entr\u00E9es dans la table
+ExtendedTableAddCommand.Add.Label=Ajouter une ou plusieurs entr\u00E9e(s) de table
 ExtendedTableCopyCommand.Copy.Label=Copier une ou plusieurs entr\u00E9e(s) de table dans le presse-papier interne
 ExtendedTableModel.ModifiedObject.Error=L'objet ModifiedBeanListenable doit \u00EAtre d\u00E9fini avant d'utiliser cette m\u00E9thode
 ExtendedTableMoveCommand.MoveLabel=D\u00E9placer vers le haut ou le bas une ou plusieurs entr\u00E9es de table
-ExtendedTablePasteCommand.Paste.Label=Coller les donn\u00E9es du presse-papier interne
+ExtendedTablePasteCommand.Paste.Label=Coller des donn\u00E9es du presse-papiers interne
 ExtendedTableRemoveCommand.Romve.Label=Supprimer les entr\u00E9es de table
 ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=R\u00E9initialiser tous les types de base de donn\u00E9es pour obtenir les valeurs par d\u00E9faut
-ImportPushButton.ImportButton.Tip=Remplacer toutes les lignes par un import de fichier XML
+ImportPushButton.ImportButton.Tip=Remplacer toutes les lignes par celles import\u00E9es d'un fichier XML.
 ImportPushButtonForExtendedTable.ErrorMsg.Text=Une erreur est survenue
 LabelledFileField.BrowseButton.Text=Parcourir...
-LabelledFileField.FileDialog.Text=S\u00E9lectionner un(e)
-Mode.Mode.ToString=Mode[{0}]
+LabelledFileField.FileDialog.Text=Choissisez un
+Mode.Mode.ToString=Mode [{0}]
 ModeReader.IgnoreElement=Ignorer les \u00E9l\u00E9ments inconnus
-ModelSelectionDialog.Title=\u00C9diter les param\u00E8tres via le r\u00E9f\u00E9rentiel
+ModelSelectionDialog.Title=Editer les param\u00E8tres en utilisant le r\u00E9f\u00E9rentiel
 ModifyBeanValueCommand.ModifyCell.Label=Modifier la valeur de la cellule
-MoveDownPushButton.MoveDownTip=Descendre les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
-MoveUpPushButton.MoveUpButton.Tip=Monter les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
+MoveDownPushButton.MoveDownTip=D\u00E9place vers le bas les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
+MoveUpPushButton.MoveUpButton.Tip=D\u00E9place vers le haut les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
 PastePushButton.PasteButton.Label=Coller
-ProposalUtils.CellProposal.Error=La suggestion de ce type de CellEditor n'est pas support\u00E9e :
-ProposalUtils.CtrlProposal.ErrorMsg=La suggestion de ce type de Control n'est pas support\u00E9e :
-RemovePushButton.RemoveButton.Tip=Supprimer les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
-ResetDBTypesButton.ResetDBTypesButton.Tip=R\u00E9initialiser les types de bases de donn\u00E9es
+RemovePushButton.RemoveButton.Tip=Supprime les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
+ResetDBTypesButton.ResetDBTypesButton.Tip=Initialise les types DB
 Rule.rule=R\u00E8gle [{0}]
-SaveAsGenericSchemaPushButton.saveAsSchema=Sauvegarder comme sch\u00E9ma g\u00E9n\u00E9rique
-SelectContextVariablesPushButton.Label=S\u00E9lectionner les variables de contexte
+SaveAsGenericSchemaPushButton.saveAsSchema=Enregistrer comme sch\u00E9ma g\u00E9n\u00E9rique
+SelectContextVariablesPushButton.Label=S\u00E9lectionne les variables du contexte
 SWTCalendarWithTime.contentEvening=Soir
-SWTCalendarWithTime.contentHr=Hr :
+SWTCalendarWithTime.contentHr=H:
 SWTCalendarWithTime.contentMin=Min :
 SWTCalendarWithTime.contentMorning=Matin
 SWTCalendarWithTime.contentNoon=Midi
 SWTCalendarWithTime.contentNow=Maintenant
 SWTCalendarWithTime.contnetSec=Sec :
-TableViewerCreator.CallMethod.ErrorMsg=Vous pouvez cr\u00E9er cette m\u00E9thode seulement si vous avez appel\u00E9 createTable()
-TableViewerCreator.CellModifier.ExError=Le CellModifier courant ne supporte pas cette op\u00E9ration. \n Utilisez '{0}' ou une classe qui l'\u00E9tend pour cette fonction.
-TableViewerCreator.columnNoIBeanProperty=La colonne '{0}' ('{1}') poss\u00E8de un CellEditor mais n'a pas de IBeanPropertyAccessors !
+TableViewerCreator.CallMethod.ErrorMsg=Vous ne pouvez appeler cette m\u00E9thode que si vous avez d\u00E9j\u00E0 appel\u00E9 createTable()
 TableViewerCreator.columnNullId=La colonne '{0}' a un ID null.
 TableViewerCreator.IdProperty.AssertMsg=Vous devez changer l'idProperty de l'une de vos colonnes, l'idProperty doit \u00EAtre unique pour chaque colonne d'une table.
 TableViewerCreator.Table.BeNull=la table est null.
 TableViewerCreator.TableColumn.AssertMsg=La TableColumn de TableEditorColumn avec idProperty '{0}' n'a pas la bonne Table parente
 TreeToTablesLinker.Type.Unsupported=Ce type de currentControl n'est pas support\u00E9
-commons.error=Erreur
+commons.error=ERROR
 exception.errorOccured=Une erreur est survenue ({0}).\nConsultez le log pour plus de d\u00E9tails.
-ModelSelectionDialog.Message=S\u00E9lectionnez une option ou annulez.
+ModelSelectionDialog.Message=Choisissez une option, ou annulez
 ModelSelectionDialog.Option=Option
 ModelSelectionDialog.BuiltIn=Basculer la propri\u00E9t\u00E9 en mode Built-In.
 ModelSelectionDialog.ViewSchema=Voir le sch\u00E9ma (lecture seule)
 ModelSelectionDialog.newViewSchema=Voir le sch\u00E9ma
-ModelSelectionDialog.ViewQuery=Voir la requ\u00EAte (lecture seule).
+ModelSelectionDialog.ViewQuery=Voir la requ\u00EAte (lecture seule)
 ModelSelectionDialog.Update=Mettre \u00E0 jour la connexion du r\u00E9f\u00E9rentiel.
-SSLConfirmDialog.KeyStore=Saisissez le KeyStore
-SSLConfirmDialog.TrustStore=Saisissez le TrustStore
-SSLConfirmDialog.Password=Saisissez le mot de passe
-FileStep2.previewFailure=Erreur de pr\u00E9visualisation. Des param\u00E8tres doivent \u00EAtre modifi\u00E9s.\nNote\u00A0: les erreurs de pr\u00E9visualisation sont g\u00E9n\u00E9ralement dues \u00E0 un mauvais param\u00E8tre d'encodage.
+FileStep2.previewFailure=Erreur de pr\u00E9visualisation. Des param\u00E8tres doivent \u00EAtre modifi\u00E9s`\nNote : Les erreurs de pr\u00E9visualisation sont g\u00E9n\u00E9ralement li\u00E9es \u00E0 un mauvais param\u00E9trage de l'encodage.
 GlobalServiceRegister.ServiceNotRegistered=Le service {0} n'a pas \u00E9t\u00E9 enregistr\u00E9.
 MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.title=Le XML ne peut analyser.
 MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.msg=Le XML ne peut analyser dans ce format.
-HibernateUtils.auditDBIsNotUsable=La base de donn\u00E9es d'audit doit \u00EAtre vide ou contenir uniquement des tables li\u00E9es \u00E0 l'audit.
-CasePushButton.CaseButton.Tip=Colonne de BdD en majuscules/minuscules
-QuotePushButton.QuoteButton.Tip=Ajouter/supprimer les guillemets sur une colonne de BdD
-QuoteManipulateDialog.title=Ajouter/supprimer les guillemets sur une colonne de BdD
-QuoteManipulateDialog.addQuote=Ajouter un guillemet
-QuoteManipulateDialog.removeQuote=Supprimer le guillemet
+SSLConfirmDialog.KeyStore=saisissez le KeyStore
+SSLConfirmDialog.TrustStore=saisissez le TrustStore
+SSLConfirmDialog.Password=saisissez le mot de passe

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

@@ -1,137 +1,132 @@
-AccessorUtils.Assert0=\u3053\u306E\u30AB\u30E9\u30E0(\u30BF\u30A4\u30C8\u30EB'{0}'\u3001id '{1}')\u306E'BeanPropertyAccessors'\u306F\u6B63\u3057\u304F\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002  {2}\u306Fbean\u306B\u5FC5\u8981\u3067\u3059<B>
-AccessorUtils.Assert1=\u3053\u306E\u30AB\u30E9\u30E0(\u30BF\u30A4\u30C8\u30EB'{0}'\u3001id '{1}')\u306E'BeanPropertyAccessors'\u306F\u6B63\u3057\u304F\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u307E\u305F\u306F\u8A2D\u5B9A\u3055\u308C\u305F\u5024\u306E\u30BF\u30A4\u30D7\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093\u3002
+AccessorUtils.Assert0=\u3053\u306E\u30AB\u30E9\u30E0 (\u30BF\u30A4\u30C8\u30EB '{0}' \u3001id '{1}') \u306E BeanPropertyAccessors\u306F\u6B63\u3057\u304F\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002{2}\u306Fbean <B>\u304C\u5FC5\u8981\u3068\u3057\u307E\u3059\u3002
+AccessorUtils.Assert1=\u3053\u306E\u30AB\u30E9\u30E0\uFF08\u30BF\u30A4\u30C8\u30EB '{0}' \u3001id '{1}'\uFF09\u306EBeanPropertyAccessors\u306F\u6B63\u3057\u304F\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u304B\u3001\u5024\u30BB\u30C3\u30C8\u306E\u578B\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093\u3002
 AccessorUtils.NoClassDef=NoClassDefFoundError ({0}):{1}
-AccessorUtils.isReq=\u306Fbean (<B>)\u3067\u8981\u6C42\u3055\u308C\u307E\u3059\u3002
-AccessorUtils.isReqValue= \u306F\u5024(<V>)\u3067\u8981\u6C42\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u305D\u306E\u5024\u306FCellEditorValueAdapter\u3067\u9069\u5FDC\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
+AccessorUtils.isReq=\u306Fbean (<B>) \u3067\u8981\u6C42\u3055\u308C\u307E\u3059\u3002
+AccessorUtils.isReqValue=\u306F\u5024 (<V>) \u3067\u8981\u6C42\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u305D\u306E\u5024\u306FCellEditorValueAdapter\u3067\u9069\u5FDC\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
 AddPushButton.AddButton.Tip=\u8FFD\u52A0
 AddAllPushButton.AddAllButton.Tip=\u3059\u3079\u3066\u8FFD\u52A0
 CellEditorDialogBehavior.textContent=...
-CellEditorValueAdapterFactory.valueNotStringType=Bean\u5024\u306F\u6587\u5B57\u5217\u30BF\u30A4\u30D7\u306E\u30AF\u30E9\u30B9\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-ColorStyledText.RedoItem.Text=\u3084\u308A\u76F4\u3057
+CellEditorValueAdapterFactory.valueNotStringType=Bean\u306E\u5024\u306FString\u578B\u306E\u30AF\u30E9\u30B9\u3067\u306A\u304F\u3066\u306F\u306A\u308A\u307E\u305B\u3093\u3002
+ColorStyledText.RedoItem.Text=\u3084\u308A\u76F4\u3059
 ColorStyledText.UndoItem.Text=\u5143\u306B\u623B\u3059
 ColorStyledText.CopyItem.Text=\u30B3\u30D4\u30FC
-ColorStyledText.PasteItem.Text=\u8CBC\u308A\u4ED8\u3051
+ColorStyledText.PasteItem.Text=\u8CBC\u4ED8\u3051
 ColorStyledText.SelectAllItem.Text=\u3059\u3079\u3066\u9078\u629E
 ContentProposalAdapterExtended.close=\u9589\u3058\u308B
-ContentProposalAdapterExtended.closeFocusout=\u30D5\u30A9\u30FC\u30AB\u30B9\u30A2\u30A6\u30C8\u3092\u9589\u3058\u308B
-ControlUtils.Unsupported1=\u3053\u306E\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB({0})\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5FC5\u8981\u3067\u3042\u308C\u3070\u3001\u30B1\u30FC\u30B9\u3092\u8FFD\u52A0\u3057\u3066\u304F\u3060\u3055\u3044...
-CopyPushButton.CopyButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u30B3\u30D4\u30FC
-Curve2D.MaxNum.Be0=maximumSegments\u306F\u6B63\u6570\u304B0\u306B\u3057\u3066\u304F\u3060\u3055\u3044
+ContentProposalAdapterExtended.closeFocusout=Focusout\u3092\u9589\u3058\u308B
+ControlUtils.Unsupported1=\u3053\u306E\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB({0}) \u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3001\u5FC5\u8981\u3067\u3042\u308C\u3070\u30B1\u30FC\u30B9\u3092\u8FFD\u52A0\u3057\u3066\u304F\u3060\u3055\u3044...
+CopyPushButton.CopyButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u306E\u30B3\u30D4\u30FC
+Curve2D.MaxNum.Be0=maximumSegments\u306F\u6B63\u6570\u307E\u305F\u306F0\u306B\u3057\u3066\u304F\u3060\u3055\u3044
 Curve2D.MinNum.Be0=minimumSegments\u306F\u6B63\u6570\u307E\u305F\u306F0\u306B\u3057\u3066\u304F\u3060\u3055\u3044
-DateDialog.textContent=\u65E5\u6642\u3092\u9078\u629E
-DefaultCellModifier.tableItemDispose=\u7834\u68C4\u3055\u308C\u305F\u30C6\u30FC\u30D6\u30EB\u30A2\u30A4\u30C6\u30E0
+DateDialog.textContent=\u65E5\u4ED8\u3068\u6642\u9593\u306E\u9078\u629E
+DefaultCellModifier.tableItemDispose=\u7834\u68C4\u3055\u308C\u305F\u30C6\u30FC\u30D6\u30EB\u9805\u76EE
 DialogErrorForCellEditorListener.Error.MsgDialogTitle=\u30A8\u30E9\u30FC
 ErrorDialogWidthDetailArea.ErrorMessage.Text=\u30A8\u30E9\u30FC\u30E1\u30C3\u30BB\u30FC\u30B8
-ErrorDialogWidthDetailArea.ErrorMessage.ColumnText=\u30AB\u30E9\u30E0\u306B\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
-ErrorDialogWidthDetailArea.ErrorMessage.ColumnText.NotValid=\u5165\u529B'{0}'\u304C\u4E0D\u6B63\u3067\u3059\u3002\u4EE3\u308F\u308A\u306B\u5143\u306E\u5024'{1}'\u3092\u4F7F\u3044\u307E\u3059\u3002
-ErrorDialogWithContinue.setParameter=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u8A2D\u5B9A\u3057\u3066\u7D9A\u884C
-EventUtil.activate=\u6709\u52B9\u5316
-EventUtil.arm=arm
+ErrorDialogWidthDetailArea.ErrorMessage.ColumnText=\u30AB\u30E9\u30E0\u306F\u7A7A\u767D\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093
+ErrorDialogWidthDetailArea.ErrorMessage.ColumnText.NotValid=\u5165\u529B\'{0}\'\u306F\u4E0D\u6B63\u3067\u3059\u3002\u30AA\u30EA\u30B8\u30CA\u30EB\u5024\'{1}\'\u304C\u4EE3\u7528\u3055\u308C\u307E\u3059\u3002
+ErrorDialogWithContinue.setParameter=\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u8A2D\u5B9A\u3057\u3066\u7D99\u7D9A
+EventUtil.activate=\u30A2\u30AF\u30C6\u30A3\u30D6\u5316
+EventUtil.arm=\u906E\u65AD
 EventUtil.close=\u9589\u3058\u308B
-EventUtil.collapse=\u6298\u308A\u7573\u3080
-EventUtil.deactivate=\u7121\u52B9\u5316
+EventUtil.collapse=\u6298\u308A\u305F\u305F\u3080
+EventUtil.deactivate=\u975E\u30A2\u30AF\u30C6\u30A3\u30D6\u5316
 EventUtil.defaultSelection=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u9078\u629E
 EventUtil.deiconify=\u975E\u30A2\u30A4\u30B3\u30F3\u5316
-EventUtil.detailNull=NULL
+EventUtil.detailNull=Null
 EventUtil.dispose=\u7834\u68C4
-EventUtil.dragDetect=\u30C9\u30E9\u30C3\u30B0\u691C\u51FA
-EventUtil.expand=\u5C55\u958B
-EventUtil.focusIn=\u30D5\u30A9\u30FC\u30AB\u30B9\u30A4\u30F3
-EventUtil.focusOut=\u30D5\u30A9\u30FC\u30AB\u30B9\u30A2\u30A6\u30C8
-EventUtil.hardKeyDown=\u30CF\u30FC\u30C9\u30AD\u30FC\u30C0\u30A6\u30F3
-EventUtil.hardKeyUp=\u30CF\u30FC\u30C9\u30AD\u30FC\u30A2\u30C3\u30D7
+EventUtil.dragDetect=\u30C9\u30E9\u30C3\u30B0\u306E\u691C\u77E5
+EventUtil.expand=\u5C55\u958B\u3059\u308B
+EventUtil.focusIn=\u30D5\u30A9\u30FC\u30AB\u30B9\u3092\u3042\u3066\u308B
+EventUtil.focusOut=\u30D5\u30A9\u30FC\u30AB\u30B9\u3092\u5916\u3059
+EventUtil.hardKeyDown=\u30AD\u30FC\u30C0\u30A6\u30F3
+EventUtil.hardKeyUp=\u30AD\u30FC\u30A2\u30C3\u30D7
 EventUtil.help=\u30D8\u30EB\u30D7
-EventUtil.hide=\u975E\u8868\u793A
+EventUtil.hide=\u96A0\u3059
 EventUtil.iconify=\u30A2\u30A4\u30B3\u30F3\u5316
 EventUtil.keyDown=\u30AD\u30FC\u30C0\u30A6\u30F3
 EventUtil.keyUp=\u30AD\u30FC\u30A2\u30C3\u30D7
-EventUtil.menuDetect=\u30E1\u30CB\u30E5\u30FC\u691C\u51FA
+EventUtil.menuDetect=\u30E1\u30CB\u30E5\u30FC\u691C\u77E5
 EventUtil.modify=\u5909\u66F4
 EventUtil.mouseDoubleClick=\u30DE\u30A6\u30B9\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF
 EventUtil.mouseDown=\u30DE\u30A6\u30B9\u30C0\u30A6\u30F3
 EventUtil.mouseEnter=\u30DE\u30A6\u30B9\u30A8\u30F3\u30BF\u30FC
-EventUtil.mouseExit=\u30DE\u30A6\u30B9\u7D42\u4E86
+EventUtil.mouseExit=\u30DE\u30A6\u30B9\u30A4\u30B0\u30B8\u30C3\u30C8
 EventUtil.mouseHover=\u30DE\u30A6\u30B9\u30DB\u30D0\u30FC
-EventUtil.mouseMove=\u30DE\u30A6\u30B9\u79FB\u52D5
+EventUtil.mouseMove=\u30DE\u30A6\u30B9\u306E\u79FB\u52D5
 EventUtil.mouseUp=\u30DE\u30A6\u30B9\u30A2\u30C3\u30D7
 EventUtil.move=\u79FB\u52D5
 EventUtil.paint=\u30DA\u30A4\u30F3\u30C8
-EventUtil.resize=\u30B5\u30A4\u30BA\u5909\u66F4
-EventUtil.selectedEqual=\u9078\u629E\u6E08\u307F=
+EventUtil.resize=\u30EA\u30B5\u30A4\u30BA
+EventUtil.selectedEqual=\u9078\u629E\u3055\u308C\u305F=
 EventUtil.selection=\u9078\u629E
 EventUtil.show=\u8868\u793A
 EventUtil.traverse=\u30C8\u30E9\u30D0\u30FC\u30B9
-EventUtil.typeNull=NULL
-EventUtil.UnknowDetail=\u30A4\u30D9\u30F3\u30C8\u8A73\u7D30\u306E\u4E0D\u660E\u306A???\u5024:
-EventUtil.UnknowType=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7\u306E\u4E0D\u660E\u306A???\u5024:
+EventUtil.typeNull=Null
+EventUtil.UnknowDetail=\u30A4\u30D9\u30F3\u30C8\u8A73\u7D30\u306E\u4E0D\u660E\u306A???\u5024 :
+EventUtil.UnknowType=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7\u306E\u4E0D\u660E\u306A???\u5024 :
 EventUtil.verify=\u78BA\u8A8D
 ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u51FA\u6765\u307E\u305B\u3093
 ExceptionMessageDialog.Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
 ExceptionMessageDialog.log=\u30ED\u30B0
-ExceptionMessageDialog.No=\u3044\u3044\u3048
+ExceptionMessageDialog.No=\u4E0D\u53EF
 ExceptionMessageDialog.OK=OK
-ExceptionMessageDialog.Yes=\u306F\u3044
+ExceptionMessageDialog.Yes=\u5229\u7528\u53EF
 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
-ExtendedTableAddCommand.Add.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u8FFD\u52A0
-ExtendedTableCopyCommand.Copy.Label=\u5185\u90E8\u30AF\u30EA\u30FC\u30F3\u30DC\u30FC\u30C9\u306B\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u30B3\u30D4\u30FC
-ExtendedTableModel.ModifiedObject.Error=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u524D\u306BModifiedBeanListenable\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-ExtendedTableMoveCommand.MoveLabel=\u8907\u6570\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u4E0A\u4E0B\u306B\u79FB\u52D5
-ExtendedTablePasteCommand.Paste.Label=\u5185\u90E8\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u304B\u3089\u30C7\u30FC\u30BF\u3092\u8CBC\u308A\u4ED8\u3051\u308B
-ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664
-ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=DB\u30BF\u30A4\u30D7\u3092\u3059\u3079\u3066\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u53D6\u5F97
-ImportPushButton.ImportButton.Tip=\u884C\u3092\u3059\u3079\u3066XML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u7F6E\u63DB
+ExtendedTableAddCommand.Add.Label=\uFF11\u3064\u307E\u305F\u306F\u305D\u308C\u4EE5\u4E0A\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u306E\u8FFD\u52A0
+ExtendedTableCopyCommand.Copy.Label=\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u306B\uFF11\u3064\u4EE5\u4E0A\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u30B3\u30D4\u30FC
+ExtendedTableModel.ModifiedObject.Error=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u524D\u306BModifiedBeanListenable\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093\u3002
+ExtendedTableMoveCommand.MoveLabel=\uFF11\u3064\u307E\u305F\u306F\u305D\u308C\u4EE5\u4E0A\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u306E\u4E0A\u4E0B\u79FB\u52D5
+ExtendedTablePasteCommand.Paste.Label=\u5185\u90E8\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u304B\u3089\u30C7\u30FC\u30BF\u306E\u8CBC\u308A\u4ED8\u3051
+ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u306E\u524A\u9664
+ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3092\u53D6\u5F97\u3059\u308B\u305F\u3081\u306B\u5168\u3066\u306EDB\u30BF\u30A4\u30D7\u3092\u30EA\u30BB\u30C3\u30C8
+ImportPushButton.ImportButton.Tip=\u3059\u3079\u3066\u306E\u884C\u3092xml\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u7F6E\u63DB\u3048
 ImportPushButtonForExtendedTable.ErrorMsg.Text=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 LabelledFileField.BrowseButton.Text=\u53C2\u7167...
 LabelledFileField.FileDialog.Text=\u9078\u629E
-Mode.Mode.ToString=\u30E2\u30FC\u30C9[{0}]
-ModeReader.IgnoreElement=\u4E0D\u660E\u30A8\u30EC\u30E1\u30F3\u30C8\u3092\u7121\u8996
-ModelSelectionDialog.Title=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3092\u4F7F\u3063\u3066\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u7DE8\u96C6
-ModifyBeanValueCommand.ModifyCell.Label=\u30BB\u30EB\u5024\u3092\u5909\u66F4
+Mode.Mode.ToString=\u30E2\u30FC\u30C9 [{0}]
+ModeReader.IgnoreElement=\u4E0D\u660E\u306A\u8981\u7D20\u3092\u7121\u8996
+ModelSelectionDialog.Title=\u30EA\u30DD\u30B8\u30C8\u30EA\u3092\u4F7F\u7528\u3057\u3066\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u7DE8\u96C6
+ModifyBeanValueCommand.ModifyCell.Label=\u30BB\u30EB\u5024\u306E\u5909\u66F4
 MoveDownPushButton.MoveDownTip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u4E0B\u306B\u79FB\u52D5
 MoveUpPushButton.MoveUpButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u4E0A\u306B\u79FB\u52D5
-PastePushButton.PasteButton.Label=\u8CBC\u308A\u4ED8\u3051
-ProposalUtils.CellProposal.Error=CellEditor\u306E\u3053\u306E\u30BF\u30A4\u30D7\u306E\u63D0\u6848\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093:
+PastePushButton.PasteButton.Label=\u8CBC\u4ED8\u3051
+ProposalUtils.CellProposal.Error=\u3053\u306E\u30BF\u30A4\u30D7\u306ECellEditor\u3092\u63D0\u6848\u3059\u308B\u3053\u3068\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093:
 ProposalUtils.CtrlProposal.ErrorMsg=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5236\u5FA1\u3092\u63D0\u6848\u3059\u308B\u3053\u3068\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093:
-RemovePushButton.RemoveButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u524A\u9664
-ResetDBTypesButton.ResetDBTypesButton.Tip=DB\u30BF\u30A4\u30D7\u3092\u30EA\u30BB\u30C3\u30C8
-Rule.rule=\u30EB\u30FC\u30EB[{0}]
+RemovePushButton.RemoveButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u306E\u524A\u9664
+ResetDBTypesButton.ResetDBTypesButton.Tip=DB\u30BF\u30A4\u30D7\u306E\u30EA\u30BB\u30C3\u30C8
+Rule.rule=\u30EB\u30FC\u30EB [{0}]
 SaveAsGenericSchemaPushButton.saveAsSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
-SelectContextVariablesPushButton.Label=\u30B3\u30F3\u30C6\u30AF\u30B9\u30C8\u5909\u6570\u3092\u9078\u629E
-SWTCalendarWithTime.contentEvening=\u5915\u65B9
-SWTCalendarWithTime.contentHr=\u6642:
-SWTCalendarWithTime.contentMin=\u5206:
+SelectContextVariablesPushButton.Label=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u9078\u629E
+SWTCalendarWithTime.contentEvening=\u5348\u5F8C
+SWTCalendarWithTime.contentHr=\u6642 :
+SWTCalendarWithTime.contentMin=\u5206 :
 SWTCalendarWithTime.contentMorning=\u5348\u524D
-SWTCalendarWithTime.contentNoon=\u5348\u5F8C
+SWTCalendarWithTime.contentNoon=\u6B63\u5348
 SWTCalendarWithTime.contentNow=\u73FE\u5728
-SWTCalendarWithTime.contnetSec=\u79D2:
-TableViewerCreator.CallMethod.ErrorMsg=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u3001createTable()\u3092\u65E2\u306B\u547C\u3073\u51FA\u3057\u3066\u3044\u308B\u5834\u5408\u306E\u307F\u547C\u3073\u51FA\u305B\u307E\u3059
-TableViewerCreator.CellModifier.ExError=\u73FE\u5728\u306ECellModifier\u306F\u3053\u306E\u64CD\u4F5C\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002\n\u3053\u306E\u6A5F\u80FD\u3092\u4F7F\u3046\u306B\u306F\u3001'{0}'\u304B\u62E1\u5F35\u30AF\u30E9\u30B9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
-TableViewerCreator.columnNoIBeanProperty=\u30AB\u30E9\u30E0'{0}' ('{1}')\u306B\u306FCellEditor\u30BB\u30C3\u30C8\u304C\u3042\u308A\u307E\u3059\u304C\u3001IBeanPropertyAccessors\u304C\u3042\u308A\u307E\u305B\u3093!
-TableViewerCreator.columnNullId=\u30AB\u30E9\u30E0'{0}'\u304Cnull\u3067\u3059\uFF01
+SWTCalendarWithTime.contnetSec=\u79D2 :
+TableViewerCreator.CallMethod.ErrorMsg=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u3001\u65E2\u306B createTable() \u3092\u547C\u3073\u51FA\u3057\u6E08\u307F\u306E\u5834\u5408\u3060\u3051\u547C\u3073\u51FA\u305B\u307E\u3059
+TableViewerCreator.CellModifier.ExError=\u73FE\u5728\u306ECellModifier\u306F\u3053\u306E\u64CD\u4F5C\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002'{0}'\u3092\u4F7F\u7528\u3059\u308B\u304B\u3001\u62E1\u5F35\u3057\u3066\u3053\u306E\u30D5\u30A3\u30FC\u30C1\u30E3\u30FC\u3092\u4F7F\u7528\u3067\u304D\u308B\u3088\u3046\u306B\u3059\u308B\u30AF\u30E9\u30B9\u3092\u4F7F\u7528\u3057\u307E\u3059
+TableViewerCreator.columnNoIBeanProperty=\u30AB\u30E9\u30E0'{0}' ('{1}')\u306B\u306FCellEditor\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001IBeanPropertyAccessors\u306F\u3042\u308A\u307E\u305B\u3093!
+TableViewerCreator.columnNullId=\u30AB\u30E9\u30E0 \'{0}\' \u306FNull\u306EID\u3092\u6301\u3063\u3066\u3044\u307E\u3059\u3002
 TableViewerCreator.IdProperty.AssertMsg=\u30AB\u30E9\u30E0\u306EidProperty\u306E\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3001idProperty\u306F\uFF11\u3064\u306E\u30C6\u30FC\u30D6\u30EB\u3067\u30E6\u30CB\u30FC\u30AF\u3067\u306A\u304F\u3066\u306F\u306A\u308A\u307E\u305B\u3093\u3002
-TableViewerCreator.Table.BeNull=\u30C6\u30FC\u30D6\u30EB\u304CNULL\u3067\u3059
-TableViewerCreator.TableColumn.AssertMsg=idProperty'{0}'\u304C\u3042\u308BTableEditorColumn\u306ETableColumn\u306B\u306F\u3001\u6B63\u3057\u3044\u89AA\u30C6\u30FC\u30D6\u30EB\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093
-TreeToTablesLinker.Type.Unsupported=currentControl\u306E\u3053\u306E\u30BF\u30A4\u30D7\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+TableViewerCreator.Table.BeNull=\u30C6\u30FC\u30D6\u30EB\u304Cnull\u3067\u3059
+TableViewerCreator.TableColumn.AssertMsg=ID \u30D7\u30ED\u30D1\u30C6\u30A3\'{0}\'\u304C\u3042\u308BTableEditorColumn\u306E\u30C6\u30FC\u30D6\u30EB\u30AB\u30E9\u30E0\u306F\u3001\u6B63\u3057\u3044\u89AA\u30C6\u30FC\u30D6\u30EB\u3092\u6301\u3063\u3066\u3044\u307E\u305B\u3093\u3002
+TreeToTablesLinker.Type.Unsupported=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u30AB\u30EC\u30F3\u30C8\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 commons.error=\u30A8\u30E9\u30FC
-exception.errorOccured=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002\n\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+exception.errorOccured=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF08{0}\uFF09\\n\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ModelSelectionDialog.Message=\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\uFF11\u3064\u9078\u629E\u3059\u308B\u304B\u3001\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ModelSelectionDialog.Option=\u30AA\u30D7\u30B7\u30E7\u30F3
-ModelSelectionDialog.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u5909\u66F4\u3057\u307E\u3059\u3002
-ModelSelectionDialog.ViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
-ModelSelectionDialog.newViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A
-ModelSelectionDialog.ViewQuery=\u30AF\u30A8\u30EA\u30FC\u3046\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
-ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002
-SSLConfirmDialog.KeyStore=KeyStore\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
-SSLConfirmDialog.TrustStore=TrustStore\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
-SSLConfirmDialog.Password=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
-FileStep2.previewFailure=\u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u3002\u3044\u304F\u3064\u304B\u306E\u8A2D\u5B9A\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3002\n\u6CE8: \u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u306F\u4E00\u822C\u306B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u306E\u8AA4\u308A\u304C\u539F\u56E0\u3067\u3059\u3002
-GlobalServiceRegister.ServiceNotRegistered=\u30B5\u30FC\u30D3\u30B9{0}\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.title=XML\u306B\u89E3\u6790\u3067\u304D\u307E\u305B\u3093.
-MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.msg=\u3053\u306E\u5F62\u5F0F\u3067\u306F\u3001XML\u306B\u89E3\u6790\u3067\u304D\u307E\u305B\u3093.
-HibernateUtils.auditDBIsNotUsable=\u76E3\u67FB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F\u7A7A\u306B\u3059\u308B\u304B\u3001\u76E3\u67FB\u306B\u95A2\u9023\u3059\u308B\u30C6\u30FC\u30D6\u30EB\u306E\u307F\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002
-CasePushButton.CaseButton.Tip=\u5927\u6587\u5B57/\u5C0F\u6587\u5B57DB\u30AB\u30E9\u30E0
-QuotePushButton.QuoteButton.Tip=DB\u30AB\u30E9\u30E0\u306E\u5F15\u7528\u7B26\u3092\u8FFD\u52A0/\u524A\u9664
-QuoteManipulateDialog.title=DB\u30AB\u30E9\u30E0\u306E\u5F15\u7528\u7B26\u3092\u8FFD\u52A0/\u524A\u9664
-QuoteManipulateDialog.addQuote=\u5F15\u7528\u7B26\u3092\u8FFD\u52A0
-QuoteManipulateDialog.removeQuote=\u5F15\u7528\u7B26\u3092\u524A\u9664
+ModelSelectionDialog.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u5909\u66F4
+ModelSelectionDialog.ViewSchema=\u30B9\u30AD\u30FC\u30DE\u306E\u53C2\u7167\uFF08\u8AAD\u8FBC\u306E\u307F\uFF09
+ModelSelectionDialog.newViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u53C2\u7167
+ModelSelectionDialog.ViewQuery=\u30AF\u30A8\u30EA\u306E\u8868\u793A\uFF08\u8AAD\u307F\u53D6\u308A\u5C02\u7528\uFF09\u3002
+ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u63A5\u7D9A\u306E\u66F4\u65B0\u3002
+FileStep2.previewFailure=\u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u3002\u3044\u304F\u3064\u304B\u306E\u8A2D\u5B9A\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3002\\n\u6CE8\u8A18: \u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u306F\u4E00\u822C\u7684\u306B\u8AA4\u3063\u305F\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u306B\u3088\u308A\u8D77\u3053\u308A\u307E\u3059\u3002
+GlobalServiceRegister.ServiceNotRegistered=\u30B5\u30FC\u30D3\u30B9 {0} \u306F\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.title=XML\u306F\u3001\u89E3\u6790\u3067\u304D\u307E\u305B\u3093.
+MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.msg=XML\u306F\u3001\u3053\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3067\u306F\u89E3\u6790\u3067\u304D\u307E\u305B\u3093.
+SSLConfirmDialog.KeyStore=KeyStore\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044
+SSLConfirmDialog.TrustStore=TrustStore\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044
+SSLConfirmDialog.Password=KeyStore\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044
+HibernateUtils.auditDBIsNotUsable=\u76E3\u67FB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F\u7A7A\u306B\u3057\u3066\u4E0B\u3055\u3044\u3002\u542B\u3081\u3066\u3088\u3044\u306E\u306F\u76E3\u67FB\u306B\u95A2\u9023\u3059\u308B\u30C6\u30FC\u30D6\u30EB\u306E\u307F\u3067\u3059\u3002

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

@@ -1,8 +1,8 @@
-AccessorUtils.Assert0=\u672A\u6B63\u786E\u914D\u7F6E\u5217 (\u6807\u9898\u4E3A '{0}'\uFF0CID \u4E3A '{1}') \u7684 'BeanPropertyAccessors'\u3002  {2} \u662F bean \u6240\u5FC5\u9700\u7684<B>
-AccessorUtils.Assert1=\u8FD9\u4E2A\u5217 (\u6807\u9898\u4E3A '{0}'\uFF0CID \u4E3A '{1}') \u7684\u201CBeanPropertyAccessors\u201D\u6CA1\u6709\u6B63\u786E\u914D\u7F6E\uFF0C\u6216\u8005\u503C\u8BBE\u7F6E\u4E3A\u4E0D\u6B63\u786E\u7684\u7C7B\u578B\u3002
+AccessorUtils.Assert0=\u8FD9\u4E2A\u5217 (\u6807\u9898\u4E3A \'{0}\'\uFF0CID \u4E3A \'{1}\') \u7684\u201CBeanPropertyAccessors\u201D\u6CA1\u6709\u6B63\u786E\u914D\u7F6E\u3002{2} \u662FBean \u6240\u5FC5\u9700\u7684<B>
+AccessorUtils.Assert1=\u8FD9\u4E2A\u5217 (\u6807\u9898\u4E3A \'{0}\'\uFF0CID \u4E3A \'{1}\') \u7684\u201CBeanPropertyAccessors\u201D\u6CA1\u6709\u6B63\u786E\u914D\u7F6E\uFF0C\u6216\u8005\u503C\u8BBE\u7F6E\u4E3A\u4E0D\u6B63\u786E\u7684\u7C7B\u578B\u3002
 AccessorUtils.NoClassDef=NoClassDefFoundError ({0}):{1}
-AccessorUtils.isReq= \u662F bean (<B>) \u6240\u5FC5\u9700\u7684\u3002
-AccessorUtils.isReqValue= \u662F\u503C (<V>) \u6240\u5FC5\u9700\u7684\uFF0C\u4F46\u8BE5\u503C\u53EF\u4F7F\u7528 CellEditorValueAdapter \u6765\u8C03\u6574\u3002
+AccessorUtils.isReq=\\ \u662F bean (<B>) \u6240\u5FC5\u9700\u7684\u3002
+AccessorUtils.isReqValue=\\ \u662F\u503C (<V>) \u6240\u5FC5\u9700\u7684\uFF0C\u4F46\u8BE5\u503C\u53EF\u4F7F\u7528 CellEditorValueAdapter \u6765\u8C03\u6574\u3002
 AddPushButton.AddButton.Tip=\u6DFB\u52A0
 AddAllPushButton.AddAllButton.Tip=\u6DFB\u52A0\u6240\u6709
 CellEditorDialogBehavior.textContent=...
@@ -23,7 +23,7 @@ DefaultCellModifier.tableItemDispose=TableItem \u5DF2\u5904\u7406
 DialogErrorForCellEditorListener.Error.MsgDialogTitle=\u9519\u8BEF
 ErrorDialogWidthDetailArea.ErrorMessage.Text=\u9519\u8BEF\u6D88\u606F
 ErrorDialogWidthDetailArea.ErrorMessage.ColumnText=\u5217\u4E0D\u80FD\u4E3A\u7A7A
-ErrorDialogWidthDetailArea.ErrorMessage.ColumnText.NotValid=\u8F93\u5165 '{0}' \u65E0\u6548\uFF0C\u5C06\u8F6C\u800C\u4F7F\u7528\u521D\u59CB\u503C '{1}'\u3002
+ErrorDialogWidthDetailArea.ErrorMessage.ColumnText.NotValid=\u8F93\u5165 \'{0}\' \u65E0\u6548\uFF0C\u5C06\u8F6C\u800C\u4F7F\u7528\u521D\u59CB\u503C \'{1}\'\u3002
 ErrorDialogWithContinue.setParameter=\u8BBE\u7F6E\u53C2\u6570\u5E76\u7EE7\u7EED
 EventUtil.activate=\u6FC0\u6D3B
 EventUtil.arm=arm
@@ -63,7 +63,7 @@ EventUtil.show=\u663E\u793A
 EventUtil.traverse=\u6A2A\u8D2F
 EventUtil.typeNull=Null
 EventUtil.UnknowDetail=\u672A\u77E5\u4E8B\u4EF6\u8BE6\u7EC6\u4FE1\u606F\u503C ???\uFF1A
-EventUtil.UnknowType=\u672A\u77E5\u7684\u65F6\u95F4\u7C7B\u578B\uFF1A
+EventUtil.UnknowType=\u672A\u77E5\u4E8B\u4EF6\u7C7B\u578B\u503C ???\uFF1A
 EventUtil.verify=\u9A8C\u8BC1
 ExceptionHandler.Parameter.BeNull=\u5F02\u5E38\uFF1A\u53C2\u6570\u4E0D\u80FD\u4E3A null
 ExceptionMessageDialog.Cancel=\u53D6\u6D88
@@ -72,7 +72,7 @@ ExceptionMessageDialog.No=\u5426
 ExceptionMessageDialog.OK=\u786E\u5B9A
 ExceptionMessageDialog.Yes=\u662F
 ExportPushButton.ExportButton.Tip=\u5BFC\u51FA\u6240\u6709\u884C\u5230 XML \u6587\u4EF6
-ExportPushButtonForExtendedTable.ErrorMsg.Text=\u51FA\u9519\uFF01
+ExportPushButtonForExtendedTable.ErrorMsg.Text=\u51FA\u9519
 ExtendedTableAddCommand.Add.Label=\u6DFB\u52A0\u4E00\u4E2A\u6216\u591A\u4E2A\u8868
 ExtendedTableCopyCommand.Copy.Label=\u590D\u5236\u5185\u90E8\u526A\u8D34\u677F\u4E2D\u7684\u4E00\u4E2A\u6216\u591A\u4E2A\u8868\u6761\u76EE\u3002
 ExtendedTableModel.ModifiedObject.Error=ModifiedBeanListenable \u5BF9\u8C61\u5FC5\u987B\u5728\u4F7F\u7528\u6B64\u65B9\u6CD5\u4E4B\u524D\u8BBE\u7F6E
@@ -81,7 +81,7 @@ ExtendedTablePasteCommand.Paste.Label=\u4ECE\u5185\u90E8\u526A\u8D34\u677F\u7C98
 ExtendedTableRemoveCommand.Romve.Label=\u79FB\u9664\u8868\u6761\u76EE
 ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=\u91CD\u7F6E\u6240\u6709\u6570\u636E\u5E93\u7C7B\u578B\u4E3A\u9ED8\u8BA4\u503C
 ImportPushButton.ImportButton.Tip=\u5BFC\u5165 XML \u6587\u4EF6\u66FF\u6362\u6240\u6709\u884C
-ImportPushButtonForExtendedTable.ErrorMsg.Text=\u51FA\u9519\uFF01
+ImportPushButtonForExtendedTable.ErrorMsg.Text=\u51FA\u9519
 LabelledFileField.BrowseButton.Text=\u6D4F\u89C8...
 LabelledFileField.FileDialog.Text=\u9009\u62E9\u4E00\u4E2A
 Mode.Mode.ToString=\u6A21\u5F0F [{0}]
@@ -92,7 +92,7 @@ MoveDownPushButton.MoveDownTip=\u5411\u4E0B\u79FB\u52A8\u9009\u4E2D\u9879
 MoveUpPushButton.MoveUpButton.Tip=\u5411\u4E0A\u79FB\u52A8\u9009\u4E2D\u9879
 PastePushButton.PasteButton.Label=\u7C98\u8D34
 ProposalUtils.CellProposal.Error=\u5BF9\u6B64\u7C7B\u578B CellEditor \u7684\u63D0\u8BAE\u4E0D\u53D7\u652F\u6301:
-ProposalUtils.CtrlProposal.ErrorMsg=\u63A7\u952E\u7C7B\u578B\u63D0\u793A\u4E0D\u88AB\u652F\u6301\uFF1A
+ProposalUtils.CtrlProposal.ErrorMsg=\u5BF9\u6B64\u7C7B\u578B\u63A7\u5236\u7684\u63D0\u8BAE\u4E0D\u53D7\u652F\u6301:
 RemovePushButton.RemoveButton.Tip=\u79FB\u9664\u6240\u9009\u9879
 ResetDBTypesButton.ResetDBTypesButton.Tip=\u91CD\u7F6E\u6240\u6709\u6570\u636E\u5E93\u7C7B\u578B
 Rule.rule=\u89C4\u5219 [{0}]
@@ -106,15 +106,15 @@ SWTCalendarWithTime.contentNoon=\u4E2D\u5348
 SWTCalendarWithTime.contentNow=\u73B0\u5728
 SWTCalendarWithTime.contnetSec=\u79D2:
 TableViewerCreator.CallMethod.ErrorMsg=\u53EA\u6709\u60A8\u5DF2\u7ECF\u8C03\u7528\u4E86 createTable() \u65B9\u6CD5\u540E\uFF0C\u624D\u80FD\u8C03\u7528\u6B64\u65B9\u6CD5\u3002
-TableViewerCreator.CellModifier.ExError=\u5F53\u524D CellModifier \u4E0D\u652F\u6301\u6B64\u64CD\u4F5C\u3002\n \u4F7F\u7528 '{0}' \u6216\u80FD\u591F\u5BF9\u5176\u8FDB\u884C\u6269\u5C55\u7684\u7C7B\u6765\u4F7F\u7528\u6B64\u529F\u80FD
-TableViewerCreator.columnNoIBeanProperty=\u5217 '{0}' ('{1}') \u8BBE\u7F6E\u4E86 CellEditor\uFF0C\u4F46\u6CA1\u6709 IBeanPropertyAccessors\uFF01
-TableViewerCreator.columnNullId=\u5217 '{0}' \u7684 id \u4E3A null\uFF01
+TableViewerCreator.CellModifier.ExError=\u5F53\u524D CellModifier \u4E0D\u652F\u6301\u6B64\u64CD\u4F5C\u3002\\n \u4F7F\u7528 \'{0}\' \u6216\u6269\u5C55\u5B83\u7684\u7C7B\u6765\u4F7F\u7528\u6B64\u529F\u80FD
+TableViewerCreator.columnNoIBeanProperty=\u5217 \'{0}\' (\'{1}\') \u8BBE\u7F6E\u4E86 CellEditor\uFF0C\u4F46\u6CA1\u6709 IBeanPropertyAccessors\uFF01
+TableViewerCreator.columnNullId=\u5217 \'{0}\' \u7684 id \u4E3A null\uFF01
 TableViewerCreator.IdProperty.AssertMsg=\u4F60\u5FC5\u987B\u6539\u53D8\u5176\u4E2D\u4E00\u4E2A\u5217\u7684 idProperty\uFF0C\u4E00\u4E2A\u8868\u4E2D\u7684\u6BCF\u4E2A\u5217\u7684 idProperty \u5FC5\u987B\u552F\u4E00\u3002
 TableViewerCreator.Table.BeNull=\u8868\u4E3A null
-TableViewerCreator.TableColumn.AssertMsg=TableEditorColumn \u7684 idProperty \u4E3A '{0}' \u7684 TableColumn \u6CA1\u6709\u6B63\u786E\u7684 Table \u7236\u9879
+TableViewerCreator.TableColumn.AssertMsg=TableEditorColumn \u7684 idProperty \u4E3A \'{0}\' \u7684 TableColumn \u6CA1\u6709\u6B63\u786E\u7684 Table \u7236\u9879
 TreeToTablesLinker.Type.Unsupported=\u4E0D\u652F\u6301\u8FD9\u79CD\u7C7B\u578B\u7684 currentControl
 commons.error=\u9519\u8BEF
-exception.errorOccured=\u53D1\u751F\u9519\u8BEF ({0})\u3002\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
+exception.errorOccured=\u53D1\u751F\u9519\u8BEF ({0})\u3002\\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
 ModelSelectionDialog.Message=\u8BF7\u9009\u62E9\u4E00\u4E2A\u9009\u9879\u6216\u53D6\u6D88\u3002
 ModelSelectionDialog.Option=\u9009\u9879
 ModelSelectionDialog.BuiltIn=\u66F4\u6539\u4E3A\u5185\u7F6E\u5C5E\u6027\u3002
@@ -122,16 +122,11 @@ ModelSelectionDialog.ViewSchema=\u67E5\u770B schema (\u53EA\u8BFB)\u3002
 ModelSelectionDialog.newViewSchema=\u67E5\u770B schema
 ModelSelectionDialog.ViewQuery=\u67E5\u770B\u67E5\u8BE2 (\u53EA\u8BFB)\u3002
 ModelSelectionDialog.Update=\u66F4\u65B0\u5B58\u50A8\u5E93\u8FDE\u63A5\u3002
-SSLConfirmDialog.KeyStore=\u8BF7\u8F93\u5165\u5BC6\u94A5\u5E93
-SSLConfirmDialog.TrustStore=\u8BF7\u8F93\u5165\u4FE1\u4EFB\u5E93
-SSLConfirmDialog.Password=\u8BF7\u8F93\u5165\u5BC6\u7801
-FileStep2.previewFailure=\u9884\u89C8\u9519\u8BEF\u3002\u987B\u6539\u53D8\u4E00\u4E9B\u8BBE\u7F6E\u3002\n\u6CE8\u610F\uFF1A\u9884\u89C8\u9519\u8BEF\u53EF\u80FD\u662F\u56E0\u4E3A\u9519\u8BEF\u7684\u7F16\u7801\u8BBE\u7F6E\u9020\u6210\u7684\u3002
+FileStep2.previewFailure=\u9884\u89C8\u9519\u8BEF\u3002\u987B\u6539\u53D8\u4E00\u4E9B\u8BBE\u7F6E\u3002\\n\u6CE8\u610F\uFF1A\u9884\u89C8\u9519\u8BEF\u53EF\u80FD\u662F\u56E0\u4E3A\u9519\u8BEF\u7684\u7F16\u7801\u8BBE\u7F6E\u9020\u6210\u7684\u3002
 GlobalServiceRegister.ServiceNotRegistered=\u670D\u52A1 {0} \u8FD8\u672A\u6CE8\u518C\u3002
 MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.title=xml \u65E0\u6CD5\u89E3\u6790\u3002
 MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.msg=xml \u65E0\u6CD5\u4EE5\u8FD9\u79CD\u683C\u5F0F\u89E3\u6790\u3002
+SSLConfirmDialog.KeyStore=\u8BF7\u8F93\u5165\u5BC6\u94A5\u5E93
+SSLConfirmDialog.TrustStore=\u8BF7\u8F93\u5165\u4FE1\u4EFB\u5E93
+SSLConfirmDialog.Password=\u8BF7\u8F93\u5165\u5BC6\u7801
 HibernateUtils.auditDBIsNotUsable=\u5BA1\u8BA1\u6570\u636E\u5E93\u5FC5\u987B\u4E3A\u7A7A\u6216\u4EC5\u5305\u542B\u4E0E\u5BA1\u8BA1\u76F8\u5173\u7684\u8868\u3002
-CasePushButton.CaseButton.Tip=\u5927\u5199/\u5C0F\u5199\u6570\u636E\u5E93\u5217
-QuotePushButton.QuoteButton.Tip=\u6DFB\u52A0/\u79FB\u9664\u6570\u636E\u5E93\u5217\u7684\u5F15\u53F7
-QuoteManipulateDialog.title=\u6DFB\u52A0/\u79FB\u9664\u6570\u636E\u5E93\u5217\u7684\u5F15\u53F7
-QuoteManipulateDialog.addQuote=\u6DFB\u52A0\u5F15\u53F7
-QuoteManipulateDialog.removeQuote=\u79FB\u9664\u5F15\u53F7

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

@@ -109,8 +109,6 @@ public enum EImage implements IImage {
     TABLE_VIEW("/icons/array_hot.png"), //$NON-NLS-1$
     NO_TABLE_VIEW("/icons/array.png"), //$NON-NLS-1$
     COMPOSITE_BACKGROUND("/icons/compositeBackground.jpg"), //$NON-NLS-1$
-    
-    DOWNLOAD_LIB("/icons/download.png"), //$NON-NLS-1$
 
     LOCK_ICON("/icons/lock.gif"), //$NON-NLS-1$
     UNLOCK_ICON("/icons/unlock.gif"), //$NON-NLS-1$
@@ -127,6 +125,7 @@ public enum EImage implements IImage {
     FILL_COLOR_ICON("/icons/fill_color.gif"), //$NON-NLS-1$
 
     OPEN_IN_BROWSER("/icons/open.gif"), //$NON-NLS-1$
+    DOWNLOAD_MODULE("/icons/download.gif"), //$NON-NLS-1$
 
     COMPONENT_MISSING("/icons/component_missing.png"), //$NON-NLS-1$
 

main/plugins/org.talend.commons.runtime/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.runtime</artifactId>

main/plugins/org.talend.commons.runtime/src/org/talend/commons/CommonsPlugin.java

@@ -28,7 +28,6 @@ import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
 import org.talend.commons.exception.ExceptionService;
 import org.talend.commons.runtime.debug.TalendDebugHandler;
-import org.talend.commons.utils.platform.PluginChecker;
 import org.talend.commons.utils.system.EclipseCommandLine;
 
 /**
@@ -58,8 +57,6 @@ public class CommonsPlugin implements BundleActivator {
     // TESB-17856: For commandline builds ESB Micorservice bundle
     private static boolean isESBMicorservice = false;
 
-    private static Boolean isDevMode = null;
-
     private static ServiceTracker proxyTracker;
 
     public static boolean isWorkbenchCreated() {
@@ -113,17 +110,6 @@ public class CommonsPlugin implements BundleActivator {
         return System.getProperty(EclipseCommandLine.PROP_VM) == null;
     }
 
-    public static boolean isDevMode() {
-        try {
-            if (isDevMode == null) {
-                isDevMode = Platform.getBundle(PluginChecker.RCP_BUNDLE_ID).getBundleContext().getProperty("osgi.dev") != null;
-            }
-            return isDevMode;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
     public static boolean isDebugMode() {
         return Boolean.getBoolean("talendDebug") //$NON-NLS-1$
                 || ArrayUtils.contains(Platform.getApplicationArgs(), TalendDebugHandler.TALEND_DEBUG);

main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/ExceptionHandler.java

@@ -38,12 +38,6 @@ public class ExceptionHandler {
         CommonExceptionHandler.log(message);
     }
 
-    public static void logDebug(String message) {
-        if (CommonsPlugin.isDebugMode() || CommonsPlugin.isDevMode()) {
-            CommonExceptionHandler.log(message);
-        }
-    }
-    
     public static void process(Throwable ex, Priority priority) {
         CommonExceptionHandler.process(ex, priority);
 

main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/LoginException.java

@@ -20,24 +20,9 @@ package org.talend.commons.exception;
 public class LoginException extends BusinessException {
 
     public static final String RESTART = "restart";
-    
-    private int errCode;
-    
-
-    public LoginException(String key, Throwable cause) {
-        super(key, cause);
-    }
 
     public LoginException(String message) {
         super(message);
     }
-    
-    public LoginException(int errCode, String message) {
-        super(message);
-        this.errCode = errCode;
-    }
-    
-    public int getErrCode() {
-        return this.errCode;
-    }
+
 }

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

@@ -1,60 +1,53 @@
-DatabaseContentRetriever.PRODUCTNAME=Nom commercial de la base
-DatabaseContentRetriever.PRODUCTVERSION=Version du produit de la base de donn\u00E9es :
-DB2ForZosResultSet.outofRange= c'est en dehors de la plage possible.
-DB2ForZosResultSet.parameterIndex=Argument invalide : index des param\u00E8tres
-DB2ForZosResultSet.unknowCloumn=Argument invalide : nom de colonne inconnu
-SoftwareSystemManager.NULL_CONN_INSTANCE=Instance de connexion null.
-SoftwareSystemManager.NULL_INSTANCE_SOFTWARE_SYS=Instance de syst\u00E8me de logiciel null.
-SybaseResultSet.outofRange= c'est en dehors de la plage possible.
-SybaseResultSet.parameterIndex=Argument invalide : index des param\u00E8tres
-SybaseResultSet.unknowCloumn=Argument invalide : nom de colonne inconnu
+DatabaseContentRetriever.PRODUCTNAME=Nom de produit de la base de donn\u00E9es :
+DatabaseContentRetriever.PRODUCTVERSION=Version du produit : 
+DB2ForZosResultSet.parameterIndex=Argument invalide\: index du param\u00E8tre
+DB2ForZosResultSet.unknowCloumn=Argument invalide\: nom de colonne inconnu
+SybaseResultSet.parameterIndex=Argument invalide\:index du param\u00E8tre
+SybaseResultSet.unknowCloumn=Argument invalide:\ nom de colonne inconnu
 AbstractFakeResultSet.unknowCloumn=Argument invalide : {0} est un nom de colonne inconnu
-AbstractFakeResultSet.parameterIndexOutOfRange=Argument invalide : l'index du param\u00E8tre {0} est hors de la plage
-EntryLocation.returnTableName={tableName={0}, ColumnName={1}}
+AbstractFakeResultSet.parameterIndexOutOfRange=Argument invalide\: index du param\u00E8tre {0} hors de la plage
+EntryLocation.returnTableName= {tableName={0}, columnName={1}}
 ExceptionHandler.Parameter.BeNull=le param\u00E8tre ex ne peut \u00EAtre null
-ExtensionImplementationProviders.ExtensionPointError=Le point d'extension doit autoriser une instance unique
 ListenableList.IndexSameLength.Error=indexOrigin et indexDestination doivent avoir la m\u00EAme longueur
 ReflectionPropertyException.Access.ErrorMsg3=Une erreur est survenue lors de l'acc\u00E8s \u00E0 {0} de la propri\u00E9t\u00E9 ' de la propri\u00E9t\u00E9 '{1}' de la classe '{2}'
 ResourceUtils.canMove1=Peut d\u00E9placer
 ResourceUtils.canMove2=Peut d\u00E9placer {0} -> {1}
 ResourceUtils.cannotMoveRule3=Impossible de d\u00E9placer {0} -> {1} (R\u00E8gle 3-Descendant)
 ResourceUtils.cnanotMoveRule1=Impossible de d\u00E9placer {0} -> {1} (R\u00E8gle 1-Tester si la source et la cible sont diff\u00E9rentes)
-ResourceUtils.go= ->
+ResourceUtils.go=\ ->
 ResourceUtils.streamNull=le flux est null
 ReusableMultiKey.Keys.BeNull=Le tableau de cl\u00E9s ne peut pas \u00EAtre null
-StringUtils.IllegalArgument0=supporte uniquement l'encodage \\\\uxxxx ou \\\\xhh.
-StringUtils.IllegalArgument1=Encodage \\\\uxxxx malform\u00E9.
-StringUtils.IllegalArgument2=Encodage \\\\uxxxx malform\u00E9.
-StringUtils.IllegalArgument3=Encodage \\\\0xxx malform\u00E9.
+StringUtils.IllegalArgument0=supporte uniquement l'encodage \\uxxxx ou \\xhh.
+StringUtils.IllegalArgument1=Encodage \\uxxxx malform\u00E9.
+StringUtils.IllegalArgument2=Encodage \\uxxxx malform\u00E9.
+StringUtils.IllegalArgument3=Encodage \\0xxx malform\u00E9.
 VersionUtils.Version.Error2=Cha\u00EEne de caract\u00E8res mal form\u00E9e {0} (attendait M{1}m)
-FilesUtils.operationCanceled=Op\u00E9ration de copie de fichier ou de r\u00E9pertoire annul\u00E9e.
+FilesUtils.operationCanceled=Op\u00E9ration de copie de fichier ou de r\u00E9pertoire annul\u00E9e
 resources.file.notCreated=Le fichier "{0}" ne peut \u00EAtre cr\u00E9\u00E9 ({1})
-resources.file.notDeleted=Le fichier "{0}" ne peut pas \u00EAtre supprim\u00E9
+resources.file.notDeleted=Le fichier "{0}" ne peut \u00EAtre supprim\u00E9
 resources.file.notGet=Fichier requis "{0}" non trouv\u00E9 dans le r\u00E9pertoire "{1}"
 resources.fileContent.notGet=Le contenu du fichier "{0}" ne peut \u00EAtre r\u00E9cup\u00E9r\u00E9
-resources.folder.notCreated=Le dossier "{0}" ne peut pas \u00EAtre cr\u00E9\u00E9
-resources.folder.notDeleted=Le dossier "{0}" ne peut pas \u00EAtre supprim\u00E9
+resources.folder.notCreated=Le dossier "{0}" ne peut \u00EAtre cr\u00E9\u00E9
+resources.folder.notDeleted=Le dossier "{0}" ne peut \u00EAtre supprim\u00E9
 resources.folder.notEmptied=Le dossier "{0}" ne peut \u00EAtre vid\u00E9
 resources.folder.notGet=Impossible de trouver le dossier requis "{0}" dans le projet "{1}"
 resources.members.notGet=Les membres du conteneur "{0}" ne peuvent \u00EAtre r\u00E9cup\u00E9r\u00E9s
-resources.project.notGet=Impossible de trouver le projet "{0}" requis
-resources.resource.notMoved=La ressource "{0}" ne peut pas \u00EAtre d\u00E9plac\u00E9e vers "{1}"
+resources.project.notGet=Impossible de r\u00E9cup\u00E9rer le projet requis "{0}"
+resources.resource.notMoved=Impossible de d\u00E9placer la ressource "{0}" vers "{1}"
 utils.data.container=L'Id {0} est d\u00E9j\u00E0 utilis\u00E9 dans un conteneur
 utils.workbench.extensions.badNumberOfExtension=Mauvais nombre d'extension trouv\u00E9 dans {0}. Entre {1} et {2} attendu mais {3} trouv\u00E9.
-utils.workbench.extensions.noExtension=Impossible de trouver un plug-in pour \u00E9tendre le point d'extension d'ID "{0}".
-XmlNodeRetriever.countResult=Compte de r\u00E9sultat :
-XmlNodeRetriever.field2Node=field2Node=
-XmlNodeRetriever.filed1Node=field1Node=
+utils.workbench.extensions.noExtension=Impossible de trouver un plug-in pour \u00E9tendre le point d'extension d'ID {0}.
+XmlNodeRetriever.countResult=R\u00E9sultat du compte \:
 XmlNodeRetriever.mainExpression=expression principale =
-XmlNodeRetriever.mainNode=mainNode
-XmlNodeRetriever.proposal2Node=proposal2Nodes :
-XmlNodeRetriever.prposal1Node=proposal1Nodes :
 XmlNodeRetriever.singleQuotes='
 XmlNodeRetriever.xPathExpression=Expression XPath = '
 VersionUtils.readPropertyFileError=Erreur de lecture de propri\u00E9t\u00E9 dans le fichier talend.properties.
-AS400ResultSet.unknowCloumn=Argument invalide : nom de colonne inconnu
-AS400ResultSet.parameterIndex=Argument invalide : index des param\u00E8tres
-AS400ResultSet.outofRange= c'est en dehors de la plage possible.
-ITaCoKitService.exception.multipleInstance=Plus d'une instance trouv\u00E9e : {0}
+AS400ResultSet.unknowCloumn=Argument invalide\: nom de colonne inconnu
+AS400ResultSet.parameterIndex=Argument invalide\: index du param\u00E8tre
+AS400ResultSet.outofRange=\ est hors de la plage.
 TalendProxySelector.exception.badUriMap=URI du mapping invalide\u00A0: {0}
 TalendProxySelector.exception.proxySelectionError=Erreur lors de la s\u00E9lection du proxy pour {0}
+DB2ForZosResultSet.outofRange=\ est en dehors de la limite.
+ExtensionImplementationProviders.ExtensionPointError=Le point d'extension doit autoriser une instance unique
+XmlNodeRetriever.proposal2Node=proposal2Nodes :
+XmlNodeRetriever.prposal1Node=proposal1Nodes :

main/plugins/org.talend.commons.runtime/src/org/talend/commons/i18n/internal/messages_ja.properties

@@ -1,60 +1,60 @@
-DatabaseContentRetriever.PRODUCTNAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u88FD\u54C1\u540D:
-DatabaseContentRetriever.PRODUCTVERSION=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u88FD\u54C1\u306E\u30D0\u30FC\u30B8\u30E7\u30F3:
-DB2ForZosResultSet.outofRange= \u304C\u7BC4\u56F2\u5916\u3067\u3059\u3002
-DB2ForZosResultSet.parameterIndex=\u7121\u52B9\u306A\u5F15\u6570: \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
-DB2ForZosResultSet.unknowCloumn=\u7121\u52B9\u306A\u5F15\u6570: \u30AB\u30E9\u30E0\u540D\u304C\u4E0D\u660E
+DatabaseContentRetriever.PRODUCTNAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u88FD\u54C1\u540D\uFF1A
+DatabaseContentRetriever.PRODUCTVERSION=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\uFF1A
+DB2ForZosResultSet.outofRange=\\ \u7BC4\u56F2\u5916\u3067\u3059\u3002
+DB2ForZosResultSet.parameterIndex=\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059: \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
+DB2ForZosResultSet.unknowCloumn=\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059: \u4E0D\u660E\u306A\u30AB\u30E9\u30E0\u540D
+SybaseResultSet.outofRange=\ \u7BC4\u56F2\u5916\u3067\u3059\u3002
+SybaseResultSet.parameterIndex=\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059: \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
+SybaseResultSet.unknowCloumn=\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059: \u4E0D\u660E\u306A\u30AB\u30E9\u30E0\u540D
+AbstractFakeResultSet.unknowCloumn=\u7121\u52B9\u306A\u5F15\u6570 : {0} \u306F\u4E0D\u6B63\u306A\u30AB\u30E9\u30E0\u540D\u3067\u3059\u3002
+AbstractFakeResultSet.parameterIndexOutOfRange=\u7121\u52B9\u306A\u5F15\u6570\uFF1A\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9{0} \u306E\u76EE\u76DB\u308A\u304C\u4E0D\u6B63\u3067\u3059\u3002
+EntryLocation.returnTableName={\u30C6\u30FC\u30D6\u30EB\u540D={0}, \u30AB\u30E9\u30E0\u540D={1}}
+ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u51FA\u6765\u307E\u305B\u3093
+ExtensionImplementationProviders.ExtensionPointError=\u62E1\u5F35\u30DD\u30A4\u30F3\u30C8\u306F\u30B7\u30F3\u30B0\u30EB\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u8A8D\u8A3C\u3057\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093
+ListenableList.IndexSameLength.Error=indexOrigin \u3068 indexDestination\u306F \u540C\u3058\u9577\u3055\u3067\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093
+ReflectionPropertyException.Access.ErrorMsg3=\u30AF\u30E9\u30B9 \'{2}\' \u306E\u30D7\u30ED\u30D1\u30C6\u30A3 \'{1}\' \u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u306E {0} \u3078\u306E\u30A2\u30AF\u30BB\u30B9\u8A66\u884C\u4E2D\u306E\u30A8\u30E9\u30FC
+ResourceUtils.canMove1=\u79FB\u52D5\u53EF\u80FD
+ResourceUtils.canMove2=\u79FB\u52D5\u53EF\u80FD {0} -> {1}
+ResourceUtils.cannotMoveRule3=\u79FB\u52D5\u4E0D\u53EF {0} -> {1} \uFF08\u30EB\u30FC\u30EB3-Descendant\uFF09
+ResourceUtils.cnanotMoveRule1=\u79FB\u52D5\u4E0D\u53EF {0} -> {1} \uFF08\u30EB\u30FC\u30EB1-\u79FB\u52D5\u5143\u3068\u79FB\u52D5\u5148\u304C\u9055\u3046\u304B\u30C6\u30B9\u30C8\uFF09
+ResourceUtils.go=\ ->
+ResourceUtils.streamNull=\u30B9\u30C8\u30EA\u30FC\u30E0\u304CNull\u3067\u3059
+ReusableMultiKey.Keys.BeNull=\u30AD\u30FC\u306E\u914D\u5217\u306FNull\u3067\u3042\u3063\u3066\u306F\u3044\u3051\u307E\u305B\u3093
+StringUtils.IllegalArgument0=\\uxxxx\u307E\u305F\u306F\\xhh\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u306E\u307F\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002
+StringUtils.IllegalArgument1=\\uxxxx\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u304C\u4E0D\u6B63\u3067\u3059\u3002
+StringUtils.IllegalArgument2=\\uxxxx\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u304C\u4E0D\u6B63\u3067\u3059\u3002
+StringUtils.IllegalArgument3=\\0xxx\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u304C\u4E0D\u6B63\u3067\u3059\u3002
+VersionUtils.Version.Error2=\u4E0D\u6B63\u306A\u6587\u5B57\u5217 {0} (M{1}m\u3092\u4F34\u3046)
+FilesUtils.operationCanceled=\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u306E\u30B3\u30D4\u30FC\u4E2D\u306B\u64CD\u4F5C\u304C\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F\u3002
+resources.file.notCreated=\u30D5\u30A1\u30A4\u30EB \"{0}\" \u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093 ({1})
+resources.file.notDeleted=\u30D5\u30A1\u30A4\u30EB \"{0}\" \u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093
+resources.file.notGet=\u5FC5\u8981\u306A\u30D5\u30A1\u30A4\u30EB \"{0}\" \u304C\u30D5\u30A9\u30EB\u30C0 \"{1}\" \u306B\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+resources.fileContent.notGet=\u30D5\u30A1\u30A4\u30EB \"{0}\" \u306E\u5185\u5BB9\u304C\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
+resources.folder.notCreated=\u30D5\u30A9\u30EB\u30C0 \"{0}\" \u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
+resources.folder.notDeleted=\"{0}\"\u30D5\u30A9\u30EB\u30C0\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093
+resources.folder.notEmptied=\"{0}\"\u30D5\u30A9\u30EB\u30C0\u3092\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093
+resources.folder.notGet=\u5FC5\u8981\u306A\u30D5\u30A9\u30EB\u30C0 \"{0}\" \u304C\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 \"{1}\" \u306B\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+resources.members.notGet=\u30B3\u30F3\u30C6\u30CA \"{0}\" \u306E\u30E1\u30F3\u30D0\u304C\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
+resources.project.notGet=\u5FC5\u8981\u306A\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 \"{0}\" \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+resources.resource.notMoved=\u30EA\u30BD\u30FC\u30B9 \"{0}\" \u3092 \"{1}\" \u306B\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093
+utils.data.container=Id {0} \u306F\u3059\u3067\u306B\u30B3\u30F3\u30C6\u30CA\u3067\u4F7F\u7528\u4E2D\u3067\u3059
+utils.workbench.extensions.badNumberOfExtension=\u4E0D\u6B63\u306A\u6570\u306E\u62E1\u5F35\u304C {0} \u306B\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002 {1} \u3068 {2} \u306E\u9593\u306B\u4E0D\u6B63\u306A {3} \u304C\u3042\u308A\u307E\u3059\u3002
+utils.workbench.extensions.noExtension=\u30D7\u30E9\u30B0\u30A4\u30F3\u62E1\u5F35\u30DD\u30A4\u30F3\u30C8ID \"{0}\" \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
+XmlNodeRetriever.countResult=\u30AB\u30A6\u30F3\u30C8\u7D50\u679C :
+XmlNodeRetriever.field2Node=\u30D5\u30A3\u30FC\u30EB\u30C92\u30CE\u30FC\u30C9=
+XmlNodeRetriever.filed1Node=\u30D5\u30A3\u30FC\u30EB\u30C91\u30CE\u30FC\u30C9=
+XmlNodeRetriever.mainExpression=\u30E1\u30A4\u30F3\u5F0F=
+XmlNodeRetriever.mainNode=\u30E1\u30A4\u30F3\u30CE\u30FC\u30C9=
+XmlNodeRetriever.proposal2Node=\u63D0\u68482\u30CE\u30FC\u30C9\uFF1A:
+XmlNodeRetriever.prposal1Node=\u63D0\u68481\u30CE\u30FC\u30C9\uFF1A:
+XmlNodeRetriever.singleQuotes=\'
+XmlNodeRetriever.xPathExpression=XPath\u5F0F=\'
+VersionUtils.readPropertyFileError=talend.properties\u30D5\u30A1\u30A4\u30EB\u5185\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u8AAD\u307F\u53D6\u308A\u3067\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
 SoftwareSystemManager.NULL_CONN_INSTANCE=Null\u63A5\u7D9A\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3002
 SoftwareSystemManager.NULL_INSTANCE_SOFTWARE_SYS=Null\u30BD\u30D5\u30C8\u30A6\u30A7\u30A2\u30B7\u30B9\u30C6\u30E0\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3002
-SybaseResultSet.outofRange= \u304C\u7BC4\u56F2\u5916\u3067\u3059\u3002
-SybaseResultSet.parameterIndex=\u7121\u52B9\u306A\u5F15\u6570: \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
-SybaseResultSet.unknowCloumn=\u7121\u52B9\u306A\u5F15\u6570: \u30AB\u30E9\u30E0\u540D\u304C\u4E0D\u660E
-AbstractFakeResultSet.unknowCloumn=\u7121\u52B9\u306A\u5F15\u6570: {0}\u304C\u4E0D\u660E\u306A\u30AB\u30E9\u30E0\u540D
-AbstractFakeResultSet.parameterIndexOutOfRange=\u7121\u52B9\u306A\u5F15\u6570: \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9{0}\u304C\u7BC4\u56F2\u5916
-EntryLocation.returnTableName={tableName={0}, \u30AB\u30E9\u30E0\u540D={1}}
-ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u51FA\u6765\u307E\u305B\u3093
-ExtensionImplementationProviders.ExtensionPointError=\u62E1\u5F35\u30DD\u30A4\u30F3\u30C8\u306F1\u3064\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u8A8D\u8A3C\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-ListenableList.IndexSameLength.Error=indexOrigin\u3068indexDestination\u304C\u540C\u3058\u9577\u3055\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-ReflectionPropertyException.Access.ErrorMsg3=\u30AF\u30E9\u30B9'{2}'\u306E\u30D7\u30ED\u30D1\u30C6\u30A3'{1}'\u306E{0}\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-ResourceUtils.canMove1=\u79FB\u52D5\u53EF\u80FD
-ResourceUtils.canMove2=Can move {0} -> {1}
-ResourceUtils.cannotMoveRule3=Cannot move {0} -> {1} (Rule 3-Descendant)
-ResourceUtils.cnanotMoveRule1={0}\u3092{1}\u306B\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093(\u30EB\u30FC\u30EB1 - \u30BD\u30FC\u30B9\u3068\u30BF\u30FC\u30B2\u30C3\u30C8\u304C\u7570\u306A\u308B\u5834\u5408\u306F\u30C6\u30B9\u30C8)
-ResourceUtils.go= ->
-ResourceUtils.streamNull=\u30B9\u30C8\u30EA\u30FC\u30E0\u304CNULL\u3067\u3059
-ReusableMultiKey.Keys.BeNull=\u30AD\u30FC\u306E\u914D\u5217\u306FNULL\u5024\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-StringUtils.IllegalArgument0=\u306F\\uxxxx\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u307E\u305F\u306F\\xhh\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u306E\u307F\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002
-StringUtils.IllegalArgument1=\u4E0D\u6B63\u306A\\uxxxx\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3002
-StringUtils.IllegalArgument2=\u4E0D\u6B63\u306A\\uxxxx\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3002
-StringUtils.IllegalArgument3=\u4E0D\u6B63\u306A\\0xxx\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3002
-VersionUtils.Version.Error2=\u4E0D\u6B63\u306A\u6587\u5B57\u5217{0} (M{1}m\u3092\u60F3\u5B9A)
-FilesUtils.operationCanceled=\u30D5\u30A9\u30EB\u30C0\u30FC\u307E\u305F\u306F\u30D5\u30A1\u30A4\u30EB\u306E\u30B3\u30D4\u30FC\u4E2D\u306B\u64CD\u4F5C\u304C\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F.
-resources.file.notCreated="{0}"\u3068\u3044\u3046\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093({1})
-resources.file.notDeleted="{0}"\u3068\u3044\u3046\u30D5\u30A1\u30A4\u30EB\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093
-resources.file.notGet="{1}"\u3068\u3044\u3046\u30D5\u30A9\u30EB\u30C0\u30FC\u306B"{0}"\u3068\u3044\u3046\u5FC5\u8981\u306A\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-resources.fileContent.notGet=\u30D5\u30A1\u30A4\u30EB "{0}" \u306E\u5185\u5BB9\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
-resources.folder.notCreated="{0}"\u3068\u3044\u3046\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
-resources.folder.notDeleted="{0}"\u3068\u3044\u3046\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093
-resources.folder.notEmptied="{0}"\u3068\u3044\u3046\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093
-resources.folder.notGet="{1}"\u3068\u3044\u3046\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306B"{0}"\u3068\u3044\u3046\u5FC5\u8981\u306A\u30D5\u30A9\u30EB\u30C0\u30FC\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-resources.members.notGet=\u30B3\u30F3\u30C6\u30CA\u30FC\u306E\u30E1\u30F3\u30D0\u30FC "{0}" \u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
-resources.project.notGet="{0}"\u3068\u3044\u3046\u5FC5\u8981\u306A\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-resources.resource.notMoved="{0}"\u3068\u3044\u3046\u30EA\u30BD\u30FC\u30B9\u3092"{1}"\u306B\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093
-utils.data.container=\u30B3\u30F3\u30C6\u30CA\u30FC\u3067\u65E2\u306B\u4F7F\u7528\u3055\u308C\u308BID{0}
-utils.workbench.extensions.badNumberOfExtension={0}\u306B\u62E1\u5F35\u306E\u4E0D\u6B63\u306A\u6570\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002{1}\u304B\u3089{2}\u307E\u3067\u60F3\u5B9A\u3057\u3066\u3044\u307E\u3057\u305F\u304C\u3001{3}\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002
-utils.workbench.extensions.noExtension=\u62E1\u5F35\u30DD\u30A4\u30F3\u30C8ID"{0}"\u3092\u5EF6\u9577\u3059\u308B\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-XmlNodeRetriever.countResult=\u30AB\u30A6\u30F3\u30C8\u7D50\u679C:
-XmlNodeRetriever.field2Node=\u30D5\u30A3\u30FC\u30EB\u30C92\u30CE\u30FC\u30C9\\=
-XmlNodeRetriever.filed1Node=\u30D5\u30A3\u30FC\u30EB\u30C91\u30CE\u30FC\u30C9\\=
-XmlNodeRetriever.mainExpression=\u30E1\u30A4\u30F3\u5F0F=
-XmlNodeRetriever.mainNode=mainNode=
-XmlNodeRetriever.proposal2Node=proposal2Nodes :
-XmlNodeRetriever.prposal1Node=proposal1Nodes \\:
-XmlNodeRetriever.singleQuotes='
-XmlNodeRetriever.xPathExpression=xPathExpression = '
-VersionUtils.readPropertyFileError=\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u307F\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-AS400ResultSet.unknowCloumn=\u7121\u52B9\u306A\u5F15\u6570: \u30AB\u30E9\u30E0\u540D\u304C\u4E0D\u660E
-AS400ResultSet.parameterIndex=\u7121\u52B9\u306A\u5F15\u6570: \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
-AS400ResultSet.outofRange= \u304C\u7BC4\u56F2\u5916\u3067\u3059\u3002
+AS400ResultSet.unknowCloumn=\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059: \u4E0D\u660E\u306A\u30AB\u30E9\u30E0\u540D
+AS400ResultSet.parameterIndex=\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059: \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
+AS400ResultSet.outofRange=\\ \u7BC4\u56F2\u5916\u3067\u3059\u3002
 ITaCoKitService.exception.multipleInstance=\u8907\u6570\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: {0}
 TalendProxySelector.exception.badUriMap=\u4E0D\u6B63\u306Auri\u30DE\u30C3\u30D7: {0}
 TalendProxySelector.exception.proxySelectionError={0}\u306E\u30D7\u30ED\u30AD\u30B7\u306E\u9078\u629E\u6642\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3059

main/plugins/org.talend.commons.runtime/src/org/talend/commons/i18n/internal/messages_zh_CN.properties

@@ -1,11 +1,9 @@
 DatabaseContentRetriever.PRODUCTNAME=\u6570\u636E\u5E93\u4EA7\u54C1\u540D\u79F0:
-DatabaseContentRetriever.PRODUCTVERSION=\u6570\u636E\u5E93\u4EA7\u54C1\u7248\u672C\uFF1A
-DB2ForZosResultSet.outofRange= \u8D85\u51FA\u8303\u56F4\u3002
+DatabaseContentRetriever.PRODUCTVERSION=\u6570\u636E\u5E93\u4EA7\u54C1\u7248\u672C:
+DB2ForZosResultSet.outofRange=\\ \u8D85\u51FA\u8303\u56F4\u3002
 DB2ForZosResultSet.parameterIndex=\u65E0\u6548\u7684\u53C2\u6570\uFF1A\u53C2\u6570\u7D22\u5F15
 DB2ForZosResultSet.unknowCloumn=\u65E0\u6548\u7684\u53C2\u6570\uFF1A\u5217\u540D\u672A\u77E5
-SoftwareSystemManager.NULL_CONN_INSTANCE=null \u8FDE\u63A5\u5B9E\u4F8B
-SoftwareSystemManager.NULL_INSTANCE_SOFTWARE_SYS=null \u8F6F\u4EF6\u7CFB\u7EDF\u5B9E\u4F8B
-SybaseResultSet.outofRange= \u8D85\u51FA\u8303\u56F4\u3002
+SybaseResultSet.outofRange=\\ \u8D85\u51FA\u8303\u56F4\u3002
 SybaseResultSet.parameterIndex=\u65E0\u6548\u7684\u53C2\u6570\uFF1A\u53C2\u6570\u7D22\u5F15
 SybaseResultSet.unknowCloumn=\u65E0\u6548\u7684\u53C2\u6570\uFF1A\u5217\u540D\u672A\u77E5
 AbstractFakeResultSet.unknowCloumn=\u65E0\u6548\u7684\u53C2\u6570\uFF1A\u672A\u77E5\u5217\u540D {0}
@@ -19,29 +17,29 @@ ResourceUtils.canMove1=\u53EF\u4EE5\u79FB\u52A8
 ResourceUtils.canMove2=\u53EF\u4EE5\u79FB\u52A8 {0} -> {1}
 ResourceUtils.cannotMoveRule3=\u65E0\u6CD5\u79FB\u52A8 {0} -> {1} (\u89C4\u5219 3 - \u540E\u4EE3)
 ResourceUtils.cnanotMoveRule1=\u65E0\u6CD5\u79FB\u52A8 {0} -> {1} (\u89C4\u5219 1 - \u6E90\u548C\u76EE\u6807\u4E0D\u540C\u65F6\u6267\u884C\u6D4B\u8BD5)
-ResourceUtils.go= ->
+ResourceUtils.go=\\ ->
 ResourceUtils.streamNull=\u6D41\u4E3A null
 ReusableMultiKey.Keys.BeNull=\u952E\u6570\u7EC4\u4E0D\u80FD\u4E3A null
-StringUtils.IllegalArgument0=\u53EA\u652F\u6301 \\uxxxx \u6216 \\xhh \u7F16\u7801\u3002
-StringUtils.IllegalArgument1=\\uxxxx \u7F16\u7801\u683C\u5F0F\u9519\u8BEF\u3002
-StringUtils.IllegalArgument2=\\uxxxx \u7F16\u7801\u683C\u5F0F\u9519\u8BEF\u3002
-StringUtils.IllegalArgument3=\\0xxx \u7F16\u7801\u683C\u5F0F\u9519\u8BEF\u3002
+StringUtils.IllegalArgument0=\u53EA\u652F\u6301 \\\\uxxxx \u6216 \\\\xhh \u7F16\u7801\u3002
+StringUtils.IllegalArgument1=\\\\uxxxx \u7F16\u7801\u683C\u5F0F\u9519\u8BEF\u3002
+StringUtils.IllegalArgument2=\\\\uxxxx \u7F16\u7801\u683C\u5F0F\u9519\u8BEF\u3002
+StringUtils.IllegalArgument3=\\\\0xxx \u7F16\u7801\u683C\u5F0F\u9519\u8BEF\u3002
 VersionUtils.Version.Error2=\u5B57\u7B26\u4E32 {0} \u683C\u5F0F\u9519\u8BEF (\u5E94\u4E3A M{1}m)
-FilesUtils.operationCanceled=\u590D\u5236\u6587\u4EF6\u6216\u6587\u4EF6\u5939\u65F6\u64CD\u4F5C\u5DF2\u53D6\u6D88\u3002
-resources.file.notCreated=\u6587\u4EF6 "{0}" \u4E0D\u80FD\u88AB\u521B\u5EFA ({1})
-resources.file.notDeleted=\u6587\u4EF6 "{0}" \u4E0D\u80FD\u88AB\u5220\u9664
-resources.file.notGet=\u5FC5\u9700\u7684\u6587\u4EF6 "{0}" \u6CA1\u6709\u5728\u6587\u4EF6\u5939 "{1}" \u4E2D
-resources.fileContent.notGet=\u6587\u4EF6 "{0}" \u7684\u5185\u5BB9\u65E0\u6CD5\u83B7\u53D6
-resources.folder.notCreated=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939 "{0}"
-resources.folder.notDeleted=\u65E0\u6CD5\u5220\u9664\u6587\u4EF6\u5939 "{0}"
-resources.folder.notEmptied=\u65E0\u6CD5\u6E05\u7A7A\u6587\u4EF6\u5939 "{0}"
-resources.folder.notGet=\u5FC5\u9700\u7684\u6587\u4EF6\u5939 "{0}" \u6CA1\u6709\u5728\u5DE5\u7A0B "{1}" \u4E2D
-resources.members.notGet=\u65E0\u6CD5\u83B7\u53D6\u5BB9\u5668 "{0}" \u7684\u6210\u5458
-resources.project.notGet=\u5FC5\u9700\u7684\u5DE5\u7A0B "{0}" \u4E0D\u5B58\u5728
-resources.resource.notMoved=\u8D44\u6E90 "{0}" \u4E0D\u80FD\u79FB\u52A8\u5230 "{1}"
+FilesUtils.operationCanceled=\u590D\u5236\u6587\u4EF6\u6216\u6587\u4EF6\u5939\u65F6\u64CD\u4F5C\u88AB\u53D6\u6D88\u3002
+resources.file.notCreated=\u6587\u4EF6 \"{0}\" \u4E0D\u80FD\u88AB\u521B\u5EFA ({1})
+resources.file.notDeleted=\u6587\u4EF6 \"{0}\" \u4E0D\u80FD\u88AB\u5220\u9664
+resources.file.notGet=\u5FC5\u9700\u7684\u6587\u4EF6 \"{0}\" \u6CA1\u6709\u5728\u6587\u4EF6\u5939 \"{1}\" \u4E2D
+resources.fileContent.notGet=\u6587\u4EF6 \"{0}\" \u7684\u5185\u5BB9\u65E0\u6CD5\u83B7\u53D6
+resources.folder.notCreated=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939 \"{0}\"
+resources.folder.notDeleted=\u65E0\u6CD5\u5220\u9664\u6587\u4EF6\u5939 \"{0}\"
+resources.folder.notEmptied=\u65E0\u6CD5\u6E05\u7A7A\u6587\u4EF6\u5939 \"{0}\"
+resources.folder.notGet=\u5FC5\u9700\u7684\u6587\u4EF6\u5939 \"{0}\" \u6CA1\u6709\u5728\u5DE5\u7A0B \"{1}\" \u4E2D
+resources.members.notGet=\u65E0\u6CD5\u83B7\u53D6\u5BB9\u5668 \"{0}\" \u7684\u6210\u5458
+resources.project.notGet=\u5FC5\u9700\u7684\u5DE5\u7A0B \"{0}\" \u4E0D\u5B58\u5728
+resources.resource.notMoved=\u8D44\u6E90 \"{0}\" \u4E0D\u80FD\u79FB\u52A8\u5230 \"{1}\"
 utils.data.container=Id {0} \u5DF2\u5728\u5BB9\u5668\u4E2D\u88AB\u4F7F\u7528
 utils.workbench.extensions.badNumberOfExtension={0} \u4E0A\u7684\u6269\u5C55\u6570\u6709\u8BEF\u3002\u5E94\u4ECB\u4E8E {1} \u548C {2} \u4E4B\u95F4\uFF0C\u4F46\u5B9E\u9645\u4E3A {3}\u3002
-utils.workbench.extensions.noExtension=\u6269\u5C55\u70B9 ID \u4E3A "{0}" \u7684\u63D2\u4EF6\u4E0D\u5B58\u5728
+utils.workbench.extensions.noExtension=\u6269\u5C55\u70B9 ID \u4E3A \"{0}\" \u7684\u63D2\u4EF6\u4E0D\u5B58\u5728
 XmlNodeRetriever.countResult=\u8BA1\u7B97\u7ED3\u679C:
 XmlNodeRetriever.field2Node=field2Node=
 XmlNodeRetriever.filed1Node=field1Node=
@@ -49,12 +47,14 @@ XmlNodeRetriever.mainExpression=\u4E3B\u8868\u8FBE\u5F0F =
 XmlNodeRetriever.mainNode=mainNode=
 XmlNodeRetriever.proposal2Node=proposal2Nodes :
 XmlNodeRetriever.prposal1Node=proposal1Nodes :
-XmlNodeRetriever.singleQuotes='
-XmlNodeRetriever.xPathExpression=xPathExpression = '
+XmlNodeRetriever.singleQuotes=\'
+XmlNodeRetriever.xPathExpression=xPathExpression = \'
 VersionUtils.readPropertyFileError=\u5728 talend.properties \u6587\u4EF6\u4E2D\u8BFB\u53D6\u5C5E\u6027\u65F6\u51FA\u9519\u3002
+SoftwareSystemManager.NULL_CONN_INSTANCE=null \u8FDE\u63A5\u5B9E\u4F8B
+SoftwareSystemManager.NULL_INSTANCE_SOFTWARE_SYS=null \u8F6F\u4EF6\u7CFB\u7EDF\u5B9E\u4F8B
 AS400ResultSet.unknowCloumn=\u65E0\u6548\u7684\u53C2\u6570\uFF1A\u5217\u540D\u672A\u77E5
 AS400ResultSet.parameterIndex=\u65E0\u6548\u7684\u53C2\u6570\uFF1A\u53C2\u6570\u7D22\u5F15
-AS400ResultSet.outofRange= \u8D85\u51FA\u8303\u56F4\u3002
+AS400ResultSet.outofRange=\\ \u8D85\u51FA\u8303\u56F4\u3002
 ITaCoKitService.exception.multipleInstance=\u53D1\u73B0\u591A\u4E2A\u5B9E\u4F8B\uFF1A{0}
 TalendProxySelector.exception.badUriMap=\u9519\u8BEF\u7684 uri \u6620\u5C04\uFF1A{0}
 TalendProxySelector.exception.proxySelectionError=\u4E3A {0} \u9009\u62E9\u4EE3\u7406\u65F6\u51FA\u9519

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/PatchComponent.java

@@ -23,7 +23,7 @@ public interface PatchComponent extends P2InstallComponent {
 
     static final String FOLDER_PATCHES = "patches"; //$NON-NLS-1$
 
-    boolean install(IProgressMonitor monitor, File... patchFiles) throws Exception;
+    boolean install(IProgressMonitor monitor, File patchFile) throws Exception;
 
     boolean isPlainZipInstalled(IProgressMonitor monitor, String patchName) throws Exception;
 }

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/VersionUtils.java

@@ -36,7 +36,6 @@ import org.osgi.framework.FrameworkUtil;
 import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.i18n.internal.Messages;
-import org.talend.utils.format.PresentableBox;
 
 /**
  * Represents a version. Contents a major and a minor version.<br/>
@@ -328,12 +327,7 @@ public class VersionUtils {
         String talendVersion = getTalendVersion();
         String majorVersion = StringUtils.substringBeforeLast(talendVersion, "."); //$NON-NLS-1$
         String artifactIdFolder = mojoType.getMojoArtifactIdFolder();
-        File[] artifactFiles = new File[0];
-        File folder = new File(artifactIdFolder);
-        if (folder.exists()) {
-            artifactFiles = folder.listFiles();
-        }
-        Optional<File> optional = Stream.of(artifactFiles)
+        Optional<File> optional = Stream.of(new File(artifactIdFolder).listFiles())
                 .filter(f -> f.isDirectory() && f.getName().startsWith(majorVersion))
                 .sorted((f1, f2) -> new DefaultArtifactVersion(f2.getName()).compareTo(new DefaultArtifactVersion(f1.getName())))
                 .findFirst();
@@ -363,21 +357,6 @@ public class VersionUtils {
         return version;
     }
 
-    public static String getInternalMajorVersion() {
-        return StringUtils.substringBefore(getInternalVersion(), "."); //$NON-NLS-1$
-    }
-
-    public static String getDisplayPatchVersion(String patchName) {
-        try {
-            if (Integer.parseInt(StringUtils.substringAfterLast(patchName, "v")) > 1) { //$NON-NLS-1$
-                return patchName;
-            }
-            return StringUtils.substringBefore(patchName, "v"); //$NON-NLS-1$
-        } catch (NumberFormatException e) {
-            return patchName;
-        }
-    }
-
     public static void clearCache() {
         synchronized (VersionUtils.class) {
             productVersion = null;
@@ -410,15 +389,5 @@ public class VersionUtils {
         }
         return null;
     }
-    
-    public static String getProductVersionLog() {
-            Object version = getDisplayVersion();
-            String mess = "Starting Talend's platform log system."; //$NON-NLS-1$
-            if (version != null) {
-                mess += ("VERSION= " + version); //$NON-NLS-1$
-            }
-            PresentableBox box = new PresentableBox("TALEND", mess, 0); //$NON-NLS-1$
-            return box.getFullBox();
-    }
 
 }

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/platform/PluginChecker.java

@@ -20,8 +20,6 @@ import org.osgi.framework.Bundle;
  */
 public final class PluginChecker {
 
-    public static final String RCP_BUNDLE_ID = "org.talend.rcp";
-
     private static final String TDQ_ID = "org.talend.dataprofiler.core.tdq"; //$NON-NLS-1$
 
     private static final String TDCP_ID = "org.talend.datacleansing.core"; //$NON-NLS-1$

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/resource/ZipFileStatus.java

@@ -15,7 +15,6 @@ package org.talend.commons.utils.resource;
 import java.io.File;
 import java.io.IOException;
 import java.util.Enumeration;
-import java.util.Properties;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
@@ -45,8 +44,6 @@ public class ZipFileStatus {
 
     String pluginsEntryName = null;
 
-    private Properties props = new Properties();
-
     public ZipFileStatus(File file) {
         super();
         this.file = file;
@@ -63,11 +60,6 @@ public class ZipFileStatus {
                     judgeZipEntry(zipFile,enumeration.nextElement());
                 }
 
-                ZipEntry propEntry = zipFile.getEntry("patch.properties");
-                if (propEntry != null) {
-                    props.load(zipFile.getInputStream(propEntry));
-                }
-
                 judgePathes();
 
             } catch (ZipException e) {
@@ -148,20 +140,4 @@ public class ZipFileStatus {
         return null; // means no plugins
     }
 
-    public boolean isHasArtfacts() {
-        return hasArtfacts;
-    }
-
-    public boolean isHasContents() {
-        return hasContents;
-    }
-
-    public boolean isHasPlugins() {
-        return hasPlugins;
-    }
-
-    public Properties getProps() {
-        return props;
-    }
-
 }

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/system/EclipseCommandLine.java

@@ -21,29 +21,10 @@
 // ============================================================================
 package org.talend.commons.utils.system;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Filter;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.util.tracker.ServiceTracker;
-import org.talend.commons.exception.ExceptionHandler;
 
 /**
  * Creates and updates properties for the eclipse commandline in case of relaunch <br/>
@@ -55,13 +36,11 @@ public class EclipseCommandLine {
 
     public static final String PROP_VM = "eclipse.vm"; //$NON-NLS-1$
 
-    public static final String PROP_VMARGS = "eclipse.vmargs"; //$NON-NLS-1$
+    static final String PROP_VMARGS = "eclipse.vmargs"; //$NON-NLS-1$
 
     static final String PROP_COMMANDS = "eclipse.commands"; //$NON-NLS-1$
 
     static final String CMD_VMARGS = "-vmargs"; //$NON-NLS-1$
-    
-    static final String CMD_VM = "-vm"; //$NON-NLS-1$
 
     static final String NEW_LINE = "\n"; //$NON-NLS-1$
 
@@ -91,10 +70,6 @@ public class EclipseCommandLine {
 
     static public final String TALEND_CLEAN_UNINSTALLED_BUNDLES = "-talendCleanUninstalledBundles";
 
-    static public final String PROP_KEY_PROFILE_ID = "eclipse.p2.profile";
-
-    static public final String ARG_BRANCH = "-branch";
-
     static public final String LOGIN_ONLINE_UPDATE = "--loginOnlineUpdate";
 
     static public final String ARG_TALEND_BUNDLES_CLEANED = "-talend.studio.bundles.cleaned"; //$NON-NLS-1$
@@ -111,10 +86,6 @@ public class EclipseCommandLine {
     static public final String TALEND_DISABLE_EXTERNAL_MODULE_INSTALL_DIALOG_COMMAND = "--disableExternalModuleInstallDialog"; //$NON-NLS-1$
 
     static public final String TALEND_NOSPLASH_COMMAND = "-nosplash"; //$NON-NLS-1$
-    
-    static public final String TALEND_RESTART_FLAG = "-talendRestart";
-    
-    static public final String TALEND_SKIP_PROJECT_VERSION_CHECK_FLAG = "-skipProjectVersionCheck";
 
     /**
      * for TUP-2218, enable to open the job auto, when open studio. the args should be name of job. if want to open
@@ -127,21 +98,6 @@ public class EclipseCommandLine {
      * later.
      */
     static public final String TALEND_SHOW_JOB_TYPE_COMMAND = "--showJobType"; //$NON-NLS-1$
-    
-    private static final String HEX_STRING = "0123456789ABCDEF";
-    
-    public static final String SCHEME_FILE = "file"; //$NON-NLS-1$
-
-    private static final String UNC_PREFIX = "//"; //$NON-NLS-1$
-    
-    static private final Set<String> TALEND_ARGS = new HashSet<String>();
-    
-    static {
-        TALEND_ARGS.add(TALEND_CLEAN_UNINSTALLED_BUNDLES);
-        TALEND_ARGS.add(ARG_TALEND_BUNDLES_CLEANED);
-        TALEND_ARGS.add(PROP_TALEND_BUNDLES_DO_CLEAN);
-        TALEND_ARGS.add(TALEND_RELOAD_COMMAND);
-    }
 
     static public void updateOrCreateExitDataPropertyWithCommand(String command, String value, boolean delete) {
         updateOrCreateExitDataPropertyWithCommand(command, value, delete, false);
@@ -151,16 +107,6 @@ public class EclipseCommandLine {
         if (argName == null || argName.trim().isEmpty()) {
             return null;
         }
-
-        try {
-            if (isWindows() && TALEND_ARGS.contains(argName) && !isPoweredByTalend()) {
-                ExceptionHandler.logDebug("argName: " + argName + ", sysProp: " + argName + ", value: " + System.getProperty(argName));
-                Properties p = loadConfigIni();
-                return p.getProperty(argName);
-            }
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
         String[] commandLineArgs = Platform.getCommandLineArgs();
         if (commandLineArgs == null || commandLineArgs.length <= 0) {
             return null;
@@ -174,152 +120,6 @@ public class EclipseCommandLine {
         return null;
     }
 
-    private static boolean isPoweredByTalend() {
-        return !Platform.getProduct().getId().equals("org.talend.rcp.branding.jetl.product") && !Platform.getProduct().getId().equals("org.talend.rcp.branding.jetl.bigdata.product");
-    }
-    
-    private static boolean isWindows() {
-        return EnvironmentUtils.isWindowsSystem();
-    }
-    
-    private static void updateConfigIni(String command, String value, boolean delete) {
-        Properties p = loadConfigIni();
-
-        if (delete) {
-            p.remove(command);
-        } else {
-            p.put(command, value);
-        }
-        try {
-            File f = getConfigFile();
-            try (FileOutputStream fos = new FileOutputStream(f)) {
-                p.store(fos, "updated " + command);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-    
-    private static Properties loadConfigIni() {
-        Properties p = new Properties();
-        try {
-            File f = getConfigFile();
-            try (FileInputStream fis = new FileInputStream(f)) {
-                p.load(fis);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return p;
-    }
-    
-    private static String decode(String bytes) {
-        if (bytes == null) {
-            return null;
-        }
-        ByteArrayOutputStream baos = new ByteArrayOutputStream(bytes.length() / 2);
-        for (int i = 0; i < bytes.length(); i += 2) {
-            baos.write((HEX_STRING.indexOf(bytes.charAt(i)) << 4 | HEX_STRING.indexOf(bytes.charAt(i + 1))));
-        }
-        return new String(baos.toByteArray());
-    }
-    
-    private static File getConfigFile() throws URISyntaxException {
-        // configuration/config.ini
-        File iniFile = new File(getConfigurationFolder(), decode("636F6E6669672E696E69")); //$NON-NLS-1$
-
-        return iniFile;
-    }
-
-    private static Location getConfigLocation(BundleContext context) {
-        Filter filter = null;
-        try {
-            filter = context.createFilter(Location.CONFIGURATION_FILTER);
-        } catch (InvalidSyntaxException e) {
-            // should not happen
-        }
-        ServiceTracker configLocationTracker = new ServiceTracker(context, filter, null);
-        configLocationTracker.open();
-        try {
-            return (Location) configLocationTracker.getService();
-        } finally {
-            configLocationTracker.close();
-        }
-    }
-    
-    /**
-     * Returns the URL as a URI. This method will handle broken URLs that are not properly encoded (for example they
-     * contain unencoded space characters).
-     */
-    private static URI toURI(URL url) throws URISyntaxException {
-        // URL behaves differently across platforms so for file: URLs we parse from string form
-        if (SCHEME_FILE.equals(url.getProtocol())) {
-            String pathString = url.toExternalForm().substring(5);
-            // ensure there is a leading slash to handle common malformed URLs such as file:c:/tmp
-            if (pathString.indexOf('/') != 0)
-                pathString = '/' + pathString;
-            else if (pathString.startsWith(UNC_PREFIX) && !pathString.startsWith(UNC_PREFIX, 2)) {
-                // URL encodes UNC path with two slashes, but URI uses four (see bug 207103)
-                pathString = UNC_PREFIX + pathString;
-            }
-            return new URI(SCHEME_FILE, null, pathString, null);
-        }
-        try {
-            return new URI(url.toExternalForm());
-        } catch (URISyntaxException e) {
-            // try multi-argument URI constructor to perform encoding
-            return new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(), url.getPath(), url.getQuery(),
-                    url.getRef());
-        }
-    }
-
-    private static File toFile(URI uri) {
-        try {
-            if (!SCHEME_FILE.equalsIgnoreCase(uri.getScheme()))
-                return null;
-            // assume all illegal characters have been properly encoded, so use URI class to unencode
-            return new File(uri);
-        } catch (IllegalArgumentException e) {
-            // File constructor does not support non-hierarchical URI
-            String path = uri.getPath();
-            // path is null for non-hierarchical URI such as file:c:/tmp
-            if (path == null)
-                path = uri.getSchemeSpecificPart();
-            return new File(path);
-        }
-    }
-    
-    private static File getConfigurationFolder() {
-        BundleContext configuratorBundleContext = getCurrentBundleContext();
-        final URL url = getConfigLocation(configuratorBundleContext).getURL();
-        try {
-            return toFile(toURI(url));
-        } catch (URISyntaxException e) {
-            //
-        }
-        return null;
-    }
-    
- // always return a valid bundlesContext or throw a runtimeException
-    private static BundleContext getCurrentBundleContext() {
-        Bundle bundle = FrameworkUtil.getBundle(EclipseCommandLine.class);
-        if (bundle != null) {
-            BundleContext bundleContext = bundle.getBundleContext();
-            if (bundleContext != null) {
-                return bundleContext;
-            } else {
-                throw new RuntimeException(
-                        "could not find current BundleContext, this should never happen, check that the bunlde is activated when this class is accessed");
-            }
-        } else {
-            throw new RuntimeException(
-                    "could not find current Bundle, this should never happen, check that the bunlde is activated when this class is accessed");
-        }
-    }
-    
     /**
      * this creates or updates the org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY by adding or changing
      * the command with value, except if value is null then the command shall be removed.
@@ -330,17 +130,6 @@ public class EclipseCommandLine {
      * @param isOption this flag used to trigger for the option command without any arguments.
      */
     static public void updateOrCreateExitDataPropertyWithCommand(String command, String value, boolean delete, boolean isOption) {
-        try {
-            if (isWindows() && TALEND_ARGS.contains(command) && !isPoweredByTalend()) {
-                ExceptionHandler.logDebug("command: " + command + ", prop: " + command + ", value: " + value + ", delete: " + delete);
-                updateConfigIni(command, value, delete);
-                return;
-            }
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-       
-        
         boolean isValueNull = false;
         if (value == null || "".equals(value)) { //$NON-NLS-1$
             isValueNull = true;
@@ -394,9 +183,9 @@ public class EclipseCommandLine {
                                 + (isValueNull ? "" : value + EclipseCommandLine.NEW_LINE)
                                 + currentProperty.substring(indexOfVmArgs);
                     } else {// vmargs command not found so don't know where to set it to throw Exception
-                        currentProperty = currentProperty.substring(0, indexOfVmArgs) + command + EclipseCommandLine.NEW_LINE
-                                + (isValueNull ? "" : value + EclipseCommandLine.NEW_LINE);
-//                        throw new IllegalArgumentException("the property :" + org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY + "must constain " + EclipseCommandLine.CMD_VMARGS);
+                        throw new IllegalArgumentException("the property :"
+                                + org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY + "must constain "
+                                + EclipseCommandLine.CMD_VMARGS);
                     }
                 }
             }
@@ -465,44 +254,6 @@ public class EclipseCommandLine {
                 result.append(vmargs);
             }
         }
-        
-        String exitData = result.toString();
-        
-        ExceptionHandler.logDebug("exitData before duplicated: " + exitData);
-        
-        if (isWindows() && !isPoweredByTalend()) {
-            exitData = removeDuplicated(result).toString();
-        }
-        ExceptionHandler.logDebug("exitData: " + exitData);
-        System.setProperty(org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY, exitData);
-        
-    }
-    
-    private static StringBuilder removeDuplicated(StringBuffer sb) {
-        StringBuilder ret = new StringBuilder();
-        StringTokenizer t = new StringTokenizer(sb.toString(), EclipseCommandLine.NEW_LINE);
-        while (t.hasMoreElements()) {
-            String ele = (String) t.nextElement();
-            boolean add = true;
-            if (ele.equals("-launcher")) {
-                if (ret.indexOf(ele) > 0) {
-                    // dump value of launcher
-                    t.nextElement();
-                    add = false;
-                }
-            } else if (ele.equals(EclipseCommandLine.CMD_VMARGS)) {
-                add = false;
-                break;
-            }
-
-            if (add) {
-                ret.append(ele);
-                ret.append(EclipseCommandLine.NEW_LINE);
-            }
-
-        }
-        
-        return ret;
-
+        System.setProperty(org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY, result.toString());
     }
 }

main/plugins/org.talend.commons.ui/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.ui</artifactId>

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

@@ -1,139 +1,136 @@
-AccessorUtils.Assert0=L'attribut 'BeanPropertyAccessors' de la colonne (nomm\u00E9e '{0}' et ayant l'id '{1}') n'est pas configur\u00E9 correctement.   {2} est requis pour le bean<B>
-AccessorUtils.Assert1=L'attribut 'BeanPropertyAccessors' de la colonne (nomm\u00E9e'{0}' et ayant l'id '{1}') n'est pas configur\u00E9 correctement ou le type de la valeur affect\u00E9e n'est pas correct.
-AccessorUtils.NoClassDef=ErreurClassDefNonTrouv\u00E9e ({0})\u00A0:
-AccessorUtils.isReq=est requis pour le bean (<B>).
-AccessorUtils.isReqValue=est requis pour la valeur (<V>), mais la valeur peut \u00EAtre adapt\u00E9e avec le CellEditorValueAdapter.
-AddPushButton.AddButton.Tip=Ajouter
-AddAllPushButton.AddAllButton.Tip=Ajouter tout
-CellEditorDialogBehavior.textContent=...
-CellEditorValueAdapterFactory.valueNotStringType=La valeur du bean doit \u00EAtre une classe de type String.
-ColorStyledText.RedoItem.Text=R\u00E9p\u00E9ter
-ColorStyledText.UndoItem.Text=Annuler
-ColorStyledText.CopyItem.Text=Copier
+commons.error=ERROR
+TableViewerCreator.TableColumn.AssertMsg=La TableColumn de TableEditorColumn avec idProperty '{0}' n'a pas la bonne Table parente
 ColorStyledText.PasteItem.Text=Coller
-ColorStyledText.SelectAllItem.Text=Tout s\u00E9lectionner
-ContentProposalAdapterExtended.close=Fermer
-ContentProposalAdapterExtended.closeFocusout=fermeture de focusout
-ControlUtils.Unsupported1=Ce contr\u00F4le ({0}) n'est pas support\u00E9. Ajoutez "Case" si vous souhaitez...
-CopyPushButton.CopyButton.Tip=Copier les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
-Curve2D.MaxNum.Be0=maximumSegments doit \u00EAtre positif ou 0
+EventUtil.UnknowDetail=Valeur inconnue du d\u00E9tail de l'\u00E9v\u00E9nement \:
+ImportPushButtonForExtendedTable.ErrorMsg.Text=Une erreur est survenue
+ResetDBTypesButton.ResetDBTypesButton.Tip=Initialise les types DB
+ExportPushButtonForExtendedTable.ErrorMsg.Text=Erreur
+TableViewerCreator.IdProperty.AssertMsg=Vous devez changer l'idProperty de l'une de vos colonnes, l'idProperty doit \u00EAtre unique pour chaque colonne d'une table.
+TableViewerCreator.CallMethod.ErrorMsg=Vous ne pouvez appeler cette m\u00E9thode que si vous avez d\u00E9j\u00E0 appel\u00E9 createTable()
+ModelSelectionDialog.BuiltIn=Basculer la propri\u00E9t\u00E9 en mode Built-In.
+ExtendedTablePasteCommand.Paste.Label=Coller les donn\u00E9es du presse-papier interne
+SelectContextVariablesPushButton.Label=S\u00E9lectionne les variables du contexte
+ExtendedTableModel.ModifiedObject.Error=L'objet ModifiedBeanListenable doit \u00EAtre d\u00E9fini avant d'utiliser cette m\u00E9thode
+ImportPushButton.ImportButton.Tip=Remplacer toutes les lignes par l'import du fichier xml
+LabelledFileField.FileDialog.Text=Choissisez un
+ModelSelectionDialog.Option=Option
+ModelSelectionDialog.Update=Mettre \u00E0 jour la connexion.
+TableViewerCreator.Table.BeNull=table vide
+ModelSelectionDialog.Title=Editer les param\u00E8tres en utilisant le r\u00E9f\u00E9rentiel
+AddAllPushButton.AddAllButton.Tip=Ajoute tout
+ExtendedTableRemoveCommand.Romve.Label=Supprimer les entr\u00E9es de table
+AddPushButton.AddButton.Tip=Ajouter
+MoveDownPushButton.MoveDownTip=D\u00E9place vers le bas les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
+ExtendedTableCopyCommand.Copy.Label=Copier une ou plusieurs entr\u00E9e(s) de table dans le presse-papier interne
+ProposalUtils.CtrlProposal.ErrorMsg=La suggestion de ce type de Control n'est pas support\u00E9e :
+AccessorUtils.isReq=est requis pour le bean (<B>).
+EventUtil.UnknowType=valeur inconnue du type d'\u00E9v\u00E9nement \:
+ProposalUtils.CellProposal.Error=La suggestion de ce type de CellEditor n'est pas support\u00E9e :
+RemovePushButton.RemoveButton.Tip=Supprime les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
+FileStep2.previewFailure=Erreur de pr\u00E9visualisation. Des param\u00E8tres doivent \u00EAtre modifi\u00E9s.\nNote : les erreurs de pr\u00E9visualisation sont g\u00E9n\u00E9ralement dues \u00E0 un mauvais param\u00E8tre d'encodage.
+PastePushButton.PasteButton.Label=Coller
+ModelSelectionDialog.ViewSchema=Voir le sch\u00E9ma (lecture seule)
+LabelledFileField.BrowseButton.Text=Parcourir...
+ModelSelectionDialog.ViewQuery=Voir la requ\u00EAte (lecture seule)
+MoveUpPushButton.MoveUpButton.Tip=D\u00E9place vers le haut les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
+AccessorUtils.Assert1=L'attribut 'BeanPropertyAccessors' de la colonne (nomm\u00E9e'{0}' et ayant l'id '{1}') n'est pas configur\u00E9 correctement ou le type de la valeur affect\u00E9e n'est pas correct.
+exception.errorOccured=Une erreur est survenue ({0}). Lire le fichier de log pour plus de d\u00E9tails.
+ColorStyledText.CopyItem.Text=Copier
+AccessorUtils.Assert0=L'attribut 'BeanPropertyAccessors' de la colonne (nomm\u00E9e '{0}' et ayant l'id '{1}') n'est pas configur\u00E9 correctement. {2} est requis pour le bean 
+ExtendedTableMoveCommand.MoveLabel=D\u00E9placer vers le haut ou le bas une ou plusieurs entr\u00E9es de table
+CopyPushButton.CopyButton.Tip=Copie les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
+ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=R\u00E9initialiser tous les types de base de donn\u00E9es pour obtenir les valeurs par d\u00E9faut
+ExtendedTableAddCommand.Add.Label=Ajouter une ou plusieurs entr\u00E9e(s) de table
+ControlUtils.Unsupported1=Ce contr\u00F4le ({0}) n'est pas support\u00E9. Ajoutez "Case" si vous voulez ...
+AccessorUtils.isReqValue=est requis pour la valeur (<V>), mais la valeur peut \u00EAtre adapt\u00E9e avec le CellEditorValueAdapter.
+AccessorUtils.NoClassDef=ErreurClassDefNonTrouv\u00E9 ({0}):
+ErrorDialogWidthDetailArea.ErrorMessage.Text=Message d'erreur
+ExceptionHandler.Parameter.BeNull=le param\u00E8tre ex ne peut \u00EAtre null
+ModelSelectionDialog.Message=Choisissez une option, ou annulez
+TreeToTablesLinker.Type.Unsupported=Ce type de currentControl n'est pas support\u00E9
+Mode.Mode.ToString=Mode [{0}]
+ModifyBeanValueCommand.ModifyCell.Label=Modifier la valeur de la cellule
+ColorStyledText.SelectAllItem.Text=S\u00E9lectionner tout
+DialogErrorForCellEditorListener.Error.MsgDialogTitle=ERROR
+ExportPushButton.ExportButton.Tip=Exporte toutes les lignes dans un fichier XML
+TableViewerCreator.CellModifier.ExError=Le CellModifier courant ne supporte pas cette op\u00E9ration. Utilisez '{0}' ou une classe qui l'\u00E9tend pour cette fonction.
 Curve2D.MinNum.Be0=minimumSegments doit \u00EAtre positif ou \u00E9gal \u00E0 0
+ModeReader.IgnoreElement=Ignorer un \u00E9l\u00E9ment inconnu
+Curve2D.MaxNum.Be0=maximumSegments doit \u00EAtre positif ou nul
+CellEditorDialogBehavior.textContent=...
+CellEditorValueAdapterFactory.valueNotStringType=La valeur du Bean doit \u00EAtre une classe type String
+ColorStyledText.RedoItem.Text=R\u00E9tablir
+ColorStyledText.UndoItem.Text=Annuler
+ContentProposalAdapterExtended.close=Fermer
+ContentProposalAdapterExtended.closeFocusout=Fermeture de focusout
 DateDialog.textContent=S\u00E9lectionnez la date et l'heure
 DefaultCellModifier.tableItemDispose=TableItem effac\u00E9
-DialogErrorForCellEditorListener.Error.MsgDialogTitle=Erreur
-ErrorDialogWidthDetailArea.ErrorMessage.Text=Message d'erreur
-ErrorDialogWithContinue.setParameter=Configurer les param\u00E8tres et continuer
+ErrorDialogWithContinue.setParameter=Renseignez les param\u00E8tres et continuez
 EventUtil.activate=Activer
-EventUtil.arm=ARM
+EventUtil.arm=arme
 EventUtil.close=Fermer
 EventUtil.collapse=R\u00E9duire
 EventUtil.deactivate=D\u00E9sactiver
-EventUtil.defaultSelection=S\u00E9lection par d\u00E9faut
-EventUtil.deiconify=d\u00E9siconifier
+EventUtil.defaultSelection=s\u00E9lection par d\u00E9faut
+EventUtil.deiconify=d\u00E9-ic\u00F4nifie
 EventUtil.detailNull=Null
-EventUtil.dispose=retirer
-EventUtil.dragDetect=d\u00E9tection de glissement
-EventUtil.expand=D\u00E9velopper
-EventUtil.focusIn=activation
-EventUtil.focusOut=d\u00E9sactivation
-EventUtil.hardKeyDown=touche fl\u00E8che bas
-EventUtil.hardKeyUp=touche fl\u00E8che haut
+EventUtil.dispose=Retirer
+EventUtil.dragDetect=D\u00E9tection de glissement
+EventUtil.expand=d\u00E9velopper
+EventUtil.focusIn=Activation
+EventUtil.focusOut=D\u00E9sactivation
+EventUtil.hardKeyDown=Touche fl\u00E8che bas
+EventUtil.hardKeyUp=Touche fl\u00E8che haut
 EventUtil.help=Aide
-EventUtil.hide=masquer
+EventUtil.hide=cacher
 EventUtil.iconify=ic\u00F4nifier
-EventUtil.keyDown=fl\u00E8che bas
-EventUtil.keyUp=fl\u00E8che haut
-EventUtil.menuDetect=d\u00E9tection du menu
+EventUtil.keyDown=Fl\u00E8che bas
+EventUtil.keyUp=Fl\u00E8che haut
+EventUtil.menuDetect=D\u00E9tection du menu
 EventUtil.modify=Modifier
 EventUtil.mouseDoubleClick=double-clic
-EventUtil.mouseDown=souris bas
-EventUtil.mouseEnter=souris entr\u00E9e
-EventUtil.mouseExit=souris sortie
-EventUtil.mouseHover=survoler avec la souris
-EventUtil.mouseMove=d\u00E9placement de la souris
-EventUtil.mouseUp=souris haut
+EventUtil.mouseDown=Souris bas
+EventUtil.mouseEnter=Souris Entr\u00E9e
+EventUtil.mouseExit=Souris sortie
+EventUtil.mouseHover=Survoler avec la souris
+EventUtil.mouseMove=D\u00E9placement de la souris
+EventUtil.mouseUp=Souris haut
 EventUtil.move=D\u00E9placer
 EventUtil.paint=peint
 EventUtil.resize=redimensionner
-EventUtil.selectedEqual=S\u00C9LECTIONN\u00C9(E)
+EventUtil.selectedEqual=S\u00C9LECTIONN\u00C9
 EventUtil.selection=S\u00E9lection
 EventUtil.show=Afficher
 EventUtil.traverse=traverse
 EventUtil.typeNull=Null
-EventUtil.UnknowDetail=valeur inconnue du d\u00E9tail de l'\u00E9v\u00E9nement :
-EventUtil.UnknowType=valeur inconnue du type d'\u00E9v\u00E9nement\u00A0:
 EventUtil.verify=v\u00E9rifier
-ExceptionHandler.Parameter.BeNull=le param\u00E8tre ex ne peut \u00EAtre null
-ExceptionMessageDialog.log=log
-ExportPushButton.ExportButton.Tip=Exporte toutes les lignes dans un fichier XML
-ExportPushButtonForExtendedTable.ErrorMsg.Text=Une erreur est survenue
-ExtendedTableAddCommand.Add.Label=Ajouter une ou plusieurs entr\u00E9es dans la table
-ExtendedTableCopyCommand.Copy.Label=Copier une ou plusieurs entr\u00E9e(s) de table dans le presse-papier interne
-ExtendedTableModel.ModifiedObject.Error=L'objet ModifiedBeanListenable doit \u00EAtre d\u00E9fini avant d'utiliser cette m\u00E9thode
-ExtendedTableMoveCommand.MoveLabel=D\u00E9placer vers le haut ou le bas une ou plusieurs entr\u00E9es de table
-ExtendedTablePasteCommand.Paste.Label=Coller les donn\u00E9es du presse-papier interne
-ExtendedTableRemoveCommand.Romve.Label=Supprimer les entr\u00E9es de table
-ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=R\u00E9initialiser tous les types de base de donn\u00E9es pour obtenir les valeurs par d\u00E9faut
-ExtendedTableCaseCommand.case.Label=Passer les colonnes de base de donn\u00E9es s\u00E9lectionn\u00E9es en majuscules/minuscules
-ExtendedTableQuoteCommand.Quote.Label=Ajouter des guillemets autour des colonnes de base de donn\u00E9es s\u00E9lectionn\u00E9es
-ImportPushButton.ImportButton.Tip=Remplacer toutes les lignes par un import de fichier XML
-ImportPushButtonForExtendedTable.ErrorMsg.Text=Une erreur est survenue
-LabelledFileField.BrowseButton.Text=Parcourir...
-LabelledFileField.FileDialog.Text=S\u00E9lectionner un(e)
-Mode.Mode.ToString=Mode[{0}]
-ModeReader.IgnoreElement=Ignorer les \u00E9l\u00E9ments inconnus
-ModelSelectionDialog.Title=\u00C9diter les param\u00E8tres via le r\u00E9f\u00E9rentiel
-ModifyBeanValueCommand.ModifyCell.Label=Modifier la valeur de la cellule
-MoveDownPushButton.MoveDownTip=Descendre les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
-MoveUpPushButton.MoveUpButton.Tip=Monter les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
-PastePushButton.PasteButton.Label=Coller
-ProposalUtils.CellProposal.Error=La suggestion de ce type de CellEditor n'est pas support\u00E9e\u00A0:
-ProposalUtils.CtrlProposal.ErrorMsg=La suggestion de ce type de Control n'est pas support\u00E9e :
-RemovePushButton.RemoveButton.Tip=Supprimer les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s
-ResetDBTypesButton.ResetDBTypesButton.Tip=R\u00E9initialiser les types de bases de donn\u00E9es
+ExceptionMessageDialog.log=Fichier de log
 Rule.rule=R\u00E8gle [{0}]
-SaveAsGenericSchemaPushButton.saveAsSchema=Sauvegarder comme sch\u00E9ma g\u00E9n\u00E9rique
-SelectContextVariablesPushButton.Label=S\u00E9lectionner les variables de contexte
-SWTCalendarWithTime.contentEvening=Soir
-SWTCalendarWithTime.contentHr=Hr :
-SWTCalendarWithTime.contentMin=Min :
+SaveAsGenericSchemaPushButton.saveAsSchema=Enregistrer comme sch\u00E9ma g\u00E9n\u00E9rique
+SWTCalendarWithTime.contentEvening=Soir\u00E9e
+SWTCalendarWithTime.contentHr=Hr:
+SWTCalendarWithTime.contentMin=Min \:
 SWTCalendarWithTime.contentMorning=Matin
 SWTCalendarWithTime.contentNoon=Midi
 SWTCalendarWithTime.contentNow=Maintenant
-SWTCalendarWithTime.contnetSec=Sec :
-TableViewerCreator.CallMethod.ErrorMsg=Vous pouvez cr\u00E9er cette m\u00E9thode seulement si vous avez appel\u00E9 createTable()
-TableViewerCreator.CellModifier.ExError=Le CellModifier courant ne supporte pas cette op\u00E9ration. \n Utilisez '{0}' ou une classe qui l'\u00E9tend pour cette fonction.
-TableViewerCreator.columnNoIBeanProperty=La colonne '{0}' ('{1}') poss\u00E8de un CellEditor mais n'a pas de IBeanPropertyAccessors !
-TableViewerCreator.columnNullId=La colonne '{0}' a un ID null.
-TableViewerCreator.IdProperty.AssertMsg=Vous devez changer l'idProperty de l'une de vos colonnes, l'idProperty doit \u00EAtre unique pour chaque colonne d'une table.
-TableViewerCreator.Table.BeNull=la table est null.
-TableViewerCreator.TableColumn.AssertMsg=La TableColumn de TableEditorColumn avec idProperty '{0}' n'a pas la bonne Table parente
-TreeToTablesLinker.Type.Unsupported=Ce type de currentControl n'est pas support\u00E9
-commons.error=Erreur
-exception.errorOccured=Une erreur est survenue ({0}).\nConsultez le log pour plus de d\u00E9tails.
-ModelSelectionDialog.Message=S\u00E9lectionnez une option ou annulez.
-ModelSelectionDialog.Option=Option
-ModelSelectionDialog.BuiltIn=Basculer la propri\u00E9t\u00E9 en mode Built-In.
-ModelSelectionDialog.ViewSchema=Voir le sch\u00E9ma (lecture seule)
-ModelSelectionDialog.ViewQuery=Voir la requ\u00EAte (lecture seule).
-ModelSelectionDialog.Update=Mettre \u00E0 jour la connexion du r\u00E9f\u00E9rentiel.
-FileStep2.previewFailure=Erreur de pr\u00E9visualisation. Des param\u00E8tres doivent \u00EAtre modifi\u00E9s.\nNote\u00A0: les erreurs de pr\u00E9visualisation sont g\u00E9n\u00E9ralement dues \u00E0 un mauvais param\u00E8tre d'encodage.
+SWTCalendarWithTime.contnetSec=Sec \:
+TableViewerCreator.columnNoIBeanProperty=La colonne {0}' ('{1}') poss\u00E8de un CellEditor mais n'a pas de IBeanPropertyAccessors !
+TableViewerCreator.columnNullId=La colonne '{0}' a un id null \!
 StateComposite.FLL_DB_INFOR=Renseigner les informations de la BdD
 StateComposite.HELP_MESSAGE=Messages d'aide
 StateComposite.MESSAGE1=Il est possible de cr\u00E9er des Jobs dynamiques et de configurer un nom de fichier ou de table d\u00E9pendant de la table d'entr\u00E9e.
 StateComposite.MESSAGE2=Ceci requiert simplement l'utilisation du texte
-StateComposite.MESSAGE3= dans le nom du fichier ou de la table.
+StateComposite.MESSAGE3=\ dans le nom du fichier ou de la table.
 StateComposite.MESSAGE4=Par exemple pour une table :
 StateComposite.MESSAGE5=Par exemple pour un fichier :
-StateComposite.MESSAGE6= ou peut-\u00EAtre
+StateComposite.MESSAGE6=ou peut-\u00EAtre
 StateComposite.OUTPUT_SELECTION=S\u00E9lection de la sortie
 StateComposite.SEL_JOBNAME=D\u00E9finir le nom des Jobs
-StateComposite.STATE=\u00C9tat
+StateComposite.STATE=Etat
 StateComposite.TABLE_SELECTION=S\u00E9lection de la table
 StateComposite.TEMPLATE_SELECTION=S\u00E9lection du mod\u00E8le
-ArchiveDirectoryChooser.WizardProjectsImportPage_RootSelectTitle=S\u00E9lectionner un r\u00E9per&toire racine :
+ArchiveDirectoryChooser.WizardProjectsImportPage_RootSelectTitle=S\u00E9lectionner r\u00E9per&toire racine :
 ArchiveDirectoryChooser.DataTransfer_browse=Pa&rcourir
 ArchiveDirectoryChooser.WizardProjectsImportPage_ArchiveSelectTitle=S\u00E9lectionner fichier &archive :
-ArchiveDirectoryChooser.FileExport_selectDestinationMessage=S\u00E9lectionnez un r\u00E9pertoire vers lequel exporter.
-ArchiveDirectoryChooser.ArchiveExport_description=Exporter les ressources vers un fichier archive sur le syst\u00E8me de fichiers local.
-DisplayUtils.NotSupportedExceptionOnLinux=Linux/Unit ne supporte pas l'affichage multiple.
+ArchiveDirectoryChooser.FileExport_selectDestinationMessage=S\u00E9lectionner un r\u00E9pertoire vers lequel exporter.
+ArchiveDirectoryChooser.ArchiveExport_description=Exporter les ressources vers un fichier archive dans le syst\u00E8me de fichiers local.

main/plugins/org.talend.commons.ui/src/main/java/messages_ja.properties

@@ -1,139 +1,137 @@
-AccessorUtils.Assert0=\u3053\u306E\u30AB\u30E9\u30E0(\u30BF\u30A4\u30C8\u30EB'{0}'\u3001id '{1}')\u306E'BeanPropertyAccessors'\u306F\u6B63\u3057\u304F\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002  {2}\u306Fbean\u306B\u5FC5\u8981\u3067\u3059<B>
-AccessorUtils.Assert1=\u3053\u306E\u30AB\u30E9\u30E0(\u30BF\u30A4\u30C8\u30EB'{0}'\u3001id '{1}')\u306E'BeanPropertyAccessors'\u306F\u6B63\u3057\u304F\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u307E\u305F\u306F\u8A2D\u5B9A\u3055\u308C\u305F\u5024\u306E\u30BF\u30A4\u30D7\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093\u3002
-AccessorUtils.NoClassDef=NoClassDefFoundError ({0}):
-AccessorUtils.isReq=\u306Fbean (<B>)\u3067\u8981\u6C42\u3055\u308C\u307E\u3059\u3002
-AccessorUtils.isReqValue=\u306F\u5024(<V>)\u3067\u8981\u6C42\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u305D\u306E\u5024\u306FCellEditorValueAdapter\u3067\u9069\u5FDC\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
-AddPushButton.AddButton.Tip=\u8FFD\u52A0
+commons.error=\u30A8\u30E9\u30FC
+TableViewerCreator.TableColumn.AssertMsg=ID \u30D7\u30ED\u30D1\u30C6\u30A3'{0}'\u304C\u3042\u308BTableEditorColumn\u306E\u30C6\u30FC\u30D6\u30EB\u30AB\u30E9\u30E0\u306F\u3001\u6B63\u3057\u3044\u89AA\u30C6\u30FC\u30D6\u30EB\u3092\u6301\u3063\u3066\u3044\u307E\u305B\u3093\u3002
+ColorStyledText.PasteItem.Text=\u8CBC\u4ED8\u3051
+EventUtil.UnknowDetail=\u30A4\u30D9\u30F3\u30C8\u8A73\u7D30\u306E\u4E0D\u660E\u306A???\u5024 :
+ImportPushButtonForExtendedTable.ErrorMsg.Text=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+ResetDBTypesButton.ResetDBTypesButton.Tip=DB\u30BF\u30A4\u30D7\u306E\u30EA\u30BB\u30C3\u30C8
+ExportPushButtonForExtendedTable.ErrorMsg.Text=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+TableViewerCreator.IdProperty.AssertMsg=\u30AB\u30E9\u30E0\u306EidProperty\u306E\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3001idProperty\u306F\uFF11\u3064\u306E\u30C6\u30FC\u30D6\u30EB\u3067\u30E6\u30CB\u30FC\u30AF\u3067\u306A\u304F\u3066\u306F\u306A\u308A\u307E\u305B\u3093\u3002
+TableViewerCreator.CallMethod.ErrorMsg=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u3001\u65E2\u306B createTable() \u3092\u547C\u3073\u51FA\u3057\u6E08\u307F\u306E\u5834\u5408\u3060\u3051\u547C\u3073\u51FA\u305B\u307E\u3059
+ModelSelectionDialog.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u5909\u66F4
+ExtendedTablePasteCommand.Paste.Label=\u5185\u90E8\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u304B\u3089\u30C7\u30FC\u30BF\u306E\u8CBC\u308A\u4ED8\u3051
+SelectContextVariablesPushButton.Label=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u9078\u629E
+ExtendedTableModel.ModifiedObject.Error=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u524D\u306BModifiedBeanListenable\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093\u3002
+ImportPushButton.ImportButton.Tip=\u3059\u3079\u3066\u306E\u884C\u3092xml\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u7F6E\u63DB\u3048
+LabelledFileField.FileDialog.Text=\u9078\u629E
+ModelSelectionDialog.Option=\u30AA\u30D7\u30B7\u30E7\u30F3
+ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u63A5\u7D9A\u306E\u66F4\u65B0\u3002
+TableViewerCreator.Table.BeNull=\u30C6\u30FC\u30D6\u30EB\u304Cnull\u3067\u3059
+ModelSelectionDialog.Title=\u30EA\u30DD\u30B8\u30C8\u30EA\u3092\u4F7F\u7528\u3057\u3066\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u7DE8\u96C6
 AddAllPushButton.AddAllButton.Tip=\u3059\u3079\u3066\u8FFD\u52A0
-CellEditorDialogBehavior.textContent=...
-CellEditorValueAdapterFactory.valueNotStringType=Bean\u5024\u306F\u6587\u5B57\u5217\u30BF\u30A4\u30D7\u306E\u30AF\u30E9\u30B9\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-ColorStyledText.RedoItem.Text=\u3084\u308A\u76F4\u3057
-ColorStyledText.UndoItem.Text=\u5143\u306B\u623B\u3059
+ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u306E\u524A\u9664
+AddPushButton.AddButton.Tip=\u8FFD\u52A0
+MoveDownPushButton.MoveDownTip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u4E0B\u306B\u79FB\u52D5
+ExtendedTableCopyCommand.Copy.Label=\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u306B\uFF11\u3064\u4EE5\u4E0A\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u30B3\u30D4\u30FC
+ProposalUtils.CtrlProposal.ErrorMsg=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5236\u5FA1\u3092\u63D0\u6848\u3059\u308B\u3053\u3068\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093:
+AccessorUtils.isReq=\u306Fbean (<B>) \u3067\u8981\u6C42\u3055\u308C\u307E\u3059\u3002
+EventUtil.UnknowType=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7\u306E\u4E0D\u660E\u306A???\u5024 :
+ProposalUtils.CellProposal.Error=CellEditor\u306E\u3053\u306E\u30BF\u30A4\u30D7\u306E\u63D0\u6848\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093 :
+RemovePushButton.RemoveButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u306E\u524A\u9664
+FileStep2.previewFailure=\u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u3002\u3044\u304F\u3064\u304B\u306E\u8A2D\u5B9A\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3002\\n\u6CE8: \u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u306F\u4E00\u822C\u306B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u306E\u8AA4\u308A\u304C\u539F\u56E0\u3067\u3059\u3002
+PastePushButton.PasteButton.Label=\u8CBC\u4ED8\u3051
+ModelSelectionDialog.ViewSchema=\u30B9\u30AD\u30FC\u30DE\u306E\u53C2\u7167\uFF08\u8AAD\u8FBC\u306E\u307F\uFF09
+LabelledFileField.BrowseButton.Text=\u53C2\u7167...
+ModelSelectionDialog.ViewQuery=\u30AF\u30A8\u30EA\u306E\u8868\u793A\uFF08\u8AAD\u307F\u53D6\u308A\u5C02\u7528\uFF09\u3002
+MoveUpPushButton.MoveUpButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u4E0A\u306B\u79FB\u52D5
+AccessorUtils.Assert1=\u3053\u306E\u30AB\u30E9\u30E0\uFF08\u30BF\u30A4\u30C8\u30EB '{0}' \u3001id '{1}'\uFF09\u306EBeanPropertyAccessors\u306F\u6B63\u3057\u304F\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u304B\u3001\u5024\u30BB\u30C3\u30C8\u306E\u578B\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093\u3002
+exception.errorOccured=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF08{0}\uFF09\\n\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ColorStyledText.CopyItem.Text=\u30B3\u30D4\u30FC
-ColorStyledText.PasteItem.Text=\u8CBC\u308A\u4ED8\u3051
-ColorStyledText.SelectAllItem.Text=\u3059\u3079\u3066\u9078\u629E
-ContentProposalAdapterExtended.close=\u9589\u3058\u308B
-ContentProposalAdapterExtended.closeFocusout=\u30D5\u30A9\u30FC\u30AB\u30B9\u30A2\u30A6\u30C8\u3092\u9589\u3058\u308B
-ControlUtils.Unsupported1=\u3053\u306E\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB({0})\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5FC5\u8981\u3067\u3042\u308C\u3070\u3001\u30B1\u30FC\u30B9\u3092\u8FFD\u52A0\u3057\u3066\u304F\u3060\u3055\u3044...
-CopyPushButton.CopyButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u30B3\u30D4\u30FC
-Curve2D.MaxNum.Be0=maximumSegments\u306F\u6B63\u6570\u304B0\u306B\u3057\u3066\u304F\u3060\u3055\u3044
-Curve2D.MinNum.Be0=minimumSegments\u306F\u6B63\u307E\u305F\u306F0\u306B\u3057\u3066\u304F\u3060\u3055\u3044
-DateDialog.textContent=\u65E5\u6642\u3092\u9078\u629E
-DefaultCellModifier.tableItemDispose=\u7834\u68C4\u3055\u308C\u305F\u30C6\u30FC\u30D6\u30EB\u30A2\u30A4\u30C6\u30E0
-DialogErrorForCellEditorListener.Error.MsgDialogTitle=\u30A8\u30E9\u30FC
+AccessorUtils.Assert0=\u3053\u306E\u30AB\u30E9\u30E0 (\u30BF\u30A4\u30C8\u30EB '{0}' \u3001id '{1}') \u306E BeanPropertyAccessors\u306F\u6B63\u3057\u304F\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002{2}\u306Fbean <B>\u304C\u5FC5\u8981\u3068\u3057\u307E\u3059\u3002
+ExtendedTableMoveCommand.MoveLabel=\uFF11\u3064\u307E\u305F\u306F\u305D\u308C\u4EE5\u4E0A\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u306E\u4E0A\u4E0B\u79FB\u52D5
+CopyPushButton.CopyButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u306E\u30B3\u30D4\u30FC
+ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3092\u53D6\u5F97\u3059\u308B\u305F\u3081\u306B\u5168\u3066\u306EDB\u30BF\u30A4\u30D7\u3092\u30EA\u30BB\u30C3\u30C8
+ExtendedTableAddCommand.Add.Label=\uFF11\u3064\u307E\u305F\u306F\u305D\u308C\u4EE5\u4E0A\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u306E\u8FFD\u52A0
+ControlUtils.Unsupported1=\u3053\u306E\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB({0}) \u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3001\u5FC5\u8981\u3067\u3042\u308C\u3070\u30B1\u30FC\u30B9\u3092\u8FFD\u52A0\u3057\u3066\u304F\u3060\u3055\u3044...
+AccessorUtils.isReqValue=\u306F\u5024 (<V>) \u3067\u8981\u6C42\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u305D\u306E\u5024\u306F CellEditorValueAdapter \u3067\u9069\u5FDC\u3055\u305B\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
+AccessorUtils.NoClassDef=NoClassDefFoundError ({0}):
 ErrorDialogWidthDetailArea.ErrorMessage.Text=\u30A8\u30E9\u30FC\u30E1\u30C3\u30BB\u30FC\u30B8
-ErrorDialogWithContinue.setParameter=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u8A2D\u5B9A\u3057\u3066\u7D9A\u884C
-EventUtil.activate=\u6709\u52B9\u5316
-EventUtil.arm=arm
+ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u51FA\u6765\u307E\u305B\u3093
+ModelSelectionDialog.Message=\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\uFF11\u3064\u9078\u629E\u3059\u308B\u304B\u3001\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+TreeToTablesLinker.Type.Unsupported=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u30AB\u30EC\u30F3\u30C8\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+Mode.Mode.ToString=\u30E2\u30FC\u30C9 [{0}]
+ModifyBeanValueCommand.ModifyCell.Label=\u30BB\u30EB\u5024\u306E\u5909\u66F4
+ColorStyledText.SelectAllItem.Text=\u3059\u3079\u3066\u9078\u629E
+DialogErrorForCellEditorListener.Error.MsgDialogTitle=\u30A8\u30E9\u30FC
+ExportPushButton.ExportButton.Tip=\u3059\u3079\u3066\u306E\u884C\u3092XML\u30D5\u30A1\u30A4\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
+TableViewerCreator.CellModifier.ExError=\u73FE\u5728\u306ECellModifier\u306F\u3053\u306E\u64CD\u4F5C\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002'{0}'\u3092\u4F7F\u7528\u3059\u308B\u304B\u3001\u62E1\u5F35\u3057\u3066\u3053\u306E\u30D5\u30A3\u30FC\u30C1\u30E3\u30FC\u3092\u4F7F\u7528\u3067\u304D\u308B\u3088\u3046\u306B\u3059\u308B\u30AF\u30E9\u30B9\u3092\u4F7F\u7528\u3057\u307E\u3059
+Curve2D.MinNum.Be0=minimumSegments\u306F\u6B63\u307E\u305F\u306F0\u306B\u3057\u3066\u304F\u3060\u3055\u3044
+ModeReader.IgnoreElement=\u4E0D\u660E\u306A\u8981\u7D20\u3092\u7121\u8996
+Curve2D.MaxNum.Be0=maximumSegments\u306F\u6B63\u307E\u305F\u306F0\u306B\u3057\u3066\u304F\u3060\u3055\u3044
+CellEditorDialogBehavior.textContent=...
+CellEditorValueAdapterFactory.valueNotStringType=Bean\u306E\u5024\u306FString\u578B\u306E\u30AF\u30E9\u30B9\u3067\u306A\u304F\u3066\u306F\u306A\u308A\u307E\u305B\u3093\u3002
+ColorStyledText.RedoItem.Text=\u3084\u308A\u76F4\u3059
+ColorStyledText.UndoItem.Text=\u5143\u306B\u623B\u3059
+ContentProposalAdapterExtended.close=\u9589\u3058\u308B
+ContentProposalAdapterExtended.closeFocusout=Focusout\u3092\u9589\u3058\u308B
+DateDialog.textContent=\u65E5\u4ED8\u3068\u6642\u9593\u306E\u9078\u629E
+DefaultCellModifier.tableItemDispose=\u7834\u68C4\u3055\u308C\u305F\u30C6\u30FC\u30D6\u30EB\u9805\u76EE
+ErrorDialogWithContinue.setParameter=\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u8A2D\u5B9A\u3057\u3066\u7D99\u7D9A
+EventUtil.activate=\u30A2\u30AF\u30C6\u30A3\u30D6\u5316
+EventUtil.arm=\u906E\u65AD
 EventUtil.close=\u9589\u3058\u308B
-EventUtil.collapse=\u6298\u308A\u7573\u3080
-EventUtil.deactivate=\u7121\u52B9\u5316
+EventUtil.collapse=\u6298\u308A\u305F\u305F\u3080
+EventUtil.deactivate=\u975E\u30A2\u30AF\u30C6\u30A3\u30D6\u5316
 EventUtil.defaultSelection=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u9078\u629E
 EventUtil.deiconify=\u975E\u30A2\u30A4\u30B3\u30F3\u5316
-EventUtil.detailNull=NULL
+EventUtil.detailNull=Null
 EventUtil.dispose=\u7834\u68C4
-EventUtil.dragDetect=\u30C9\u30E9\u30C3\u30B0\u691C\u51FA
-EventUtil.expand=\u5C55\u958B
-EventUtil.focusIn=\u30D5\u30A9\u30FC\u30AB\u30B9\u30A4\u30F3
-EventUtil.focusOut=\u30D5\u30A9\u30FC\u30AB\u30B9\u30A2\u30A6\u30C8
-EventUtil.hardKeyDown=\u30CF\u30FC\u30C9\u30AD\u30FC\u30C0\u30A6\u30F3
-EventUtil.hardKeyUp=\u30CF\u30FC\u30C9\u30AD\u30FC\u30A2\u30C3\u30D7
+EventUtil.dragDetect=\u30C9\u30E9\u30C3\u30B0\u306E\u691C\u77E5
+EventUtil.expand=\u5C55\u958B\u3059\u308B
+EventUtil.focusIn=\u30D5\u30A9\u30FC\u30AB\u30B9\u3092\u3042\u3066\u308B
+EventUtil.focusOut=\u30D5\u30A9\u30FC\u30AB\u30B9\u3092\u5916\u3059
+EventUtil.hardKeyDown=\u30AD\u30FC\u30C0\u30A6\u30F3
+EventUtil.hardKeyUp=\u30AD\u30FC\u30A2\u30C3\u30D7
 EventUtil.help=\u30D8\u30EB\u30D7
-EventUtil.hide=\u975E\u8868\u793A
+EventUtil.hide=\u96A0\u3059
 EventUtil.iconify=\u30A2\u30A4\u30B3\u30F3\u5316
 EventUtil.keyDown=\u30AD\u30FC\u30C0\u30A6\u30F3
 EventUtil.keyUp=\u30AD\u30FC\u30A2\u30C3\u30D7
-EventUtil.menuDetect=\u30E1\u30CB\u30E5\u30FC\u691C\u51FA
+EventUtil.menuDetect=\u30E1\u30CB\u30E5\u30FC\u691C\u77E5
 EventUtil.modify=\u5909\u66F4
 EventUtil.mouseDoubleClick=\u30DE\u30A6\u30B9\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF
 EventUtil.mouseDown=\u30DE\u30A6\u30B9\u30C0\u30A6\u30F3
 EventUtil.mouseEnter=\u30DE\u30A6\u30B9\u30A8\u30F3\u30BF\u30FC
-EventUtil.mouseExit=\u30DE\u30A6\u30B9\u7D42\u4E86
+EventUtil.mouseExit=\u30DE\u30A6\u30B9\u30A4\u30B0\u30B8\u30C3\u30C8
 EventUtil.mouseHover=\u30DE\u30A6\u30B9\u30DB\u30D0\u30FC
-EventUtil.mouseMove=\u30DE\u30A6\u30B9\u79FB\u52D5
+EventUtil.mouseMove=\u30DE\u30A6\u30B9\u306E\u79FB\u52D5
 EventUtil.mouseUp=\u30DE\u30A6\u30B9\u30A2\u30C3\u30D7
 EventUtil.move=\u79FB\u52D5
 EventUtil.paint=\u30DA\u30A4\u30F3\u30C8
-EventUtil.resize=\u30B5\u30A4\u30BA\u5909\u66F4
-EventUtil.selectedEqual=\u9078\u629E\u6E08\u307F
+EventUtil.resize=\u30EA\u30B5\u30A4\u30BA
+EventUtil.selectedEqual=\u9078\u629E\u3055\u308C\u305F
 EventUtil.selection=\u9078\u629E
 EventUtil.show=\u8868\u793A
 EventUtil.traverse=\u30C8\u30E9\u30D0\u30FC\u30B9
-EventUtil.typeNull=NULL
-EventUtil.UnknowDetail=\u30A4\u30D9\u30F3\u30C8\u8A73\u7D30\u306E\u4E0D\u660E\u306A???\u5024:
-EventUtil.UnknowType=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7\u306E\u4E0D\u660E\u306A???\u5024:
+EventUtil.typeNull=Null
 EventUtil.verify=\u78BA\u8A8D
-ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u51FA\u6765\u307E\u305B\u3093
 ExceptionMessageDialog.log=\u30ED\u30B0
-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
-ExtendedTableAddCommand.Add.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u8FFD\u52A0
-ExtendedTableCopyCommand.Copy.Label=\u5185\u90E8\u30AF\u30EA\u30FC\u30F3\u30DC\u30FC\u30C9\u306B\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u30B3\u30D4\u30FC
-ExtendedTableModel.ModifiedObject.Error=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u524D\u306BModifiedBeanListenable\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-ExtendedTableMoveCommand.MoveLabel=\u8907\u6570\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u4E0A\u4E0B\u306B\u79FB\u52D5
-ExtendedTablePasteCommand.Paste.Label=\u5185\u90E8\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u304B\u3089\u30C7\u30FC\u30BF\u3092\u8CBC\u308A\u4ED8\u3051\u308B
-ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664
-ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=DB\u30BF\u30A4\u30D7\u3092\u3059\u3079\u3066\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u53D6\u5F97
-ExtendedTableCaseCommand.case.Label=\u9078\u629E\u3055\u308C\u305FDB\u30AB\u30E9\u30E0\u3092\u5927\u6587\u5B57/\u5C0F\u6587\u5B57\u306B\u5909\u66F4
-ExtendedTableQuoteCommand.Quote.Label=\u9078\u629E\u3055\u308C\u305FDB\u30AB\u30E9\u30E0\u3092\u56F2\u3080
-ImportPushButton.ImportButton.Tip=\u884C\u3092\u3059\u3079\u3066XML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u7F6E\u63DB
-ImportPushButtonForExtendedTable.ErrorMsg.Text=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-LabelledFileField.BrowseButton.Text=\u53C2\u7167...
-LabelledFileField.FileDialog.Text=\u9078\u629E
-Mode.Mode.ToString=\u30E2\u30FC\u30C9[{0}]
-ModeReader.IgnoreElement=\u4E0D\u660E\u30A8\u30EC\u30E1\u30F3\u30C8\u3092\u7121\u8996
-ModelSelectionDialog.Title=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3092\u4F7F\u3063\u3066\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u7DE8\u96C6
-ModifyBeanValueCommand.ModifyCell.Label=\u30BB\u30EB\u5024\u3092\u5909\u66F4
-MoveDownPushButton.MoveDownTip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u4E0B\u306B\u79FB\u52D5
-MoveUpPushButton.MoveUpButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u4E0A\u306B\u79FB\u52D5
-PastePushButton.PasteButton.Label=\u8CBC\u308A\u4ED8\u3051
-ProposalUtils.CellProposal.Error=CellEditor\u306E\u3053\u306E\u30BF\u30A4\u30D7\u306E\u63D0\u6848\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093:
-ProposalUtils.CtrlProposal.ErrorMsg=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5236\u5FA1\u3092\u63D0\u6848\u3059\u308B\u3053\u3068\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093:
-RemovePushButton.RemoveButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u524A\u9664
-ResetDBTypesButton.ResetDBTypesButton.Tip=DB\u30BF\u30A4\u30D7\u3092\u30EA\u30BB\u30C3\u30C8
-Rule.rule=\u30EB\u30FC\u30EB[{0}]
+Rule.rule=\u30EB\u30FC\u30EB [{0}]
 SaveAsGenericSchemaPushButton.saveAsSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
-SelectContextVariablesPushButton.Label=\u30B3\u30F3\u30C6\u30AF\u30B9\u30C8\u5909\u6570\u3092\u9078\u629E
-SWTCalendarWithTime.contentEvening=\u5915\u65B9
-SWTCalendarWithTime.contentHr=\u6642:
-SWTCalendarWithTime.contentMin=\u5206:
+SWTCalendarWithTime.contentEvening=\u5348\u5F8C
+SWTCalendarWithTime.contentHr=\u6642 :
+SWTCalendarWithTime.contentMin=\u5206 :
 SWTCalendarWithTime.contentMorning=\u5348\u524D
-SWTCalendarWithTime.contentNoon=\u5348\u5F8C
+SWTCalendarWithTime.contentNoon=\u6B63\u5348
 SWTCalendarWithTime.contentNow=\u73FE\u5728
-SWTCalendarWithTime.contnetSec=\u79D2:
-TableViewerCreator.CallMethod.ErrorMsg=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u3001createTable()\u3092\u65E2\u306B\u547C\u3073\u51FA\u3057\u3066\u3044\u308B\u5834\u5408\u306E\u307F\u547C\u3073\u51FA\u305B\u307E\u3059
-TableViewerCreator.CellModifier.ExError=\u73FE\u5728\u306ECellModifier\u306F\u3053\u306E\u64CD\u4F5C\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002\n\u3053\u306E\u6A5F\u80FD\u3092\u4F7F\u3046\u306B\u306F\u3001'{0}'\u304B\u62E1\u5F35\u30AF\u30E9\u30B9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
-TableViewerCreator.columnNoIBeanProperty=\u30AB\u30E9\u30E0'{0}' ('{1}')\u306B\u306FCellEditor\u30BB\u30C3\u30C8\u304C\u3042\u308A\u307E\u3059\u304C\u3001IBeanPropertyAccessors\u304C\u3042\u308A\u307E\u305B\u3093!
-TableViewerCreator.columnNullId=\u30AB\u30E9\u30E0'{0}'\u304Cnull\u3067\u3059\uFF01
-TableViewerCreator.IdProperty.AssertMsg=\u30AB\u30E9\u30E0\u306EidProperty\u306E\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3001idProperty\u306F\uFF11\u3064\u306E\u30C6\u30FC\u30D6\u30EB\u3067\u30E6\u30CB\u30FC\u30AF\u3067\u306A\u304F\u3066\u306F\u306A\u308A\u307E\u305B\u3093\u3002
-TableViewerCreator.Table.BeNull=\u30C6\u30FC\u30D6\u30EB\u304CNULL\u3067\u3059
-TableViewerCreator.TableColumn.AssertMsg=idProperty'{0}'\u304C\u3042\u308BTableEditorColumn\u306ETableColumn\u306B\u306F\u3001\u6B63\u3057\u3044\u89AA\u30C6\u30FC\u30D6\u30EB\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093
-TreeToTablesLinker.Type.Unsupported=currentControl\u306E\u3053\u306E\u30BF\u30A4\u30D7\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-commons.error=\u30A8\u30E9\u30FC
-exception.errorOccured=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002\n\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-ModelSelectionDialog.Message=\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\uFF11\u3064\u9078\u629E\u3059\u308B\u304B\u3001\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-ModelSelectionDialog.Option=\u30AA\u30D7\u30B7\u30E7\u30F3
-ModelSelectionDialog.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u5909\u66F4\u3057\u307E\u3059\u3002
-ModelSelectionDialog.ViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
-ModelSelectionDialog.ViewQuery=\u30AF\u30A8\u30EA\u30FC\u3046\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
-ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002
-FileStep2.previewFailure=\u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u3002\u3044\u304F\u3064\u304B\u306E\u8A2D\u5B9A\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3002\n\u6CE8: \u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u306F\u4E00\u822C\u306B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u306E\u8AA4\u308A\u304C\u539F\u56E0\u3067\u3059\u3002
-StateComposite.FLL_DB_INFOR=DB\u60C5\u5831\u3092\u5165\u529B
+SWTCalendarWithTime.contnetSec=\u79D2 :
+TableViewerCreator.columnNoIBeanProperty=\u30AB\u30E9\u30E0'{0}' ('{1}')\u306B\u306FCellEditor\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001IBeanPropertyAccessors\u306F\u3042\u308A\u307E\u305B\u3093!
+TableViewerCreator.columnNullId=\u30AB\u30E9\u30E0\'{0}\'\u304Cnull\u3067\u3059\uFF01
+StateComposite.FLL_DB_INFOR=DB\u60C5\u5831\u306E\u5165\u529B
 StateComposite.HELP_MESSAGE=\u30D8\u30EB\u30D7\u30E1\u30C3\u30BB\u30FC\u30B8
-StateComposite.MESSAGE1=\u30C0\u30A4\u30CA\u30DF\u30C3\u30AF\u30B8\u30E7\u30D6\u3092\u8A2D\u5B9A\u3057\u3066\u3001\u5165\u529B\u30C6\u30FC\u30D6\u30EB\u306B\u4F9D\u5B58\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u540D\u307E\u305F\u306F\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u3059\u3002
-StateComposite.MESSAGE2=\u884C\u3046\u306B\u306F\u3001\u30D5\u30A1\u30A4\u30EB\u540D\u307E\u305F\u306F\u30C6\u30FC\u30D6\u30EB\u540D\u5185\u306B\u3042\u308B\u30C6\u30AD\u30B9\u30C8\u306E\u4F7F\u7528\u306E\u307F\u304C\u5FC5\u8981\u3067\u3059
-StateComposite.MESSAGE3= \u3002
-StateComposite.MESSAGE4=\u30C6\u30FC\u30D6\u30EB\u306E\u4F8B:
-StateComposite.MESSAGE5=\u30D5\u30A1\u30A4\u30EB\u306E\u4F8B:
-StateComposite.MESSAGE6= or maybe
+StateComposite.MESSAGE1=\u52D5\u7684\u30B8\u30E7\u30D6\u3092\u4F5C\u6210\u3057\u3001\u30D5\u30A1\u30A4\u30EB\u540D\u3084\u30C6\u30FC\u30D6\u30EB\u3092\u8A2D\u5B9A\u3059\u308B\u3053\u3068\u306F\u53EF\u80FD\u3067\u3059...
+StateComposite.MESSAGE2=\u3053\u308C\u306B\u3064\u3044\u3066\u306F\u3001\u30C6\u30AD\u30B9\u30C8\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
+StateComposite.MESSAGE3=\u30D5\u30A1\u30A4\u30EB\u540D\u3001\u307E\u305F\u306F\u30C6\u30FC\u30D6\u30EB\u540D\u306B
+StateComposite.MESSAGE4=\u4F8B\u3000\u30C6\u30FC\u30D6\u30EB:
+StateComposite.MESSAGE5=\u4F8B\u3000\u30D5\u30A1\u30A4\u30EB:
+StateComposite.MESSAGE6=\ \u304A\u305D\u3089\u304F
 StateComposite.OUTPUT_SELECTION=\u51FA\u529B\u9078\u629E
-StateComposite.SEL_JOBNAME=\u30B8\u30E7\u30D6\u540D\u3092\u8A2D\u5B9A
-StateComposite.STATE=\u5DDE
+StateComposite.SEL_JOBNAME=\u30B8\u30E7\u30D6\u540D\u306E\u8A2D\u5B9A
+StateComposite.STATE=\u72B6\u614B
 StateComposite.TABLE_SELECTION=\u30C6\u30FC\u30D6\u30EB\u9078\u629E
 StateComposite.TEMPLATE_SELECTION=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u9078\u629E
-ArchiveDirectoryChooser.WizardProjectsImportPage_RootSelectTitle=\u30EB\u30FC\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u3092\u9078\u629E(&T)
-ArchiveDirectoryChooser.DataTransfer_browse=\u53C2\u7167(&R)...
-ArchiveDirectoryChooser.WizardProjectsImportPage_ArchiveSelectTitle=\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E(&A):
-ArchiveDirectoryChooser.FileExport_selectDestinationMessage=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u3092\u9078\u629E\u3057\u307E\u3059\u3002
-ArchiveDirectoryChooser.ArchiveExport_description=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u4E0A\u306E\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u306B\u30EA\u30BD\u30FC\u30B9\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002
+ArchiveDirectoryChooser.WizardProjectsImportPage_RootSelectTitle=\u30EB\u30FC&\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u9078\u629E:
+ArchiveDirectoryChooser.DataTransfer_browse=\u53C2&\u7167...
+ArchiveDirectoryChooser.WizardProjectsImportPage_ArchiveSelectTitle=&\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u306E\u9078\u629E:
+ArchiveDirectoryChooser.FileExport_selectDestinationMessage=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u9078\u629E
+ArchiveDirectoryChooser.ArchiveExport_description=\u30EA\u30BD\u30FC\u30B9\u3092\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u4E0A\u306E\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002
 DisplayUtils.NotSupportedExceptionOnLinux=Linux/Unit\u3067\u306F\u30DE\u30EB\u30C1\u30C7\u30A3\u30B9\u30D7\u30EC\u30A4\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002

main/plugins/org.talend.commons.ui/src/main/java/messages_zh_CN.properties

@@ -1,27 +1,70 @@
-AccessorUtils.Assert0=\u672A\u6B63\u786E\u914D\u7F6E\u5217 (\u6807\u9898\u4E3A '{0}'\uFF0CID \u4E3A '{1}') \u7684 'BeanPropertyAccessors'\u3002  {2} \u662F bean \u6240\u5FC5\u9700\u7684<B>
-AccessorUtils.Assert1=\u8FD9\u4E2A\u5217 (\u6807\u9898\u4E3A '{0}'\uFF0CID \u4E3A '{1}') \u7684\u201CBeanPropertyAccessors\u201D\u6CA1\u6709\u6B63\u786E\u914D\u7F6E\uFF0C\u6216\u8005\u503C\u8BBE\u7F6E\u4E3A\u4E0D\u6B63\u786E\u7684\u7C7B\u578B\u3002
-AccessorUtils.NoClassDef=NoClassDefFoundError ({0}):
-AccessorUtils.isReq= \u662F bean (<B>) \u6240\u5FC5\u9700\u7684\u3002
-AccessorUtils.isReqValue=\u662F\u503C (<V>) \u6240\u5FC5\u9700\u7684\uFF0C\u4F46\u8BE5\u503C\u53EF\u4F7F\u7528 CellEditorValueAdapter \u6765\u8C03\u6574\u3002
-AddPushButton.AddButton.Tip=\u6DFB\u52A0
+commons.error=\u9519\u8BEF
+TableViewerCreator.TableColumn.AssertMsg=TableEditorColumn \u7684 idProperty \u4E3A \'{0}\' \u7684 TableColumn \u6CA1\u6709\u6B63\u786E\u7684 Table \u7236\u9879
+ColorStyledText.PasteItem.Text=\u7C98\u8D34
+EventUtil.UnknowDetail=\u672A\u77E5\u4E8B\u4EF6\u8BE6\u7EC6\u4FE1\u606F\u503C ???\uFF1A
+ImportPushButtonForExtendedTable.ErrorMsg.Text=\u51FA\u9519
+ResetDBTypesButton.ResetDBTypesButton.Tip=\u91CD\u7F6E\u6240\u6709\u6570\u636E\u5E93\u7C7B\u578B
+ExportPushButtonForExtendedTable.ErrorMsg.Text=\u51FA\u9519\uFF01
+TableViewerCreator.IdProperty.AssertMsg=\u4F60\u5FC5\u987B\u6539\u53D8\u5176\u4E2D\u4E00\u4E2A\u5217\u7684 idProperty\uFF0C\u4E00\u4E2A\u8868\u4E2D\u7684\u6BCF\u4E2A\u5217\u7684 idProperty \u5FC5\u987B\u552F\u4E00\u3002
+TableViewerCreator.CallMethod.ErrorMsg=\u53EA\u6709\u60A8\u5DF2\u7ECF\u8C03\u7528\u4E86 createTable() \u65B9\u6CD5\u540E\uFF0C\u624D\u80FD\u8C03\u7528\u6B64\u65B9\u6CD5\u3002
+ModelSelectionDialog.BuiltIn=\u66F4\u6539\u4E3A\u5185\u7F6E\u5C5E\u6027\u3002
+ExtendedTablePasteCommand.Paste.Label=\u4ECE\u5185\u90E8\u526A\u8D34\u677F\u7C98\u8D34\u6570\u636E
+SelectContextVariablesPushButton.Label=\u9009\u62E9\u4E0A\u4E0B\u6587\u53D8\u91CF
+ExtendedTableModel.ModifiedObject.Error=ModifiedBeanListenable \u5BF9\u8C61\u5FC5\u987B\u5728\u4F7F\u7528\u6B64\u65B9\u6CD5\u4E4B\u524D\u8BBE\u7F6E
+ImportPushButton.ImportButton.Tip=\u5BFC\u5165 XML \u6587\u4EF6\u66FF\u6362\u6240\u6709\u884C
+LabelledFileField.FileDialog.Text=\u9009\u62E9\u4E00\u4E2A
+ModelSelectionDialog.Option=\u9009\u9879
+ModelSelectionDialog.Update=\u66F4\u65B0\u5B58\u50A8\u5E93\u8FDE\u63A5\u3002
+TableViewerCreator.Table.BeNull=\u8868\u4E3A null
+ModelSelectionDialog.Title=\u4F7F\u7528\u5B58\u50A8\u5E93\u7F16\u8F91\u53C2\u6570
 AddAllPushButton.AddAllButton.Tip=\u6DFB\u52A0\u6240\u6709
+ExtendedTableRemoveCommand.Romve.Label=\u79FB\u9664\u8868\u6761\u76EE
+AddPushButton.AddButton.Tip=\u6DFB\u52A0
+MoveDownPushButton.MoveDownTip=\u5411\u4E0B\u79FB\u52A8\u9009\u4E2D\u9879
+ExtendedTableCopyCommand.Copy.Label=\u590D\u5236\u5185\u90E8\u526A\u8D34\u677F\u4E2D\u7684\u4E00\u4E2A\u6216\u591A\u4E2A\u8868\u6761\u76EE\u3002
+ProposalUtils.CtrlProposal.ErrorMsg=\u63A7\u952E\u7C7B\u578B\u63D0\u793A\u4E0D\u88AB\u652F\u6301\uFF1A
+AccessorUtils.isReq=\u662F bean (<B>) \u6240\u5FC5\u9700\u7684\u3002
+EventUtil.UnknowType=\u672A\u77E5\u7684\u65F6\u95F4\u7C7B\u578B\uFF1A
+ProposalUtils.CellProposal.Error=CellEditor\u7C7B\u578B\u63D0\u793A\u4E0D\u88AB\u652F\u6301\uFF1A
+RemovePushButton.RemoveButton.Tip=\u79FB\u9664\u6240\u9009\u9879
+FileStep2.previewFailure=\u9884\u89C8\u9519\u8BEF\u3002\u987B\u6539\u53D8\u4E00\u4E9B\u8BBE\u7F6E\u3002\\n\u6CE8\u610F\uFF1A\u9884\u89C8\u9519\u8BEF\u53EF\u80FD\u662F\u56E0\u4E3A\u9519\u8BEF\u7684\u7F16\u7801\u8BBE\u7F6E\u9020\u6210\u7684\u3002
+PastePushButton.PasteButton.Label=\u7C98\u8D34
+ModelSelectionDialog.ViewSchema=\u67E5\u770B schema (\u53EA\u8BFB)\u3002
+LabelledFileField.BrowseButton.Text=\u6D4F\u89C8...
+ModelSelectionDialog.ViewQuery=\u67E5\u770B\u67E5\u8BE2 (\u53EA\u8BFB)\u3002
+MoveUpPushButton.MoveUpButton.Tip=\u5411\u4E0A\u79FB\u52A8\u9009\u4E2D\u9879
+AccessorUtils.Assert1=\u8FD9\u4E2A\u5217 (\u6807\u9898\u4E3A \'{0}\'\uFF0CID \u4E3A \'{1}\') \u7684\u201CBeanPropertyAccessors\u201D\u6CA1\u6709\u6B63\u786E\u914D\u7F6E\uFF0C\u6216\u8005\u503C\u8BBE\u7F6E\u4E3A\u4E0D\u6B63\u786E\u7684\u7C7B\u578B\u3002
+exception.errorOccured=\u53D1\u751F\u9519\u8BEF ({0})\u3002\\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
+ColorStyledText.CopyItem.Text=\u590D\u5236
+AccessorUtils.Assert0=\u672A\u6B63\u786E\u914D\u7F6E\u5217 (\u6807\u9898\u4E3A \'{0}\'\uFF0CID \u4E3A \'{1}\') \u7684 \'BeanPropertyAccessors\'\u3002  {2} \u662F bean \u6240\u5FC5\u9700\u7684<B>
+ExtendedTableMoveCommand.MoveLabel=\u5411\u4E0A\u6216\u5411\u4E0B\u79FB\u52A8\u4E00\u4E2A\u6216\u591A\u4E2A\u8868\u6761\u76EE
+CopyPushButton.CopyButton.Tip=\u590D\u5236\u9009\u5B9A\u7684\u9879
+ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=\u91CD\u7F6E\u6240\u6709\u6570\u636E\u5E93\u7C7B\u578B\u4E3A\u9ED8\u8BA4\u503C
+ExtendedTableAddCommand.Add.Label=\u6DFB\u52A0\u4E00\u4E2A\u6216\u591A\u4E2A\u8868
+ControlUtils.Unsupported1=\u6B64\u9762\u677F ({0}) \u4E0D\u53D7\u652F\u6301\u3002\u5982\u679C\u60A8\u60F3\u4F7F\u7528\uFF0C\u8BF7\u6DFB\u52A0\u4E8B\u4EF6...
+AccessorUtils.isReqValue=\u662F\u503C (<V>) \u6240\u5FC5\u9700\u7684\uFF0C\u4F46\u8BE5\u503C\u53EF\u4F7F\u7528 CellEditorValueAdapter \u6765\u8C03\u6574\u3002
+AccessorUtils.NoClassDef=NoClassDefFoundError ({0}):
+ErrorDialogWidthDetailArea.ErrorMessage.Text=\u9519\u8BEF\u6D88\u606F
+ExceptionHandler.Parameter.BeNull=\u5F02\u5E38\uFF1A\u53C2\u6570\u4E0D\u80FD\u4E3A null
+ModelSelectionDialog.Message=\u8BF7\u9009\u62E9\u4E00\u4E2A\u9009\u9879\u6216\u53D6\u6D88\u3002
+TreeToTablesLinker.Type.Unsupported=\u4E0D\u652F\u6301\u8FD9\u79CD\u7C7B\u578B\u7684 currentControl
+Mode.Mode.ToString=\u6A21\u5F0F [{0}]
+ModifyBeanValueCommand.ModifyCell.Label=\u4FEE\u6539\u5355\u5143\u683C\u503C
+ColorStyledText.SelectAllItem.Text=\u5168\u9009
+DialogErrorForCellEditorListener.Error.MsgDialogTitle=\u9519\u8BEF
+ExportPushButton.ExportButton.Tip=\u5BFC\u51FA\u6240\u6709\u884C\u5230 XML \u6587\u4EF6
+TableViewerCreator.CellModifier.ExError=\u5F53\u524D CellModifier \u4E0D\u652F\u6301\u6B64\u64CD\u4F5C\u3002\\n \u4F7F\u7528 \'{0}\' \u6216\u6269\u5C55\u5B83\u7684\u7C7B\u6765\u4F7F\u7528\u6B64\u529F\u80FD
+Curve2D.MinNum.Be0=minimumSegments \u5FC5\u987B\u4E3A\u6B63\u6570\u6216 0
+ModeReader.IgnoreElement=\u5FFD\u7565\u672A\u77E5\u5143\u7D20
+Curve2D.MaxNum.Be0=maximumSegments \u5FC5\u987B\u4E3A\u6B63\u6570\u6216 0
 CellEditorDialogBehavior.textContent=...
 CellEditorValueAdapterFactory.valueNotStringType=Bean \u503C\u5E94\u662F\u5B57\u7B26\u4E32\u7C7B\u578B\u7684\u7C7B\uFF01
 ColorStyledText.RedoItem.Text=\u91CD\u505A
 ColorStyledText.UndoItem.Text=\u64A4\u6D88
-ColorStyledText.CopyItem.Text=\u590D\u5236
-ColorStyledText.PasteItem.Text=\u7C98\u8D34
-ColorStyledText.SelectAllItem.Text=\u5168\u9009
 ContentProposalAdapterExtended.close=\u5173\u95ED
 ContentProposalAdapterExtended.closeFocusout=\u5173\u95ED focusout
-ControlUtils.Unsupported1=\u6B64\u9762\u677F ({0}) \u4E0D\u53D7\u652F\u6301\u3002\u5982\u679C\u60A8\u60F3\u4F7F\u7528\uFF0C\u8BF7\u6DFB\u52A0\u4E8B\u4EF6...
-CopyPushButton.CopyButton.Tip=\u590D\u5236\u9009\u5B9A\u7684\u9879
-Curve2D.MaxNum.Be0=maximumSegments \u5FC5\u987B\u4E3A\u6B63\u6570\u6216 0
-Curve2D.MinNum.Be0=minimumSegments \u5FC5\u987B\u4E3A\u6B63\u6570\u6216 0
 DateDialog.textContent=\u9009\u62E9\u65E5\u671F\u548C\u65F6\u95F4
 DefaultCellModifier.tableItemDispose=TableItem \u5DF2\u5904\u7406
-DialogErrorForCellEditorListener.Error.MsgDialogTitle=\u9519\u8BEF
-ErrorDialogWidthDetailArea.ErrorMessage.Text=\u9519\u8BEF\u6D88\u606F
 ErrorDialogWithContinue.setParameter=\u8BBE\u7F6E\u53C2\u6570\u5E76\u7EE7\u7EED
 EventUtil.activate=\u6FC0\u6D3B
 EventUtil.arm=arm
@@ -60,40 +103,10 @@ EventUtil.selection=\u9009\u62E9
 EventUtil.show=\u663E\u793A
 EventUtil.traverse=\u6A2A\u8D2F
 EventUtil.typeNull=Null
-EventUtil.UnknowDetail=\u672A\u77E5\u4E8B\u4EF6\u8BE6\u7EC6\u4FE1\u606F\u503C ???\uFF1A
-EventUtil.UnknowType=\u672A\u77E5\u7684\u65F6\u95F4\u7C7B\u578B\uFF1A
 EventUtil.verify=\u9A8C\u8BC1
-ExceptionHandler.Parameter.BeNull=\u5F02\u5E38\uFF1A\u53C2\u6570\u4E0D\u80FD\u4E3A null
 ExceptionMessageDialog.log=\u65E5\u5FD7
-ExportPushButton.ExportButton.Tip=\u5BFC\u51FA\u6240\u6709\u884C\u5230 XML \u6587\u4EF6
-ExportPushButtonForExtendedTable.ErrorMsg.Text=\u51FA\u9519\uFF01
-ExtendedTableAddCommand.Add.Label=\u6DFB\u52A0\u4E00\u4E2A\u6216\u591A\u4E2A\u8868
-ExtendedTableCopyCommand.Copy.Label=\u590D\u5236\u5185\u90E8\u526A\u8D34\u677F\u4E2D\u7684\u4E00\u4E2A\u6216\u591A\u4E2A\u8868\u6761\u76EE\u3002
-ExtendedTableModel.ModifiedObject.Error=ModifiedBeanListenable \u5BF9\u8C61\u5FC5\u987B\u5728\u4F7F\u7528\u6B64\u65B9\u6CD5\u4E4B\u524D\u8BBE\u7F6E
-ExtendedTableMoveCommand.MoveLabel=\u5411\u4E0A\u6216\u5411\u4E0B\u79FB\u52A8\u4E00\u4E2A\u6216\u591A\u4E2A\u8868\u6761\u76EE
-ExtendedTablePasteCommand.Paste.Label=\u4ECE\u5185\u90E8\u526A\u8D34\u677F\u7C98\u8D34\u6570\u636E
-ExtendedTableRemoveCommand.Romve.Label=\u79FB\u9664\u8868\u6761\u76EE
-ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=\u91CD\u7F6E\u6240\u6709\u6570\u636E\u5E93\u7C7B\u578B\u4E3A\u9ED8\u8BA4\u503C
-ExtendedTableCaseCommand.case.Label=\u5C06\u9009\u5B9A\u7684\u6570\u636E\u5E93\u5217\u6539\u4E3A\u5927\u5199/\u5C0F\u5199
-ExtendedTableQuoteCommand.Quote.Label=\u4E3A\u9009\u5B9A\u7684\u6570\u636E\u5E93\u5217\u52A0\u5F15\u53F7
-ImportPushButton.ImportButton.Tip=\u5BFC\u5165 XML \u6587\u4EF6\u66FF\u6362\u6240\u6709\u884C
-ImportPushButtonForExtendedTable.ErrorMsg.Text=\u51FA\u9519\uFF01
-LabelledFileField.BrowseButton.Text=\u6D4F\u89C8...
-LabelledFileField.FileDialog.Text=\u9009\u62E9\u4E00\u4E2A
-Mode.Mode.ToString=\u6A21\u5F0F [{0}]
-ModeReader.IgnoreElement=\u5FFD\u7565\u672A\u77E5\u5143\u7D20
-ModelSelectionDialog.Title=\u4F7F\u7528\u5B58\u50A8\u5E93\u7F16\u8F91\u53C2\u6570
-ModifyBeanValueCommand.ModifyCell.Label=\u4FEE\u6539\u5355\u5143\u683C\u503C
-MoveDownPushButton.MoveDownTip=\u5411\u4E0B\u79FB\u52A8\u9009\u4E2D\u9879
-MoveUpPushButton.MoveUpButton.Tip=\u5411\u4E0A\u79FB\u52A8\u9009\u4E2D\u9879
-PastePushButton.PasteButton.Label=\u7C98\u8D34
-ProposalUtils.CellProposal.Error=CellEditor\u7C7B\u578B\u63D0\u793A\u4E0D\u88AB\u652F\u6301\uFF1A
-ProposalUtils.CtrlProposal.ErrorMsg=\u63A7\u952E\u7C7B\u578B\u63D0\u793A\u4E0D\u88AB\u652F\u6301\uFF1A
-RemovePushButton.RemoveButton.Tip=\u79FB\u9664\u6240\u9009\u9879
-ResetDBTypesButton.ResetDBTypesButton.Tip=\u91CD\u7F6E\u6240\u6709\u6570\u636E\u5E93\u7C7B\u578B
 Rule.rule=\u89C4\u5219 [{0}]
 SaveAsGenericSchemaPushButton.saveAsSchema=\u53E6\u5B58\u4E3A\u901A\u7528 schema
-SelectContextVariablesPushButton.Label=\u9009\u62E9\u4E0A\u4E0B\u6587\u53D8\u91CF
 SWTCalendarWithTime.contentEvening=\u665A\u95F4
 SWTCalendarWithTime.contentHr=\u65F6:
 SWTCalendarWithTime.contentMin=\u6700\u5C0F:
@@ -101,31 +114,16 @@ SWTCalendarWithTime.contentMorning=\u65E9\u6668
 SWTCalendarWithTime.contentNoon=\u4E2D\u5348
 SWTCalendarWithTime.contentNow=\u73B0\u5728
 SWTCalendarWithTime.contnetSec=\u79D2:
-TableViewerCreator.CallMethod.ErrorMsg=\u53EA\u6709\u60A8\u5DF2\u7ECF\u8C03\u7528\u4E86 createTable() \u65B9\u6CD5\u540E\uFF0C\u624D\u80FD\u8C03\u7528\u6B64\u65B9\u6CD5\u3002
-TableViewerCreator.CellModifier.ExError=\u5F53\u524D CellModifier \u4E0D\u652F\u6301\u6B64\u64CD\u4F5C\u3002\n \u4F7F\u7528 '{0}' \u6216\u80FD\u591F\u5BF9\u5176\u8FDB\u884C\u6269\u5C55\u7684\u7C7B\u6765\u4F7F\u7528\u6B64\u529F\u80FD
-TableViewerCreator.columnNoIBeanProperty=\u5217 '{0}' ('{1}') \u8BBE\u7F6E\u4E86 CellEditor\uFF0C\u4F46\u6CA1\u6709 IBeanPropertyAccessors\uFF01
-TableViewerCreator.columnNullId=\u5217 '{0}' \u7684 id \u4E3A null\uFF01
-TableViewerCreator.IdProperty.AssertMsg=\u4F60\u5FC5\u987B\u6539\u53D8\u5176\u4E2D\u4E00\u4E2A\u5217\u7684 idProperty\uFF0C\u4E00\u4E2A\u8868\u4E2D\u7684\u6BCF\u4E2A\u5217\u7684 idProperty \u5FC5\u987B\u552F\u4E00\u3002
-TableViewerCreator.Table.BeNull=\u8868\u4E3A null
-TableViewerCreator.TableColumn.AssertMsg=TableEditorColumn \u7684 idProperty \u4E3A '{0}' \u7684 TableColumn \u6CA1\u6709\u6B63\u786E\u7684 Table \u7236\u9879
-TreeToTablesLinker.Type.Unsupported=\u4E0D\u652F\u6301\u8FD9\u79CD\u7C7B\u578B\u7684 currentControl
-commons.error=\u9519\u8BEF
-exception.errorOccured=\u53D1\u751F\u9519\u8BEF ({0})\u3002\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
-ModelSelectionDialog.Message=\u8BF7\u9009\u62E9\u4E00\u4E2A\u9009\u9879\u6216\u53D6\u6D88\u3002
-ModelSelectionDialog.Option=\u9009\u9879
-ModelSelectionDialog.BuiltIn=\u66F4\u6539\u4E3A\u5185\u7F6E\u5C5E\u6027\u3002
-ModelSelectionDialog.ViewSchema=\u67E5\u770B schema (\u53EA\u8BFB)\u3002
-ModelSelectionDialog.ViewQuery=\u67E5\u770B\u67E5\u8BE2 (\u53EA\u8BFB)\u3002
-ModelSelectionDialog.Update=\u66F4\u65B0\u5B58\u50A8\u5E93\u8FDE\u63A5\u3002
-FileStep2.previewFailure=\u9884\u89C8\u9519\u8BEF\u3002\u987B\u6539\u53D8\u4E00\u4E9B\u8BBE\u7F6E\u3002\n\u6CE8\u610F\uFF1A\u9884\u89C8\u9519\u8BEF\u53EF\u80FD\u662F\u56E0\u4E3A\u9519\u8BEF\u7684\u7F16\u7801\u8BBE\u7F6E\u9020\u6210\u7684\u3002
+TableViewerCreator.columnNoIBeanProperty=\u5217 \'{0}\' (\'{1}\') \u8BBE\u7F6E\u4E86 CellEditor\uFF0C\u4F46\u6CA1\u6709 IBeanPropertyAccessors\uFF01
+TableViewerCreator.columnNullId=\u5217 \'{0}\' \u7684 id \u4E3A null\uFF01
 StateComposite.FLL_DB_INFOR=\u586B\u5199\u6570\u636E\u5E93\u4FE1\u606F
 StateComposite.HELP_MESSAGE=\u5E2E\u52A9\u6D88\u606F
 StateComposite.MESSAGE1=\u53EF\u4EE5\u521B\u5EFA\u52A8\u6001\u4F5C\u4E1A\u5E76\u8BBE\u7F6E\u4F9D\u8D56\u4E8E\u8F93\u5165\u8868\u7684\u6587\u4EF6\u540D\u6216\u8868\u540D\u3002
 StateComposite.MESSAGE2=\u5BF9\u6B64\uFF0C\u53EA\u5728\u9700\u5728\u6587\u4EF6\u540D\u6216\u8868\u540D\u4E2D
-StateComposite.MESSAGE3= \u5728\u6587\u4EF6\u540D\u6216\u8868\u540D\u4E2D\u3002
+StateComposite.MESSAGE3=\\ \u5728\u6587\u4EF6\u540D\u6216\u8868\u540D\u4E2D\u3002
 StateComposite.MESSAGE4=\u4F8B\u5982\u5BF9\u4E8E\u4E00\u4E2A\u8868:
 StateComposite.MESSAGE5=\u4F8B\u5982\u5BF9\u4E8E\u4E00\u4E2A\u6587\u4EF6:
-StateComposite.MESSAGE6= \u6216\u8005\u53EF\u80FD
+StateComposite.MESSAGE6=\\ \u6216\u8005\u53EF\u80FD
 StateComposite.OUTPUT_SELECTION=\u8F93\u51FA\u9009\u62E9
 StateComposite.SEL_JOBNAME=\u8BBE\u7F6E\u4F5C\u4E1A\u540D\u79F0
 StateComposite.STATE=\u72B6\u6001

main/plugins/org.talend.core.repository/plugin.xml

@@ -285,6 +285,30 @@
                 type="INFORMIX">
           </DBType>
        </RepositoryComponent>
+       <RepositoryComponent
+             name="INGRES"
+             withSchema="true"
+             input="tIngresInput"
+             output="tIngresOutput">
+          <Item
+                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
+          </Item>
+          <DBType
+                type="INGRES">
+          </DBType>
+       </RepositoryComponent>
+       <RepositoryComponent
+             name="INTERBASE"
+             withSchema="true"
+             input="tInterbaseInput"
+             output="tInterbaseOutput">
+          <Item
+                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
+          </Item>
+          <DBType
+                type="INTERBASE">
+          </DBType>
+       </RepositoryComponent>
        <RepositoryComponent
              name="JAVADB"
              withSchema="true"
@@ -396,6 +420,18 @@
                 type="ORACLESN">
           </DBType>
        </RepositoryComponent>
+       <RepositoryComponent
+             name="PARACCEL"
+             withSchema="true"
+             input="tParAccelInput"
+             output="tParAccelOutput">
+          <Item
+                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
+          </Item>
+          <DBType
+                type="PARACCEL">
+          </DBType>
+       </RepositoryComponent>
        <RepositoryComponent
              name="PLUSPSQL"
              withSchema="true"
@@ -494,6 +530,18 @@
                 type="TERADATA">
           </DBType>
        </RepositoryComponent>
+       <RepositoryComponent
+             name="VECTORWISE"
+             withSchema="true"
+             input="tVectorWiseInput"
+             output="tVectorWiseOutput">
+          <Item
+                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
+          </Item>
+          <DBType
+                type="VECTORWISE">
+          </DBType>
+       </RepositoryComponent>
        <RepositoryComponent
              name="VERTICA"
              withSchema="true"

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

@@ -1,181 +1,141 @@
-AbstractEMFRepositoryFactory.cannotGenerateItem=Impossible de g\u00E9n\u00E9rer le libell\u00E9 de l'\u00E9l\u00E9ment coll\u00E9.
+AbstractEMFRepositoryFactory.cannotGenerateItem=Impossible de cr\u00E9er le libell\u00E9 de l'\u00E9l\u00E9ment coll\u00E9.
 AbstractEMFRepositoryFactory.job=Job
-AbstractEMFRepositoryFactory.presistenceException.OnlyOneOccurenceMustbeFound=Plusieurs \u00E9l\u00E9ments sont r\u00E9cup\u00E9r\u00E9s en m\u00EAme temps.\n{0}
+AbstractEMFRepositoryFactory.presistenceException.OnlyOneOccurenceMustbeFound=Plusieurs \u00E9l\u00E9ments ont \u00E9t\u00E9 r\u00E9cup\u00E9r\u00E9s en m\u00EAme temps.\n{0}
 AbstractEMFRepositoryFactory.presistenceException.whoCauseProblems=Les \u00E9l\u00E9ments \u00E0 l'origine des probl\u00E8mes sont :
-AbstractEMFRepositoryFactory.requiredComponent=Requis pour utiliser le composant :
-ProxyRepositoryFactory.bussinessException.itemNonModifiable=Vous ne poss\u00E9dez pas assez de droits pour effectuer cette action
-ProxyRepositoryFactory.cleanWorkspace=Vider l'espace de mod\u00E9lisation graphique
-ProxyRepositoryFactory.DeleteFolderContainsLockedItem=Impossible de supprimer un dossier contenant des \u00E9l\u00E9ments verrouill\u00E9s.
+AbstractEMFRepositoryFactory.requiredComponent=Requis pour utiliser le composant \:
+ProxyRepositoryFactory.bussinessException.itemNonModifiable=Vous n'avez pas assez de droits pour cette action
 ProxyRepositoryFactory.exec.migration.tasks=Ex\u00E9cution des t\u00E2ches de migration
-ProxyRepositoryFactory.illegalArgumentException.labeAlreadyInUse=Le libell\u00E9 {0} est en cours d'utilisation
+ProxyRepositoryFactory.illegalArgumentException.labeAlreadyInUse=Le libell\u00E9 {0} est d\u00E9j\u00E0 utilis\u00E9
 ProxyRepositoryFactory.illegalArgumentException.labelNotMatchPattern=Le libell\u00E9 {0} ne correspond pas au mod\u00E8le {1}
 ProxyRepositoryFactory.initializeProjectConnection=Initialisation de la connexion au projet
-ProxyRepositoryFactory.CycleReferenceError=Une r\u00E9f\u00E9rence circulaire de projet a \u00E9t\u00E9 d\u00E9tect\u00E9e.
 ProxyRepositoryFactory.JobNameErroe=Erreur dans le nom du Job
 ProxyRepositoryFactory.Label=Libell\u00E9
-ProxyRepositoryFactory.load.componnents=Chargement des composants...
-ProxyRepositoryFactory.load.sdk.componnents=Chargement des composants SDK...
-ProxyRepositoryFactory.log.Restoration=Restauration [{0}] par {1} de "\\{2}".
-ProxyRepositoryFactory.log.lock=Verrouiller [{0}] par "{1}".
-ProxyRepositoryFactory.log.loggedOn={0} connect\u00E9 sur {1}
+ProxyRepositoryFactory.load.componnents=Charger des composants...
+ProxyRepositoryFactory.log.Restoration=Restauration de [{0}] par {1} vers "/{2}".
+ProxyRepositoryFactory.log.lock=Verrou de [{0}] par "{1}".
+ProxyRepositoryFactory.log.loggedOn={0} connect\u00E9 \u00E0 {1}
 ProxyRepositoryFactory.log.logicalDeletion=Suppression logique de [{0}] par {1}.
-ProxyRepositoryFactory.log.move=D\u00E9placer [{0}] dans "{1}".
-ProxyRepositoryFactory.log.newIdGenerated=Nouvel ID g\u00E9n\u00E9r\u00E9 pour le projet [{0}] \\= {1}
-ProxyRepositoryFactory.log.physicalDeletion=Suppression physique de [{0}] par {1}.
-ProxyRepositoryFactory.log.tempFolderEmptied=Dossier temporaire vid\u00E9 ({0} fichiers supprim\u00E9s en {1} ms)
-ProxyRepositoryFactory.log.unlock=[{0}] d\u00E9verrouill\u00E9 par "{1}".
+ProxyRepositoryFactory.log.move=D\u00E9placement de [{0}] vers "{1}".
+ProxyRepositoryFactory.log.newIdGenerated=Nouvel ID g\u00E9n\u00E9r\u00E9 sur le projet [{0}] \= {1}
+ProxyRepositoryFactory.log.physicalDeletion=Suppression physique de [{0}] par {1}
+ProxyRepositoryFactory.log.tempFolderEmptied=Dossier temp vid\u00E9 ({0} fichiers supprim\u00E9s en {1}ms)
+ProxyRepositoryFactory.log.unlock=D\u00E9verrouiller [{0}] par "{1}".
 ProxyRepositoryFactory.logonInProgress=Connexion en cours...
-ProxyRepositoryFactory.MoveFolderContainsLockedItem=Impossible de d\u00E9placer un dossier contenant des \u00E9l\u00E9ments verrouill\u00E9s.
-ProxyRepositoryFactory.projectIsNotCompatible=Le projet {0} a \u00E9t\u00E9 ouvert par un Studio plus r\u00E9cent. Impossible de l'ouvrir.
-ProxyRepositoryFactory.projectCanNotOpen=Impossible d'ouvrir le projet. La t\u00E2che en erreur est {0}.
-ProxyRepositoryFactory.RenameFolderContainsLockedItem=Impossible de renommer un fichier contenant des \u00E9l\u00E9ments verrouill\u00E9s.
+ProxyRepositoryFactory.projectIsNotCompatible=Le projet {0} a \u00E9t\u00E9 ouvert par un studio plus r\u00E9cent. Impossible de l'ouvrir.
 ProxyRepositoryFactory.ReplaceJob=est en cours d'utilisation, voulez-vous le remplacer ?
 ProxyRepositoryFactory.synch.repo.items=Synchronisation des \u00E9l\u00E9ments du r\u00E9f\u00E9rentiel
-ProxyRepositoryFactory.synchronizeLibraries=Synchronisation des librairies
-ProxyRepositoryFactory.installComponents=Installation des composants...
-ProxyRepositoryFactory.titleWarning=Avertissement
-ProxyRepositoryFactory.msgMissingReferencedProjects=Projet de r\u00E9f\u00E9rence manquant [{0}]. Continuez ?
-ProxyRepositoryFactory.exceptionMissingReferencedProjects=Projet r\u00E9f\u00E9renc\u00E9 manquant [{0}].
-ProxyRepositoryFactory.btnLabelContinue=Continuer
+ProxyRepositoryFactory.synchronizeLibraries=Synchronisation des biblioth\u00E8ques...
 CreateSandboxProjectDialog.createUserLabel=Cr\u00E9er un nouvel utilisateur li\u00E9 au projet Sandbox cr\u00E9\u00E9
-CreateSandboxProjectDialog.Failure=\u00C9chec
-CreateSandboxProjectDialog.failureMessage=\u00C9chec de la cr\u00E9ation du projet Sandbox.
+CreateSandboxProjectDialog.Failure=Echec
+CreateSandboxProjectDialog.failureMessage=Echec de la cr\u00E9ation du projet Sandbox.
 CreateSandboxProjectDialog.ProjectDesc=Description
 CreateSandboxProjectDialog.ProjectLabel=Libell\u00E9
+CreateSandboxProjectDialog.ProjectSvnAdvance=Param\u00E8tres avanc\u00E9s de SVN
 CreateSandboxProjectDialog.successMessage=Cr\u00E9ation r\u00E9ussie du projet Sandbox.
 CreateSandboxProjectDialog.successTitile=Succ\u00E8s
-CreateSandboxProjectDialog.Title=Cr\u00E9er un projet  Sandbox - {0}
+CreateSandboxProjectDialog.svnUrl=URL
+CreateSandboxProjectDialog.Title=Cr\u00E9er le projet Sandbox - {0}
 CreateSandboxProjectDialog.userFirstname=Pr\u00E9nom
 CreateSandboxProjectDialog.userLastname=Nom de famille
+CreateSandboxProjectDialog.userLoginMessage=Le nom du projet SVN ne peut \u00EAtre vide
 CreateSandboxProjectDialog.userLoginValidMessage=L'identifiant de l'utilisateur doit \u00EAtre un e-mail valide
 CreateSandboxProjectDialog.userPasswordEmptyMessage=Le mot de passe ne doit pas \u00EAtre vide
-CreateSandboxProjectDialog.Login=Connexion
+CreateSandboxProjectDialog.Login=Identifiant
 CreateSandboxProjectDialog.Password=Mot de passe
-PropertiesWizardPage.Author=Cr\u00E9\u00E9 par :
-PropertiesWizardPage.Locker=Verrouill\u00E9 par
+CreateSandboxProjectDialog.URLMessage=Vous devez d\u00E9finir l'URL SVN
+CreateSandboxProjectDialog.userSvnSettingLabel=Param\u00E8tres par d\u00E9faut SVN
+PropertiesWizardPage.Author=Auteur
+PropertiesWizardPage.Locker=Verrouill\u00E9 par :
 PropertiesWizardPage.Description=Description
-PropertiesWizardPage.EmptyDescWarning=Il est d\u00E9conseill\u00E9 de laisser le champ Description vide.
-PropertiesWizardPage.EmptyPurposeWarning=Il est d\u00E9conseill\u00E9 de laisser le champ Objectif vide.
-PropertiesWizardPage.ItemExistsError=Cet \u00E9l\u00E9ment existe d\u00E9j\u00E0. V\u00E9rifiez la Corbeille et videz-la si n\u00E9cessaire.
+PropertiesWizardPage.EmptyDescWarning=Il n'est pas recommand\u00E9 de laisser vide la description.
+PropertiesWizardPage.EmptyPurposeWarning=Il n'est pas recommand\u00E9 de laisser l'objectif vide.
+PropertiesWizardPage.ItemExistsError=Cet \u00E9l\u00E9ment existe d\u00E9j\u00E0. V\u00E9rifiez la corbeille et videz-la si besoin.
 PropertiesWizardPage.KeywordsError=Le nom n'est pas un identifiant valide.
 PropertiesWizardPage.Name=Nom
 PropertiesWizardPage.NameEmptyError=Le nom est vide.
 PropertiesWizardPage.NameFormatError=Le nom contient des caract\u00E8res incorrects.
-PropertiesWizardPage.Path=Chemin d'acc\u00E8s
+PropertiesWizardPage.Path=Chemin
 PropertiesWizardPage.Purpose=Objectif
 PropertiesWizardPage.Select=S\u00E9lectionner
-PropertiesWizardPage.SelectfolderMessage=S\u00E9lectionnez le dossier dans lequel l'\u00E9l\u00E9ment sera cr\u00E9\u00E9
-PropertiesWizardPage.SelectfolderTitle=S\u00E9lection du dossier
+PropertiesWizardPage.SelectfolderMessage=S\u00E9lectionner le dossier dans lequel l'\u00E9l\u00E9ment sera cr\u00E9\u00E9
+PropertiesWizardPage.SelectfolderTitle=S\u00E9lectionner dossier
 PropertiesWizardPage.Status=Statut
 PropertiesWizardPage.Version=Version
 PropertiesWizardPage.Version.Major=M
-PropertiesWizardPage.Version.Minor=m
+PropertiesWizardPage.Version.Minor=M
 PropertiesWizardPage.ImageSizeError=S\u00E9lectionnez une image de taille 32*32.
 EAuthenticationMethod.anonymousAuth=Authentification anonyme
 EAuthenticationMethod.simpleAuth=Authentification simple
-AdvancedSocketFactory.failedInitial=Erreur : impossible d'initialiser :
-LDAPCATruster.failedCreateCert=Impossible de cr\u00E9er le stockage du certificat
-LDAPCATruster.failedCreateTmp=Impossible de cr\u00E9er le
-LDAPCATruster.failedInitialTrust=\u00C9chec de cr\u00E9ation du gestionnaire de confiance initial :
-LDAPCATruster.failedLoadCert=Impossible de charger le stockage des certificats :
-LDAPCATruster.failedSaveTrust=Impossible de sauvegarder le Trust Store :
-LDAPCATruster.locationInvalid=L'emplacement du fichier du store de certificat est invalide :
-LDAPCATruster.noCertificate=\nUtilisez la commande Keytool pour importer le certificat du serveur.
+AdvancedSocketFactory.failedInitial=Erreur\: \u00E9chec d'initialisation\:
 LDAPCATruster.sslError1=Erreur SSL : \u00E9chec de la v\u00E9rification de la cha\u00EEne de certification du serveur.
-LDAPCATruster.sslError2=Erreur SSL : \u00E9chec de la v\u00E9rification de la cha\u00EEne de certification du serveur et \\n l'autorit\u00E9 de certification est manquante.
-LDAPCATruster.sslError3=Erreur SSL : l'autorit\u00E9 de certification n'est pas dans la cha\u00EEne de certification du serveur.
 CopyAction.thisText.copy=Copier
 RestoreAction.action.title=Restaurer
 RestoreAction.action.toolTipText=Restaurer
 PasteAction.thisText.paste=Coller
 DeleteAction.action.foreverTitle=Supprimer d\u00E9finitivement
 DeleteAction.action.logicalTitle=Supprimer
-DeleteAction.action.logicalToolTipText=Placer l'\u00E9l\u00E9ment dans la Corbeille
-DeleteAction.deleteJobAssignedToOneService= est attribu\u00E9 \u00E0 une op\u00E9ration d'un service.\nSupprimer ce Job ?
-DeleteAction.deleteSomeJobsAssignedToServices= sont assign\u00E9s \u00E0 des op\u00E9rations de Services.\nSupprimer ces Jobs ?
-DeleteAction.dialog.message0=sera supprim\u00E9 d\u00E9finitivement (r\u00E9cup\u00E9ration impossible).
+DeleteAction.action.logicalToolTipText=Mettre l'objet \u00E0 la corbeille
+DeleteAction.deleteJobAssignedToOneService=\ est assign\u00E9 \u00E0 une op\u00E9ration d'un Service.\nSupprimer ce Job ?
+DeleteAction.dialog.message0=Sera effac\u00E9 d\u00E9finitivement (r\u00E9cup\u00E9ration impossible)
 DeleteAction.dialog.message1=Les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s seront supprim\u00E9s d\u00E9finitivement (pas de r\u00E9cup\u00E9ration possible).
-DeleteAction.dialog.message2=Continuer malgr\u00E9 tout ?
-DeleteAction.dialog.messageAllElements=Tous les \u00E9l\u00E9ments seront supprim\u00E9s d\u00E9finitivement (r\u00E9cup\u00E9ration impossible).
+DeleteAction.dialog.message2=Continuer ?
+DeleteAction.dialog.messageAllElements=Tous les \u00E9l\u00E9ments seront  supprim\u00E9s d\u00E9finitivement (impossible de r\u00E9cup\u00E9rer).
 DeleteAction.dialog.title=Supprimer d\u00E9finitivement
-DeleteAction.error.lockedOrOpenedObject.newMessage=Le {0} est verrouill\u00E9 et ne peut pas \u00EAtre supprim\u00E9.\n Si cet objet est ouvert, vous devez le fermer avant de le supprimer.
-DeleteAction.error.testCaseLockedOrOpenedObject.newMessage=Les sc\u00E9narios de test de {0} sont verrouill\u00E9s, vous ne pouvez les supprimer.\n Si cet objet est ouvert, fermez-le avant suppression.
+DeleteAction.error.lockedOrOpenedObject.newMessage={0} est verrouill\u00E9, vous ne pouvez le supprimer.\n Si cet objet est ouvert, vous devez le fermer avant suppression.
 DeleteAction.error.title=Suppression interdite
 DeleteAction.warning.message1=Impossible de supprimer le dossier car au moins un \u00E9l\u00E9ment de ce dossier est ouvert. Fermez les \u00E9l\u00E9ments ouverts et r\u00E9essayez.
 DeleteAction.warning.title=Avertissement
-DuplicateAction.cannotGenerateItem=Impossible de g\u00E9n\u00E9rer le libell\u00E9 de l'\u00E9l\u00E9ment coll\u00E9.
-DuplicateAction.dialog.message=Nommer le nouveau Job
-DuplicateAction.dialog.title=Saisissez un nom pour le Job
+DuplicateAction.cannotGenerateItem=Impossible de cr\u00E9er le libell\u00E9 de l'\u00E9l\u00E9ment coll\u00E9.
+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.v2=Dupliquer
 DuplicateAction.thisText.duplicate=Dupliquer
 DuplicateAction.NameEmptyError=Le nom est vide.
 DuplicateAction.NameFormatError=Le nom contient des caract\u00E8res incorrects.
-DuplicateAction.ItemExistsError=Cet \u00E9l\u00E9ment existe d\u00E9j\u00E0. V\u00E9rifiez la Corbeille et videz-la si n\u00E9cessaire.
+DuplicateAction.ItemExistsError=Cet \u00E9l\u00E9ment existe d\u00E9j\u00E0. V\u00E9rifiez la corbeille et videz-la si besoin.
 DuplicateAction.KeywordsError=Le nom n'est pas un identifiant valide.
-DuplicateAction.SameAsProjectname=Le nom est le m\u00EAme que celui du projet.
 EmptyRecycleBinAction.action.title=Vider la Corbeille
 EmptyRecycleBinAction.action.toolTipText=Vider la Corbeille
 EmptyRecycleBinAction.dialog.title=Vider la Corbeille
-EmptyRecycleBinAction.dialog.allDependencies=Vous ne pouvez vider la Corbeille.\nLa perspective Data Profiler d\u00E9pend d'un \u00E9l\u00E9ment. Ne le supprimez pas.
-PasteObjectAction.error.labelAlreadyExists=Un objet ayant ce libell\u00E9 existe d\u00E9j\u00E0 avec le m\u00EAme chemin d'acc\u00E8s
+PasteObjectAction.error.labelAlreadyExists=Un objet avec ce libell\u00E9 existe d\u00E9j\u00E0 dans ce chemin
 PasteObjectAction.error.title=Impossible de coller
 JobletReferenceDialog.DeletedInfor=dans la Corbeille
-JobletReferenceDialog.Messages=Impossible de supprimer certains Joblets car ils sont r\u00E9f\u00E9renc\u00E9s dans des Jobs.
+JobletReferenceDialog.Messages=Impossible de supprimer certains joblets car ils sont r\u00E9f\u00E9renc\u00E9s dans des Jobs.
 JobletReferenceDialog.NodeTotals=Totaux
-JobletReferenceDialog.NodeTotalsTip=Total des r\u00E9f\u00E9rences des noeuds
-JobletReferenceDialog.project=Projet
+JobletReferenceDialog.NodeTotalsTip=Total des r\u00E9f\u00E9rences des n\u0153uds
+JobletReferenceDialog.project=Project
 JobletReferenceDialog.ReferenceJob=Job de r\u00E9f\u00E9rence
-JobletReferenceDialog.Title=Supprimer l'\u00E9chec du Joblet
-ContextReferenceDialog.Title=Supprimer le groupe de contextes
+JobletReferenceDialog.Title=\u00C9chec de la suppression du Joblet
+ContextReferenceDialog.Title=Supprimer le groupe de contexte
 ContextReferenceDialog.Recycle=dans la Corbeille
 ContextReferenceDialog.ReferenceJob=Objets de r\u00E9f\u00E9rence
 ContextReferenceDialog.Types=Type
-ContextReferenceDialog.NodeTypeTip=Type de r\u00E9f\u00E9rences du n\u0153ud
-ContextReferenceDialog.Messages=Le contexte({0} {1}) est r\u00E9f\u00E9renc\u00E9 dans :\n
-ContextReferenceDialog.kindMessages=Le groupe de contextes de {0} {1} est r\u00E9f\u00E9renc\u00E9 par la liste suivante. Si vous souhaitez le supprimer, le groupe de contextes du Job sera chang\u00E9 en Built-In \u00E0 la prochaine ouverture du Job. Le supprimer malgr\u00E9 tout ?
+ContextReferenceDialog.Messages=Le contexte({0} {1}) est r\u00E9f\u00E9renc\u00E9 dans\:\n
 ContextReferenceDialog.kindMessages1=Le groupe de contextes {0} {1} est r\u00E9f\u00E9renc\u00E9 par la liste suivante. Le supprimer malgr\u00E9 tout ?
-CopyToGenericSchemaHelper.cannotGenarateItem=Impossible de g\u00E9n\u00E9rer le libell\u00E9 de l'\u00E9l\u00E9ment coll\u00E9.
+CopyToGenericSchemaHelper.cannotGenarateItem=Impossible de cr\u00E9er le libell\u00E9 de l'\u00E9l\u00E9ment coll\u00E9.
 ProxyRepositoryFactory.ReplaceJobHazardDescription=\nLes d\u00E9pendances envers la connexion originale peuvent \u00EAtre perdues.
-ItemReferenceDialog.title=\u00C9lements ne pouvant \u00EAtre supprim\u00E9s
-ItemReferenceDialog.item=\u00C9l\u00E9ment
-ItemReferenceDialog.referenceItem=\u00C9l\u00E9ment de r\u00E9f\u00E9rence
+ItemReferenceDialog.title=El\u00E9ments ne pouvant \u00EAtre supprim\u00E9s
+ItemReferenceDialog.item=El\u00E9ment
+ItemReferenceDialog.referenceItem=El\u00E9ment de r\u00E9f\u00E9rence
 ItemReferenceDialog.nodeTotals=Totaux
-ItemReferenceDialog.nodeTotalsTip=Total des r\u00E9f\u00E9rences des noeuds
-ItemReferenceDialog.project=Projet
+ItemReferenceDialog.project=Project
 ItemReferenceDialog.deletedInfor=dans la Corbeille
 ItemReferenceDialog.messages=Des \u00E9l\u00E9ments ne peuvent \u00EAtre supprim\u00E9s car ils sont r\u00E9f\u00E9renc\u00E9s par d'autres.
-ItemReferenceDialog.doNotDelete.button=Ne pas supprimer
-ItemReferenceDialog.forceDelete.button=Forcer la suppression
-ItemReferenceDialog.forceDelete.warn.title=\u00CAtes-vous s\u00FBr(e) ?
-ItemReferenceDialog.forceDelete.warn.message=Forcer la suppression peut briser des \u00E9l\u00E9ments utilisant cet \u00E9l\u00E9ment. Forcer la suppression ?
 ProjectRepositoryNode.code=Code
 ProjectRepositoryNode.rulesManagement=Gestion des r\u00E8gles
-ProjectRepositoryNode.itemInvalid=\u00C9l\u00E9ment non valide : [{0}]{1}
-ProjectRepositoryNode.invalidItem=\u00C9l\u00E9ment invalide
+ProjectRepositoryNode.itemInvalid=El\u00E9ment invalide : [{0}] {1}
+ProjectRepositoryNode.invalidItem=El\u00C3\u00A9ment invalide
 ProjectRepositoryNode.columns=Colonnes
 ProjectRepositoryNode.validationRules=R\u00E8gles de validation
 ProjectRepositoryNode.cdcFoundation=Fondation CDC
 ProjectRepositoryNode.genericSchema=Sch\u00E9mas g\u00E9n\u00E9riques
 ProjectRepositoryNode.queries=Requ\u00EAtes
 ProjectRepositoryNode.synonymSchemas=Sch\u00E9mas synonymes
-ProjectRepositoryNode.calculationViewSchemas=Sch\u00E9ma de la vue Calculation
 ProjectRepositoryNode.tableSchemas=Sch\u00E9mas des tables
-ProjectRepositoryNode.viewSchemas=Voir les sch\u00E9mas
+ProjectRepositoryNode.viewSchemas=Sch\u00E9mas des vues
 ProjectRepositoryNode.sapFunctions=Fonctions SAP
-ProjectRepositoryNode.sapBapi=SAP Bapi
-ProjectRepositoryNode.sapFunctions.inputSchema=Lecture
-ProjectRepositoryNode.sapFunctions.outputSchema=Sortie
-ProjectRepositoryNode.sapIDocs=SAP IDoc
-ProjectRepositoryNode.sapTables=Tables SAP
-ProjectRepositoryNode.sapBWAdvancedDataStoreObject=ADSO SAP
-ProjectRepositoryNode.sapBWDataSource=Source des donn\u00E9es SAP
-ProjectRepositoryNode.sapBWDataStoreObject=Objet Data Store SAP
-ProjectRepositoryNode.sapBWInfoCube=InfoCube SAP
-ProjectRepositoryNode.sapBWInfoObject=InfoObject SAP
-ProjectRepositoryNode.sapContentExtractor=Extracteur SAP BI Content
+ProjectRepositoryNode.sapIDocs=SAP iDocs
 RepositoryDropAdapter_copyingItems=Copie des \u00E9l\u00E9ments...
-RepositoryDropAdapter_errorMsg=Ce r\u00E9pertoire contient l'\u00E9l\u00E9ment verrouill\u00E9, il ne peut \u00EAtre d\u00E9plac\u00E9
 RepositoryDropAdapter_lockedByOthers=Cet \u00E9l\u00E9ment est verrouill\u00E9 par d'autres utilisateurs, impossible de le d\u00E9placer.
 RepositoryDropAdapter_lockedByYou=Cet \u00E9l\u00E9ment est verrouill\u00E9 par vous-m\u00EAme, il ne peut \u00EAtre d\u00E9plac\u00E9.
 RepositoryDropAdapter_moveTitle=D\u00E9placer
@@ -183,23 +143,38 @@ RepositoryDropAdapter_movingItems=D\u00E9placement des \u00E9l\u00E9ments...
 RepositoryDropAdapter.checkingLockStatus=V\u00E9rifier le statut de verrouillage de
 RepositoryDropAdapter.moving=D\u00E9placement
 NewFolderWizard.description=Cr\u00E9er un nouveau dossier dans le r\u00E9f\u00E9rentiel
-NewFolderWizard.failureText=Une erreur est survenue. Impossible de cr\u00E9er les dossiers. Consultez le log pour plus d'informations.
-NewFolderWizard.failureTitle=Erreur
+NewFolderWizard.failureText=Une erreur est survenue. Impossible de cr\u00E9er le dossier. Consultez le log pour plus de d\u00E9tails.
+NewFolderWizard.failureTitle=ERROR
 NewFolderWizard.label=Libell\u00E9
 NewFolderWizard.nameEmpty=Libell\u00E9 requis
-NewFolderWizard.nameIncorrect=Le libell\u00E9 contient des caract\u00E8res incorrects.
-NewFolderWizard.nameInvalid=Le libell\u00E9 {0} est interdit
+NewFolderWizard.nameIncorrect=Le libell\u00E9 contient des caract\u00E8res incorrects
+NewFolderWizard.nameInvalid=Libell\u00E9 {0} est interdit
 NewFolderWizard.title=Dossier
 NewFolderWizard.windowTitle=Nouveau dossier
 CreateFolderAction.action.title=Cr\u00E9er un dossier
 CreateFolderAction.action.toolTipText=Cr\u00E9er un dossier
-RenameFolderAction.action.title=Renommer le dossier
-RenameFolderAction.action.toolTipText=Renommer le dossier
-RenameFolderAction.description=Renommer le dossier
+RenameFolderAction.action.title=Renommer dossier
+RenameFolderAction.action.toolTipText=Renommer dossier
 RenameFolderAction.warning.editorOpen.message=Impossible de renommer le dossier "{1}" car un \u00E9l\u00E9ment ({0}) contenu dans ce dossier est ouvert.\nFermez-le et r\u00E9essayez.
-RenameFolderAction.warning.editorOpen.title=Action non disponible
-RenameFolderAction.warning.cannotFind.message=Impossible de renommer le dossier, il a \u00E9t\u00E9 d\u00E9plac\u00E9 ou supprim\u00E9. Cliquez sur le bouton Actualiser pour mettre \u00E0 jour le r\u00E9f\u00E9rentiel.
-RenameFolderAction.warning.cannotFind.title=Action non disponible
-ConvertJobsUtil.warning.title=Avertissement
+RenameFolderAction.warning.editorOpen.title=Action indisponible
+RenameFolderAction.warning.cannotFind.message=Impossible de renommer le dossier, il a \u00E9t\u00E9 d\u00E9plac\u00E9 ou supprim\u00E9. Cliquez sur le bouton Rafra\u00EEchir pour mettre \u00E0 jour le r\u00E9f\u00E9rentiel.
+RenameFolderAction.warning.cannotFind.title=Action indisponible
+ProxyRepositoryFactory.cleanWorkspace=Vider l'espace de mod\u00E9lisation graphique
+ProxyRepositoryFactory.DeleteFolderContainsLockedItem=Impossible de supprimer un dossier contenant des \u00E9l\u00E9ments verrouill\u00E9s.
+ProxyRepositoryFactory.MoveFolderContainsLockedItem=Impossible de d\u00E9placer un dossier contenant des \u00E9l\u00E9ments verrouill\u00E9s.
+ProxyRepositoryFactory.RenameFolderContainsLockedItem=Impossible de renommer un fichier contenant des \u00E9l\u00E9ments  verrouill\u00E9s.
+RepositoryDropAdapter_errorMsg=Ce r\u00E9pertoire contient l'\u00E9l\u00E9ment verrouill\u00E9, il ne peut \u00EAtre d\u00E9plac\u00E9
+RenameFolderAction.description=Renommer le dossier
+ProxyRepositoryFactory.projectCanNotOpen=Impossible d'ouvrir le projet. La t\u00E2che en erreur est {0}.
+ProjectRepositoryNode.sapBapi=SAP Bapi
+ProjectRepositoryNode.sapFunctions.outputSchema=Sortie
+ProjectRepositoryNode.sapTables=Tables SAP
+DuplicateAction.input.title.v2=Duplicate
+DuplicateAction.SameAsProjectname=Le nom est le m\u00EAme que celui du projet.
+DeleteAction.error.testCaseLockedOrOpenedObject.newMessage=Les tests/sc\u00E9narios de {0} sont verrouill\u00E9s, vous ne pouvez les supprimer.\nSi cet objet est ouvert, fermez-le avant suppression.
 ConvertJobsUtil.warning.message=Le framework cible n'est pas totalement support\u00E9 dans cette version.
-SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=Cr\u00E9er des logs de stat et des param\u00E8tres implicites.
+ItemReferenceDialog.doNotDelete.button=Ne pas supprimer
+ItemReferenceDialog.forceDelete.button=Forcer la suppression
+ItemReferenceDialog.forceDelete.warn.title=\u00CAtes-vous s\u00FBr ?
+ItemReferenceDialog.forceDelete.warn.message=Forcer la suppression peut briser des \u00E9l\u00E9ments utilisant cet \u00E9l\u00E9ment. Forcer la suppression ?
+ProxyRepositoryFactory.load.sdk.componnents=Chargement des composants SDK...

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

@@ -1,205 +1,209 @@
 AbstractEMFRepositoryFactory.cannotGenerateItem=\u8CBC\u4ED8\u3051\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u30E9\u30D9\u30EB\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093\u3002
 AbstractEMFRepositoryFactory.job=\u30B8\u30E7\u30D6
-AbstractEMFRepositoryFactory.presistenceException.OnlyOneOccurenceMustbeFound=\u8907\u6570\u306E\u30A2\u30A4\u30C6\u30E0\u304C\u540C\u6642\u306B\u53D6\u5F97\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n{0}
-AbstractEMFRepositoryFactory.presistenceException.whoCauseProblems=\u554F\u984C\u767A\u751F\u539F\u56E0\u306F\uFF1A
-AbstractEMFRepositoryFactory.requiredComponent=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u4F7F\u7528\u306B\u5FC5\u8981:
-ProxyRepositoryFactory.bussinessException.itemNonModifiable=\u3053\u306E\u30A2\u30AF\u30B7\u30E7\u30F3\u3092\u884C\u3046\u305F\u3081\u306E\u5341\u5206\u306A\u6A29\u9650\u304C\u3042\u308A\u307E\u305B\u3093
-ProxyRepositoryFactory.cleanWorkspace=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u30AF\u30EA\u30FC\u30F3\u30A2\u30C3\u30D7
-ProxyRepositoryFactory.DeleteFolderContainsLockedItem=\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u542B\u3080\u30D5\u30A9\u30EB\u30C0\u30FC\u306F\u524A\u9664\u3067\u304D\u307E\u305B\u3093
-ProxyRepositoryFactory.exec.migration.tasks=\u79FB\u884C\u30BF\u30B9\u30AF\u3092\u5B9F\u884C
-ProxyRepositoryFactory.illegalArgumentException.labeAlreadyInUse=\u30E9\u30D9\u30EB{0}\u304C\u65E2\u306B\u4F7F\u7528\u4E2D\u3067\u3059
-ProxyRepositoryFactory.illegalArgumentException.labelNotMatchPattern=\u30E9\u30D9\u30EB{0}\u304C\u30D1\u30BF\u30FC\u30F3{1}\u306B\u4E00\u81F4\u3057\u307E\u305B\u3093
-ProxyRepositoryFactory.initializeProjectConnection=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u63A5\u7D9A\u3092\u521D\u671F\u5316
-ProxyRepositoryFactory.CycleReferenceError=\u30B5\u30A4\u30AF\u30EB\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u53C2\u7167\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
-ProxyRepositoryFactory.JobNameErroe=\u30B8\u30E7\u30D6\u540D\u30A8\u30E9\u30FC
+AbstractEMFRepositoryFactory.presistenceException.OnlyOneOccurenceMustbeFound=\u4E00\u3064\u4EE5\u4E0A\u306E\u30A2\u30A4\u30C6\u30E0\u304C\u540C\u6642\u306B\u53D6\u5F97\u3055\u308C\u307E\u3057\u305F\u3002\\n{0}
+AbstractEMFRepositoryFactory.presistenceException.whoCauseProblems=\u554F\u984C\u306E\u539F\u56E0\u3068\u306A\u3063\u305F\u9805\u76EE:
+AbstractEMFRepositoryFactory.requiredComponent=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u4F7F\u7528\u306B\u5FC5\u8981\u306A\u3053\u3068:
+ProxyRepositoryFactory.bussinessException.itemNonModifiable=\u3042\u306A\u305F\u306F\u3053\u306E\u30A2\u30AF\u30B7\u30E7\u30F3\u306E\u6A29\u9650\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+ProxyRepositoryFactory.exec.migration.tasks=\u79FB\u884C\u30BF\u30B9\u30AF\u3092\u5B9F\u884C\u3057\u307E\u3059
+ProxyRepositoryFactory.illegalArgumentException.labeAlreadyInUse=\u30E9\u30D9\u30EB{0}\u306F\u65E2\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
+ProxyRepositoryFactory.illegalArgumentException.labelNotMatchPattern=\u30E9\u30D9\u30EB{0} \u306F\u30D1\u30BF\u30FC\u30F3 {1}\u3068\u5408\u81F4\u3057\u3066\u3044\u307E\u305B\u3093
+ProxyRepositoryFactory.initializeProjectConnection=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3078\u63A5\u7D9A
+ProxyRepositoryFactory.JobNameErroe=\u30B8\u30E7\u30D6\u540D\u3000\u30A8\u30E9\u30FC
 ProxyRepositoryFactory.Label=\u30E9\u30D9\u30EB
-ProxyRepositoryFactory.load.componnents=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9...
-ProxyRepositoryFactory.load.sdk.componnents=SDK\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9...
-ProxyRepositoryFactory.log.Restoration=Restoration [{0}] by {1} to "/{2}".
-ProxyRepositoryFactory.log.lock="{1}"\u306B\u3088\u3063\u3066\u30ED\u30C3\u30AF[{0}]\u3002
-ProxyRepositoryFactory.log.loggedOn={0} logged on {1}
-ProxyRepositoryFactory.log.logicalDeletion={1}\u306B\u3088\u3063\u3066\u8AD6\u7406\u524A\u9664[{0}]\u3002
-ProxyRepositoryFactory.log.move="{1}"\u3092[{0}]\u306B\u79FB\u52D5
-ProxyRepositoryFactory.log.newIdGenerated=New ID generated on project [{0}] = {1}
-ProxyRepositoryFactory.log.physicalDeletion={1}\u306B\u3088\u308B\u7269\u7406\u524A\u9664[{0}]\u3002
-ProxyRepositoryFactory.log.tempFolderEmptied=\u4E00\u6642\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u7A7A\u306B\u3057\u307E\u3057\u305F({1}\u30DF\u30EA\u79D2\u3067{0}\u30D5\u30A1\u30A4\u30EB\u3092\u524A\u9664)
-ProxyRepositoryFactory.log.unlock="{1}"\u306B\u3088\u3063\u3066\u30ED\u30C3\u30AF\u89E3\u9664[{0}]\u3002
-ProxyRepositoryFactory.logonInProgress=\u30ED\u30B0\u30AA\u30F3\u4E2D...
-ProxyRepositoryFactory.MoveFolderContainsLockedItem=\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u542B\u3080\u30D5\u30A9\u30EB\u30C0\u30FC\u306F\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093
-ProxyRepositoryFactory.projectIsNotCompatible=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8{0}\u304C\u3088\u308A\u6700\u65B0\u306EStudio\u306B\u3088\u3063\u3066\u958B\u304B\u308C\u305F\u305F\u3081\u3001\u958B\u3051\u307E\u305B\u3093\u3002
-ProxyRepositoryFactory.projectCanNotOpen=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u958B\u3051\u307E\u305B\u3093\u3002\u30A8\u30E9\u30FC\u30BF\u30B9\u30AF\u306F{0}\u3067\u3059\u3002
-ProxyRepositoryFactory.RenameFolderContainsLockedItem=\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u542B\u3080\u30D5\u30A9\u30EB\u30C0\u30FC\u540D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093
-ProxyRepositoryFactory.ReplaceJob=\u304C\u65E2\u306B\u4F7F\u7528\u4E2D\u3067\u3059\u3002\u7F6E\u63DB\u3057\u307E\u3059\u304B?
-ProxyRepositoryFactory.synch.repo.items=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u30A2\u30A4\u30C6\u30E0\u3092\u540C\u671F
-ProxyRepositoryFactory.synchronizeLibraries=\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u3092\u540C\u671F...
-ProxyRepositoryFactory.installComponents=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u4E2D...
-ProxyRepositoryFactory.titleWarning=\u8B66\u544A
-ProxyRepositoryFactory.msgMissingReferencedProjects=\u53C2\u7167\u3055\u308C\u305F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8[{0}]\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u30ED\u30B0\u30A4\u30F3\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u7D9A\u884C\u3057\u307E\u3059\u304B?
-ProxyRepositoryFactory.exceptionMissingReferencedProjects=\u53C2\u7167\u3055\u308C\u308B\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8[{0}]\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-ProxyRepositoryFactory.btnLabelContinue=\u7D9A\u884C
-CreateSandboxProjectDialog.createUserLabel=Sandbox\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306B\u30EA\u30F3\u30AF\u3055\u308C\u305F\u65B0\u3057\u3044\u30E6\u30FC\u30B6\u30FC\u3092\u4F5C\u6210
+ProxyRepositoryFactory.load.componnents=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30ED\u30FC\u30C9...
+ProxyRepositoryFactory.log.Restoration={1}\u304B\u3089[{0}]\u3092 \"/{2}\"\u3078\u5FA9\u5143\u3057\u307E\u3059\u3002
+ProxyRepositoryFactory.log.lock=\"{1}\"\u306B\u3088\u3063\u3066 [{0}]\u3000\u3092\u30ED\u30C3\u30AF
+ProxyRepositoryFactory.log.loggedOn=[{0}]\u306F\"{1}\"\u306B\u3088\u3063\u3066\u8A18\u9332\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+ProxyRepositoryFactory.log.logicalDeletion=\"{1}\"\u306B\u3088\u3063\u3066 [{0}]\u3092\u8AD6\u7406\u524A\u9664
+ProxyRepositoryFactory.log.move=[{0}] \u3092 \"{1}\"\u3078\u79FB\u52D5\u3002
+ProxyRepositoryFactory.log.newIdGenerated=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8[{0}] = {1}\u3067\u65B0\u898FID\u304C\u751F\u6210\u3055\u308C\u307E\u3057\u305F
+ProxyRepositoryFactory.log.physicalDeletion=\"{1}\"\u306B\u3088\u3063\u3066 [{0}]\u3092\u7269\u7406\u524A\u9664
+ProxyRepositoryFactory.log.tempFolderEmptied=\u4E00\u6642\u30D5\u30A9\u30EB\u30C0\u306F\u7A7A\u3067\u3059 ({0} \u30D5\u30A1\u30A4\u30EB\u306F {1} \u30DF\u30EA\u79D2\u3067\u524A\u9664\u3055\u308C\u307E\u3059)
+ProxyRepositoryFactory.log.unlock=\"{1}\"\u306B\u3088\u3063\u3066 [{0}] \u3092\u30ED\u30C3\u30AF\u89E3\u9664
+ProxyRepositoryFactory.logonInProgress=\u30ED\u30B0\u30AA\u30F3\u4E2D\u3067\u3059...
+ProxyRepositoryFactory.projectIsNotCompatible=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8{0}\u306F\u3088\u308A\u65B0\u3057\u3044Studio\u306B\u3088\u3063\u3066\u65E2\u306B\u958B\u304B\u308C\u3066\u3044\u308B\u305F\u3081\u3001\u958B\u304F\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3002
+ProxyRepositoryFactory.ReplaceJob=\u65E2\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u7F6E\u63DB\u3048\u307E\u3059\u304B\uFF1F
+ProxyRepositoryFactory.synch.repo.items=\u30EA\u30DD\u30B8\u30C8\u30EA\u3092\u540C\u671F\u4E2D\u3067\u3059
+ProxyRepositoryFactory.synchronizeLibraries=\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u540C\u671F\u4E2D...
+CreateSandboxProjectDialog.createUserLabel=\u4F5C\u6210\u3057\u305Fsandbox\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306B\u30EA\u30F3\u30AF\u3057\u305F\u65B0\u898F\u30E6\u30FC\u30B6\u306E\u4F5C\u6210
 CreateSandboxProjectDialog.Failure=\u5931\u6557
-CreateSandboxProjectDialog.failureMessage=Sandbox\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+CreateSandboxProjectDialog.failureMessage=\u30B5\u30F3\u30C9\u30DC\u30C3\u30AF\u30B9\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
 CreateSandboxProjectDialog.ProjectDesc=\u8AAC\u660E
 CreateSandboxProjectDialog.ProjectLabel=\u30E9\u30D9\u30EB
-CreateSandboxProjectDialog.successMessage=Sandbox\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u6B63\u3057\u304F\u3057\u307E\u3057\u305F\u3002
+CreateSandboxProjectDialog.ProjectSvnAdvance=SVN\u8A73\u7D30\u8A2D\u5B9A
+CreateSandboxProjectDialog.successMessage=sandbox\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210\u306B\u6210\u529F\u3057\u307E\u3057\u305F
 CreateSandboxProjectDialog.successTitile=\u6210\u529F
-CreateSandboxProjectDialog.Title=Sandbox \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u4F5C\u6210 - -{0}
-CreateSandboxProjectDialog.userFirstname=\u540D
-CreateSandboxProjectDialog.userLastname=\u59D3
-CreateSandboxProjectDialog.userLoginValidMessage=\u30E6\u30FC\u30B6\u30FC\u30ED\u30B0\u30A4\u30F3\u306F\u6709\u52B9\u306A\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-CreateSandboxProjectDialog.userPasswordEmptyMessage=\u30E6\u30FC\u30B6\u30FC\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+CreateSandboxProjectDialog.svnUrl=URL
+CreateSandboxProjectDialog.Title=Sandbox\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210 - {0}
+CreateSandboxProjectDialog.userFirstname=\u30D5\u30A1\u30FC\u30B9\u30C8\u30CD\u30FC\u30E0
+CreateSandboxProjectDialog.userLastname=\u30E9\u30B9\u30C8\u30CD\u30FC\u30E0
+CreateSandboxProjectDialog.userLoginMessage=svn\u30ED\u30B0\u30A4\u30F3\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+CreateSandboxProjectDialog.userLoginValidMessage=\u6B63\u3057\u3044e-mail\u30A2\u30C9\u30EC\u30B9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+CreateSandboxProjectDialog.userPasswordEmptyMessage=\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u8A2D\u5B9A\u304C\u5FC5\u8981\u3067\u3059
 CreateSandboxProjectDialog.Login=\u30ED\u30B0\u30A4\u30F3
 CreateSandboxProjectDialog.Password=\u30D1\u30B9\u30EF\u30FC\u30C9
+CreateSandboxProjectDialog.URLMessage=svnURL\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
+CreateSandboxProjectDialog.userSvnSettingLabel=\u30C7\u30D5\u30A9\u30EB\u30C8SVN\u8A2D\u5B9A
 PropertiesWizardPage.Author=\u4F5C\u6210\u8005
-PropertiesWizardPage.Locker=\u30ED\u30C3\u30AF\u4FDD\u6301\u8005
+PropertiesWizardPage.Locker=\u30ED\u30C3\u30AB\u30FC
 PropertiesWizardPage.Description=\u8AAC\u660E
-PropertiesWizardPage.EmptyDescWarning=\u8AAC\u660E\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u5165\u529B\u3092\u63A8\u5968\u3057\u307E\u3059\u3002
-PropertiesWizardPage.EmptyPurposeWarning=\u76EE\u7684\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u5165\u529B\u3092\u63A8\u5968\u3057\u307E\u3059
-PropertiesWizardPage.ItemExistsError=\u30A2\u30A4\u30C6\u30E0\u304C\u5B58\u5728\u3057\u307E\u3059\u3002\u3054\u307F\u7BB1\u3092\u78BA\u8A8D\u3057\u3066\u7A7A\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-PropertiesWizardPage.KeywordsError=\u540D\u524D\u304C\u6709\u52B9\u306AID\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+PropertiesWizardPage.EmptyDescWarning=\u8AAC\u660E\u3092\u7A7A\u306B\u3059\u308B\u3053\u3068\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093\u3002
+PropertiesWizardPage.EmptyPurposeWarning=\u76EE\u7684\u3092\u7A7A\u306B\u3059\u308B\u3053\u3068\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093\u3002
+PropertiesWizardPage.ItemExistsError=\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
+PropertiesWizardPage.KeywordsError=\u540D\u524D\u304C\u6709\u52B9\u306A\u8B58\u5225\u5B50\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
 PropertiesWizardPage.Name=\u540D\u524D
-PropertiesWizardPage.NameEmptyError=\u540D\u524D\u304C\u7A7A\u3067\u3059\u3002
+PropertiesWizardPage.NameEmptyError=\u540D\u524D\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044\u3002
 PropertiesWizardPage.NameFormatError=\u540D\u524D\u306B\u4E0D\u6B63\u306A\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
 PropertiesWizardPage.Path=\u30D1\u30B9
 PropertiesWizardPage.Purpose=\u76EE\u7684
 PropertiesWizardPage.Select=\u9078\u629E
-PropertiesWizardPage.SelectfolderMessage=\u30A2\u30A4\u30C6\u30E0\u304C\u4F5C\u6210\u3055\u308C\u308B\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u9078\u629E
-PropertiesWizardPage.SelectfolderTitle=\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u9078\u629E
+PropertiesWizardPage.SelectfolderMessage=\u30A2\u30A4\u30C6\u30E0\u3092\u4F5C\u6210\u3059\u308B\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u9078\u629E\u3057\u307E\u3059
+PropertiesWizardPage.SelectfolderTitle=\u30D5\u30A9\u30EB\u30C0\u306E\u9078\u629E
 PropertiesWizardPage.Status=\u30B9\u30C6\u30FC\u30BF\u30B9
 PropertiesWizardPage.Version=\u30D0\u30FC\u30B8\u30E7\u30F3
 PropertiesWizardPage.Version.Major=M
 PropertiesWizardPage.Version.Minor=m
-PropertiesWizardPage.ImageSizeError=\u30B5\u30A4\u30BA\u304C32x32\u306E\u753B\u50CF\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-EAuthenticationMethod.anonymousAuth=\u533F\u540D\u8A8D\u8A3C
+PropertiesWizardPage.ImageSizeError=\u30B5\u30A4\u30BA\u304C 32x32 \u306E\u30A4\u30E1\u30FC\u30B8\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+EAuthenticationMethod.anonymousAuth=\u533F\u540D\u306E\u8A8D\u8A3C
 EAuthenticationMethod.simpleAuth=\u5358\u7D14\u306A\u8A8D\u8A3C
-AdvancedSocketFactory.failedInitial=\u30A8\u30E9\u30FC : \u521D\u671F\u5316\u306B\u5931\u6557\u3057\u307E\u3057\u305F :
-LDAPCATruster.failedCreateCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
-LDAPCATruster.failedCreateTmp=tmp\u4FE1\u983C\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
-LDAPCATruster.failedInitialTrust=\u521D\u671F\u4FE1\u983C\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
-LDAPCATruster.failedLoadCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-LDAPCATruster.failedSaveTrust=\u4FE1\u983C\u30B9\u30C8\u30A2\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
+AdvancedSocketFactory.failedInitial=\u30A8\u30E9\u30FC \uFF1A \u521D\u671F\u5316\u306B\u5931\u6557\u3057\u307E\u3057\u305F \uFF1A
+LDAPCATruster.failedCreateCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u306E\u4F5C\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F\uFF1A
+LDAPCATruster.failedCreateTmp=\u4E00\u6642\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u306E\u4F5C\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F :
+LDAPCATruster.failedInitialTrust=\u521D\u671F\u30C8\u30E9\u30B9\u30C8\u30DE\u30CD\u30FC\u30B8\u30E3\u306E\u4F5C\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F :
+LDAPCATruster.failedLoadCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u306E\u30ED\u30FC\u30C9\u306B\u5931\u6557\u3057\u307E\u3057\u305F :
+LDAPCATruster.failedSaveTrust=\u8A3C\u660E\u66F8\u306E\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F:
 LDAPCATruster.locationInvalid=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u30D5\u30A1\u30A4\u30EB\u306E\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u7121\u52B9\u3067\u3059:
-LDAPCATruster.noCertificate=\n\u30AD\u30FC\u30C4\u30FC\u30EB\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u3063\u3066\u3001\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-LDAPCATruster.sslError1=SSL\u30A8\u30E9\u30FC\uFF1A\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u3092\u691C\u8A3C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-LDAPCATruster.sslError2=SSL\u30A8\u30E9\u30FC: \u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u3092\u691C\u8A3C\u3067\u304D\u306A\u304F\u3066\u3001\\nCA\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-LDAPCATruster.sslError3=SSL\u30A8\u30E9\u30FC: CA\u8A3C\u660E\u66F8\u304C\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u306B\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+LDAPCATruster.noCertificate=\u30B5\u30FC\u30D0\u8A3C\u660E\u66F8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B\u306B\u306F\u3001keytool\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+LDAPCATruster.sslError1=SSL\u30A8\u30E9\u30FC\uFF1A\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u306E\u691C\u8A3C\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
+LDAPCATruster.sslError2=SSL\u30A8\u30E9\u30FC\uFF1A\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u306E\u691C\u8A3C\u306B\u5931\u6557\u3057\u3001CA\u304C\u6B20\u843D\u3057\u3066\u3044\u307E\u3059\u3002
+LDAPCATruster.sslError3=SSL\u30A8\u30E9\u30FC\uFF1ACA\u304C\u30B5\u30FC\u30D0\u8A3C\u660E\u66F8\u306B\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 CopyAction.thisText.copy=\u30B3\u30D4\u30FC
 RestoreAction.action.title=\u5FA9\u5143
 RestoreAction.action.toolTipText=\u5FA9\u5143
-PasteAction.thisText.paste=\u8CBC\u308A\u4ED8\u3051
-DeleteAction.action.foreverTitle=\u5B8C\u5168\u306B\u524A\u9664
+PasteAction.thisText.paste=\u8CBC\u4ED8\u3051
+DeleteAction.action.foreverTitle=\u3054\u307F\u7BB1\u3092\u7A7A\u306B\u3059\u308B
 DeleteAction.action.logicalTitle=\u524A\u9664
-DeleteAction.action.logicalToolTipText=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u3054\u307F\u7BB1\u306B\u5165\u308C\u308B
-DeleteAction.deleteJobAssignedToOneService= \u306F\u30B5\u30FC\u30D3\u30B9\u306E\u64CD\u4F5C\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u3066\u3044\u307E\u3059!\n\u3053\u306E\u30B8\u30E7\u30D6\u3092\u524A\u9664\u3057\u307E\u3059\u304B?
-DeleteAction.deleteSomeJobsAssignedToServices= \u306F\u4E00\u90E8\u306E\u30B5\u30FC\u30D3\u30B9\u306E\u4E00\u90E8\u306E\u64CD\u4F5C\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u3066\u3044\u307E\u3059!\n\u3053\u308C\u3089\u306E\u30B8\u30E7\u30D6\u3092\u524A\u9664\u3057\u307E\u3059\u304B?
-DeleteAction.dialog.message0=\u3054\u307F\u7BB1\u3092\u7A7A\u306B\u3059\u308B(\u5FA9\u65E7\u3067\u304D\u307E\u305B\u3093)
-DeleteAction.dialog.message1=\u9078\u629E\u3057\u305F\u30A8\u30EC\u30E1\u30F3\u30C8\u306F\u5B8C\u5168\u306B\u524A\u9664\u3055\u308C\u307E\u3059\u3002
-DeleteAction.dialog.message2=\u7D9A\u884C\u3057\u307E\u3059\u304B?
-DeleteAction.dialog.messageAllElements=\u30A8\u30EC\u30E1\u30F3\u30C8\u306F\u3059\u3079\u3066\u5B8C\u5168\u306B\u524A\u9664\u3055\u308C\u307E\u3059(\u53D6\u5F97\u4E0D\u53EF\u80FD)\u3002
-DeleteAction.dialog.title=\u5B8C\u5168\u306B\u524A\u9664
-DeleteAction.error.lockedOrOpenedObject.newMessage={0}\u304C\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\n\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u958B\u3044\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u524A\u9664\u524D\u306B\u9589\u3058\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-DeleteAction.error.testCaseLockedOrOpenedObject.newMessage={0}\u306E\u30C6\u30B9\u30C8\u30B1\u30FC\u30B9\u304C\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\n\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u958B\u3044\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u524A\u9664\u524D\u306B\u9589\u3058\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-DeleteAction.error.title=\u524A\u9664\u7981\u6B62
+DeleteAction.action.logicalToolTipText=\u30B4\u30DF\u7BB1\u306B\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u79FB\u52D5
+DeleteAction.deleteJobAssignedToOneService=\u30AA\u30DA\u30EC\u30FC\u30B7\u30E7\u30F3\u30B5\u30FC\u30D3\u30B9\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u3053\u306E\u30B8\u30E7\u30D6\u3092\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F
+DeleteAction.deleteSomeJobsAssignedToServices=\u30AA\u30DA\u30EC\u30FC\u30B7\u30E7\u30F3\u30B5\u30FC\u30D3\u30B9\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u3053\u308C\u3089\u306E\u30B8\u30E7\u30D6\u3092\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F
+DeleteAction.dialog.message0=\u5B8C\u5168\u306B\u524A\u9664\u3055\u308C\u307E\u3059\uFF08\u5143\u306B\u623B\u3059\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\uFF09
+DeleteAction.dialog.message1=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u306F\u5B8C\u5168\u306B\u524A\u9664\u3055\u308C\u307E\u3059\uFF08\u5FA9\u65E7\u51FA\u6765\u307E\u305B\u3093\uFF09\u3002
+DeleteAction.dialog.message2=\u7D9A\u3051\u307E\u3059\u304B\uFF1F
+DeleteAction.dialog.messageAllElements=\u5168\u3066\u306E\u30A2\u30A4\u30C6\u30E0\u306F\u5B8C\u5168\u306B\u524A\u9664\u3055\u308C\u307E\u3059\u3002
+DeleteAction.dialog.title=\u3054\u307F\u7BB1\u3092\u7A7A\u306B\u3059\u308B
+DeleteAction.error.lockedOrOpenedObject.newMessage={0}\u306F\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u524A\u9664\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3002\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u304C\u958B\u304B\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u4E8B\u524D\u306B\u9589\u3058\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+DeleteAction.error.title=\u524A\u9664\u306F\u7981\u6B62\u3055\u308C\u3066\u3044\u307E\u3059
 DeleteAction.warning.message1=\u30D5\u30A9\u30EB\u30C0\u5185\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u958B\u304B\u308C\u3066\u3044\u308B\u305F\u3081\u30D5\u30A9\u30EB\u30C0\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\u3059\u3079\u3066\u306E\u30A2\u30A4\u30C6\u30E0\u3092\u9589\u3058\u305F\u72B6\u614B\u3067\u518D\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 DeleteAction.warning.title=\u8B66\u544A
 DuplicateAction.cannotGenerateItem=\u8CBC\u4ED8\u3051\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u30E9\u30D9\u30EB\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093\u3002
 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\u304F\u3060\u3055\u3044
-DuplicateAction.input.message=\u65B0\u3057\u3044\u540D\u524D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
-DuplicateAction.input.title.v2=\u8907\u88FD
+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.thisText.duplicate=\u8907\u88FD
-DuplicateAction.NameEmptyError=\u540D\u524D\u304C\u7A7A\u3067\u3059\u3002
+DuplicateAction.NameEmptyError=\u540D\u524D\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044\u3002
 DuplicateAction.NameFormatError=\u540D\u524D\u306B\u4E0D\u6B63\u306A\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-DuplicateAction.ItemExistsError=\u30A2\u30A4\u30C6\u30E0\u304C\u5B58\u5728\u3057\u307E\u3059\u3002\u3054\u307F\u7BB1\u3092\u78BA\u8A8D\u3057\u3066\u7A7A\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-DuplicateAction.KeywordsError=\u540D\u524D\u304C\u6709\u52B9\u306AID\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-DuplicateAction.SameAsProjectname=\u540D\u524D\u304C\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D\u3068\u540C\u3058\u3067\u3059\u3002
+DuplicateAction.ItemExistsError=\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
+DuplicateAction.KeywordsError=\u540D\u524D\u304C\u6709\u52B9\u306A\u8B58\u5225\u5B50\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
 EmptyRecycleBinAction.action.title=\u3054\u307F\u7BB1\u3092\u7A7A\u306B\u3059\u308B
 EmptyRecycleBinAction.action.toolTipText=\u3054\u307F\u7BB1\u3092\u7A7A\u306B\u3059\u308B
 EmptyRecycleBinAction.dialog.title=\u3054\u307F\u7BB1\u3092\u7A7A\u306B\u3059\u308B
-EmptyRecycleBinAction.dialog.allDependencies=\u3054\u307F\u7BB1\u3092\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093\u3002\n\u30C7\u30FC\u30BF\u30D7\u30ED\u30D5\u30A1\u30A4\u30E9\u30FC\u30D1\u30FC\u30B9\u30DA\u30AF\u30C6\u30A3\u30D6\u304C\u30A2\u30A4\u30C6\u30E0\u306E1\u3064\u306B\u4F9D\u5B58\u3057\u3066\u3044\u307E\u3059\u3002\u524A\u9664\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002
-PasteObjectAction.error.labelAlreadyExists=\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u30E9\u30D9\u30EB\u306F\u65E2\u306B\u3053\u306E\u30D1\u30B9\u306B\u5B58\u5728\u3057\u307E\u3059
-PasteObjectAction.error.title=\u8CBC\u308A\u4ED8\u3051\u4E0D\u53EF
-JobletReferenceDialog.DeletedInfor=\u3054\u307F\u7BB1\u5185
-JobletReferenceDialog.Messages=\u30B8\u30E7\u30D6\u304B\u3089\u53C2\u7167\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001\u4E00\u90E8\u306E\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002
+EmptyRecycleBinAction.dialog.allDependencies=\u30B4\u30DF\u7BB1\u3092\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093\u3002\u30C7\u30FC\u30BF\u5206\u6790\u30D1\u30FC\u30B9\u30DA\u30AF\u30C6\u30A3\u30D6\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u30A2\u30A4\u30C6\u30E0\u304C\u3042\u308A\u307E\u3059\u3002
+PasteObjectAction.error.labelAlreadyExists=\u3053\u306E\u30D1\u30B9\u306B\u306F\u3001\u3053\u306E\u30E9\u30D9\u30EB\u3092\u3082\u3063\u305F\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u304C\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059
+PasteObjectAction.error.title=\u8CBC\u308A\u4ED8\u3051\u3067\u304D\u307E\u305B\u3093
+JobletReferenceDialog.DeletedInfor=\u3054\u307F\u7BB1\u3078
+JobletReferenceDialog.Messages=\u30B8\u30E7\u30D6\u304B\u3089\u53C2\u7167\u3055\u308C\u3066\u3044\u308B\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u306F\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002
 JobletReferenceDialog.NodeTotals=\u5408\u8A08
-JobletReferenceDialog.NodeTotalsTip=\u30CE\u30FC\u30C9\u53C2\u7167\u306E\u5408\u8A08
+JobletReferenceDialog.NodeTotalsTip=\u30CE\u30FC\u30C9\u53C2\u7167\u5408\u8A08\u6570
 JobletReferenceDialog.project=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
 JobletReferenceDialog.ReferenceJob=\u53C2\u7167\u30B8\u30E7\u30D6
-JobletReferenceDialog.Title=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u306E\u5931\u6557\u3092\u524A\u9664
-ContextReferenceDialog.Title=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u3092\u524A\u9664
-ContextReferenceDialog.Recycle=\u3054\u307F\u7BB1\u5185
+JobletReferenceDialog.Title=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u524A\u9664\u306E\u5931\u6557
+ContextReferenceDialog.Title=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u524A\u9664
+ContextReferenceDialog.Recycle=\u3054\u307F\u7BB1\u3078
 ContextReferenceDialog.ReferenceJob=\u53C2\u7167\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8
 ContextReferenceDialog.Types=\u30BF\u30A4\u30D7
-ContextReferenceDialog.NodeTypeTip=\u30CE\u30FC\u30C9\u53C2\u7167\u306E\u30BF\u30A4\u30D7
-ContextReferenceDialog.Messages=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8({0} {1})\u306F\n\u304B\u3089\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059
-ContextReferenceDialog.kindMessages={0} {1}\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u306F\u6B21\u306E\u30EA\u30B9\u30C8\u306B\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u524A\u9664\u3057\u305F\u3044\u5834\u5408\u306F\u3001\u30B8\u30E7\u30D6\u304C\u3082\u3046\u4E00\u5EA6\u958B\u304B\u308C\u305F\u6642\u306B\u3001\u30B8\u30E7\u30D6\u3067\u4F7F\u7528\u3055\u308C\u308B\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u306F\u7D44\u307F\u8FBC\u307F\u306B\u5909\u63DB\u3055\u308C\u307E\u3059\u3002\u524A\u9664\u3057\u307E\u3059\u304B?
-ContextReferenceDialog.kindMessages1={0} {1}\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u304C\u4EE5\u4E0B\u306E\u30EA\u30B9\u30C8\u306B\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u524A\u9664\u3057\u307E\u3059\u304B?
+ContextReferenceDialog.NodeTypeTip=\u30CE\u30FC\u30C9\u53C2\u7167\u30BF\u30A4\u30D7
+ContextReferenceDialog.Messages=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\uFF08{0}{1}\uFF09\u306F:\\n\u304B\u3089\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059
+ContextReferenceDialog.kindMessages={0} \u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u306F\u4EE5\u4E0B\u306E\u30EA\u30B9\u30C8\u304B\u3089\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u524A\u9664\u3092\u5B9F\u884C\u3057\u307E\u3059\u304B\uFF1F \u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u3092\u524A\u9664\u3057\u305F\u3044\u5834\u5408\u3001\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u306F\u30B8\u30E7\u30D6\u3092\u6B21\u56DE\u958B\u3044\u305F\u969B\u306B\u30D3\u30EB\u30C8-\u30A4\u30F3\u306B\u5909\u308F\u308A\u307E\u3059\u3002
+ContextReferenceDialog.kindMessages1=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7 {0} {1} \u306F\u4EE5\u4E0B\u306E\u30EA\u30B9\u30C8\u304B\u3089\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u524A\u9664\u3092\u5B9F\u884C\u3057\u307E\u3059\u304B\uFF1F
 CopyToGenericSchemaHelper.cannotGenarateItem=\u8CBC\u4ED8\u3051\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u30E9\u30D9\u30EB\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093\u3002
 ProxyRepositoryFactory.ReplaceJobHazardDescription=\n\u5143\u306E\u63A5\u7D9A\u3078\u306E\u4F9D\u5B58\u304C\u5931\u308F\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059!
 ItemReferenceDialog.title=\u524A\u9664\u3067\u304D\u306A\u3044\u30A2\u30A4\u30C6\u30E0
 ItemReferenceDialog.item=\u30A2\u30A4\u30C6\u30E0
 ItemReferenceDialog.referenceItem=\u53C2\u7167\u30A2\u30A4\u30C6\u30E0
 ItemReferenceDialog.nodeTotals=\u5408\u8A08
-ItemReferenceDialog.nodeTotalsTip=\u30CE\u30FC\u30C9\u53C2\u7167\u306E\u5408\u8A08
+ItemReferenceDialog.nodeTotalsTip=\u30CE\u30FC\u30C9\u53C2\u7167\u5408\u8A08\u6570
 ItemReferenceDialog.project=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
-ItemReferenceDialog.deletedInfor=\u3054\u307F\u7BB1\u5185
-ItemReferenceDialog.messages=\u4ED6\u306E\u30A2\u30A4\u30C6\u30E0\u306B\u3088\u3063\u3066\u53C2\u7167\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001\u4E00\u90E8\u306E\u30A2\u30A4\u30C6\u30E0\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002
-ItemReferenceDialog.doNotDelete.button=\u524A\u9664\u3057\u306A\u3044
-ItemReferenceDialog.forceDelete.button=\u524A\u9664\u3092\u5F37\u5236
-ItemReferenceDialog.forceDelete.warn.title=\u3088\u308D\u3057\u3044\u3067\u3059\u304B?
-ItemReferenceDialog.forceDelete.warn.message=\u524A\u9664\u306E\u5F37\u5236\u30A2\u30AF\u30B7\u30E7\u30F3\u3092\u5B9F\u884C\u3059\u308B\u3068\u3001\u3053\u306E\u30A2\u30A4\u30C6\u30E0\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u30A2\u30A4\u30C6\u30E0\u304C\u58CA\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u524A\u9664\u3092\u5F37\u5236\u3057\u307E\u3059\u304B?
+ItemReferenceDialog.deletedInfor=\u3054\u307F\u7BB1\u3078
+ItemReferenceDialog.messages=\u4ED6\u306E\u30A2\u30A4\u30C6\u30E0\u304B\u3089\u53C2\u7167\u3055\u308C\u3066\u3044\u308B\u30A2\u30A4\u30C6\u30E0\u306F\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002
 ProjectRepositoryNode.code=\u30B3\u30FC\u30C9
 ProjectRepositoryNode.rulesManagement=\u30EB\u30FC\u30EB\u7BA1\u7406
-ProjectRepositoryNode.itemInvalid=\u7121\u52B9\u306A\u30A2\u30A4\u30C6\u30E0: [{0}] {1}
-ProjectRepositoryNode.invalidItem=\u7121\u52B9\u306A\u30A2\u30A4\u30C6\u30E0
+ProjectRepositoryNode.itemInvalid=\u30A2\u30A4\u30C6\u30E0\u306F\u4E0D\u6B63\u3067\u3059\uFF1A[{0}] {1}
+ProjectRepositoryNode.invalidItem=\u9805\u76EE\u304C\u4E0D\u6B63\u3067\u3059
 ProjectRepositoryNode.columns=\u30AB\u30E9\u30E0
 ProjectRepositoryNode.validationRules=\u691C\u8A3C\u30EB\u30FC\u30EB
-ProjectRepositoryNode.cdcFoundation=CDC Foundation
+ProjectRepositoryNode.cdcFoundation=CDC\u8A2D\u5B9A
 ProjectRepositoryNode.genericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE
-ProjectRepositoryNode.queries=\u30AF\u30A8\u30EA\u30FC
-ProjectRepositoryNode.synonymSchemas=\u30B7\u30CE\u30CB\u30E0\u30B9\u30AD\u30FC\u30DE
-ProjectRepositoryNode.calculationViewSchemas=\u8A08\u7B97\u30D3\u30E5\u30FC\u30B9\u30AD\u30FC\u30DE
-ProjectRepositoryNode.tableSchemas=\u30C6\u30FC\u30D6\u30EB\u30B9\u30AD\u30FC\u30DE
-ProjectRepositoryNode.viewSchemas=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A
-ProjectRepositoryNode.sapFunctions=SAP\u95A2\u6570
+ProjectRepositoryNode.queries=\u30AF\u30A8\u30EA
+ProjectRepositoryNode.synonymSchemas=\u30B7\u30CE\u30CB\u30E0
+ProjectRepositoryNode.tableSchemas=\u30C6\u30FC\u30D6\u30EB
+ProjectRepositoryNode.viewSchemas=\u30D3\u30E5\u30FC
+ProjectRepositoryNode.sapFunctions=SAP\u30D5\u30A1\u30F3\u30AF\u30B7\u30E7\u30F3
+ProjectRepositoryNode.sapIDocs=SAP iDoc
+RepositoryDropAdapter_copyingItems=\u30A2\u30A4\u30C6\u30E0\u3092\u30B3\u30D4\u30FC\u4E2D...
+RepositoryDropAdapter_lockedByOthers=\u3053\u306E\u30A2\u30A4\u30C6\u30E0\u306F\u4ED6\u306E\u30E6\u30FC\u30B6\u30FC\u306B\u3088\u3063\u3066\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u4ECA\u306F\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093\u3002
+RepositoryDropAdapter_lockedByYou=\u3053\u306E\u30A2\u30A4\u30C6\u30E0\u306F\u3042\u306A\u305F\u3088\u3063\u3066\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u4ECA\u306F\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093\u3002
+RepositoryDropAdapter_moveTitle=\u79FB\u52D5
+RepositoryDropAdapter_movingItems=\u30A2\u30A4\u30C6\u30E0\u3092\u79FB\u52D5\u4E2D...
+RepositoryDropAdapter.checkingLockStatus=\u30ED\u30C3\u30AF\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30C1\u30A7\u30C3\u30AF\u4E2D
+RepositoryDropAdapter.moving=\u79FB\u52D5\u4E2D
+NewFolderWizard.description=\u30EA\u30DD\u30B8\u30C8\u30EA\u306B\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
+NewFolderWizard.failureText=\u30A8\u30E9\u30FC\u767A\u751F\u3002\u30D5\u30A9\u30EB\u30C0\u306F\u4F5C\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u307F\u3066\u304F\u3060\u3055\u3044\u3002
+NewFolderWizard.failureTitle=\u30A8\u30E9\u30FC
+NewFolderWizard.label=\u30E9\u30D9\u30EB
+NewFolderWizard.nameEmpty=\u30E9\u30D9\u30EB\u540D\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044
+NewFolderWizard.nameIncorrect=\u30E9\u30D9\u30EB\u306B\u4E0D\u6B63\u306A\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
+NewFolderWizard.nameInvalid=\u30E9\u30D9\u30EB{0} \u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+NewFolderWizard.title=\u30D5\u30A9\u30EB\u30C0\u30FC
+NewFolderWizard.windowTitle=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+CreateFolderAction.action.title=\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
+CreateFolderAction.action.toolTipText=\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
+RenameFolderAction.action.title=\u30D5\u30A9\u30EB\u30C0\u306E\u30EA\u30CD\u30FC\u30E0
+RenameFolderAction.action.toolTipText=\u30D5\u30A9\u30EB\u30C0\u306E\u30EA\u30CD\u30FC\u30E0
+RenameFolderAction.warning.editorOpen.message=\u3053\u306E\u30D5\u30A9\u30EB\u30C0\u30FC\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u30A2\u30A4\u30C6\u30E0({0})\u304C\u73FE\u5728\u958B\u3044\u3066\u3044\u308B\u305F\u3081\u3001"{1}"\u30D5\u30A9\u30EB\u30C0\u30FC\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3002\u9589\u3058\u3066\u304B\u3089\u518D\u8A66\u884C\u3057\u3066\u4E0B\u3055\u3044\u3002
+RenameFolderAction.warning.editorOpen.title=\u6709\u52B9\u306A\u64CD\u4F5C\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+RenameFolderAction.warning.cannotFind.message=\u30D5\u30A9\u30EB\u30C0\u30FC\u306E\u540D\u79F0\u5909\u66F4\u304C\u51FA\u6765\u307E\u305B\u3093\u3002\u65E2\u306B\u79FB\u52D5\u3057\u3066\u3044\u308B\u304B\u524A\u9664\u3055\u308C\u3066\u3044\u308B\u304B\u3082\u3057\u308C\u306A\u3044\u306E\u3067\u3001\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5\u3057\u3066\u30EA\u30DD\u30B8\u30C8\u30EA\u5185\u5BB9\u3092\u66F4\u65B0\u3057\u3066\u4E0B\u3055\u3044\u3002
+RenameFolderAction.warning.cannotFind.title=\u6709\u52B9\u306A\u64CD\u4F5C\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+ProxyRepositoryFactory.cleanWorkspace=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u30AF\u30EA\u30FC\u30F3\u30A2\u30C3\u30D7
+ProxyRepositoryFactory.DeleteFolderContainsLockedItem=\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u542B\u3080\u30D5\u30A9\u30EB\u30C0\u306F\u524A\u9664\u51FA\u6765\u307E\u305B\u3093
+ProxyRepositoryFactory.MoveFolderContainsLockedItem=\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u542B\u3080\u30D5\u30A9\u30EB\u30C0\u30FC\u306F\u79FB\u52D5\u51FA\u6765\u307E\u305B\u3093
+ProxyRepositoryFactory.RenameFolderContainsLockedItem=\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u542B\u3080\u30D5\u30A9\u30EB\u30C0\u30FC\u306F\u30EA\u30CD\u30FC\u30E0\u51FA\u6765\u307E\u305B\u3093
+RepositoryDropAdapter_errorMsg=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u79FB\u52D5\u51FA\u6765\u307E\u305B\u3093
+RenameFolderAction.description=\u30D5\u30A9\u30EB\u30C0\u306E\u30EA\u30CD\u30FC\u30E0
+ProxyRepositoryFactory.projectCanNotOpen=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u958B\u304F\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3002\u30A8\u30E9\u30FC\u30BF\u30B9\u30AF\u306F{0}\u3067\u3059\u3002
 ProjectRepositoryNode.sapBapi=SAP Bapi
-ProjectRepositoryNode.sapFunctions.inputSchema=\u5165\u529B
+ProjectRepositoryNode.sapFunctions.inputSchema=Input (\u5165\u529B)
 ProjectRepositoryNode.sapFunctions.outputSchema=\u51FA\u529B
-ProjectRepositoryNode.sapIDocs=SAP iDocs
 ProjectRepositoryNode.sapTables=SAP\u30C6\u30FC\u30D6\u30EB
-ProjectRepositoryNode.sapBWAdvancedDataStoreObject=SAP ADSO
+DuplicateAction.input.title.v2=\u8907\u88FD
+DuplicateAction.SameAsProjectname=\u540D\u524D\u304C\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D\u3092\u91CD\u8907\u3057\u307E\u3059
+DeleteAction.error.testCaseLockedOrOpenedObject.newMessage=\u30C6\u30B9\u30C8\u30B1\u30FC\u30B9\u53C8\u306F{0}\u306E\u30B1\u30FC\u30B9\u304C\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u308B\u306E\u3067\u524A\u9664\u51FA\u6765\u307E\u305B\u3093\u3002\u524A\u9664\u306E\u524D\u306B\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u9589\u3058\u3066\u4E0B\u3055\u3044\u3002
 ProjectRepositoryNode.sapBWDataSource=SAP DataSource
 ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
 ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
-ProjectRepositoryNode.sapContentExtractor=SAP BI\u30B3\u30F3\u30C6\u30F3\u30C4\u30A8\u30AF\u30B9\u30C8\u30E9\u30AF\u30BF\u30FC
-RepositoryDropAdapter_copyingItems=\u30A2\u30A4\u30C6\u30E0\u3092\u30B3\u30D4\u30FC\u4E2D...
-RepositoryDropAdapter_errorMsg=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u73FE\u5728\u3001\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093,
-RepositoryDropAdapter_lockedByOthers=\u3053\u306E\u30A2\u30A4\u30C6\u30E0\u304C\u4ED6\u306E\u30E6\u30FC\u30B6\u30FC\u306B\u3088\u3063\u3066\u30ED\u30C3\u30AF\u3055\u308C\u307E\u3057\u305F\u3002\u73FE\u5728\u3001\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093\u3002
-RepositoryDropAdapter_lockedByYou=\u3053\u306E\u30A2\u30A4\u30C6\u30E0\u306F\u81EA\u5206\u306B\u3088\u3063\u3066\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u73FE\u5728\u3001\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093\u3002
-RepositoryDropAdapter_moveTitle=\u79FB\u52D5
-RepositoryDropAdapter_movingItems=\u30A2\u30A4\u30C6\u30E0\u3092\u79FB\u52D5\u4E2D...
-RepositoryDropAdapter.checkingLockStatus=\u30ED\u30C3\u30AF\u30B9\u30C6\u30FC\u30BF\u30B9\u3092\u30C1\u30A7\u30C3\u30AF\u4E2D
-RepositoryDropAdapter.moving=\u79FB\u52D5\u4E2D
-NewFolderWizard.description=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u306B\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u4F5C\u6210
-NewFolderWizard.failureText=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002\u8A73\u7D30\u306F\u3001\u30ED\u30B0\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002
-NewFolderWizard.failureTitle=\u30A8\u30E9\u30FC
-NewFolderWizard.label=\u30E9\u30D9\u30EB
-NewFolderWizard.nameEmpty=\u30E9\u30D9\u30EB\u304C\u5FC5\u8981\u3067\u3059
-NewFolderWizard.nameIncorrect=\u30E9\u30D9\u30EB\u306B\u4E0D\u6B63\u306A\u6587\u5B57\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
-NewFolderWizard.nameInvalid=\u30E9\u30D9\u30EB{0}\u304C\u7981\u6B62\u3055\u308C\u3066\u3044\u307E\u3059
-NewFolderWizard.title=\u30D5\u30A9\u30EB\u30C0\u30FC
-NewFolderWizard.windowTitle=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u30FC
-CreateFolderAction.action.title=\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u4F5C\u6210
-CreateFolderAction.action.toolTipText=\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u4F5C\u6210
-RenameFolderAction.action.title=\u30D5\u30A9\u30EB\u30C0\u30FC\u540D\u3092\u5909\u66F4
-RenameFolderAction.action.toolTipText=\u30D5\u30A9\u30EB\u30C0\u30FC\u540D\u3092\u5909\u66F4
-RenameFolderAction.description=\u30D5\u30A9\u30EB\u30C0\u30FC\u540D\u3092\u5909\u66F4
-RenameFolderAction.warning.editorOpen.message=\u73FE\u5728\u3001\u3053\u306E\u30D5\u30A9\u30EB\u30C0\u30FC\u306B\u542B\u307E\u308C\u308B\u30A2\u30A4\u30C6\u30E0({0})\u304C\u958B\u304B\u308C\u3066\u3044\u308B\u305F\u3081\u3001"{1}" \u30D5\u30A9\u30EB\u30C0\u30FC\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3002\n\u9589\u3058\u3066\u3001\u518D\u8A66\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-RenameFolderAction.warning.editorOpen.title=\u4F7F\u7528\u3067\u304D\u306A\u3044\u30A2\u30AF\u30B7\u30E7\u30F3
-RenameFolderAction.warning.cannotFind.message=\u30D5\u30A9\u30EB\u30C0\u30FC\u540D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3002\u79FB\u52D5\u3055\u308C\u305F\u304B\u3001\u524A\u9664\u3055\u308C\u305F\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u66F4\u65B0\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u3001\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3092\u66F4\u65B0\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-RenameFolderAction.warning.cannotFind.title=\u4F7F\u7528\u3067\u304D\u306A\u3044\u30A2\u30AF\u30B7\u30E7\u30F3
 ConvertJobsUtil.warning.title=\u8B66\u544A
-ConvertJobsUtil.warning.message=\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u306F\u3001\u30BF\u30FC\u30B2\u30C3\u30C8\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u304C\u5B8C\u5168\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=\u7D71\u8A08\u30ED\u30B0\u3068\u6697\u9ED9\u7684\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u4F5C\u6210
+ConvertJobsUtil.warning.message=\u30BF\u30FC\u30B2\u30C3\u30C8\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u306F\u3001\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u306F\u5B8C\u5168\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+ItemReferenceDialog.doNotDelete.button=\u524A\u9664\u3057\u306A\u3044
+ItemReferenceDialog.forceDelete.button=\u524A\u9664\u306E\u5F37\u5236
+ItemReferenceDialog.forceDelete.warn.title=\u3088\u308D\u3057\u3044\u3067\u3059\u304B?
+ItemReferenceDialog.forceDelete.warn.message=\u524A\u9664\u306E\u5F37\u5236\u30A2\u30AF\u30B7\u30E7\u30F3\u3092\u5B9F\u884C\u3059\u308B\u3068\u3001\u3053\u306E\u30A2\u30A4\u30C6\u30E0\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u30A2\u30A4\u30C6\u30E0\u304C\u58CA\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u524A\u9664\u3092\u5F37\u5236\u3057\u307E\u3059\u304B?
+ProjectRepositoryNode.sapContentExtractor=SAP BI\u30B3\u30F3\u30C6\u30F3\u30C4\u62BD\u51FA
+ProjectRepositoryNode.calculationViewSchemas=\u8A08\u7B97\u30D3\u30E5\u30FC\u30B9\u30AD\u30FC\u30DE
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject=SAP ADSO
+ProxyRepositoryFactory.CycleReferenceError=\u30B5\u30A4\u30AF\u30EB\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u53C2\u7167\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
+ProxyRepositoryFactory.titleWarning=\u8B66\u544A
+ProxyRepositoryFactory.msgMissingReferencedProjects=\u53C2\u7167\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8[{0}]\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3078\u306E\u30ED\u30B0\u30A4\u30F3\u3092\u7D9A\u884C\u3057\u307E\u3059\u304B?
+ProxyRepositoryFactory.exceptionMissingReferencedProjects=\u53C2\u7167\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8[{0}]\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+ProxyRepositoryFactory.btnLabelContinue=\u7D9A\u884C
+ProxyRepositoryFactory.load.sdk.componnents=SDK\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30ED\u30FC\u30C9...
+SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=\u7D71\u8A08\u30ED\u30B0\u3068\u6697\u9ED9\u7684\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u4F5C\u6210\u3059\u308B

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

@@ -1,56 +1,49 @@
-AbstractEMFRepositoryFactory.cannotGenerateItem=\u65E0\u6CD5\u751F\u6210\u7C98\u8D34\u9879\u76EE\u7684\u6807\u7B7E.
+AbstractEMFRepositoryFactory.cannotGenerateItem=\u65E0\u6CD5\u751F\u6210\u7C98\u8D34\u9879\u76EE\u6807\u7B7E\u3002
 AbstractEMFRepositoryFactory.job=\u4F5C\u4E1A
-AbstractEMFRepositoryFactory.presistenceException.OnlyOneOccurenceMustbeFound=\u540C\u65F6\u83B7\u53D6\u5230\u591A\u4E2A\u9879\u76EE\u3002\n{0}
+AbstractEMFRepositoryFactory.presistenceException.OnlyOneOccurenceMustbeFound=\u540C\u65F6\u83B7\u53D6\u5230\u591A\u4E2A\u9879\u76EE\u3002\\n{0}
 AbstractEMFRepositoryFactory.presistenceException.whoCauseProblems=\u5F15\u8D77\u95EE\u9898\u7684\u9879\u76EE\u662F:
 AbstractEMFRepositoryFactory.requiredComponent=\u4E3A\u4F7F\u7528\u4EE5\u4E0B\u7EC4\u4EF6\u6240\u5FC5\u9700:
 ProxyRepositoryFactory.bussinessException.itemNonModifiable=\u60A8\u6CA1\u6709\u8DB3\u591F\u7684\u6743\u9650\u6765\u6267\u884C\u6B64\u64CD\u4F5C
-ProxyRepositoryFactory.cleanWorkspace=\u6E05\u6D01\u5DE5\u4F5C\u533A
-ProxyRepositoryFactory.DeleteFolderContainsLockedItem=\u65E0\u6CD5\u5220\u9664\u5305\u542B\u9501\u5B9A\u9879\u76EE\u7684\u6587\u4EF6\u5939
 ProxyRepositoryFactory.exec.migration.tasks=\u6267\u884C\u8FC1\u79FB\u4EFB\u52A1
 ProxyRepositoryFactory.illegalArgumentException.labeAlreadyInUse=\u6807\u7B7E {0} \u5DF2\u88AB\u4F7F\u7528
 ProxyRepositoryFactory.illegalArgumentException.labelNotMatchPattern=\u6807\u7B7E {0} \u4E0E\u6A21\u5F0F {1} \u4E0D\u7B26
 ProxyRepositoryFactory.initializeProjectConnection=\u521D\u59CB\u5316\u5DE5\u7A0B\u8FDE\u63A5
-ProxyRepositoryFactory.CycleReferenceError=\u68C0\u6D4B\u5230\u5FAA\u73AF\u5DE5\u7A0B\u5F15\u7528\u3002
 ProxyRepositoryFactory.JobNameErroe=\u4F5C\u4E1A\u540D\u79F0\u9519\u8BEF
 ProxyRepositoryFactory.Label=\u6807\u7B7E
 ProxyRepositoryFactory.load.componnents=\u52A0\u8F7D\u7EC4\u4EF6...
-ProxyRepositoryFactory.load.sdk.componnents=\u52A0\u8F7D SDK \u7EC4\u4EF6...
-ProxyRepositoryFactory.log.Restoration=[{0}] \u88AB {1} \u6062\u590D\u5230 "/{2}"\u3002
-ProxyRepositoryFactory.log.lock=\u7531 "{1}" \u9501\u5B9A [{0}]\u3002
+ProxyRepositoryFactory.log.Restoration=[{0}] \u88AB {1} \u6062\u590D\u5230 \"/{2}\"\u3002
+ProxyRepositoryFactory.log.lock=\u7531 \"{1}\" \u9501\u5B9A [{0}]\u3002
 ProxyRepositoryFactory.log.loggedOn={0} \u767B\u5F55\u5230 {1}
 ProxyRepositoryFactory.log.logicalDeletion=[{0}] \u88AB {1} \u903B\u8F91\u5220\u9664\u3002
-ProxyRepositoryFactory.log.move=\u4ECE [{0}] \u79FB\u52A8\u5230 "{1}"\u3002
+ProxyRepositoryFactory.log.move=\u4ECE [{0}] \u79FB\u52A8\u5230 \"{1}\"\u3002
 ProxyRepositoryFactory.log.newIdGenerated=\u5728\u5DE5\u7A0B [{0}] \u4E0A\u751F\u6210\u7684\u65B0 ID = {1}
 ProxyRepositoryFactory.log.physicalDeletion=\u7269\u7406\u6027\u5220\u9664 \u7531{1}\u5220\u9664[{0}]\u3002
 ProxyRepositoryFactory.log.tempFolderEmptied=\u4E34\u65F6\u6587\u4EF6\u5939\u5DF2\u6E05\u7A7A (\u5728 {1} \u6BEB\u79D2\u5185\u5220\u9664\u4E86 {0} \u4E2A\u6587\u4EF6)
-ProxyRepositoryFactory.log.unlock=[{0}] \u88AB "{1}" \u89E3\u9501\u3002
+ProxyRepositoryFactory.log.unlock=[{0}] \u88AB \"{1}\" \u89E3\u9501\u3002
 ProxyRepositoryFactory.logonInProgress=\u6B63\u5728\u767B\u5F55...
-ProxyRepositoryFactory.MoveFolderContainsLockedItem=\u65E0\u6CD5\u79FB\u52A8\u5305\u542B\u9501\u5B9A\u9879\u76EE\u7684\u6587\u4EF6\u5939
 ProxyRepositoryFactory.projectIsNotCompatible=\u5DE5\u7A0B {0} \u5DF2\u88AB\u4E00\u4E2A\u65E5\u671F\u66F4\u65B0\u7684 studio \u6253\u5F00\uFF0C\u6240\u4EE5\u65E0\u6CD5\u6253\u5F00\u3002
-ProxyRepositoryFactory.projectCanNotOpen=\u65E0\u6CD5\u6253\u5F00\u5DE5\u7A0B\u3002\u9519\u8BEF\u4EFB\u52A1\u662F {0}\u3002
-ProxyRepositoryFactory.RenameFolderContainsLockedItem=\u65E0\u6CD5\u91CD\u547D\u540D\u5305\u542B\u9501\u5B9A\u9879\u76EE\u7684\u6587\u4EF6\u5939
 ProxyRepositoryFactory.ReplaceJob=\u5DF2\u5728\u4F7F\u7528\u4E2D\uFF0C\u662F\u5426\u8981\u66FF\u6362\u5B83\uFF1F
 ProxyRepositoryFactory.synch.repo.items=\u540C\u6B65\u5B58\u50A8\u5E93\u9879\u76EE
 ProxyRepositoryFactory.synchronizeLibraries=\u540C\u6B65\u5E93...
-ProxyRepositoryFactory.installComponents=\u6B63\u5728\u5B89\u88C5\u7EC4\u4EF6...
-ProxyRepositoryFactory.titleWarning=\u8B66\u544A
-ProxyRepositoryFactory.msgMissingReferencedProjects=\u7F3A\u5C11\u5F15\u7528\u7684\u5DE5\u7A0B [{0}]\u3002\u662F\u5426\u8981\u7EE7\u7EED\u767B\u5F55\u5DE5\u7A0B\uFF1F
-ProxyRepositoryFactory.exceptionMissingReferencedProjects=\u7F3A\u5C11\u5F15\u7528\u7684\u5DE5\u7A0B [{0}]\u3002
-ProxyRepositoryFactory.btnLabelContinue=\u7EE7\u7EED
 CreateSandboxProjectDialog.createUserLabel=\u65B0\u5EFA\u4E00\u4E2A\u8FDE\u63A5\u5230\u521B\u5EFA\u6C99\u7BB1\u5DE5\u7A0B\u7684\u7528\u6237
 CreateSandboxProjectDialog.Failure=\u5931\u8D25
 CreateSandboxProjectDialog.failureMessage=\u521B\u5EFA\u6C99\u76D2\u5DE5\u7A0B\u5931\u8D25\u3002
 CreateSandboxProjectDialog.ProjectDesc=\u63CF\u8FF0
 CreateSandboxProjectDialog.ProjectLabel=\u6807\u7B7E
+CreateSandboxProjectDialog.ProjectSvnAdvance=SVN \u9AD8\u7EA7\u8BBE\u7F6E
 CreateSandboxProjectDialog.successMessage=\u6210\u529F\u521B\u5EFA\u6C99\u76D2\u5DE5\u7A0B
 CreateSandboxProjectDialog.successTitile=\u6210\u529F
-CreateSandboxProjectDialog.Title=\u521B\u5EFA\u6C99\u76D2 \u5DE5\u7A0B - {0}
+CreateSandboxProjectDialog.svnUrl=URL
+CreateSandboxProjectDialog.Title=\u521B\u5EFA\u6C99\u76D2\u5DE5\u7A0B - {0}
 CreateSandboxProjectDialog.userFirstname=\u540D\u5B57
 CreateSandboxProjectDialog.userLastname=\u59D3\u6C0F
+CreateSandboxProjectDialog.userLoginMessage=\u5DE5\u7A0B svn \u767B\u5F55\u540D\u4E0D\u80FD\u4E3A\u7A7A
 CreateSandboxProjectDialog.userLoginValidMessage=\u7528\u6237\u767B\u5F55\u540D\u5FC5\u987B\u662F\u6709\u6548\u7684\u7535\u5B50\u90AE\u4EF6
 CreateSandboxProjectDialog.userPasswordEmptyMessage=\u7528\u6237\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A
 CreateSandboxProjectDialog.Login=\u767B\u5F55\u540D
 CreateSandboxProjectDialog.Password=\u5BC6\u7801
+CreateSandboxProjectDialog.URLMessage=\u5FC5\u987B\u8BBE\u5B9A svn URL
+CreateSandboxProjectDialog.userSvnSettingLabel=\u9ED8\u8BA4 SVN \u8BBE\u7F6E
 PropertiesWizardPage.Author=\u4F5C\u8005
 PropertiesWizardPage.Locker=\u9501\u5B9A\u4EBA
 PropertiesWizardPage.Description=\u63CF\u8FF0
@@ -73,16 +66,16 @@ PropertiesWizardPage.Version.Minor=m
 PropertiesWizardPage.ImageSizeError=\u8BF7\u9009\u62E9\u5C3A\u5BF8\u4E3A 32*32 \u7684\u56FE\u50CF\u3002
 EAuthenticationMethod.anonymousAuth=\u533F\u540D\u8EAB\u4EFD\u9A8C\u8BC1
 EAuthenticationMethod.simpleAuth=\u7B80\u5355\u8EAB\u4EFD\u9A8C\u8BC1
-AdvancedSocketFactory.failedInitial=\u9519\u8BEF\uFF1A\u65E0\u6CD5\u521D\u59CB\u5316\uFF1A
+AdvancedSocketFactory.failedInitial=\u9519\u8BEF\uFF1A\u65E0\u6CD5\u521D\u59CB\u5316:
 LDAPCATruster.failedCreateCert=\u65E0\u6CD5\u521B\u5EFA\u8BC1\u4E66\u5E93:
 LDAPCATruster.failedCreateTmp=\u65E0\u6CD5\u521B\u5EFA\u4E34\u65F6\u4FE1\u4EFB\u5E93:
 LDAPCATruster.failedInitialTrust=\u65E0\u6CD5\u521B\u5EFA\u521D\u59CB\u4FE1\u4EFB\u7BA1\u7406\u5668:
 LDAPCATruster.failedLoadCert=\u65E0\u6CD5\u52A0\u8F7D\u8BC1\u4E66\u5E93:
 LDAPCATruster.failedSaveTrust=\u65E0\u6CD5\u4FDD\u5B58\u4FE1\u4EFB\u5E93:
 LDAPCATruster.locationInvalid=\u8BC1\u4E66\u5E93\u6587\u4EF6\u7684\u4F4D\u7F6E\u65E0\u6548:
-LDAPCATruster.noCertificate=\n\u8BF7\u4F7F\u7528 keytool \u547D\u4EE4\u5BFC\u5165\u670D\u52A1\u5668\u8BC1\u4E66\u3002
+LDAPCATruster.noCertificate=\\n\u8BF7\u4F7F\u7528 keytool \u547D\u4EE4\u5BFC\u5165\u670D\u52A1\u5668\u8BC1\u4E66\u3002
 LDAPCATruster.sslError1=SSL \u9519\u8BEF\uFF1A\u670D\u52A1\u5668\u8BC1\u4E66\u94FE\u9A8C\u8BC1\u5931\u8D25\u3002
-LDAPCATruster.sslError2=SSL \u9519\u8BEF\uFF1A\u670D\u52A1\u5668\u8BC1\u4E66\u94FE\u9A8C\u8BC1\u5931\u8D25\u4E14 \\nCA \u7F3A\u5931\u3002
+LDAPCATruster.sslError2=SSL \u9519\u8BEF\uFF1A\u670D\u52A1\u5668\u8BC1\u4E66\u94FE\u9A8C\u8BC1\u5931\u8D25\u4E14 \\\\nCA \u7F3A\u5931\u3002
 LDAPCATruster.sslError3=SSL \u9519\u8BEF\uFF1ACA \u8BC1\u4E66\u4E0D\u5728\u670D\u52A1\u5668\u8BC1\u4E66\u94FE\u4E2D\u3002
 CopyAction.thisText.copy=\u590D\u5236
 RestoreAction.action.title=\u6062\u590D
@@ -91,33 +84,30 @@ PasteAction.thisText.paste=\u7C98\u8D34
 DeleteAction.action.foreverTitle=\u6C38\u4E45\u5220\u9664
 DeleteAction.action.logicalTitle=\u5220\u9664
 DeleteAction.action.logicalToolTipText=\u5C06\u5BF9\u8C61\u653E\u5165\u56DE\u6536\u7AD9
-DeleteAction.deleteJobAssignedToOneService= \u88AB\u5206\u914D\u7ED9\u670D\u52A1\u7684\u4E00\u4E2A\u64CD\u4F5C\uFF01\n\u662F\u5426\u8981\u5220\u9664\u6B64\u4F5C\u4E1A\uFF1F
-DeleteAction.deleteSomeJobsAssignedToServices= \u88AB\u5206\u914D\u7ED9\u4E00\u4E9B\u670D\u52A1\u7684\u4E00\u4E9B\u64CD\u4F5C\uFF01\n\u662F\u5426\u8981\u5220\u9664\u8FD9\u4E9B\u4F5C\u4E1A\uFF1F
+DeleteAction.deleteJobAssignedToOneService=\\ \u88AB\u5206\u914D\u7ED9\u670D\u52A1\u7684\u4E00\u4E2A\u64CD\u4F5C\uFF01\\n\u662F\u5426\u8981\u5220\u9664\u6B64\u4F5C\u4E1A\uFF1F
+DeleteAction.deleteSomeJobsAssignedToServices=\\ \u88AB\u5206\u914D\u7ED9\u4E00\u4E9B\u670D\u52A1\u7684\u4E00\u4E9B\u64CD\u4F5C\uFF01\\n\u662F\u5426\u8981\u5220\u9664\u8FD9\u4E9B\u4F5C\u4E1A\uFF1F
 DeleteAction.dialog.message0=\u5C06\u6C38\u4E45\u5220\u9664 (\u4E0D\u53EF\u6062\u590D)\u3002
 DeleteAction.dialog.message1=\u6240\u9009\u5143\u7D20\u5C06\u6C38\u4E45\u5220\u9664 (\u65E0\u6CD5\u6062\u590D)\u3002
 DeleteAction.dialog.message2=\u4ECD\u7136\u7EE7\u7EED\uFF1F
 DeleteAction.dialog.messageAllElements=\u6240\u6709\u5143\u7D20\u90FD\u5C06\u6C38\u4E45\u5220\u9664 (\u65E0\u6CD5\u6062\u590D)\u3002
 DeleteAction.dialog.title=\u6C38\u4E45\u5220\u9664
-DeleteAction.error.lockedOrOpenedObject.newMessage={0} \u5DF2\u9501\u5B9A\uFF0C\u56E0\u6B64\u60A8\u4E0D\u80FD\u5220\u9664\u5B83\u3002\n\u5982\u679C\u6B64\u5BF9\u8C61\u6253\u5F00\uFF0C\u60A8\u5FC5\u987B\u5C06\u5176\u5173\u95ED\u4E4B\u540E\u624D\u80FD\u5220\u9664\u3002
-DeleteAction.error.testCaseLockedOrOpenedObject.newMessage=\u6D4B\u8BD5\u7528\u4F8B{0}\u88AB\u9501\u5B9A\uFF0C\u56E0\u6B64\u60A8\u65E0\u6CD5\u5220\u9664\u5B83\u3002\n\u5982\u679C\u6B64\u5BF9\u8C61\u88AB\u6253\u5F00\uFF0C\u60A8\u5FC5\u987B\u5728\u5220\u9664\u4E4B\u524D\u5173\u95ED\u5B83\u3002
+DeleteAction.error.lockedOrOpenedObject.newMessage={0} \u5DF2\u9501\u5B9A\uFF0C\u56E0\u6B64\u60A8\u65E0\u6CD5\u5220\u9664\u5B83\u3002\\n\u5982\u679C\u6B64\u5BF9\u8C61\u5DF2\u6253\u5F00\uFF0C\u60A8\u5FC5\u987B\u5C06\u5176\u5173\u95ED\u4E4B\u540E\u624D\u80FD\u5220\u9664\u3002
 DeleteAction.error.title=\u7981\u6B62\u5220\u9664
 DeleteAction.warning.message1=\u65E0\u6CD5\u5220\u9664\u8BE5\u6587\u4EF6\u5939\uFF0C\u56E0\u4E3A\u5176\u4E2D\u81F3\u5C11\u6709\u4E00\u4E2A\u9879\u76EE\u5F53\u524D\u5904\u4E8E\u6253\u5F00\u72B6\u6001\u3002\u5173\u95ED\u6240\u6709\u6253\u5F00\u7684\u9879\u76EE\u5E76\u91CD\u8BD5\u3002
 DeleteAction.warning.title=\u8B66\u544A
 DuplicateAction.cannotGenerateItem=\u65E0\u6CD5\u751F\u6210\u7C98\u8D34\u9879\u76EE\u6807\u7B7E\u3002
 DuplicateAction.dialog.message=\u547D\u540D\u65B0\u4F5C\u4E1A
-DuplicateAction.dialog.title=\u8BF7\u8F93\u5165\u4F5C\u4E1A\u540D
+DuplicateAction.dialog.title=\u8BF7\u8F93\u5165\u4F5C\u4E1A\u540D\u79F0
 DuplicateAction.input.message=\u8F93\u5165\u65B0\u540D\u79F0
-DuplicateAction.input.title.v2=\u590D\u5236\u7C98\u8D34
 DuplicateAction.thisText.duplicate=\u590D\u5236\u7C98\u8D34
 DuplicateAction.NameEmptyError=\u540D\u79F0\u4E3A\u7A7A\u3002
 DuplicateAction.NameFormatError=\u540D\u79F0\u5305\u542B\u9519\u8BEF\u5B57\u7B26\u3002
 DuplicateAction.ItemExistsError=\u6B64\u9879\u76EE\u5DF2\u5B58\u5728\u3002\u8BF7\u68C0\u67E5\u56DE\u6536\u7AD9\u5E76\u5728\u9700\u8981\u65F6\u6E05\u7A7A\u3002
 DuplicateAction.KeywordsError=\u540D\u79F0\u4E0D\u662F\u6709\u6548\u6807\u8BC6\u7B26\u3002
-DuplicateAction.SameAsProjectname=\u540D\u79F0\u4E0E\u5DE5\u7A0B\u540D\u79F0\u76F8\u540C\u3002
 EmptyRecycleBinAction.action.title=\u6E05\u7A7A\u56DE\u6536\u7AD9
 EmptyRecycleBinAction.action.toolTipText=\u6E05\u7A7A\u56DE\u6536\u7AD9
 EmptyRecycleBinAction.dialog.title=\u6E05\u7A7A\u56DE\u6536\u7AD9
-EmptyRecycleBinAction.dialog.allDependencies=\u4F60\u4E0D\u80FD\u6E05\u7A7A\u56DE\u6536\u7AD9\u3002\nData Profiler Perspective \u4EE5\u6765\u5176\u4E2D\u4E00\u4E2A\u9879\u76EE\uFF0C\u8BF7\u4E0D\u8981\u5220\u9664\u5B83\u3002
+EmptyRecycleBinAction.dialog.allDependencies=\u4F60\u4E0D\u80FD\u6E05\u7A7A\u56DE\u6536\u7AD9\uFF0C\u4EFB\u4F55\u9879\u76EE\u90FD\u72EC\u7ACB\u4E8E\u6570\u636E\u5206\u5DE5\u5177\u7684\u89C6\u89D2\uFF0C\u8BF7\u4E0D\u8981\u5220\u9664\u5B83\u3002
 PasteObjectAction.error.labelAlreadyExists=\u6B64\u8DEF\u5F84\u4E0B\u5DF2\u5B58\u5728\u5E26\u6709\u8BE5\u6807\u7B7E\u7684\u5BF9\u8C61
 PasteObjectAction.error.title=\u65E0\u6CD5\u7C98\u8D34
 JobletReferenceDialog.DeletedInfor=\u5728\u56DE\u6536\u7AD9
@@ -132,11 +122,11 @@ ContextReferenceDialog.Recycle=\u5728\u56DE\u6536\u7AD9
 ContextReferenceDialog.ReferenceJob=\u5F15\u7528\u5BF9\u8C61
 ContextReferenceDialog.Types=\u7C7B\u578B
 ContextReferenceDialog.NodeTypeTip=\u8282\u70B9\u5F15\u7528\u7684\u7C7B\u578B
-ContextReferenceDialog.Messages=\u4E0A\u4E0B\u6587 ({0} {1}) \u5F15\u7528\u81EA\uFF1A\n
+ContextReferenceDialog.Messages=\u4E0A\u4E0B\u6587 ({0} {1}) \u5F15\u7528\u81EA\uFF1A\\n
 ContextReferenceDialog.kindMessages={0} {1} \u7684\u4E0A\u4E0B\u6587\u7EC4\u88AB\u4EE5\u4E0B\u5217\u8868\u5F15\u7528\uFF0C\u5982\u679C\u786E\u5B9E\u60F3\u8981\u5C06\u5176\u5220\u9664\uFF0C\u518D\u6B21\u6253\u5F00\u4F5C\u4E1A\u65F6\uFF0C\u4F5C\u4E1A\u4E2D\u6240\u7528\u7684\u4E0A\u4E0B\u6587\u7EC4\u5C06\u6539\u4E3A\u5185\u7F6E\u3002\u662F\u5426\u4ECD\u60F3\u5C06\u5176\u5220\u9664\uFF1F
 ContextReferenceDialog.kindMessages1={0} {1} \u7684\u4E0A\u4E0B\u6587\u7EC4\u88AB\u4EE5\u4E0B\u5217\u8868\u5F15\u7528\uFF0C\u662F\u5426\u4ECD\u60F3\u5C06\u5176\u5220\u9664\uFF1F
 CopyToGenericSchemaHelper.cannotGenarateItem=\u65E0\u6CD5\u751F\u6210\u7C98\u8D34\u9879\u76EE\u6807\u7B7E\u3002
-ProxyRepositoryFactory.ReplaceJobHazardDescription=\n\u5BF9\u539F\u59CB\u8FDE\u63A5\u7684\u4F9D\u8D56\u53EF\u80FD\u4F1A\u4E22\u5931\uFF01
+ProxyRepositoryFactory.ReplaceJobHazardDescription=\\n\u5BF9\u539F\u59CB\u8FDE\u63A5\u7684\u4F9D\u8D56\u53EF\u80FD\u4F1A\u4E22\u5931\uFF01
 ItemReferenceDialog.title=\u65E0\u6CD5\u5220\u9664\u7684\u9879\u76EE
 ItemReferenceDialog.item=\u9879\u76EE
 ItemReferenceDialog.referenceItem=\u5F15\u7528\u9879\u76EE
@@ -145,10 +135,6 @@ ItemReferenceDialog.nodeTotalsTip=\u8282\u70B9\u5F15\u7528\u603B\u6570
 ItemReferenceDialog.project=\u5DE5\u7A0B
 ItemReferenceDialog.deletedInfor=\u5728\u56DE\u6536\u7AD9
 ItemReferenceDialog.messages=\u6709\u4E9B\u9879\u76EE\u4E0D\u80FD\u5220\u9664\uFF0C\u56E0\u4E3A\u5B83\u4EEC\u5F15\u7528\u81EA\u5176\u4ED6\u9879\u76EE\u3002
-ItemReferenceDialog.doNotDelete.button=\u4E0D\u8981\u5220\u9664
-ItemReferenceDialog.forceDelete.button=\u5F3A\u5236\u5220\u9664
-ItemReferenceDialog.forceDelete.warn.title=\u662F\u5426\u786E\u5B9A\uFF1F
-ItemReferenceDialog.forceDelete.warn.message=\u5F3A\u5236\u5220\u9664\u64CD\u4F5C\u53EF\u80FD\u4F1A\u7834\u574F\u4F7F\u7528\u6B64\u9879\u76EE\u7684\u9879\u76EE\u3002\u662F\u5426\u771F\u7684\u8981\u5220\u9664\u5B83\uFF1F
 ProjectRepositoryNode.code=\u4EE3\u7801
 ProjectRepositoryNode.rulesManagement=\u89C4\u5219\u7BA1\u7406
 ProjectRepositoryNode.itemInvalid=\u9879\u76EE\u65E0\u6548\uFF1A[{0}] {1}
@@ -159,23 +145,11 @@ ProjectRepositoryNode.cdcFoundation=CDC Foundation
 ProjectRepositoryNode.genericSchema=\u901A\u7528 schema
 ProjectRepositoryNode.queries=\u67E5\u8BE2
 ProjectRepositoryNode.synonymSchemas=\u540C\u4E49\u5B57 schema
-ProjectRepositoryNode.calculationViewSchemas=\u8BA1\u7B97\u89C6\u56FE schema
 ProjectRepositoryNode.tableSchemas=\u8868 schema
 ProjectRepositoryNode.viewSchemas=\u67E5\u770B schema
 ProjectRepositoryNode.sapFunctions=SAP \u51FD\u6570
-ProjectRepositoryNode.sapBapi=SAP Bapi
-ProjectRepositoryNode.sapFunctions.inputSchema=\u8F93\u5165
-ProjectRepositoryNode.sapFunctions.outputSchema=\u8F93\u51FA
 ProjectRepositoryNode.sapIDocs=SAP iDocs
-ProjectRepositoryNode.sapTables=SAP \u8868
-ProjectRepositoryNode.sapBWAdvancedDataStoreObject=SAP ADSO
-ProjectRepositoryNode.sapBWDataSource=SAP DataSource
-ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
-ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
-ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
-ProjectRepositoryNode.sapContentExtractor=SAP BI \u5185\u5BB9\u63D0\u53D6\u5668
 RepositoryDropAdapter_copyingItems=\u6B63\u5728\u590D\u5236\u9879\u76EE...
-RepositoryDropAdapter_errorMsg=\u6B64\u76EE\u5F55\u5305\u542B\u9501\u5B9A\u7684\u9879\u76EE\uFF0C\u73B0\u5728\u65E0\u6CD5\u79FB\u52A8
 RepositoryDropAdapter_lockedByOthers=\u6B64\u9879\u76EE\u88AB\u5176\u4ED6\u7528\u6237\u9501\u5B9A\uFF0C\u73B0\u5728\u65E0\u6CD5\u79FB\u52A8\u3002
 RepositoryDropAdapter_lockedByYou=\u6B64\u9879\u76EE\u88AB\u60A8\u9501\u5B9A\uFF0C\u73B0\u5728\u65E0\u6CD5\u79FB\u52A8\u3002
 RepositoryDropAdapter_moveTitle=\u79FB\u52A8
@@ -195,11 +169,41 @@ CreateFolderAction.action.title=\u521B\u5EFA\u6587\u4EF6\u5939
 CreateFolderAction.action.toolTipText=\u521B\u5EFA\u6587\u4EF6\u5939
 RenameFolderAction.action.title=\u91CD\u547D\u540D\u6587\u4EF6\u5939
 RenameFolderAction.action.toolTipText=\u91CD\u547D\u540D\u6587\u4EF6\u5939
-RenameFolderAction.description=\u91CD\u547D\u540D\u6587\u4EF6\u5939
-RenameFolderAction.warning.editorOpen.message=\u65E0\u6CD5\u91CD\u547D\u540D "{1}" \u6587\u4EF6\u5939\uFF0C\u56E0\u4E3A\u5176\u4E2D\u6709\u4E00\u4E2A\u9879\u76EE ({0}) \u5F53\u524D\u5904\u4E8E\u6253\u5F00\u72B6\u6001\u3002\n\u8BF7\u5173\u95ED\u8BE5\u9879\u76EE\u5E76\u91CD\u8BD5\u3002
+RenameFolderAction.warning.editorOpen.message=\u65E0\u6CD5\u91CD\u547D\u540D \"{1}\" \u6587\u4EF6\u5939\uFF0C\u56E0\u4E3A\u5176\u4E2D\u6709\u4E00\u4E2A\u9879\u76EE ({0}) \u5F53\u524D\u5904\u4E8E\u6253\u5F00\u72B6\u6001\u3002\\n\u5173\u95ED\u5B83\u5E76\u91CD\u8BD5\u3002
 RenameFolderAction.warning.editorOpen.title=\u64CD\u4F5C\u4E0D\u53EF\u7528
 RenameFolderAction.warning.cannotFind.message=\u65E0\u6CD5\u91CD\u547D\u540D\u6587\u4EF6\u5939\uFF0C\u5176\u53EF\u80FD\u5DF2\u88AB\u79FB\u52A8\u6216\u5220\u9664\u3002\u5355\u51FB\u5237\u65B0\u6309\u94AE\u66F4\u65B0\u5B58\u50A8\u5E93\u3002
 RenameFolderAction.warning.cannotFind.title=\u64CD\u4F5C\u4E0D\u53EF\u7528
+ProxyRepositoryFactory.cleanWorkspace=\u6E05\u6D01\u5DE5\u4F5C\u533A
+ProxyRepositoryFactory.DeleteFolderContainsLockedItem=\u65E0\u6CD5\u5220\u9664\u5305\u542B\u9501\u5B9A\u9879\u76EE\u7684\u6587\u4EF6\u5939
+ProxyRepositoryFactory.MoveFolderContainsLockedItem=\u65E0\u6CD5\u79FB\u52A8\u5305\u542B\u9501\u5B9A\u9879\u76EE\u7684\u6587\u4EF6\u5939
+ProxyRepositoryFactory.RenameFolderContainsLockedItem=\u65E0\u6CD5\u91CD\u547D\u540D\u5305\u542B\u9501\u5B9A\u9879\u76EE\u7684\u6587\u4EF6\u5939
+RepositoryDropAdapter_errorMsg=\u6B64\u76EE\u5F55\u5305\u542B\u9501\u5B9A\u7684\u9879\u76EE\uFF0C\u73B0\u5728\u65E0\u6CD5\u79FB\u52A8
+RenameFolderAction.description=\u91CD\u547D\u540D\u6587\u4EF6\u5939
+ProxyRepositoryFactory.projectCanNotOpen=\u65E0\u6CD5\u6253\u5F00\u5DE5\u7A0B\u3002\u9519\u8BEF\u4EFB\u52A1\u662F {0}\u3002
+ProjectRepositoryNode.sapBapi=SAP Bapi
+ProjectRepositoryNode.sapFunctions.inputSchema=\u8F93\u5165
+ProjectRepositoryNode.sapFunctions.outputSchema=\u8F93\u51FA
+ProjectRepositoryNode.sapTables=SAP \u8868
+DuplicateAction.input.title.v2=\u590D\u5236\u7C98\u8D34
+DuplicateAction.SameAsProjectname=\u540D\u79F0\u4E0E\u5DE5\u7A0B\u540D\u79F0\u76F8\u540C\u3002
+DeleteAction.error.testCaseLockedOrOpenedObject.newMessage=\u6D4B\u8BD5\u7528\u4F8B{0}\u88AB\u9501\u5B9A\uFF0C\u56E0\u6B64\u60A8\u65E0\u6CD5\u5220\u9664\u5B83.\\n\u5982\u679C\u6B64\u5BF9\u8C61\u88AB\u6253\u5F00\uFF0C\u60A8\u5FC5\u987B\u5728\u5220\u9664\u4E4B\u524D\u5173\u95ED\u5B83\u3002
+ProjectRepositoryNode.sapBWDataSource=SAP DataSource
+ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
+ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
+ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
 ConvertJobsUtil.warning.title=\u8B66\u544A
 ConvertJobsUtil.warning.message=\u6B64\u7248\u672C\u4E0D\u5B8C\u5168\u652F\u6301\u76EE\u6807\u6846\u67B6.
+ItemReferenceDialog.doNotDelete.button=\u4E0D\u8981\u5220\u9664
+ItemReferenceDialog.forceDelete.button=\u5F3A\u5236\u5220\u9664
+ItemReferenceDialog.forceDelete.warn.title=\u662F\u5426\u786E\u5B9A\uFF1F
+ItemReferenceDialog.forceDelete.warn.message=\u5F3A\u5236\u5220\u9664\u64CD\u4F5C\u53EF\u80FD\u4F1A\u7834\u574F\u4F7F\u7528\u6B64\u9879\u76EE\u7684\u9879\u76EE\u3002\u662F\u5426\u771F\u7684\u8981\u5220\u9664\u5B83\uFF1F
+ProjectRepositoryNode.sapContentExtractor=SAP BI Content Extractor
+ProjectRepositoryNode.calculationViewSchemas=\u8BA1\u7B97\u89C6\u56FE schema
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject=SAP ADSO
+ProxyRepositoryFactory.CycleReferenceError=\u68C0\u6D4B\u5230\u5FAA\u73AF\u5DE5\u7A0B\u5F15\u7528\u3002
+ProxyRepositoryFactory.titleWarning=\u8B66\u544A
+ProxyRepositoryFactory.msgMissingReferencedProjects=\u7F3A\u5C11\u5F15\u7528\u7684\u5DE5\u7A0B [{0}]\u3002\u662F\u5426\u8981\u7EE7\u7EED\u767B\u5F55\u5DE5\u7A0B\uFF1F
+ProxyRepositoryFactory.exceptionMissingReferencedProjects=\u7F3A\u5C11\u5F15\u7528\u7684\u5DE5\u7A0B [{0}]\u3002
+ProxyRepositoryFactory.btnLabelContinue=\u7EE7\u7EED
+ProxyRepositoryFactory.load.sdk.componnents=\u52A0\u8F7D SDK \u7EC4\u4EF6...
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=\u521B\u5EFA\u7EDF\u8BA1\u65E5\u5FD7\u548C\u9690\u5F0F\u53C2\u6570

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

@@ -2205,19 +2205,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     ExceptionHandler.process(e);
                 }
                 
-                // need to set m2
-                LoginTaskRegistryReader loginTaskRegistryReader = new LoginTaskRegistryReader();
-                ILoginTask[] allLoginTasks = loginTaskRegistryReader.getAllCommandlineTaskListInstance();
-                for (ILoginTask task : allLoginTasks) {
-                    if (task.getClass().getCanonicalName().endsWith("M2eUserSettingForTalendLoginTask")) {
-                        try {
-                            task.execute(new NullProgressMonitor());
-                        } catch (Exception e) {
-                            ExceptionHandler.process(e);
-                        }
-                    }
-                }
-                
                 ICoreService coreService = getCoreService();
                 if (coreService != null) {
                     currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
@@ -2390,32 +2377,16 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
             String str[] = new String[] { getRepositoryContext().getUser() + "", projectManager.getCurrentProject() + "" }; //$NON-NLS-1$ //$NON-NLS-2$
             log.info(Messages.getString("ProxyRepositoryFactory.log.loggedOn", str)); //$NON-NLS-1$
         } catch (LoginException e) {
-            try {
-                logOffProject();
-            } catch (Exception e1) {
-                ExceptionHandler.process(e1);
-            }
+            logOffProject();
             throw e;
         } catch (PersistenceException e) {
-            try {
-                logOffProject();
-            } catch (Exception e1) {
-                ExceptionHandler.process(e1);
-            }
+            logOffProject();
             throw e;
         } catch (BusinessException e) {
-            try {
-                logOffProject();
-            } catch (Exception e1) {
-                ExceptionHandler.process(e1);
-            }
+            logOffProject();
             throw new PersistenceException(e);
         } catch (RuntimeException e) {
-            try {
-                logOffProject();
-            } catch (Exception e1) {
-                ExceptionHandler.process(e1);
-            }
+            logOffProject();
             throw e;
         }
     }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/services/IGitInfoService.java

@@ -1,54 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.repository.services;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.talend.core.IService;
-import org.talend.core.model.general.Project;
-import org.talend.core.model.properties.Property;
-
-public interface IGitInfoService extends IService {
-
-    public static final String GIT_AUTHOR = "gitAuthor";
-
-    public static final String GIT_COMMIT_DATE = "gitCommitDate";
-
-    public static final String GIT_COMMIT_ID = "gitCommitId";
-
-    /**
-     * 
-     * DOC hzhao Comment method "getGitInfo".
-     * 
-     * @param path : the path of job/route/service
-     * @param project : the project of the job property path
-     * @return : the Map<String,String> of gitAuthor/gitCommitDate/gitCommitId , can use constants
-     * GIT_AUTHOR/GIT_COMMIT_DATE/GIT_COMMIT_ID as key . NOTE : GIT_COMMIT_DATE is a String type of a millisecond
-     * @throws Exception
-     */
-    public Map<String, String> getGitInfo(IPath path, Project project) throws Exception;
-
-    /**
-     * 
-     * DOC hzhao Comment method "getGitInfo".
-     * 
-     * @param property : the talend model propertry of job/route/service
-     * @return : the Map<String,String> of gitAuthor/gitCommitDate/gitCommitId , can use constants
-     * GIT_AUTHOR/GIT_COMMIT_DATE/GIT_COMMIT_ID as key . NOTE : GIT_COMMIT_DATE is a String type of a millisecond
-     * @throws Exception
-     */
-    public Map<String, String> getGitInfo(Property property) throws Exception;
-
-
-}

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

@@ -88,7 +88,7 @@ public class PasteAction extends AContextualAction {
                         frameworkNewValue = ConvertJobsUtil.JobStreamingFramework.SPARKSTREAMINGFRAMEWORK.getDisplayName();
                     } else if (target.getContentType() == ERepositoryObjectType.PROCESS_MR) {
                         jobTypeValue = ConvertJobsUtil.JobType.BIGDATABATCH.getDisplayName();
-                        frameworkNewValue = ConvertJobsUtil.JobBatchFramework.SPARKFRAMEWORK.getDisplayName();
+                        frameworkNewValue = ConvertJobsUtil.JobBatchFramework.MAPREDUCEFRAMEWORK.getDisplayName();
                     }
                     try {
                         jobNewName = ConvertJobsUtil.getDuplicateName(sourceNode, sourceNode.getObject().getLabel());

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/view/RepositoryDropAdapter.java

@@ -145,7 +145,7 @@ public class RepositoryDropAdapter extends PluginDropAdapter {
                         frameworkNewValue = ConvertJobsUtil.JobStreamingFramework.SPARKSTREAMINGFRAMEWORK.getDisplayName();
                     } else if (targetNode.getContentType() == ERepositoryObjectType.PROCESS_MR) {
                         jobTypeValue = ConvertJobsUtil.JobType.BIGDATABATCH.getDisplayName();
-                        frameworkNewValue = ConvertJobsUtil.JobBatchFramework.SPARKFRAMEWORK.getDisplayName();
+                        frameworkNewValue = ConvertJobsUtil.JobBatchFramework.MAPREDUCEFRAMEWORK.getDisplayName();
                     }
                     final Item newItem = ConvertJobsUtil.createOperation(sourceNode.getObject().getLabel(), jobTypeValue,
                             frameworkNewValue, sourceNode.getObject());

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/view/RepositoryLabelProvider.java

@@ -525,6 +525,9 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
         RepositoryNode node = (RepositoryNode) element;
         switch (node.getType()) {
         case STABLE_SYSTEM_FOLDER:
+            if (node.getLabel().equals(ERepositoryObjectType.SNIPPETS.toString())) {
+                return JFaceResources.getFontRegistry().defaultFont();
+            }
         case SYSTEM_FOLDER:
             return JFaceResources.getFontRegistry().getBold(JFaceResources.DEFAULT_FONT);
         default:

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

@@ -212,6 +212,7 @@ public class ConvertJobsUtil {
     }
 
     public static enum JobBatchFramework {
+        MAPREDUCEFRAMEWORK("MapReduce (deprecated)", "_MAPREDUCE_FRAMEWORK_"), //$NON-NLS-1$ //$NON-NLS-2$
         SPARKFRAMEWORK("Spark", "_SPARK_FRAMEWORK_"); //$NON-NLS-1$ //$NON-NLS-2$
 
         private String displayName;
@@ -355,7 +356,8 @@ public class ConvertJobsUtil {
      * @return
      */
     public static String getJobTypeFromFramework(String frameworkObj) {
-        if (JobBatchFramework.SPARKFRAMEWORK.getDisplayName().equals(frameworkObj)) {
+        if (JobBatchFramework.MAPREDUCEFRAMEWORK.getDisplayName().equals(frameworkObj)
+                || JobBatchFramework.SPARKFRAMEWORK.getDisplayName().equals(frameworkObj)) {
             return JobType.BIGDATABATCH.getDisplayName();
         } else if (JobStreamingFramework.SPARKSTREAMINGFRAMEWORK.getName().equals(frameworkObj)) {
             return JobType.BIGDATASTREAMING.getDisplayName();

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

@@ -349,7 +349,7 @@ public class XmiResourceManager {
         return itemResource;
     }
 
-    public Resource createItemResource(boolean byteArrayResource, URI itemResourceURI) {
+    private Resource createItemResource(boolean byteArrayResource, URI itemResourceURI) {
         Resource itemResource;
         itemResource = getResourceSet().getResource(itemResourceURI, false);
         if (itemResource != null) {

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

@@ -51,7 +51,6 @@ Export-Package: org.talend.analysistask,
  org.talend.core.model.utils,
  org.talend.core.model.xml,
  org.talend.core.nexus,
- org.talend.core.pendo,
  org.talend.core.prefs,
  org.talend.core.repository,
  org.talend.core.runtime,

main/plugins/org.talend.core.runtime/mappings/mapping_Ingres.xml

@@ -0,0 +1,216 @@
+<?xml version="1.0"?>
+<mapping>
+	<dbms product="INGRES" id="ingres_id" label="Mapping Ingres"
+		default="true">
+		<dbTypes>
+			<dbType type="ANSIDATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="BOOLEAN" ignoreLen="true" ignorePre="true" />
+			<dbType type="BIGINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="BYTE" ignoreLen="true" ignorePre="true" />
+			<dbType type="BYTE VARYING" ignoreLen="true" ignorePre="true" />
+			<dbType type="C" ignoreLen="true" ignorePre="true" />
+			<dbType type="CHAR" ignorePre="true" />
+			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" />
+			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT4" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTEGER" ignoreLen="true" ignorePre="true" />
+			<dbType type="INGRESDATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTERVAL" ignoreLen="true" ignorePre="true" />
+			<dbType type="LONG NVARCHAR" ignorePre="true" />
+			<dbType type="LONG VARCHAR" ignoreLen="true" ignorePre="true" />
+			<dbType type="MONEY" ignoreLen="true" ignorePre="true" />
+			<dbType type="NCHAR" ignorePre="true" defaultLength="10"/>
+			<dbType type="NVARCHAR" ignorePre="true" defaultLength="10"/>
+			<dbType type="OBJECT_KEY"  ignoreLen="true" ignorePre="true"/>
+			<dbType type="SMALLINT"  ignoreLen="true" ignorePre="true"/>
+			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TINYINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true"/>
+			<dbType type="TABLE_KEY" ignoreLen="true" ignorePre="true" />
+			<dbType type="VARCHAR" default="true" defaultLength="1200" ignorePre="true"/>
+		</dbTypes>
+
+		<language name="java">
+			<talendToDbTypes><!-- Adviced mappings  -->
+				<talendType type="id_List"/>
+				<talendType type="id_Boolean">
+					<dbType type="BOOLEAN" default="true" />
+				</talendType>
+				<talendType type="id_Byte">
+					<dbType type="BYTE" default="true" />
+					<dbType type="BYTE VARYING" />
+				</talendType>
+				<talendType type="id_byte[]">
+				</talendType>
+				<talendType type="id_Character">
+					<dbType type="CHAR" default="true" />
+					<dbType type="VARCHAR"/>
+					<dbType type="C"/>
+					<dbType type="TEXT"/>
+					<dbType type="LONG VARCHAR"/>
+					<dbType type="NCHAR"/>
+					<dbType type="NVARCHAR"/>
+					<dbType type="LONG NVARCHAR"/>
+				</talendType>
+				<talendType type="id_Date">
+					<dbType type="DATE" default="true" />
+					<dbType type="ANSIDATE" />	
+					<dbType type="INGRESDATE" />
+					<dbType type="TIME" />
+					<dbType type="TIMESTAMP" />		
+					<dbType type="INTERVAL"/>		
+				</talendType>
+				<talendType type="id_BigDecimal">
+					<dbType type="DECIMAL" default="true" />
+					<dbType type="FLOAT4" />
+					<dbType type="FLOAT"/>
+					<dbType type="MONEY"/>
+				</talendType>
+				<talendType type="id_Double">
+					<dbType type="FLOAT" default="true" />
+					<dbType type="FLOAT4" />
+					<dbType type="DECIMAL"/>
+					<dbType type="MONEY"/>
+				</talendType>
+				<talendType type="id_Float">
+					<dbType type="FLOAT4" default="true" />
+					<dbType type="FLOAT"/>
+					<dbType type="DECIMAL" />
+					<dbType type="MONEY"/>
+				</talendType>
+				<talendType type="id_Integer">
+					<dbType type="INTEGER" default="true" />
+					<dbType type="BIGINT" />
+					<dbType type="SMALLINT"/>
+					<dbType type="TINYINT"/>
+				</talendType>
+				<talendType type="id_Long">
+					<dbType type="BIGINT" default="true" />	
+					<dbType type="INTEGER"/>
+					<dbType type="SMALLINT"/>
+					<dbType type="TINYINT"/>	
+				</talendType>
+				<talendType type="id_Object">
+					<dbType type="MONEY" default="true"/>
+					<dbType type="OBJECT_KEY" />
+					<dbType type="TABLE_KEY" />
+				</talendType>
+				<talendType type="id_Short">
+					<dbType type="SMALLINT" default="true" />
+					<dbType type="INTEGER" />
+					<dbType type="BIGINT"/>
+					<dbType type="TINYINT" />
+				</talendType>
+				<talendType type="id_String">
+					<dbType type="VARCHAR" default="true" />
+					<dbType type="LONG VARCHAR" />
+					<dbType type="NCHAR"/>
+					<dbType type="NVARCHAR" />
+					<dbType type="LONG NVARCHAR" />		
+					<dbType type="TEXT" />
+					<dbType type="C"/>
+					<dbType type="CHAR"/>
+				</talendType>
+			</talendToDbTypes>
+			<dbToTalendTypes>
+				<dbType type="ANSIDATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="BOOLEAN">
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
+				<dbType type="BIGINT">
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="BYTE">
+					<talendType type="id_Byte" default="true" />
+				</dbType>
+				<dbType type="BYTE VARYING">
+					<talendType type="id_Byte" default="true" />
+				</dbType>
+				<dbType type="C">
+					<talendType type="id_String" default="true" />
+					<talendType type="id_Character"/>
+				</dbType>
+				<dbType type="CHAR">
+					<talendType type="id_String" default="true" />
+					<talendType type="id_Character"/>
+				</dbType>
+				<dbType type="DECIMAL">
+					<talendType type="id_Float"/>
+					<talendType type="id_BigDecimal" default="true"/>
+				</dbType>
+				<dbType type="DATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="FLOAT">
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="FLOAT4">
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="INTEGER">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+					<talendType type="id_Short"/>
+				</dbType>
+				<dbType type="INGRESDATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="INTERVAL">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="LONG NVARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="LONG VARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="MONEY">
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="NCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="NVARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="OBJECT_KEY">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="SMALLINT">
+					<talendType type="id_Short" default="true" />
+					<talendType type="id_Integer" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="TEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="TINYINT">
+					<talendType type="id_Byte" default="true" />
+					<talendType type="id_Integer" />
+					<talendType type="id_Short"/>
+					<talendType type="id_Long" />
+				</dbType>
+				<dbType type="TIME">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TIMESTAMP">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TABLE_KEY">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="VARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+			</dbToTalendTypes>
+		</language>
+	</dbms>
+
+</mapping>

main/plugins/org.talend.core.runtime/mappings/mapping_Interbase.xml

@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<mapping>
+	<dbms product="INTERBASE" id="interbase_id" label="Mapping Interbase"
+		default="true">
+		<dbTypes>
+			<dbType type="BLOB" ignorePre="true" />
+			<dbType type="BOOLEAN" ignoreLen="true" ignorePre="true" />
+			<dbType type="CHAR" defaultLength="50" ignorePre="true"/>
+			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" />
+			<dbType type="DOUBLE PRECISION" />
+			<dbType type="FLOAT" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTEGER" ignoreLen="true" ignorePre="true" />
+			<dbType type="NUMERIC" defaultLength="20" defaultPrecision="10" />
+			<dbType type="SMALLINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true" />
+			<dbType type="VARCHAR" default="true" defaultLength="200" ignorePre="true"/>
+		</dbTypes>
+
+		<language name="java">
+			<talendToDbTypes>
+				<!-- Adviced mappings  -->
+				<talendType type="id_List"/>
+				<talendType type="id_Boolean">	
+					<dbType type="BOOLEAN" default="true" />				
+				</talendType>
+				<talendType type="id_Byte">				
+				</talendType>
+				<talendType type="id_byte[]">
+				</talendType>
+				<talendType type="id_Character">
+					<dbType type="CHAR" default="true"/>
+					<dbType type="VARCHAR"/>
+				</talendType>
+				<talendType type="id_Date">
+					<dbType type="DATE" default="true"/>
+					<dbType type="TIME" />
+					<dbType type="TIMESTAMP" />			
+				</talendType>
+				<talendType type="id_BigDecimal">
+					<dbType type="DECIMAL" default="true"/>
+					<dbType type="FLOAT" />
+					<dbType type="DOUBLE PRECISION" />
+					<dbType type="NUMERIC" />				
+				</talendType>
+				<talendType type="id_Double">
+					<dbType type="DOUBLE PRECISION" default="true"/>
+					<dbType type="FLOAT" />
+					<dbType type="DECIMAL" />
+					<dbType type="NUMERIC" />				
+				</talendType>
+				<talendType type="id_Float">
+					<dbType type="FLOAT" default="true"/>
+					<dbType type="DOUBLE PRECISION" />
+					<dbType type="DECIMAL" />
+					<dbType type="NUMERIC" />
+				</talendType>
+				<talendType type="id_Integer">
+					<dbType type="INTEGER" default="true"/>
+				</talendType>
+				<talendType type="id_Long">
+					<dbType type="INTEGER" default="true"/>	
+				</talendType>
+				<talendType type="id_Object">
+					<dbType type="BLOB" default="true"/>
+				</talendType>
+				<talendType type="id_Short">
+					<dbType type="SMALLINT" default="true"/>
+				</talendType>
+				<talendType type="id_String">
+					<dbType type="VARCHAR" default="true"/>
+					<dbType type="CHAR"/>	
+				</talendType>
+			</talendToDbTypes>
+			<dbToTalendTypes>
+				<dbType type="BLOB">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="BOOLEAN">
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
+				<dbType type="CHAR">
+					<talendType type="id_String" default="true" />
+					<talendType type="id_Character"/>
+				</dbType>
+				<dbType type="DATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="DECIMAL">
+					<talendType type="id_Double"/>
+					<talendType type="id_BigDecimal" default="true"/>
+					<talendType type="id_Float"/>
+				</dbType>
+				<dbType type="DOUBLE PRECISION">
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+					<talendType type="id_Float"/>
+				</dbType>
+				<dbType type="FLOAT">
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_BigDecimal"/>
+					<talendType type="id_Double"/>
+				</dbType>
+				<dbType type="INTEGER">
+					<talendType type="id_Integer" default="true" />
+				</dbType>
+				<dbType type="NUMERIC">
+					<talendType type="id_Double"/>
+					<talendType type="id_BigDecimal" default="true"/>
+					<talendType type="id_Float"/>
+				</dbType>
+				<dbType type="SMALLINT">
+					<talendType type="id_Short" default="true" />
+				</dbType>
+				<dbType type="TIME">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TIMESTAMP">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="VARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+			</dbToTalendTypes>
+		</language>
+	</dbms>
+
+</mapping>

main/plugins/org.talend.core.runtime/mappings/mapping_ParAccel.xml

@@ -0,0 +1,567 @@
+<?xml version="1.0"?>
+<mapping>
+	<dbms product="PARACCEL" id="paraccel_id" label="Mapping ParAccel"
+		default="true">
+		<dbTypes>
+			<dbType type="ABSTIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="ACLITEM" ignoreLen="true" ignorePre="true" />
+			<dbType type="BIGSERIAL" ignoreLen="true" ignorePre="true" />
+			<dbType type="BIT" ignorePre="true" />
+			<dbType type="BOOL" ignoreLen="true" ignorePre="true" />
+			<dbType type="BOX" ignoreLen="true" ignorePre="true" />
+			<dbType type="BPCHAR" ignoreLen="true" ignorePre="true" />
+			<dbType type="BYTEA" ignoreLen="true" ignorePre="true" />	
+			<dbType type="CHAR" defaultLength="50" ignorePre="true"/>
+			<dbType type="CID" ignoreLen="true" ignorePre="true" />
+			<dbType type="CIDR" ignoreLen="true" ignorePre="true" />
+			<dbType type="CIRCLE" ignoreLen="true" ignorePre="true" />
+			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT4" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT8" ignoreLen="true" ignorePre="true" />
+			<dbType type="INET" ignoreLen="true" ignorePre="true" />
+			<dbType type="INT2" ignoreLen="true" ignorePre="true" />
+			<dbType type="INT2VECTOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="INT4" ignoreLen="true" ignorePre="true" />
+			<dbType type="INT8" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTERVAL" ignorePre="true" />
+			<dbType type="LINE" ignoreLen="true" ignorePre="true" />
+			<dbType type="LSEG" ignoreLen="true" ignorePre="true" />
+			<dbType type="MACADDR" ignoreLen="true" ignorePre="true" />
+			<dbType type="MONEY" ignoreLen="true" ignorePre="true" />	
+			<dbType type="NAME" ignoreLen="true" ignorePre="true" />
+			<dbType type="NUMERIC" defaultLength="20" defaultPrecision="10"/>
+			<dbType type="OID" ignoreLen="true" ignorePre="true"  />
+			<dbType type="OIDVECTOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="PATH" ignoreLen="true" ignorePre="true" />
+			<dbType type="POINT" ignoreLen="true" ignorePre="true"  />
+			<dbType type="POLYGON" ignoreLen="true" ignorePre="true"/>
+			<dbType type="REFCURSOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="RELTIME" ignoreLen="true" ignorePre="true" />			
+			<dbType type="REGCLASS" ignoreLen="true" ignorePre="true" />
+			<dbType type="REGOPER" ignoreLen="true" ignorePre="true" />
+			<dbType type="REGOPERATOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="REGPROC" ignoreLen="true" ignorePre="true" />
+			<dbType type="REGPROCEDURE" ignoreLen="true" ignorePre="true" />
+			<dbType type="REGTYPE" ignoreLen="true" ignorePre="true" />
+			<dbType type="SERIAL" ignoreLen="true" ignorePre="true" />
+			<dbType type="SMGR" ignoreLen="true" ignorePre="true" />
+			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TID" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIME" ignorePre="true" />
+			<dbType type="TINTERVAL" ignoreLen="true" ignorePre="true"  />
+			<dbType type="TIMESTAMPTZ" ignoreLen="true" ignorePre="true"  />
+			<dbType type="TIMESTAMP" ignorePre="true"  />
+			<dbType type="TIMETZ" ignoreLen="true" ignorePre="true"  />
+			<dbType type="VARBIT" ignoreLen="true" ignorePre="true"  />			
+			<dbType type="VARCHAR" defaultLength="200" ignorePre="true" />
+			<dbType type="XID" ignoreLen="true" ignorePre="true"  />
+			
+			<dbType type="_ABSTIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="_ACLITEM" ignoreLen="true" ignorePre="true" />
+			<dbType type="_BIT" ignoreLen="true" ignorePre="true" />
+			<dbType type="_BOX" ignoreLen="true" ignorePre="true" />
+			<dbType type="_BOOL" ignoreLen="true" ignorePre="true" />
+			<dbType type="_BPCHAR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_BYTEA" ignoreLen="true" ignorePre="true" />
+			<dbType type="_CHAR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_CID" ignoreLen="true" ignorePre="true" />
+			<dbType type="_CIDR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_CIRCLE" ignoreLen="true" ignorePre="true" />
+			<dbType type="_DATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="_FLOAT4" ignoreLen="true" ignorePre="true" />
+			<dbType type="_FLOAT8" ignoreLen="true" ignorePre="true" />
+			<dbType type="_INET" ignoreLen="true" ignorePre="true" />
+			<dbType type="_INT2VECTOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_INT4" ignoreLen="true" ignorePre="true" />
+			<dbType type="_INT8" ignoreLen="true" ignorePre="true" />
+			<dbType type="_INTERVAL" ignoreLen="true" ignorePre="true" />
+			<dbType type="_LINE" ignoreLen="true" ignorePre="true" />
+			<dbType type="_LSEG" ignoreLen="true" ignorePre="true" />
+			<dbType type="_MACADDR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_MONEY" ignoreLen="true" ignorePre="true" />
+			<dbType type="_NAME" ignoreLen="true" ignorePre="true" />
+			<dbType type="_NUMERIC" ignoreLen="true" ignorePre="true" />
+			<dbType type="_OID" ignoreLen="true" ignorePre="true" />
+			<dbType type="_OIDVECTOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_PATH" ignoreLen="true" ignorePre="true"/>
+			<dbType type="_POINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="_POLYGON" ignoreLen="true" ignorePre="true" />
+			<dbType type="_REFCURSOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_REGCLASS" ignoreLen="true" ignorePre="true" />
+			<dbType type="_REGOPER" ignoreLen="true" ignorePre="true" />
+			<dbType type="_REGOPERATOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_REGPROC" ignoreLen="true" ignorePre="true" />
+			<dbType type="_REGPROCEDURE" ignoreLen="true" ignorePre="true" />
+			<dbType type="_REGTYPE" ignoreLen="true" ignorePre="true" />
+			<dbType type="_RELTIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="_TEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="_TID" ignoreLen="true" ignorePre="true" />
+			<dbType type="_TIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="_TIMESTAMP" ignoreLen="true" ignorePre="true" />
+			<dbType type="_TIMESTAMPTZ" ignoreLen="true" ignorePre="true" />
+			<dbType type="_TIMETZ" ignoreLen="true" ignorePre="true" />
+			<dbType type="_TINTERVAL" ignoreLen="true" ignorePre="true" />
+			<dbType type="_VARBIT" ignoreLen="true" ignorePre="true" />
+			<dbType type="_VARCHAR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_XID" ignoreLen="true" ignorePre="true" />
+		</dbTypes>
+
+		<language name="java">
+			<talendToDbTypes><!-- Adviced mappings  -->
+				<talendType type="id_List"/>
+				<talendType type="id_Boolean">	
+					<dbType type="BOOL" default="true" />				
+				</talendType>
+				<talendType type="id_Byte">		
+				</talendType>
+				<talendType type="id_byte[]">
+					<dbType type="BIT" default="true" />
+					<dbType type="VARBIT" />				
+				</talendType>
+				<talendType type="id_Character">
+					<dbType type="CHAR" default="true" />
+					<dbType type="BPCHAR" />
+					<dbType type="VARCHAR" />
+					<dbType type="TEXT" />							
+				</talendType>
+				<talendType type="id_Date">
+					<dbType type="DATE" default="true" />				
+					<dbType type="ABSTIME" />
+					<dbType type="TIMETZ" />
+					<dbType type="TIME" />
+					<dbType type="TIMESTAMPTZ" />
+					<dbType type="TIMESTAMP" />
+					<dbType type="INTERVAL" />
+					<dbType type="TINTERVAL" />
+					<dbType type="RELTIME" />						
+				</talendType>
+				<talendType type="id_BigDecimal">
+					<dbType type="NUMERIC" default="true" />							
+					<dbType type="FLOAT4" />
+					<dbType type="FLOAT8"/>
+				</talendType>
+				<talendType type="id_Double">
+					<dbType type="FLOAT4" />
+					<dbType type="FLOAT8" default="true" />
+					<dbType type="NUMERIC" />							
+				</talendType>
+				<talendType type="id_Float">
+					<dbType type="FLOAT4" default="true" />
+					<dbType type="FLOAT8" />
+					<dbType type="NUMERIC" />				
+				</talendType>
+				<talendType type="id_Integer">
+					<dbType type="INT2" />
+					<dbType type="INT4" default="true" />
+					<dbType type="SERIAL" />
+					<dbType type="INT8" />
+					<dbType type="BIGSERIAL" />										
+				</talendType>
+				<talendType type="id_Long">
+					<dbType type="INT2" />
+					<dbType type="INT4" />
+					<dbType type="SERIAL" />
+					<dbType type="INT8"  default="true" />
+					<dbType type="BIGSERIAL" />							
+				</talendType>
+				<talendType type="id_Object">
+					<dbType type="_POINT" />
+					<dbType type="_POLYGON" />
+					<dbType type="_FLOAT4" />
+					<dbType type="_REFCURSOR" />
+					<dbType type="_REGCLASS" />
+					<dbType type="_REGOPER" />
+					<dbType type="_REGOPERATOR" />
+					<dbType type="_REGPROC" />
+					<dbType type="_REGPROCEDURE" />
+					<dbType type="_REGTYPE" />
+					<dbType type="_RELTIME" />
+					<dbType type="_TEXT" />
+					<dbType type="_TID" />
+					<dbType type="_TIMETZ" />
+					<dbType type="_TIME" />
+					<dbType type="_TIMESTAMPTZ" />
+					<dbType type="_TIMESTAMP" />
+					<dbType type="_TINTERVAL" />
+					<dbType type="_XID" />						
+					<dbType type="ACLITEM" />			
+					<dbType type="BYTEA" />						
+					<dbType type="CID" />
+					<dbType type="CIDR" />
+					<dbType type="CIRCLE" />						
+					<dbType type="INET" />			
+					<dbType type="MACADDR" />
+					<dbType type="MONEY" />			
+					<dbType type="OID" />
+					<dbType type="PATH" />
+					<dbType type="POLYGON" />			
+					<dbType type="REFCURSOR" />
+					<dbType type="REGCLASS" />
+					<dbType type="REGOPER" />
+					<dbType type="REGOPERATOR" />
+					<dbType type="REGPROC" />
+					<dbType type="REGPROCEDURE" />
+					<dbType type="REGTYPE" />						
+					<dbType type="SMGR" />			
+					<dbType type="TID" />
+					<dbType type="XID" />
+					<dbType type="_CHAR" />
+					<dbType type="_ABSTIME" />
+					<dbType type="_ACLITEM" />
+					<dbType type="_INT8" />
+					<dbType type="_VARBIT" />
+					<dbType type="_BIT" />			
+					<dbType type="_BOOL" />
+					<dbType type="BOX" />
+					<dbType type="_BOX" />
+					<dbType type="_BYTEA" />
+					<dbType type="_VARCHAR" />
+					<dbType type="_BPCHAR" />
+					<dbType type="_CID" />
+					<dbType type="_CIDR" />
+					<dbType type="_CIRCLE" />
+					<dbType type="_DATE" />
+					<dbType type="_FLOAT8" />
+					<dbType type="_INET" />
+					<dbType type="INT2VECTOR" />
+					<dbType type="_INT2VECTOR" />
+					<dbType type="_INT4" />
+					<dbType type="_INTERVAL" />
+					<dbType type="LINE" />
+					<dbType type="_LINE" />
+					<dbType type="LSEG" />
+					<dbType type="_LSEG" />
+					<dbType type="_MACADDR" />
+					<dbType type="_MONEY" />
+					<dbType type="NAME" />
+					<dbType type="_NAME" />
+					<dbType type="_NUMERIC" />
+					<dbType type="_OID" />
+					<dbType type="OIDVECTOR" />
+					<dbType type="_OIDVECTOR" />
+					<dbType type="_PATH" />
+					<dbType type="POINT" default="true" />				
+				</talendType>
+				<talendType type="id_Short">
+					<dbType type="INT2"   default="true" />
+					<dbType type="INT4" />
+					<dbType type="SERIAL" />
+					<dbType type="INT8" />
+					<dbType type="BIGSERIAL" />					
+				</talendType>
+				<talendType type="id_String">
+					<dbType type="BPCHAR" />
+					<dbType type="VARCHAR" default="true" />
+					<dbType type="TEXT" />				
+				</talendType>
+			</talendToDbTypes>
+			<dbToTalendTypes>
+				<dbType type="INT2" >
+					<talendType type="id_Short" default="true" />				
+				</dbType>				
+				<dbType type="INT4" >
+					<talendType type="id_Integer" default="true" />
+				</dbType>				
+				<dbType type="SERIAL" >
+					<talendType type="id_Integer" default="true" />				
+				</dbType>				
+				<dbType type="INT8" >
+					<talendType type="id_Long" default="true" />				
+				</dbType>				
+				<dbType type="BIGSERIAL" >
+					<talendType type="id_Long" default="true" />				
+				</dbType>				
+				<dbType type="FLOAT4" >
+					<talendType type="id_Float" default="true" />				
+					<talendType type="id_BigDecimal"/>			
+				</dbType>				
+				<dbType type="FLOAT8" >
+					<talendType type="id_Double" default="true" />				
+					<talendType type="id_BigDecimal"/>			
+				</dbType>
+				<dbType type="NUMERIC">
+					<talendType type="id_Double"/>
+					<talendType type="id_BigDecimal" default="true"/>			
+				</dbType>				
+				<dbType type="BOOL" >
+					<talendType type="id_Boolean" default="true" />				
+				</dbType>				
+				<dbType type="BIT" >
+					<talendType type="id_byte[]" default="true" />	
+				</dbType>				
+				<dbType type="VARBIT" >
+					<talendType type="id_byte[]" default="true" />				
+				</dbType>							
+				<dbType type="CHAR" >
+					<talendType type="id_String" default="true" />				
+				</dbType>				
+				<dbType type="BPCHAR" >
+					<talendType type="id_String" default="true" />				
+				</dbType>				
+				<dbType type="VARCHAR" >
+					<talendType type="id_String" default="true" />				
+				</dbType>				
+				<dbType type="TEXT" >
+					<talendType type="id_String" default="true" />				
+				</dbType>				
+				<dbType type="DATE" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>				
+				<dbType type="ABSTIME" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>				
+				<dbType type="TIMETZ" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>				
+				<dbType type="TIME" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>				
+				<dbType type="TIMESTAMPTZ" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>				
+				<dbType type="TIMESTAMP" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>
+				<dbType type="INTERVAL" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>								
+				<dbType type="TINTERVAL" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>				
+				<dbType type="RELTIME" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>							
+				<dbType type="ACLITEM" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>							
+				<dbType type="BYTEA" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>										
+				<dbType type="CID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="CIDR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="CIRCLE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>										
+				<dbType type="INET" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>							
+				<dbType type="MACADDR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="MONEY" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>							
+				<dbType type="OID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="PATH" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="POLYGON" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>							
+				<dbType type="REFCURSOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="REGCLASS" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="REGOPER" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="REGOPERATOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="REGPROC" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="REGPROCEDURE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="REGTYPE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>										
+				<dbType type="SMGR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>							
+				<dbType type="TID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="XID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="BOX" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="INT2VECTOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="LINE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="LSEG" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="NAME" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="OIDVECTOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="POINT" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>	
+				<!-- object -->
+				<dbType type="_OIDVECTOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_PATH" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>
+				<dbType type="_NAME" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_NUMERIC" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_OID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>
+				<dbType type="_LSEG" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_MACADDR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_MONEY" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>
+				<dbType type="_LINE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>
+				<dbType type="_INT2VECTOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_INT4" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_INTERVAL" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>
+				<dbType type="_BOX" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_BYTEA" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_VARCHAR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_BPCHAR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_CID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_CIDR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_CIRCLE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_DATE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_FLOAT8" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_INET" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>
+				<dbType type="_CHAR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_ABSTIME" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_ACLITEM" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_INT8" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_VARBIT" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_BIT" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>							
+				<dbType type="_BOOL" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>
+				<dbType type="_POINT" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_POLYGON" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_FLOAT4" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_REFCURSOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_REGCLASS" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_REGOPER" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_REGOPERATOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_REGPROC" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_REGPROCEDURE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_REGTYPE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_RELTIME" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_TEXT" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_TID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_TIMETZ" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_TIME" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_TIMESTAMPTZ" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_TIMESTAMP" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_TINTERVAL" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_XID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>									
+			</dbToTalendTypes>
+		</language>
+	</dbms>
+
+</mapping>

main/plugins/org.talend.core.runtime/mappings/mapping_VectorWise.xml

@@ -0,0 +1,211 @@
+<?xml version="1.0"?>
+<mapping>
+	<dbms product="VECTORWISE" id="vectorwise_id" label="Mapping VectorWise"
+		default="true">
+		<dbTypes>
+			<dbType type="ANSIDATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="BIGINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="BYTE" ignoreLen="true" ignorePre="true" />
+			<dbType type="BYTE VARYING" ignoreLen="true" ignorePre="true" />
+			<dbType type="C" ignoreLen="true" ignorePre="true" />
+			<dbType type="CHAR" ignorePre="true" />
+			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" />
+			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT4" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTEGER" ignoreLen="true" ignorePre="true" />
+			<dbType type="INGRESDATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTERVAL" ignoreLen="true" ignorePre="true" />
+			<dbType type="LONG NVARCHAR" ignorePre="true" />
+			<dbType type="LONG VARCHAR" ignoreLen="true" ignorePre="true" />
+			<dbType type="MONEY" ignoreLen="true" ignorePre="true" />
+			<dbType type="NCHAR" ignorePre="true" defaultLength="10"/>
+			<dbType type="NVARCHAR" ignorePre="true" defaultLength="10"/>
+			<dbType type="OBJECT_KEY"  ignoreLen="true" ignorePre="true"/>
+			<dbType type="SMALLINT"  ignoreLen="true" ignorePre="true"/>
+			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TINYINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true"/>
+			<dbType type="TABLE_KEY" ignoreLen="true" ignorePre="true" />
+			<dbType type="VARCHAR" default="true" defaultLength="1200" ignorePre="true"/>
+		</dbTypes>
+
+		<language name="java">
+			<talendToDbTypes><!-- Adviced mappings  -->
+				<talendType type="id_List"/>
+				<talendType type="id_Boolean">	
+				</talendType>
+				<talendType type="id_Byte">
+					<dbType type="BYTE" default="true" />
+					<dbType type="BYTE VARYING" />
+				</talendType>
+				<talendType type="id_byte[]">
+				</talendType>
+				<talendType type="id_Character">
+					<dbType type="CHAR" default="true" />
+					<dbType type="VARCHAR"/>
+					<dbType type="C"/>
+					<dbType type="TEXT"/>
+					<dbType type="LONG VARCHAR"/>
+					<dbType type="NCHAR"/>
+					<dbType type="NVARCHAR"/>
+					<dbType type="LONG NVARCHAR"/>
+				</talendType>
+				<talendType type="id_Date">					
+					<dbType type="ANSIDATE" default="true"/>
+					<dbType type="DATE"/>
+					<dbType type="INGRESDATE" />
+					<dbType type="TIME" />
+					<dbType type="TIMESTAMP" />		
+					<dbType type="INTERVAL"/>		
+				</talendType>
+				<talendType type="id_BigDecimal">
+					<dbType type="DECIMAL" default="true" />
+					<dbType type="FLOAT4" />
+					<dbType type="FLOAT"/>
+					<dbType type="MONEY"/>
+				</talendType>
+				<talendType type="id_Double">
+					<dbType type="FLOAT" default="true" />
+					<dbType type="FLOAT4" />
+					<dbType type="DECIMAL"/>
+					<dbType type="MONEY"/>
+				</talendType>
+				<talendType type="id_Float">
+					<dbType type="FLOAT4" default="true" />
+					<dbType type="FLOAT"/>
+					<dbType type="DECIMAL" />
+					<dbType type="MONEY"/>
+				</talendType>
+				<talendType type="id_Integer">
+					<dbType type="INTEGER" default="true" />
+					<dbType type="BIGINT" />
+					<dbType type="SMALLINT"/>
+					<dbType type="TINYINT"/>
+				</talendType>
+				<talendType type="id_Long">
+					<dbType type="BIGINT" default="true" />	
+					<dbType type="INTEGER"/>
+					<dbType type="SMALLINT"/>
+					<dbType type="TINYINT"/>	
+				</talendType>
+				<talendType type="id_Object">
+					<dbType type="MONEY" default="true"/>
+					<dbType type="OBJECT_KEY" />
+					<dbType type="TABLE_KEY" />
+				</talendType>
+				<talendType type="id_Short">
+					<dbType type="SMALLINT" default="true" />
+					<dbType type="INTEGER" />
+					<dbType type="BIGINT"/>
+					<dbType type="TINYINT" />
+				</talendType>
+				<talendType type="id_String">
+					<dbType type="VARCHAR" default="true" />
+					<dbType type="LONG VARCHAR" />
+					<dbType type="NCHAR"/>
+					<dbType type="NVARCHAR" />
+					<dbType type="LONG NVARCHAR" />		
+					<dbType type="TEXT" />
+					<dbType type="C"/>
+					<dbType type="CHAR"/>
+				</talendType>
+			</talendToDbTypes>
+			<dbToTalendTypes>
+				<dbType type="ANSIDATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="BIGINT">
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="BYTE">
+					<talendType type="id_Byte" default="true" />
+				</dbType>
+				<dbType type="BYTE VARYING">
+					<talendType type="id_Byte" default="true" />
+				</dbType>
+				<dbType type="C">
+					<talendType type="id_String" default="true" />
+					<talendType type="id_Character"/>
+				</dbType>
+				<dbType type="CHAR">
+					<talendType type="id_String" default="true" />
+					<talendType type="id_Character"/>
+				</dbType>
+				<dbType type="DECIMAL">
+					<talendType type="id_Float"/>
+					<talendType type="id_BigDecimal" default="true"/>
+				</dbType>
+				<dbType type="DATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="FLOAT">
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="FLOAT4">
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="INTEGER">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+					<talendType type="id_Short"/>
+				</dbType>
+				<dbType type="INGRESDATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="INTERVAL">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="LONG NVARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="LONG VARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="MONEY">
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="NCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="NVARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="OBJECT_KEY">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="SMALLINT">
+					<talendType type="id_Short" default="true" />
+					<talendType type="id_Integer" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="TEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="TINYINT">
+					<talendType type="id_Byte" default="true" />
+					<talendType type="id_Integer" />
+					<talendType type="id_Short"/>
+					<talendType type="id_Long" />
+				</dbType>
+				<dbType type="TIME">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TIMESTAMP">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TABLE_KEY">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="VARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+			</dbToTalendTypes>
+		</language>
+	</dbms>
+
+</mapping>

main/plugins/org.talend.core.runtime/mappings/mapping_sas.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!-- Similar as db system, but this mapping file is use for SAP -->
+<mapping>
+	<dbms product="SAS" id="sas_id" label="Mapping SAS" default="true">
+		<dbTypes>
+		 <dbType type="CHAR" defaultLength="20" ignoreLen="false" ignorePre="true"/> 
+ 		 <dbType type="NUM" defaultLength="20" defaultPrecision="10" ignoreLen="false" ignorePre="false"/> 
+		</dbTypes>
+		<language name="java">
+			<talendToDbTypes><!-- Adviced mappings  -->
+				<talendType type="id_List" />
+				<talendType type="id_Boolean">
+				</talendType>
+				<talendType type="id_Byte">
+				</talendType>
+				<talendType type="id_byte[]">
+				</talendType>
+				<talendType type="id_Character">
+				</talendType>
+				<talendType type="id_Date">
+				</talendType>
+				<talendType type="id_BigDecimal">
+				</talendType>
+				<talendType type="id_Double"> 
+ 		            <dbType type="NUM" default="true"/> 
+ 		        </talendType>
+				<talendType type="id_Float">
+				</talendType>
+				<talendType type="id_Integer">
+				</talendType>
+				<talendType type="id_Long" />
+				<talendType type="id_Object">
+				</talendType>
+				<talendType type="id_Short">
+				</talendType>
+				<talendType type="id_String">
+				<dbType type="CHAR" default="true"/> 
+				</talendType>
+			</talendToDbTypes>
+			<dbToTalendTypes>
+			<dbType type="CHAR"> 
+ 		       <talendType type="id_String" default="true" /> 
+ 		        <talendType type="id_Character" /> 
+ 		       </dbType> 
+ 		     <dbType type="NUM"> 
+ 	              <talendType type="id_Double" default="true" /> 
+ 		     </dbType> 
+			</dbToTalendTypes>
+		</language>
+	</dbms>
+</mapping>

main/plugins/org.talend.core.runtime/plugin_fr.properties

@@ -0,0 +1,4 @@
+Metadata=Métadonnées
+TalendDataCollector=Collecteur de données d'utilisation
+TalendDataCollectorPreview=Aperçu
+prefs=Talend

main/plugins/org.talend.core.runtime/plugin_ja.properties

@@ -0,0 +1,4 @@
+Metadata=\u30E1\u30BF\u30C7\u30FC\u30BF
+TalendDataCollector=\u30C7\u30FC\u30BF\u30B3\u30EC\u30AF\u30BF\u306E\u4F7F\u7528\u65B9\u6CD5
+TalendDataCollectorUploading=\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9
+prefs=Talend

main/plugins/org.talend.core.runtime/plugin_zh_CN.properties

@@ -0,0 +1,2 @@
+Metadata=\u5143\u6570\u636E
+TalendDataCollectorPreview=\u9884

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.runtime</artifactId>

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

@@ -33,6 +33,9 @@ public enum EDatabase4DriverClassName {
     IBMDB2ZOS(EDatabaseTypeName.IBMDB2ZOS, "COM.ibm.db2os390.sqlj.jdbc.DB2SQLJDriver"), //$NON-NLS-1$
 
     INFORMIX(EDatabaseTypeName.INFORMIX, "com.informix.jdbc.IfxDriver"), //$NON-NLS-1$
+    INGRES(EDatabaseTypeName.INGRES, "com.ingres.jdbc.IngresDriver"), //$NON-NLS-1$
+    INTERBASE(EDatabaseTypeName.INTERBASE, "interbase.interclient.Driver"), //$NON-NLS-1$
+    VECTORWISE(EDatabaseTypeName.VECTORWISE, "com.ingres.jdbc.IngresDriver"), //$NON-NLS-1$
 
     JAVADB_DERBYCLIENT(EDatabaseTypeName.JAVADB_DERBYCLIENT, "org.apache.derby.jdbc.ClientDriver"), //$NON-NLS-1$
     JAVADB_EMBEDED(EDatabaseTypeName.JAVADB_EMBEDED, "org.apache.derby.jdbc.EmbeddedDriver"), //$NON-NLS-1$
@@ -56,6 +59,7 @@ public enum EDatabase4DriverClassName {
     ORACLE_OCI(EDatabaseTypeName.ORACLE_OCI, "oracle.jdbc.OracleDriver", "oracle.jdbc.driver.OracleDriver"), //$NON-NLS-1$ //$NON-NLS-2$
     ORACLE_CUSTOM(EDatabaseTypeName.ORACLE_CUSTOM, "oracle.jdbc.OracleDriver", "oracle.jdbc.driver.OracleDriver"), //$NON-NLS-1$ //$NON-NLS-2$
 
+    PARACCEL(EDatabaseTypeName.PARACCEL, "com.paraccel.Driver"), //$NON-NLS-1$
     REDSHIFT(EDatabaseTypeName.REDSHIFT, "com.amazon.redshift.jdbc42.Driver"), //$NON-NLS-1$
     REDSHIFT_SSO(EDatabaseTypeName.REDSHIFT_SSO, "com.amazon.redshift.jdbc42.Driver"),
 

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

@@ -75,12 +75,18 @@ public enum EDatabaseTypeName {
 
     JAVADB(
             "JavaDB", "JavaDB", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    INGRES(
+            "Ingres", "Ingres", Boolean.FALSE, "INGRES", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "INGRES"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    INTERBASE(
+            "Interbase", "Interbase", Boolean.FALSE, "INTERBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INTERBASE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     SQLITE(
             "SQLite", "SQLite", Boolean.FALSE, "SQLITE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "SQLITE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     FIREBIRD(
             "FireBird", "FireBird", Boolean.FALSE, "FIREBIRD", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "FIREBIRD"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     INFORMIX(
             "Informix", "Informix", Boolean.TRUE, "INFORMIX", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INFORMIX"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VECTORWISE(
+            "VectorWise", "VectorWise", Boolean.FALSE, "VECTORWISE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$
 
     ACCESS(
             "Access", "Access", Boolean.FALSE, "ACCESS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Default_Name), // "ACCESS"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -104,6 +110,8 @@ public enum EDatabaseTypeName {
 
     GREENPLUM(
             "Greenplum", "Greenplum", Boolean.TRUE, "GREENPLUM", "GREENPLUM", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    PARACCEL(
+            "ParAccel", "ParAccel", Boolean.TRUE, "PARACCEL", "PARACCEL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     NETEZZA(
             "Netezza", "Netezza", Boolean.FALSE, "NETEZZA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     SAS("SAS", "SAS", Boolean.TRUE, "SAS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -138,9 +146,7 @@ public enum EDatabaseTypeName {
             "HBase", "HBase", Boolean.FALSE, "HBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     MAPRDB(
-            "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true),//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    SNOWFLAKE(
-            "SNOWFLAKE","SNOWFLAKE",Boolean.TRUE,"SNOWFLAKE",EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.None);
+            "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     // displayName is used in Java code.
     private String displayName;

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

@@ -214,36 +214,6 @@ public class ConnParameterKeys {
 
     /******************************************/
 
-    /*********** Azure Synapse keys ***************/
-    
-    public static final String CONN_PARA_KEY_SYNAPSE_HOST = "CONN_PARA_KEY_SYNAPSE_HOST"; //$NON-NLS-1$
-    
-    public static final String CONN_PARA_KEY_SYNAPSE_AUTH_TOKEN = "CONN_PARA_KEY_SYNAPSE_AUTH_TOKEN"; //$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_SYNAPSE_SPARK_POOLS = "CONN_PARA_KEY_SYNAPSE_SPARK_POOLS"; //$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_SYNAPSE_FS_HOSTNAME = "CONN_PARA_KEY_SYNAPSE_FS_HOSTNAME"; //$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_SYNAPSE_FS_CONTAINER = "CONN_PARA_KEY_SYNAPSE_FS_CONTAINER"; //$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_SYNAPSE_FS_USERNAME = "CONN_PARA_KEY_SYNAPSE_FS_USERNAME"; //$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_SYNAPSE_FS_PASSWORD = "CONN_PARA_KEY_SYNAPSE_FS_PASSWORD"; //$NON-NLS-1$
-    
-    public static final String CONN_PARA_KEY_SYNAPSE_FS_STORAGE = "CONN_PARA_KEY_SYNAPSE_FS_STORAGE"; //$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_SYNAPSE_DEPLOY_BLOB = "CONN_PARA_KEY_SYNAPSE_DEPLOY_BLOB"; //$NON-NLS-1$
-    
-    public static final String CONN_PARA_KEY_DRIVER_MEMORY = "CONN_PARA_KEY_DRIVER_MEMORY"; //$NON-NLS-1$
-    
-    public static final String CONN_PARA_KEY_DRIVER_CORES = "CONN_PARA_KEY_DRIVER_CORES"; //$NON-NLS-1$
-    
-    public static final String CONN_PARA_KEY_EXECUTOR_MEMORY = "CONN_PARA_KEY_EXECUTOR_MEMORY"; //$NON-NLS-1$
-    
-    public static final String CONN_PARA_KEY_TUNING_PROPERTIES = "CONN_PARA_KEY_TUNING_PROPERTIES"; //$NON-NLS-1$
-
-    /******************************************/
-
     /**
      * HBase keys.
      */
@@ -332,8 +302,6 @@ public class ConnParameterKeys {
     public static final String CONN_PARA_KEY_DATABRICKS_ENDPOINT="CONN_PARA_KEY_DATABRICKS_ENDPOINT";
 
     public static final String CONN_PARA_KEY_DATABRICKS_CLOUD_PROVIDER = "CONN_PARA_KEY_DATABRICKS_CLOUD_PROVIDER";
-    
-    public static final String CONN_PARA_KEY_DATABRICKS_RUN_MODE = "CONN_PARA_KEY_DATABRICKS_RUN_MODE";
 
     public static final String CONN_PARA_KEY_DATABRICKS_CLUSTER_ID="CONN_PARA_KEY_DATABRICKS_CLUSTER_ID";
 

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

@@ -112,6 +112,15 @@ public enum EDatabaseConnTemplate {
     SQLITE(new DbConnStr(EDatabaseTypeName.SQLITE, //
             "jdbc:sqlite:/<filename>")), //$NON-NLS-1$
 
+    INGRES(new DbConnStr(EDatabaseTypeName.INGRES, //
+            "jdbc:ingres://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
+            "II7")), //$NON-NLS-1$
+    VECTORWISE(new DbConnStr(EDatabaseTypeName.VECTORWISE, //
+            "jdbc:ingres://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
+            "II7")), //$NON-NLS-1$
+    INTERBASE(new DbConnStr(EDatabaseTypeName.INTERBASE, //
+            "jdbc:interbase://<host>/<sid>?<property>")), //$NON-NLS-1$
+
     FIREBIRD(new DbConnStr(EDatabaseTypeName.FIREBIRD, //
             "jdbc:firebirdsql:<host>/<port>:<filename>?<property>", //$NON-NLS-1$
             "3050")), //$NON-NLS-1$
@@ -165,6 +174,11 @@ public enum EDatabaseConnTemplate {
             "jdbc:sap://<host>:<port>?<property>", //$NON-NLS-1$
             "30015", //$NON-NLS-1$
             "")), //$NON-NLS-1$
+
+    PARACCEL(new DbConnStr(EDatabaseTypeName.PARACCEL, //
+            "jdbc:paraccel://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
+            "5439")), //$NON-NLS-1$
+
     REDSHIFT(new DbConnStr(EDatabaseTypeName.REDSHIFT, //
             "jdbc:redshift://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
             "5439",//$NON-NLS-1$
@@ -371,6 +385,7 @@ public enum EDatabaseConnTemplate {
             case PSQL:
             case PLUSPSQL:
             case GREENPLUM:
+            case PARACCEL:
             case REDSHIFT:
             case REDSHIFT_SSO:
             case IBMDB2:
@@ -415,6 +430,10 @@ public enum EDatabaseConnTemplate {
             case PSQL:
             case PLUSPSQL:
             case GREENPLUM:
+            case PARACCEL:
+            case INGRES:
+            case VECTORWISE:
+            case INTERBASE:
             case FIREBIRD:
             case JAVADB_EMBEDED:
             case JAVADB_JCCJDBC:
@@ -441,6 +460,8 @@ public enum EDatabaseConnTemplate {
             case SYBASEASE_16_SA:
             case IBMDB2:
             case IBMDB2_ZOS:
+            case INGRES:
+            case INTERBASE:
             case MSSQL:
             case INFORMIX:
             case TERADATA:

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

@@ -47,6 +47,10 @@ public enum EDatabaseVersion4Drivers {
     // AS400
     AS400_V7R1_V7R3(new DbVersion4Drivers(EDatabaseTypeName.AS400, "V7R1 to V7R3", "AS400_V7R1_V7R3", "jt400-9.8.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     AS400_V6R1_V7R2(new DbVersion4Drivers(EDatabaseTypeName.AS400, "V6R1 to V7R2", "AS400_V6R1_V7R2", "jt400_V6R1.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    AS400_V5R3_V6R1(new DbVersion4Drivers(EDatabaseTypeName.AS400, "V5R3 to V6R1", "AS400_V5R3_V6R1", "jt400_V5R3.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    AS400_V5R2_V5R4(new DbVersion4Drivers(EDatabaseTypeName.AS400, "V5R2 to V5R4", "AS400_V5R2_V5R4", "jt400_V5R2.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    //
+    INTERBASE(new DbVersion4Drivers(EDatabaseTypeName.INTERBASE, "interclient.jar")), //$NON-NLS-1$
 
     //
     HSQLDB(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB, "hsqldb.jar")), //$NON-NLS-1$
@@ -81,12 +85,22 @@ public enum EDatabaseVersion4Drivers {
             "Microsoft SQL Server 2012", "Microsoft SQL Server 2012", "jtds-1.3.1-patch-20190523.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     MSSQL_PROP(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
             "Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", "adal4j-1.6.5.jar", //$NON-NLS-1$
+            new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.25.jar", "slf4j-log4j12-1.7.25.jar", "adal4j-1.6.5.jar", //$NON-NLS-1$
                     "commons-lang3-3.10.jar", "commons-codec-1.14.jar", "gson-2.8.6.jar", "oauth2-oidc-sdk-6.5.jar",
                     "json-smart-2.4.7.jar", "nimbus-jose-jwt-8.11.jar", "javax.mail-1.6.2.jar", "log4j-1.2.17.jar",
                     "accessors-smart-2.4.7.jar", "asm-9.1.jar" })),
 
     VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VERTICA_7_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.1.X (Deprecated)", "VERTICA_7_1_X", "vertica-jdbc-7.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VERTICA_7(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.0.X (Deprecated)", "VERTICA_7_0_X", "vertica-jdbc-7.0.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VERTICA_6_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 6.1.X (Deprecated)", "VERTICA_6_1_X", "vertica-jdk5-6.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VERTICA_6(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 6.0 (Deprecated)", "VERTICA_6_0", "vertica-jdk5-6.0.0-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VERTICA_5_1(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 5.1 (Deprecated)", "VERTICA_5_1", "vertica_5.1.6_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VERTICA_5(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 5.0 (Deprecated)", "VERTICA_5", "vertica_4.1.14_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VERTICA_4_1(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 4.1 (Deprecated)", "VERTICA_4_1", "vertica_4.1.7_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VERTICA_4(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 4 (Deprecated)", "VERTICA_4", "vertica_4.0_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VERTICA_3_5(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 3.5 (Deprecated)", "VERTICA_3.5", "vertica_3.5_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VERTICA_3(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 3 (Deprecated)", "VERTICA_3", "vertica_3.0_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     // for bug 0017930
     GREENPLUM_PSQL(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"PostgreSQL", "POSTGRESQL", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$
@@ -107,9 +121,15 @@ public enum EDatabaseVersion4Drivers {
     SYBASEIQ_16_SA(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 16 (SQL Anywhere)", "SYBSEIQ_16_SA", "sajdbc4-17.0.0.jar")),
     SYBASEIQ(new DbVersion4Drivers(EDatabaseTypeName.SYBASEIQ, "jconn3.jar")), //$NON-NLS-1$
 
+    // for bug 0013127
+    PARACCEL(new DbVersion4Drivers(EDatabaseTypeName.PARACCEL, "paraccel-jdbc.jar")), //$NON-NLS-1$
+    VECTORWISE(new DbVersion4Drivers(EDatabaseTypeName.VECTORWISE, "iijdbc.jar")), //$NON-NLS-1$
+
     EXASOL(new DbVersion4Drivers(EDatabaseTypeName.EXASOL, "exajdbc-6.0.9302.jar")), //$NON-NLS-1$
     MAXDB(new DbVersion4Drivers(EDatabaseTypeName.MAXDB, "sapdbc.jar")), //$NON-NLS-1$
 
+    INGRES(new DbVersion4Drivers(EDatabaseTypeName.INGRES, "iijdbc.jar")), //$NON-NLS-1$
+
     // HIVE(new DbVersion4Drivers(EDatabaseTypeName.HIVE, "STANDALONE", "STANDALONE", new String[] {
     // "hive-jdbc-0.8.1.jar",
     // "hive-metastore-0.8.1.jar", "hive-exec-0.8.1.jar", "hive-service-0.8.1.jar", "libfb303_new.jar",

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/conf/EHadoopProperties.java

@@ -102,38 +102,10 @@ public enum EHadoopProperties {
 
     HD_JOB_RESULT_FOLDER,
 
-    SYNAPSE_ENDPOINT,
-    
-    SYNAPSE_TOKEN,
-    
-    SPARK_POOL_NAME,
-    
-    SYNAPSE_STORAGE_HOST,
-    
-    SYNAPSE_STORAGE_CONTAINER,
-    
-    SYNAPSE_STORAGE_USERNAME,
-    
-    SYNAPSE_STORAGE_PASSWORD,
-    
-    DEPLOY_FOLDER,
-    
-    SPARK_DRIVER_MEM,
-    
-    SPARK_DRIVER_CORES,
-    
-    SPARK_EXECUTOR_MEMORY,
-    
     DATABRICKS_ENDPOINT,
-    
     DATABRICKS_CLOUD_PROVIDER,
-
-    DATABRICKS_RUN_MODE,
-
     DATABRICKS_CLUSTER_ID,
-    
     DATABRICKS_TOKEN,
-    
     DATABRICKS_DBFS_DEP_FOLDER;
 
     public String getName() {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/EHadoopDistributions.java

@@ -32,8 +32,6 @@ public enum EHadoopDistributions {
     PIVOTAL_HD("Pivotal HD"), //$NON-NLS-1$
 
     MICROSOFT_HD_INSIGHT("Microsoft HD Insight"), //$NON-NLS-1$
-    
-    AZURE_SYNAPSE("Azure Synapse Runtime for Apache Spark 3.0"), //$NON-NLS-1$
 
     GOOGLE_CLOUD_DATAPROC("Google Cloud Dataproc"), //$NON-NLS-1$
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/ESynapseStorage.java

@@ -1,73 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.hadoop.version;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public enum ESynapseStorage {
-
-	ADLS_GEN2("ADLS Gen2"); //$NON-NLS-1$
-
-    private String displayName;
-
-    ESynapseStorage(String displayName) {
-        this.displayName = displayName;
-    }
-
-    public String getName() {
-        return name();
-    }
-
-    public String getDisplayName() {
-        return this.displayName;
-    }
-
-    public static List<String> getAllSynapseStorageDisplayNames() {
-        return getAllSynapseStorageNames(true);
-    }
-
-    public static List<String> getAllSynapseStorageNames(boolean display) {
-        List<String> names = new ArrayList<String>();
-        ESynapseStorage[] values = values();
-        for (ESynapseStorage storage : values) {
-            if (display) {
-                names.add(storage.getDisplayName());
-            } else {
-                names.add(storage.getName());
-            }
-        }
-        return names;
-    }
-
-    public static ESynapseStorage getSynapseStoragenByDisplayName(String name) {
-        return getSynapseStorageByName(name, true);
-    }
-
-    public static ESynapseStorage getSynapseStorageByName(String name, boolean display) {
-        if (name != null) {
-            for (ESynapseStorage storage : values()) {
-                if (display) {
-                    if (name.equalsIgnoreCase(storage.getDisplayName())) {
-                        return storage;
-                    }
-                } else {
-                    if (name.equalsIgnoreCase(storage.getName())) {
-                        return storage;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-}

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

@@ -21,8 +21,6 @@ import org.talend.core.model.properties.JobletProcessItem;
 import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.service.IMRProcessService;
 import org.talend.core.service.IStormProcessService;
-import org.talend.core.ui.ISparkJobletProviderService;
-import org.talend.core.ui.ISparkStreamingJobletProviderService;
 import org.talend.designer.core.ICamelDesignerCoreService;
 
 /**
@@ -85,10 +83,6 @@ public enum ComponentCategory {
     }
 
     public static ComponentCategory getComponentCategoryFromItem(Item item) {
-        return getComponentCategoryFromItem(item, false);
-    }
-
-    public static ComponentCategory getComponentCategoryFromItem(Item item, boolean isJoblet) {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ICamelDesignerCoreService.class)) {
             ICamelDesignerCoreService camelService = (ICamelDesignerCoreService) GlobalServiceRegister.getDefault().getService(
                     ICamelDesignerCoreService.class);
@@ -117,23 +111,6 @@ public enum ComponentCategory {
             }
         }
         if (item instanceof ProcessItem || item instanceof JobletProcessItem) {
-            if (isJoblet) {
-                if (GlobalServiceRegister.getDefault().isServiceRegistered(ISparkJobletProviderService.class)) {
-                    ISparkJobletProviderService sparkJobletService = GlobalServiceRegister.getDefault()
-                            .getService(ISparkJobletProviderService.class);
-                    if (sparkJobletService.isSparkJobletItem(item)) {
-                        return ComponentCategory.CATEGORY_4_SPARK;
-                    }
-                }
-                if (GlobalServiceRegister.getDefault().isServiceRegistered(ISparkStreamingJobletProviderService.class)) {
-                    ISparkStreamingJobletProviderService sparkStrJobletService = GlobalServiceRegister.getDefault()
-                            .getService(ISparkStreamingJobletProviderService.class);
-                    if (sparkStrJobletService.isSparkStreamingJobletItem(item)) {
-                        return ComponentCategory.CATEGORY_4_SPARKSTREAMING;
-                    }
-                }
-            }
-
             return ComponentCategory.CATEGORY_4_DI;
         }
         return null;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/ContextUtils.java

@@ -71,9 +71,6 @@ public class ContextUtils {
             "instanceof", "return", "transient", "catch", "extends", "int", "short", "try", "char", "final", "interface", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
             "static", "void", "class", "finally", "long", "strictfp", "volatile", "const", "float", "native", "super", "while")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
 
-    private static final Set<String> SECURE_SENSITIVE_CONTEXT_NAMES_EXP = new HashSet<String>(Arrays.asList("resource_flow_temp_folder", "resource_webhook_payload", "resource_file_[\\w]+", 
-           "resource_directory_[\\w]+", "connection_[a-zA-Z0-9]+_[\\w]+"));
-    
 
     /**
      *
@@ -93,22 +90,6 @@ public class ContextUtils {
         return false;
     }
 
-    /**
-    *
-    * ggu Comment method "isSecureSensitiveParam".
-    *
-    */
-    public static boolean isSecureSensitiveParam (final String name) {
-       
-        for (String regexp : SECURE_SENSITIVE_CONTEXT_NAMES_EXP) {
-            if (name.matches(regexp)) {
-                return true;
-            }
-        }
-        
-        return false;
-    }
-
     /**
      *
      * update the JobContextParameter form repository ContextItem by context name.

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

@@ -26,6 +26,8 @@ import java.util.Vector;
 import java.util.regex.Pattern;
 
 import org.apache.avro.Schema;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.EMap;
@@ -65,8 +67,10 @@ import org.talend.core.model.process.INode;
 import org.talend.core.model.properties.ConnectionItem;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.impl.ConnectionItemImpl;
+import org.talend.core.model.repository.IRepositoryPrefConstants;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.routines.IRoutinesService;
+import org.talend.core.prefs.ITalendCorePrefConstants;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.i18n.Messages;
 import org.talend.core.runtime.services.IGenericWizardService;
@@ -293,7 +297,6 @@ public final class MetadataToolHelper {
         boolean isKeyword = KeywordsValidator.isKeyword(originalColumnName);
 
         StringBuilder sb = new StringBuilder();
-        int[] charBit = new int[columnName.length()];
         if (!isKeyword) {
             boolean isAllowSpecific = isAllowSpecificCharacters();
 
@@ -309,16 +312,14 @@ public final class MetadataToolHelper {
                         sb.append(car);
                     } else {
                         sb.append(underLine);
-                        charBit[i] = 1;
                     }
                 } else {
                     sb.append(car);
                 }
             }
         }
-        String returnedColumnName = trimBeginEnd_(sb.toString(), charBit);
-        if (isKeyword || "".equals(returnedColumnName) || org.apache.commons.lang.StringUtils.countMatches(returnedColumnName,
-                underLine) == originalColumnName.length()) {
+        String returnedColumnName = trimBeginEnd_(sb.toString());
+        if (isKeyword || "".equals(returnedColumnName)) {
             returnedColumnName = "Column" + index; //$NON-NLS-1$
         }
 
@@ -331,28 +332,29 @@ public final class MetadataToolHelper {
     // abc -> abc
     // _abc -> _abc
     // _____ -> ""
-    private static String trimBeginEnd_(String columnName, int[] charBit) {
+    public static String trimBeginEnd_(String columnName) {
         if (columnName == null) {
             return null;
         }
+        int len = columnName.length();
         int st = 0;
-        int len = charBit.length;
         char[] val = columnName.toCharArray(); /* avoid getfield opcode */
 
-        while (st < len && charBit[st] == 1) {
+        while ((st < len) && (val[st] == '_')) {
             st++;
         }
-        while (st < len && charBit[len - 1] == 1) {
+        while ((st < len) && (val[len - 1] == '_')) {
             len--;
         }
         if ((st > 0) || (len < columnName.length())) {
             if (st == columnName.length()) {
                 return "";
             }
-            if (st > 0 && val[st] != '_') {
-                st--;
+            if (st > 0) {
+                return columnName.substring(st - 1, len);
+            } else {
+                return columnName.substring(st, len);
             }
-            return columnName.substring(st, len);
         } else {
             return columnName;
         }

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

@@ -1,42 +0,0 @@
-package org.talend.core.model.metadata;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.talend.core.model.process.IElementParameter;
-import org.talend.core.model.process.INode;
-
-public class SparkBatchMetadataTalendTypeFilter extends SparkMetadataTalendTypeFilter{
-
-    private INode node;
-
-    public static List<String> dynamicTypeCompatibleComponents = Arrays.asList(
-            "tDeltaLakeInput",
-            "tDeltaLakeOutput",
-            "tFileInputParquet",
-            "tFileOutputParquet",
-            "tJDBCInput",
-            "tJDBCOutput", "tLogRow", "tSqlRow"
-            );
-
-    public SparkBatchMetadataTalendTypeFilter(INode node) {
-        super(node.getComponent().getName());
-        this.node = node;
-    }
-
-    @Override
-    public List<String> getComponentSpecificTypes() {
-        // For the moment only dynamic type is a component specific type
-        // dynamic type is available under 2 conditions : job uses Dataset API and component is listed in
-        // dynamicTypeCompatibleComponents
-        INode configNode = node.getProcess().getNodesOfType("tSparkConfiguration").get(0);
-        IElementParameter param = configNode.getElementParameter("USE_DATASET_API");
-        if (Boolean.FALSE.equals(param.getValue())) {
-            return null;
-        }
-        if (dynamicTypeCompatibleComponents.contains(node.getComponent().getName())) {
-            return  Arrays.asList(SparkMetadataTalendTypeFilter.DYNAMIC);
-        }
-        return null;
-    }
-}

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

@@ -22,7 +22,7 @@ public class SparkMetadataTalendTypeFilter extends MetadataTalendTypeFilter {
 
     private final static List<String> UNSUPPORTED_TYPES = Arrays.asList(new String[] { "Document", "Dynamic" }); //$NON-NLS-1$ //$NON-NLS-2$
 
-    public final static String ROWGENERATOR_COMPONENT_NAME = "tRowGenerator"; //$NON-NLS-1$
+    private final static String ROWGENERATOR_COMPONENT_NAME = "tRowGenerator"; //$NON-NLS-1$
 
     protected final static String INPUTPARQUET_COMPONENT_NAME = "tFileInputParquet", INPUTSTREAMPARQUET_COMPONENT_NAME = "tFileStreamInputParquet", OUTPUTPARQUET_COMPONENT_NAME = "tFileOutputParquet"; //$NON-NLS-1$; //$NON-NLS-2$ //$NON-NLS-3$
 
@@ -53,35 +53,21 @@ public class SparkMetadataTalendTypeFilter extends MetadataTalendTypeFilter {
         COMPONENT_UNSUPPORTED_TYPES.put(OUTPUTKUDU_COMPONENT_NAME, Arrays.asList(new String[] { "Object", "List", "Vector", "byte[]", "BigDecimal" })); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
-    public static String DYNAMIC = "Dynamic";
-
     public SparkMetadataTalendTypeFilter(String componentName) {
         this.mComponentName = componentName;
     }
 
     @Override
     protected List<String> getUnsupportedTypes() {
-        List<String> unsupportedTypes = new ArrayList<String>(UNSUPPORTED_TYPES);
-
-        // Add component specific unsupported types
         List<String> currentComponentUnsupportedType = COMPONENT_UNSUPPORTED_TYPES.get(this.mComponentName);
         if (currentComponentUnsupportedType != null) {
-            unsupportedTypes.addAll(currentComponentUnsupportedType);
+            List<String> unionList = new ArrayList<>();
+            unionList.addAll(currentComponentUnsupportedType);
+            unionList.addAll(UNSUPPORTED_TYPES);
+            return unionList;
+        } else {
+            return UNSUPPORTED_TYPES;
         }
-
-        // Remove component specific supported types
-        List<String> componentSpecificTypes = getComponentSpecificTypes();
-        if (componentSpecificTypes != null) {
-            unsupportedTypes.removeIf(item -> componentSpecificTypes.contains(item));
-        }
-
-        return unsupportedTypes;
     }
 
-    /**
-     * Get a list of types that are specifically supported by the component
-     */
-    protected List<String> getComponentSpecificTypes() {
-        return null;
-    }
 }

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

@@ -433,6 +433,16 @@ public class ComponentToRepositoryProperty {
             connection.setDatabaseType(EDatabaseTypeName.IBMDB2.getDisplayName());
             connection.setProductId(EDatabaseTypeName.IBMDB2.getProduct());
         }
+        // Ingres
+        else if (EDatabaseTypeName.INGRES.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
+            connection.setDatabaseType(EDatabaseTypeName.INGRES.getDisplayName());
+            connection.setProductId(EDatabaseTypeName.INGRES.getProduct());
+        }
+        // Interbase
+        else if (EDatabaseTypeName.INTERBASE.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
+            connection.setDatabaseType(EDatabaseTypeName.INTERBASE.getDisplayName());
+            connection.setProductId(EDatabaseTypeName.INTERBASE.getProduct());
+        }
         // Sqlite
         else if (EDatabaseTypeName.SQLITE.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
             connection.setDatabaseType(EDatabaseTypeName.SQLITE.getDisplayName());
@@ -478,6 +488,11 @@ public class ComponentToRepositoryProperty {
             connection.setDatabaseType(EDatabaseTypeName.MAXDB.getDisplayName());
             connection.setProductId(EDatabaseTypeName.MAXDB.getProduct());
         }
+        // Paraccel
+        else if (EDatabaseTypeName.PARACCEL.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
+            connection.setDatabaseType(EDatabaseTypeName.PARACCEL.getDisplayName());
+            connection.setProductId(EDatabaseTypeName.PARACCEL.getProduct());
+        }
         // Redshift
         else if (EDatabaseTypeName.REDSHIFT.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
             connection.setProductId(EDatabaseTypeName.REDSHIFT.getProduct());
@@ -585,6 +600,11 @@ public class ComponentToRepositoryProperty {
             connection.setDatabaseType(EDatabaseTypeName.SAPHana.getDisplayName());
             connection.setProductId(EDatabaseTypeName.SAPHana.getProduct());
         }
+        // VECTORWISE
+        else if (EDatabaseTypeName.VECTORWISE.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
+            connection.setDatabaseType(EDatabaseTypeName.VECTORWISE.getDisplayName());
+            connection.setProductId(EDatabaseTypeName.VECTORWISE.getProduct());
+        }
         // SAX
         // can not find corresponding component. also not exist in EDatabaseType.java.
 

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

@@ -2286,7 +2286,7 @@ public class RepositoryToComponentProperty {
                 for (int j = 0; j < schemaTargets.size(); j++) {
                     SchemaTarget schemaTarget = schemaTargets.get(j);
                     if (schemaTarget.getTagName() != null && !schemaTarget.getTagName().equals("")) { //$NON-NLS-1$
-                        tagName = "" + schemaTarget.getTagName().trim(); //$NON-NLS-1$ //$NON-NLS-2$
+                        tagName = "" + schemaTarget.getTagName().trim().replaceAll(" ", "_"); //$NON-NLS-1$ //$NON-NLS-2$
                         tagName = MetadataToolHelper.validateColumnName(tagName, j);
                         Map<String, Object> map = new HashMap<String, Object>();
                         map.put("SCHEMA_COLUMN", tagName); //$NON-NLS-1$
@@ -2361,8 +2361,7 @@ public class RepositoryToComponentProperty {
                     for (IMetadataColumn metadataColumn : listColumns) {
                         if (metadataColumn.getLabel().equals(schemaTarget.getTagName())) {
                             foundColumn = true;
-                            tagName = "" + schemaTarget.getTagName().trim(); //$NON-NLS-1$
-                            // //$NON-NLS-2$
+                            tagName = "" + schemaTarget.getTagName().trim().replaceAll(" ", "_"); //$NON-NLS-1$ //$NON-NLS-2$
                             tagName = MetadataToolHelper.validateColumnName(tagName, j);
                             Map<String, Object> map = new HashMap<String, Object>();
                             map.put("SCHEMA_COLUMN", tagName); //$NON-NLS-1$

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

@@ -16,8 +16,8 @@ package org.talend.core.model.metadata.designerproperties;
  * DOC talend class global comment. Detailled comment
  */
 public enum SapJcoVersion {
-    SAP2("sap jco 2.*", "sapjco.jar"), //$NON-NLS-1$ //$NON-NLS-2$
-    SAP3("sap jco 3.*", "com.sap.conn.jco.sapjco.jar");//$NON-NLS-1$ //$NON-NLS-2$
+    SAP2("sap jco 2.*", "sapjco.jar"), //$NON-NLS-1$
+    SAP3("sap jco 3.*", "sapjco3.jar");//$NON-NLS-1$
 
     private String displayName;
 

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

@@ -240,11 +240,6 @@ public class ContextParameterJavaTypeManager {
         if (javaType == null) {
             return null;
         }
-        
-        if(javaType.equals(JavaTypesManager.PASSWORD)) {
-        	return "Password";
-        }
-        
         Class primitiveClass = javaType.getPrimitiveClass();
         Class nullableClass = javaType.getNullableClass();
         if (nullable) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/NodeUtil.java

@@ -34,7 +34,6 @@ import org.talend.core.model.metadata.DummyMetadataTalendTypeFilter;
 import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.metadata.MetadataTalendTypeFilter;
 import org.talend.core.model.metadata.MrMetadataTalendTypeFilter;
-import org.talend.core.model.metadata.SparkBatchMetadataTalendTypeFilter;
 import org.talend.core.model.metadata.SparkMetadataTalendTypeFilter;
 import org.talend.core.model.metadata.StormMetadataTalendTypeFilter;
 import org.talend.core.model.process.AbstractNode;
@@ -428,9 +427,8 @@ public class NodeUtil {
      * @return
      */
     public static List<? extends IConnection> getFirstIncomingLineConnectionsOfType(INode node, String type) {
-        if (type == null) {
+        if (type == null)
             return new ArrayList<IConnection>();
-        }
 
         Set<String> uniqueNamesDone = new HashSet<String>();
         List<? extends IConnection> allIncomingConnections = getFirstIncomingLineConnectionsOfType(node, uniqueNamesDone, type);
@@ -452,7 +450,7 @@ public class NodeUtil {
                 if (!uniqueNamesDone.contains(nextNode.getUniqueName())) {
                     uniqueNamesDone.add(nextNode.getUniqueName());
 
-                    if (type.equals(nextNode.getElementParameter("COMPONENT_NAME").getValue())) {
+                    if (type.equals((String)nextNode.getElementParameter("COMPONENT_NAME").getValue())) {
                         conns.add(connection);
                     } else {
                         conns.addAll(getFirstIncomingLineConnectionsOfType(nextNode, uniqueNamesDone, type)); // follow this way
@@ -809,7 +807,7 @@ public class NodeUtil {
 
                 for (INode tnode : listDepartitioner) {
                     if (tnode.getUniqueName().equals(departitionerName)) { // find the tDepartitioner corresponding to
-                        // tRecollector
+                                                                           // tRecollector
                         INode startNode = getSubProcessStartNode(tnode); // find the tCollector
                         List<? extends IConnection> inConns = startNode.getIncomingConnections(EConnectionType.STARTS);
                         if (inConns != null && inConns.size() > 0) {
@@ -918,8 +916,8 @@ public class NodeUtil {
         }
         throw new IllegalArgumentException();
     }
-
-
+    
+    
     public static String getRuntimeParameterValue(INode node, IElementParameter ep) {
         if (EParameterFieldType.TABLE.equals(ep.getFieldType())) {
             Map<String, IElementParameter> types = new HashMap<String, IElementParameter>();
@@ -982,23 +980,23 @@ public class NodeUtil {
             return getRuntimeParameterValue(value, ep, false);
         }
     }
-
+    
     private static String getRuntimeParameterValue(String value, IElementParameter ep, boolean itemFromTable) {
         if (value == null) {
             value = "";
         }
-
+        
         value = value.trim();
-
+        
         boolean isMemo = false;
-
+        
         List<EParameterFieldType> needRemoveCRLFList = Arrays.asList(EParameterFieldType.MEMO, EParameterFieldType.MEMO_JAVA,
                 EParameterFieldType.MEMO_SQL, EParameterFieldType.MEMO_IMPORT, EParameterFieldType.MEMO_MESSAGE);
         if (needRemoveCRLFList.contains(ep.getFieldType())) {
             isMemo = true;
             value = value.replaceAll("[\r\n]", " ");
         }
-
+        
         List<EParameterFieldType> needQuoteList = Arrays.asList(EParameterFieldType.CLOSED_LIST,
                 EParameterFieldType.COMPONENT_LIST, EParameterFieldType.COLUMN_LIST, EParameterFieldType.PREV_COLUMN_LIST,
                 EParameterFieldType.CONNECTION_LIST, EParameterFieldType.LOOKUP_COLUMN_LIST,
@@ -1024,13 +1022,13 @@ public class NodeUtil {
                 value = value.substring(0, value.length() - 1);
             }
         }
-
+        
         if("".equals(value) || "\"\"".equals(value)) {
             return "\"\"";
         } else if("null".equals(value)) {
             return "(Object)null";
         }
-
+        
         // copied it from Log4jFileUtil.javajet but need more comment for this script
         if ("\"\\n\"".equals(value) || "\"\\r\"".equals(value) || "\"\\r\\n\"".equals(value)) {
             // for the value is "\n" "\r" "\r\n"
@@ -1050,7 +1048,7 @@ public class NodeUtil {
         else if ("BUILDIN".equals(ep.getName())) {
             return value.toLowerCase();
         }
-
+        
         //suppose all memo fields are processed well already, no need to go though this with dangerous
         if (!isMemo && !org.talend.core.model.utils.ContextParameterUtils.isDynamic(value)) {
             //https://jira.talendforge.org/browse/TDI-45563
@@ -1061,7 +1059,7 @@ public class NodeUtil {
                     return "\"\"";//return empty string as can't get the real runtime value
                 }
             }
-
+            
             if(value.length() > 1 && value.startsWith("\"") && value.endsWith("\"")) {
                 if(itemFromTable && "ARGS".equals(ep.getName())) {
                     value = value.substring(1, value.length());
@@ -1075,19 +1073,19 @@ public class NodeUtil {
                 return "\"" + checkStringQuotationMarks(value) + "\"";
             }
         }
-
+        
         //TODO remove it
         if (value.endsWith("*")) {
             return value.substring(0, value.length() - 1) + "\"*\"";
         }
-
+        
         return value;
     }
-
+    
     private static boolean isValidLiteralValue(String value) {
         return ContextParameterUtils.isValidLiteralValue(value);
     }
-
+    
     private static String checkStringQuotationMarks(String str) {
         String result = str;
         if (result.contains("\"")) {
@@ -1214,52 +1212,52 @@ public class NodeUtil {
             fakeRightQuotes = getFakeRightQuotes( original,fakeRightQuotes);
         }
         int leftPrev = 0;
-        while (leftQuotes >= 0 && rightQuotes > leftQuotes) {
-            if (leftQuotes > leftPrev) {//Outside of double quote
-                result.append(original.substring(leftPrev, leftQuotes));
-            }
+    		while (leftQuotes >= 0 && rightQuotes > leftQuotes) {
+      			if (leftQuotes > leftPrev) {//Outside of double quote
+      				  result.append(original.substring(leftPrev, leftQuotes));
+      			}
 
-            if (leftQuotes < rightQuotes) {//Inside of double quote
-                //split string for better appearance and avoid compile error when string exceed 64k
-                if(needSplit) {
-                    int current = leftQuotes;
-                    int Offset = 120;
-                    int count = 0;
-                    while (rightQuotes + 1 - current > 120) {
-                        //[\u0000] or [\000]
-                        Matcher matcher = invalid_unicode_character_regex.matcher(original.substring(current, current + Offset));
-                        if(matcher.matches()) {
-                            Offset = Offset - matcher.group(1).length();
-                        }
-                        /*
+      			if (leftQuotes < rightQuotes) {//Inside of double quote
+        				//split string for better appearance and avoid compile error when string exceed 64k
+        			  if(needSplit) {
+            				int current = leftQuotes;
+            				int Offset = 120;
+            				int count = 0;
+            				while (rightQuotes + 1 - current > 120) {
+            				    //[\u0000] or [\000]
+            				    Matcher matcher = invalid_unicode_character_regex.matcher(original.substring(current, current + Offset));
+              				  if(matcher.matches()) {
+              				      Offset = Offset - matcher.group(1).length();
+              				  }
+              				  /*
               				  else {
                   				  matcher = invalid_octal_character_regex.matcher(original.substring(current, current + Offset));
                             if(matcher.matches()) {
                                 Offset = Offset - matcher.group(1).length();
                             }
               				  }
-                         */
+              				  */
 
-                        while (original.charAt(current + Offset - 1) == '\\') {//avoid split special character e.g. \"
-                            Offset--;
-                        }
+              					while (original.charAt(current + Offset - 1) == '\\') {//avoid split special character e.g. \"
+              						  Offset--;
+              					}
 
-                        if(count>500){//This is the code that really solve TDI-39968 others are only for good appearance.
-                            result.append(original.substring(current, current + Offset).replace("\r", "").replace("\n", "\\n")).append("\" + new String()\n+\"");
-                            count = 0;
-                        }else{
-                            result.append(original.substring(current, current + Offset).replace("\r", "").replace("\n", "\\n")).append("\"\n+\"");
-                        }
+              					if(count>500){//This is the code that really solve TDI-39968 others are only for good appearance.
+                						result.append(original.substring(current, current + Offset).replace("\r", "").replace("\n", "\\n")).append("\" + new String()\n+\"");
+                						count = 0;
+              					}else{
+              						  result.append(original.substring(current, current + Offset).replace("\r", "").replace("\n", "\\n")).append("\"\n+\"");
+              					}
 
-                        current += Offset;
-                        Offset = 120;
-                        count++;
-                    }
-                    result.append(original.substring(current, rightQuotes + 1).replace("\r", "").replace("\n", "\\n"));
-                } else {
-                    result.append(original.substring(leftQuotes, rightQuotes + 1).replace("\r", "").replace("\n", "\\n"));
-                }
-            }
+              					current += Offset;
+              					Offset = 120;
+              					count++;
+            				}
+            				result.append(original.substring(current, rightQuotes + 1).replace("\r", "").replace("\n", "\\n"));
+        			  } else {
+            				result.append(original.substring(leftQuotes, rightQuotes + 1).replace("\r", "").replace("\n", "\\n"));
+        			  }
+      			}
 
             leftQuotes = original.indexOf("\"", rightQuotes + 1);
             leftPrev = rightQuotes + 1;
@@ -1396,10 +1394,7 @@ public class NodeUtil {
             if (ComponentCategory.CATEGORY_4_MAPREDUCE == cat) {
                 return new MrMetadataTalendTypeFilter();
             }
-            if (ComponentCategory.CATEGORY_4_SPARK == cat) {
-                return new SparkBatchMetadataTalendTypeFilter(node);
-            }
-            if (ComponentCategory.CATEGORY_4_SPARKSTREAMING == cat) {
+            if (ComponentCategory.CATEGORY_4_SPARK == cat || ComponentCategory.CATEGORY_4_SPARKSTREAMING == cat) {
                 return new SparkMetadataTalendTypeFilter(node.getComponent().getName());
             }
             if (ComponentCategory.CATEGORY_4_STORM == cat) {
@@ -1497,29 +1492,4 @@ public class NodeUtil {
         }
         return false;
     }
-    
-    /**
-     * TUP-32758:Used to judge if two components are compatible from name 
-     * for example tAmazonMysqlConnection and tMysqlConnection ,tAmazonOracleCommit and tOracleCommit
-     */
-    public static boolean isCompatibleByName(String componentName1, String componentName2) {
-        boolean isCompatable = false;
-        if ( componentName1 ==null || componentName2 == null 
-                || componentName1.length()<1 || componentName2.length() < 1) return false;
-        if (componentName1.replaceFirst("t", "tAmazon").equals(componentName2) ||
-                componentName2.replaceFirst("t", "tAmazon").equals(componentName1)) {
-            isCompatable = true;
-        }
-        return isCompatable;
-    }
-    
-    public static boolean isDatabaseFamily(String orginalFamilyName) {
-        boolean isDatabaseFamily = false;
-        String rootFamily = "";
-        rootFamily = orginalFamilyName != null ? orginalFamilyName.split("/")[0] : "";
-        if (rootFamily.equals("Databases")) {
-            isDatabaseFamily = true;
-        }
-        return isDatabaseFamily;
-    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoEventEntity.java

@@ -1,147 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.pendo;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * DOC jding  class global comment. Detailled comment
- */
-public class PendoEventEntity {
-
-    @JsonProperty("type")
-    private String type;
-
-    @JsonProperty("event")
-    private String event;
-
-    @JsonProperty("visitorId")
-    private String visitorId;
-
-    @JsonProperty("accountId")
-    private String accountId;
-
-    @JsonProperty("timestamp")
-    private long timestamp;
-
-    @JsonProperty("properties")
-    private Object properties;
-
-    /**
-     * Getter for type.
-     * 
-     * @return the type
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets the type.
-     * 
-     * @param type the type to set
-     */
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    /**
-     * Getter for event.
-     * 
-     * @return the event
-     */
-    public String getEvent() {
-        return event;
-    }
-
-    /**
-     * Sets the event.
-     * 
-     * @param event the event to set
-     */
-    public void setEvent(String event) {
-        this.event = event;
-    }
-
-    /**
-     * Getter for visitorId.
-     * 
-     * @return the visitorId
-     */
-    public String getVisitorId() {
-        return visitorId;
-    }
-
-    /**
-     * Sets the visitorId.
-     * 
-     * @param visitorId the visitorId to set
-     */
-    public void setVisitorId(String visitorId) {
-        this.visitorId = visitorId;
-    }
-
-    /**
-     * Getter for accountId.
-     * 
-     * @return the accountId
-     */
-    public String getAccountId() {
-        return accountId;
-    }
-
-    /**
-     * Sets the accountId.
-     * 
-     * @param accountId the accountId to set
-     */
-    public void setAccountId(String accountId) {
-        this.accountId = accountId;
-    }
-
-    /**
-     * Getter for timestamp.
-     * 
-     * @return the timestamp
-     */
-    public long getTimestamp() {
-        return timestamp;
-    }
-
-    /**
-     * Sets the timestamp.
-     * 
-     * @param timestamp the timestamp to set
-     */
-    public void setTimestamp(long timestamp) {
-        this.timestamp = timestamp;
-    }
-
-
-    /**
-     * Getter for properties.
-     * @return the properties
-     */
-    public Object getProperties() {
-        return properties;
-    }
-
-
-    /**
-     * Sets the properties.
-     * @param properties the properties to set
-     */
-    public void setProperties(Object properties) {
-        this.properties = properties;
-    }
-}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoLoginProperties.java

@@ -1,87 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.pendo;
-
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * DOC jding  class global comment. Detailled comment
- */
-public class PendoLoginProperties {
-
-    @JsonProperty("studio_version")
-    private String studioVersion;
-
-    @JsonProperty("studio_patch")
-    private String studioPatch;
-
-    @JsonProperty("enabled_features")
-    private List<String> enabledFeatures;
-
-    /**
-     * Getter for studio_version.
-     * 
-     * @return the studio_version
-     */
-    public String getStudioVersion() {
-        return studioVersion;
-    }
-
-    /**
-     * Sets the studio_version.
-     * 
-     * @param studio_version the studio_version to set
-     */
-    public void setStudioVersion(String studioVersion) {
-        this.studioVersion = studioVersion;
-    }
-
-    /**
-     * Getter for studio_patch.
-     * 
-     * @return the studio_patch
-     */
-    public String getStudioPatch() {
-        return studioPatch;
-    }
-
-    /**
-     * Sets the studio_patch.
-     * 
-     * @param studio_patch the studio_patch to set
-     */
-    public void setStudioPatch(String studioPatch) {
-        this.studioPatch = studioPatch;
-    }
-
-    /**
-     * Getter for enabled_features.
-     * 
-     * @return the enabled_features
-     */
-    public List<String> getEnabledFeatures() {
-        return enabledFeatures;
-    }
-
-    /**
-     * Sets the enabled_features.
-     * 
-     * @param enabled_features the enabled_features to set
-     */
-    public void setEnabledFeatures(List<String> enabledFeatures) {
-        this.enabledFeatures = enabledFeatures;
-    }
-
-}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackSender.java

@@ -1,304 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.pendo;
-
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.StatusLine;
-import org.apache.http.client.entity.EntityBuilder;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.entity.ContentType;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.apache.log4j.Level;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.talend.commons.exception.ExceptionHandler;
-import org.talend.commons.utils.VersionUtils;
-import org.talend.commons.utils.network.NetworkUtil;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.context.Context;
-import org.talend.core.context.RepositoryContext;
-import org.talend.core.runtime.CoreRuntimePlugin;
-import org.talend.core.service.IRemoteService;
-import org.talend.core.service.IStudioLiteP2Service;
-import org.talend.core.ui.IInstalledPatchService;
-import org.talend.repository.model.RepositoryConstants;
-import org.talend.utils.json.JSONObject;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-/**
- * DOC jding  class global comment. Detailled comment
- */
-public class PendoTrackSender {
-    
-    private static final String PREFIX_API = "api";
-
-    private static final String PENDO_INFO = "/monitoring/pendo/info";
-
-    private static final String PENDO_TRACK = "/monitoring/pendo/track";
-
-    private static final String HEAD_AUTHORIZATION = "Authorization";
-
-    private static final String HEAD_CONTENT_TYPE = "Content-Type";
-
-    private static final String HEAD_PENDO_KEY = "x-pendo-integration-key";
-
-    private static final String FEATURE_PREFIX = "org.talend.lite.";
-
-    private static final String FEATURE_TAIL = ".feature.feature.group";
-
-    private static PendoTrackSender instance;
-
-    private static String adminUrl;
-
-    private static String apiBaseUrl;
-
-    public static PendoTrackSender getInstance() {
-        if (instance == null) {
-            instance = new PendoTrackSender();
-        }
-        if (StringUtils.isBlank(adminUrl)) {
-            adminUrl = getRepositoryContext().getFields().get(RepositoryConstants.REPOSITORY_URL);
-        }
-        return instance;
-    }
-
-    public void sendToPendo() {
-        Job job = new Job("send pendo track") {
-
-            @Override
-            protected IStatus run(IProgressMonitor monitor) {
-                try {
-                    sendTrackData();
-                } catch (Exception e) {
-                    // warning only
-                    ExceptionHandler.process(e, Level.WARN);
-                }
-                return Status.OK_STATUS;
-            }
-        };
-        job.setUser(false);
-        job.setPriority(Job.INTERACTIVE);
-        job.schedule();
-    }
-
-    public void sendTrackData() throws Exception {
-        if (!checkTokenUsed(adminUrl) || !NetworkUtil.isNetworkValid()) {
-            return;
-        }
-
-        CloseableHttpClient client = null;
-        CloseableHttpResponse response = null;
-        try {
-            String pendoInfo = getPendoInfo();
-            if (StringUtils.isBlank(pendoInfo)) {
-                throw new Exception("Pendo information is empty");
-            }
-            String pendoKey = getPendoKeyFromLicense();
-            if (StringUtils.isBlank(pendoKey)) {
-                throw new Exception("Pendo key is empty");
-            }
-            
-            client = HttpClients.createDefault();
-            String url = getBaseUrl() + PENDO_TRACK;
-            HttpPost httpPost = new HttpPost(url);
-            httpPost.setHeader(HEAD_CONTENT_TYPE, ContentType.APPLICATION_JSON.getMimeType());
-            httpPost.setHeader(HEAD_PENDO_KEY, pendoKey);
-            EntityBuilder entityBuilder = EntityBuilder.create();
-            entityBuilder.setText(generateTrackData(pendoInfo)).setContentType(ContentType.APPLICATION_JSON);
-            HttpEntity entity = entityBuilder.build();
-            httpPost.setEntity(entity);
-            response = client.execute(httpPost, HttpClientContext.create());
-            StatusLine statusLine = response.getStatusLine();
-            String responseStr = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-            if (HttpURLConnection.HTTP_OK != statusLine.getStatusCode()) {
-                throw new Exception(statusLine.toString() + ", server message: [" + responseStr + "]");
-            }
-        } finally {
-            if (response != null) {
-                try {
-                    response.close();
-                } catch (Throwable e) {
-                    ExceptionHandler.process(e);
-                }
-            }
-            if (client != null) {
-                try {
-                    client.close();
-                } catch (Throwable e) {
-                    ExceptionHandler.process(e);
-                }
-            }
-        }
-    }
-
-    // TODO maybe we will have more event handler later
-    private String generateTrackData(String pendoInfo) throws Exception {
-        JSONObject infoJson = new JSONObject(pendoInfo);
-        String visitorId = ((JSONObject) infoJson.get("visitor")).getString("id");
-        String accountId = ((JSONObject) infoJson.get("account")).getString("id");
-
-        String studioPatch = null;
-        Date date = new Date();
-        IInstalledPatchService installedPatchService = IInstalledPatchService.get();
-        if (installedPatchService != null) {
-            studioPatch = installedPatchService.getLatestInstalledPatchVersion();
-        }
-        List<String> enabledFeatures = new ArrayList<String>();
-        IStudioLiteP2Service studioLiteP2Service = IStudioLiteP2Service.get();
-        if (studioLiteP2Service != null) {
-            List<String> enabledFeaturesList = studioLiteP2Service.getCurrentProjectEnabledFeatures();
-            enabledFeaturesList.stream().forEach(feature -> {
-                String result = feature;
-                if (result.startsWith(FEATURE_PREFIX)) {
-                    result = result.substring(FEATURE_PREFIX.toCharArray().length);
-                }
-                if (result.endsWith(FEATURE_TAIL)) {
-                    result = result.substring(0, result.lastIndexOf(FEATURE_TAIL));
-                }
-                enabledFeatures.add(result);
-            });
-        }
-        PendoLoginProperties loginEvent = new PendoLoginProperties();
-        loginEvent.setStudioVersion(VersionUtils.getInternalMajorVersion());
-        loginEvent.setStudioPatch(studioPatch);
-        loginEvent.setEnabledFeatures(enabledFeatures);
-
-        PendoEventEntity entity = new PendoEventEntity();
-        entity.setType("track");
-        entity.setEvent("Project Login");
-        entity.setVisitorId(visitorId);
-        entity.setAccountId(accountId);
-        entity.setTimestamp(date.getTime());
-        entity.setProperties(loginEvent);
-
-        ObjectMapper mapper = new ObjectMapper();
-        String content = mapper.writeValueAsString(entity);
-        return content;
-    }
-
-    private String getPendoInfo() throws Exception {
-        CloseableHttpClient client = null;
-        CloseableHttpResponse response = null;
-        try {
-            client = HttpClients.createDefault();
-            String url = getBaseUrl() + PENDO_INFO;
-
-            HttpGet httpGet = new HttpGet(url);
-            httpGet.setHeader(HEAD_AUTHORIZATION, "Bearer " + getToken());
-            response = client.execute(httpGet, HttpClientContext.create());
-            StatusLine statusLine = response.getStatusLine();
-            String responseStr = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-            if (HttpURLConnection.HTTP_OK != statusLine.getStatusCode()) {
-                throw new Exception(statusLine.toString() + ", server message: [" + responseStr + "]");
-            }
-            return responseStr;
-        } finally {
-            if (response != null) {
-                try {
-                    response.close();
-                } catch (Throwable e) {
-                    ExceptionHandler.process(e);
-                }
-            }
-            if (client != null) {
-                try {
-                    client.close();
-                } catch (Throwable e) {
-                    ExceptionHandler.process(e);
-                }
-            }
-        }
-    }
-
-    private boolean checkTokenUsed(String adminUrl) throws Exception {
-        if (StringUtils.isNotBlank(adminUrl) && GlobalServiceRegister.getDefault().isServiceRegistered(IRemoteService.class)) {
-            IRemoteService service = GlobalServiceRegister.getDefault().getService(IRemoteService.class);
-            return service.isTokenUsed(adminUrl);
-        }
-        return false;
-    }
-
-    public String getBaseUrl() throws Exception {
-        if (StringUtils.isNotBlank(apiBaseUrl)) {
-            return apiBaseUrl;
-        }
-
-        try {
-            URL url = new URL(adminUrl);
-            // tmc.int.cloud.talend.com
-            String authority = url.getAuthority();
-            String regex = "(\\w*\\-*\\w*\\.?){2}\\.(talend.com)";
-            Pattern  pattern= Pattern.compile(regex);
-            Matcher match = pattern.matcher(authority);
-            if (match.find()) {
-                // int.cloud.talend.com
-                authority = match.group(0);
-                URL apiURL = new URL(url.getProtocol(), PREFIX_API + "." + authority, "");
-                // https://api.int.cloud.talend.com
-                apiBaseUrl = apiURL.toString();
-            } else {
-                throw new Exception("Can't match pendo url from " + adminUrl);
-            }
-        } catch (MalformedURLException e) {
-            throw new Exception("Invalid url " + adminUrl, e.getCause());
-        }
-
-        return apiBaseUrl;
-    }
-
-    private String getToken() {
-        return getRepositoryContext().getClearPassword();
-    }
-
-    private String getPendoKeyFromLicense() throws Exception {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IRemoteService.class)) {
-            IRemoteService service = GlobalServiceRegister.getDefault().getService(IRemoteService.class);
-            return service.getPendoKeyFromLicense();
-        }
-        return null;
-    }
-
-    private static RepositoryContext getRepositoryContext() {
-        RepositoryContext repositoryContext = (RepositoryContext) CoreRuntimePlugin.getInstance().getContext()
-                .getProperty(Context.REPOSITORY_CONTEXT_KEY);
-        return repositoryContext;
-    }
-
-    public void setAdminUrl(String adminUrl) {
-        PendoTrackSender.adminUrl = adminUrl;
-    }
-
-    public void setApiBaseUrl(String apiBaseUrl) {
-        PendoTrackSender.apiBaseUrl = apiBaseUrl;
-    }
-
-}

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

@@ -1,92 +1,84 @@
-
-AbstractBrandingService_job_license_header_content=Copyright (c) 2005-2010, Talend SA.\n//\n// Ce code source a \u00E9t\u00E9 automatiquement g\u00E9n\u00E9r\u00E9 par_\n\n// (CodeGenerator version{0}\n// Vous pouvez trouver plus d'informations \u00E0 propos des produits Talend sur https://www.talend.com/\nfr/. {1}// Vous pouvez distribuer ce code suivant les termes de la licence\nGNU LGPL\n// http://www.gnu.org/licenses/lgpl.\nhtml\n).
-AbstractBrandingService.routines_license_header_content2014=Copyright (c) 2006-2014, Talend SA.\n//\n// Ce code source a \u00E9t\u00E9 automatiquement g\u00E9n\u00E9r\u00E9 par_{0}\n// (CodeGenerator version {1}\n// Vous pouvez trouver plus d'informations \u00E0 propos des produits Talend sur https://www.talend.com/fr/.\n// Vous pouvez distribuer ce code suivant les termes de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).
-AbstractComponentsProvider.folderNotExist=Le dossier {0} n'existe pas.
-AbstractItemMigrationTask.taskFailed=La t\u00E2che de migration {0} a \u00E9chou\u00E9 \u00E0 l'\u00E9l\u00E9ment {1}
+AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2010, Talend Inc.\n//\n// Ce code source a \u00E9t\u00E9 automatiquement g\u00E9n\u00E9r\u00E9 par_{0}\n// / JobDesigner (CodeGenerator version {1})\n// Vous pouvez trouver plus d'informations \u00E0 propos des produits Talend \u00E0 www.talend.com.\n// Vous pouvez distribuer ce code suivant les termes de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
+AbstractComponentsProvider.folderNotExist=Le dossier {0} n'existe pas
+AbstractItemMigrationTask.taskFailed=La t\u00E2che de migration {0} a \u00E9chou\u00E9 sur l'\u00E9l\u00E9ment {1}
 AdvancedSocketFactory.failedInitial=Erreur : impossible d'initialiser :
 ArchiveFileExportOperationFullPath.SpecialFile=spagic.properties
-ColorsCodeViewerPreferencePage.Comment1Color=Couleur de Commentaire1
-ColorsCodeViewerPreferencePage.Comment2Color=Couleur de Commentaire2
-ColorsCodeViewerPreferencePage.DigitColor=Couleur de Chiffre
-ColorsCodeViewerPreferencePage.FunctionColor=Couleur de Fonction
+ColorsCodeViewerPreferencePage.Comment1Color=Couleur de Comment1
+ColorsCodeViewerPreferencePage.Comment2Color=couleur Commentaire2
+ColorsCodeViewerPreferencePage.DigitColor=Couleur du chiffre
+ColorsCodeViewerPreferencePage.FunctionColor=couleur Fonction
 ColorsCodeViewerPreferencePage.InvalidColor=Couleur invalide
 ColorsCodeViewerPreferencePage.LabelColor=Couleur du libell\u00E9
-ColorsCodeViewerPreferencePage.Literal1Color=Couleur de Litt\u00E9ral1
-ColorsCodeViewerPreferencePage.Literal2Color=Couleur de Litt\u00E9ral2
-ColorsCodeViewerPreferencePage.MarkupColor=Couleur de Marquage
+ColorsCodeViewerPreferencePage.Literal1Color=Couleur du Litt\u00E9ral1
+ColorsCodeViewerPreferencePage.Literal2Color=Couleur du Litt\u00E9ral2
+ColorsCodeViewerPreferencePage.MarkupColor=Couleur du Marquage
 ColorsCodeViewerPreferencePage.OperatorColor=Couleur de l'op\u00E9rateur
 ColorsCodeViewerPreferencePage.defaultColor=Couleur par d\u00E9faut
 ColorsCodeViewerPreferencePage.fieldTip=&Gras
-ColorsCodeViewerPreferencePage.keyword1Color=Couleur de Motcl\u00E91
-ColorsCodeViewerPreferencePage.keyword2Color=Couleur Motcl\u00E92
-ColorsCodeViewerPreferencePage.keyword3Color=Couleur de Motcl\u00E93
-ColumnNameChangedExt.columnChanged=N\u0153ud : {0}   Colonne modifi\u00E9e : {1}-> {2}
-ComponentReturnVariableUtils.ErrorMessage=Message d'erreur
-ComponentReturnVariableUtils.NbReject=Nombre de rejets
-ComponentReturnVariableUtils.NbSuccess=Nombre de r\u00E9ussites
-ComponentReturnVariableUtils.NbLine=Nombre de lignes
+ColorsCodeViewerPreferencePage.keyword1Color=Couleur de Mot-cl\u00E91
+ColorsCodeViewerPreferencePage.keyword2Color=Couleur du Mot-cl\u00E92
+ColorsCodeViewerPreferencePage.keyword3Color=Couleur du Mot-cl\u00E93
+ColumnNameChangedExt.columnChanged=N\u0153ud : {0} Colonne modifi\u00E9e : {1}-> {2}
 ComponentsFormatPreferencePage.add=Ajouter
-ComponentsFormatPreferencePage.errorCreateConnectionName=Le nom "{0}" n'est pas valide.
-ComponentsFormatPreferencePage.formatConnection=Format de connexion par d\u00E9faut :
-ComponentsFormatPreferencePage.formatHint=Format de l'astuce par d\u00E9faut :
+ComponentsFormatPreferencePage.errorCreateConnectionName=Le nom "{0}" est invalide.
+ComponentsFormatPreferencePage.formatConnection=Format de connexion par d\u00E9faut:
+ComponentsFormatPreferencePage.formatHint=Format astuce par d\u00E9faut :
 ComponentsFormatPreferencePage.formatLable=Format du libell\u00E9 par d\u00E9faut :
-ComponentsFormatPreferencePage.remove=Supprimer
-ComponentsFormatPreferencePage.ErrorTitle=Erreur
-ComponentToRepositoryProperty.error=Erreur
+ComponentsFormatPreferencePage.remove=Remove
+ComponentsFormatPreferencePage.ErrorTitle=ERROR
+ComponentToRepositoryProperty.error=ERROR
 ComponentToRepositoryProperty.ImpossibleUseOCI=Impossible d'utiliser le type OCI dans le r\u00E9f\u00E9rentiel.
-ComponentToRepositoryProperty.ImpossibleUseWALLET=Impossible d'utiliser le type WALLET dans le r\u00E9pertoire !
-ContextComposite.tableValue=Valeurs en table
-ContextComposite.treeValue=Valeurs en arbre
+ContextComposite.tableValue=Table des valeurs
+ContextComposite.treeValue=Arbre des valeurs
 ContextComposite.variable=Variables
-ContextParameterProposal.ContextVariable=\n\nVariable de contexte.
+ContextParameterProposal.ContextVariable=\n\nVariable de context.
 ContextParameterProposal.Description=Description : {0}
-ContextValueErrorChecker.ErrorTitile=Erreur de la valeur de contexte\u00A0:
+ContextValueErrorChecker.ErrorTitile=Erreur de la valeur de contexte :
 ContextParameterProposal.NoCommentAvaiable=pas de commentaire disponible.
-ContextParameterProposal.Type=\nType : {1}
-ContextParameterProposal.VariableName=\n\nNom de la variable : {2}
+ContextParameterProposal.Type=\nType\: {1}
+ContextParameterProposal.VariableName=\n\nNom de la variable\: {2}
 ContextProcessSection.1=menuTable
 ContextProcessSection.12=Renommer le contexte
-ContextProcessSection.13=Donner un nouveau nom au contexte {0}
+ContextProcessSection.13=Nouveau nom pour le contexte {0}
 ContextProcessSection.2=Demander confirmation ?
-ContextProcessSection.29=Erreur
+ContextProcessSection.29=ERROR
 ContextProcessSection.30=Ce nom existe d\u00E9j\u00E0
-ContextProcessSection.4=Ajouter un contexte \u00E0 partir de ->(
+ContextProcessSection.4=Ajouter un nouveau contexte \u00E0 partir de ->(
 ContextProcessSection.49=Contexte par d\u00E9faut
 ContextProcessSection.50=ContextProcessSection.14
 ContextProcessSection.51=ContextProcessSection.15
 ContextProcessSection.6=Nouveau contexte
-ContextProcessSection.7=Nommez le nouveau contexte
-ContextProcessSection.ParameterNameIsNotValid=Le nom du param\u00E8tre est invalide.
+ContextProcessSection.7=Nommer le nouveau contexte
+ContextProcessSection.ParameterNameIsNotValid=Le nom de param\u00E8tre n'est pas valide.
 ContextProcessSection.RemoveInformation={0} est le contexte par d\u00E9faut et ne peut \u00EAtre supprim\u00E9.
-ContextProcessSection.errorTitle=Erreur
+ContextProcessSection.errorTitle=ERROR
 ConextTableValuesComposite.nameLabel=Nom
 ConextTemplateComposite.OrderMessages=Si vous souhaitez r\u00E9organiser les variables, cela doit \u00EAtre s\u00E9lectionn\u00E9.
 ConextTemplateComposite.OrderText=Ordre d'origine
 ContextSetConfigurationDialog.nameNotValid=le nom est invalide
 ContextTemplateComposite.CommentLabel=Commentaire
 ContextTemplateComposite.nameLabel=Nom
-ContextTemplateComposite.scriptCodeLabel=Code script
+ContextTemplateComposite.scriptCodeLabel=Code du script
 ContextTemplateComposite.sourceLabel=Source
 ContextTemplateComposite.typeLabel=Type
 ContextTreeConstants.contextName=Contexte
-ContextTreeConstants.promptName=Prompt
+ContextTreeConstants.promptName=Invite
 ContextTreeConstants.valueName=Valeur
 ContextTreeConstants.variableName=Variable
 ConextTemplateComposite.addToRepositoryContextAction.label=Ajouter au contexte du r\u00E9f\u00E9rentiel
 CorePreferencePage.componentDefaultFileDirectory=R\u00E9pertoire par d\u00E9faut des composants
-CorePreferencePage.groupBySource="Regrouper par source" en contexte
+CorePreferencePage.groupBySource="regrouper par source" en contexte
 CorePreferencePage.iReportPath=Chemin d'acc\u00E8s iReport
 CorePreferencePage.alwaysWelcome=Toujours afficher la vue de bienvenue au d\u00E9marrage
 CorePreferencePage.javaInterpreter=Interpr\u00E9teur &Java
 CorePreferencePage.perlInterpreter=Interpr\u00E9teur Perl
-CorePreferencePage.previewLimit=Limite de l'aper\u00E7u
+CorePreferencePage.previewLimit=Aper\u00E7u limite
 CorePreferencePage.runInMultiThread=Ex\u00E9cution multi thread (valeur par d\u00E9faut lors de la cr\u00E9ation d'un Job)
 CorePreferencePage.temporaryFiles=Fichiers &temporaires
 DbTableSelectorDialog.textContent=Choisir le nom de la table
 ECodeLanguage.unknowLanguage=Langage inconnu
-EComponentCategory_advanceSetting=Param\u00E8tres avanc\u00E9s
 EComponentCategory_appearance=Apparence
-EComponentCategory_assignment=Attribution
+EComponentCategory_assignment=Affectation
 EComponentCategory_basicSetting=Param\u00E8tres simples
 EComponentCategory_context=Contexte
 EComponentCategory_doc=Documentation
@@ -94,52 +86,42 @@ EComponentCategory_dynamicSetting=Param\u00E8tres dynamiques
 EComponentCategory_errorRecovery=Reprise sur erreur
 EComponentCategory_extra=Extra
 EComponentCategory_logs=Logs
-EComponentCategory_main=Principal
+EComponentCategory_main=Main
 EComponentCategory_properties=Propri\u00E9t\u00E9s
-EComponentCategory_rulerAndGrid=Rulers & Grid
 EComponentCategory_sqlTemplate=Mod\u00E8le SQL
 EComponentCategory_statsAndLogs=Stats & Logs
-EComponentCategory_gitHistory=Historique Git
+EComponentCategory_svnHistory=Historique SVN
 EComponentCategory_technical=Technique
 EComponentCategory_version=Version
-EComponentCategory_deployment=D\u00E9ploiement
 EComponentCategory_headerFooter=En-t\u00EAte/Pied de page
-EComponentCategory_view=Vue
+EComponentCategory_view=View
 EComponentCategory.validationRules=R\u00E8gles de validation
-EComponentCategory.advancedSettings=Param\u00E8tres avanc\u00E9s
+EComponentCategory.advancedSettings=Param\u00E8tres avanc\u00E9s 
 EComponentCategory.basicRun=Ex\u00E9cution simple
 EComponentCategory.breakpoint=Point d'arr\u00EAt
 EComponentCategory.parallelization=Parall\u00E9lisation
-EComponentCategory.debugRun=Ex\u00E9cution en mode Debug
-EComponentCategory.targetExec=Cible d'ex\u00E9cution
-EComponentCategory.memoryRun=Ex\u00E9cution pour la m\u00E9moire
+EComponentCategory.debugRun=Ex\u00E9cution Debug
+EComponentCategory.targetExec=Ex\u00E9c distante
 EComponentCategory.availableExtensions=Extensions disponibles
 EComponentCategory.downloadedExtensions=Extensions t\u00E9l\u00E9charg\u00E9es
 EComponentCategory.myExtensions=Mes extensions
 EComponentCategory.executeJob=Ex\u00E9cuter le Job
 EComponentCategory.monitoring=Monitoring
 EComponentCategory.hadoopConfig=Configuration de Hadoop
-EComponentCategory.stormConfig=Configuration de Storm
-EComponentCategory.sparkConfig=Configuration de Spark
-EComponentCategory.parameters=Param\u00E8tres
-EComponentCategory.actionInputOutput=Sch\u00E9ma d'entr\u00E9e/de sortie
-EConnectionType.iteratorMenu=It\u00E9rer
-EConnectionType.lookupMenu=Rechercher
-EConnectionType.RejectMenu=Reject
+EConnectionType.iteratorMenu=Iterate
+EConnectionType.lookupMenu=Look Up
+EConnectionType.mainMenu=Main
 EConnectionType.onComponentErrorMenu=On Component Error
 EConnectionType.onComponentOkMenu=On Component Ok
 EConnectionType.onSubjobErrorMenu=On Subjob Error
 EConnectionType.onSubjobOkMenu=On Subjob Ok
-EConnectionType.runAfterMenu=Run After
-EConnectionType.mainMenu=Principal
+EConnectionType.runAfterMenu=Ex\u00E9cuter apr\u00E8s
 EConnectionType.runIfMenu=Run if
 EConnectionType.tableMenu=Table
-EConnectionType.tableRefMenu=Table_ref
-EConnectionType.onRowsEndMenu=On Rows End
+EConnectionType.onRowsEndMenu=\u00C0 la fin des lignes
 EConnectionType.mergeMenu=Merge
-EConnectionType.synchronize=Synchronize
-EConnectionType.parallelize=Parallelize
-EConnectionType.startsMenu=D\u00E9but
+EConnectionType.synchronize=Synchroniser
+EConnectionType.parallelize=Parall\u00E9liser
 EConnectionType.route=Route
 EConnectionType.when=When
 EConnectionType.otherwise=Otherwise
@@ -155,17 +137,17 @@ EMetadataEncoding.GB18030=Chinois National Standard
 EMetadataEncoding.GB2312=Chinois
 EMetadataEncoding.Greek=Grec
 EMetadataEncoding.Hebrew=H\u00E9breu
-EMetadataEncoding.Latin1=Latin1 (Europe de l'Ouest)
-EMetadataEncoding.Latin2=Latin2 (Europe de l'Est)
-EMetadataEncoding.Latin3=Latin3 (Europe du Sud)
-EMetadataEncoding.Latin4=Latin4 (Europe du Nord)
+EMetadataEncoding.Latin1=Latin1 (Europe de l'ouest)
+EMetadataEncoding.Latin2=Latin2 (Europe de l'est)
+EMetadataEncoding.Latin3=Latin3 (Europe du sud)
+EMetadataEncoding.Latin4=Latin4 (Europe du nord)
 EMetadataEncoding.Latin5=Latin5 (Turc)
 EMetadataEncoding.Latin6=Latin6 (Nordique)
-EMetadataEncoding.Latin9=Latin9
+EMetadataEncoding.Latin9=latin9
 EMetadataEncoding.Microsoft_Latin1=Microsoft (Latin-1)
-EMetadataEncoding.UTF16=Unicode 2.0 (16 bits)
-EMetadataEncoding.UTF16BE=Unicode BigEndian (16 bits)
-EMetadataEncoding.UTF16LE=Unicode (16 bits)
+EMetadataEncoding.UTF16=Unicode 2.0 (16 bit)
+EMetadataEncoding.UTF16BE=Unicode BigEndian (16 bit)
+EMetadataEncoding.UTF16LE=Unicode (16 bit)
 EMetadataEncoding.UTF7=Unicode 2.0 UTF-7
 EMetadataEncoding.UTF8=Unicode 2.0 UTF-8
 ERepositoryObjectType.FolderNotFound=Impossible de trouver le dossier pour le type {0}.
@@ -175,181 +157,155 @@ ExtractMetaDataFromDataBase.connectionSuccessful=Connexion r\u00E9ussie
 ExtractMetaDataFromDataBase.dbTypeNotFound=dbType '{0}' non trouv\u00E9
 ExtractMetaDataUtils.1=Impossible d'initialiser la connexion.
 Function.FunctionName=Nom de la fonction {0}
-FunctionManager.PurePerl.Desc=Configurez votre expression.
-FunctionManager.PurePerl.ParaName=personnaliser le param\u00E8tre
+FunctionManager.PurePerl.Desc=D
+FunctionManager.PurePerl.ParaName=Param\u00E8tre personnalis\u00E9
 GlobalServiceRegister.ServiceNotRegistered=Le service {0} n'a pas \u00E9t\u00E9 enregistr\u00E9.
 GroupByContextAction.groupContext=Grouper par contexte
 GroupByVariableAction.groupVariable=Grouper par variable
-AbstractTalendFunctionParser.checkMethod=Routines : "{0}.{1}\\" \u00E9chec de l'analyse. V\u00E9rifiez la M\u00E9thode.
 JavaGlobalVariableProposal.Description=Description : {0}
-JavaGlobalVariableProposal.VariableName=\n\nNom de la variable : {1}
-JavaSimpleDateFormatProposalProvider.displaySingleQuote= ' : affiche un guillemet simple
+JavaSimpleDateFormatProposalProvider.displaySingleQuote=\ ' : afficher un guillemet simple
 JavaSimpleDateFormatProposalProvider.quoteDisplayError=Deux apostrophes affichent uniquement une seule apostrophe
-JavaTypesManager.bigDecimal=BIGDECIMAL est nombre :
-JavaTypesManager.integer=INTEGER est nombre :
-JavaTypesManager.list=LIST est nombre :
-JavaTypesManager.string=STRING est nombre :
-LDAPCATruster.failedCreateCert=Impossible de cr\u00E9er le stockage du certificat
-LDAPCATruster.failedCreateTmp=Impossible de cr\u00E9er le
-LDAPCATruster.failedInitialTrust=\u00C9chec de cr\u00E9ation du gestionnaire de confiance initial :
-LDAPCATruster.failedLoadCert=Impossible de charger le stockage des certificats :
-LDAPCATruster.failedSaveTrust=Impossible de sauvegarder le Trust Store :
-LDAPCATruster.locationInvalid=L'emplacement du fichier du store de certificat est invalide :
-LDAPCATruster.noCertificate=\nUtilisez la commande Keytool pour importer le certificat du serveur.
+JavaTypesManager.bigDecimal=BIGDECIMAL est un nombre :
+JavaTypesManager.integer=INTEGER est un nombre :
+JavaTypesManager.list=LIST est un nombre :
+JavaTypesManager.string=STRING est un nombre :
 LDAPCATruster.sslError1=Erreur SSL : \u00E9chec de la v\u00E9rification de la cha\u00EEne de certification du serveur.
-LDAPCATruster.sslError2=Erreur SSL : \u00E9chec de la v\u00E9rification de la cha\u00EEne de certification du serveur et \\n l'autorit\u00E9 de certification est manquante.
-LDAPCATruster.sslError3=Erreur SSL : l'autorit\u00E9 de certification n'est pas dans la cha\u00EEne de certification du serveur.
-ListPreferencePage.RemoveButtonName=Supprimer
-LogImageCacheAction.CacheImage=Image du cache\u00A0:
-LogImageCacheAction.CacheImageDesc=Desc. de l'image du cache\u00A0:
-MappingFileLoader.DbTypeAlreadyExists=Dans le mapping d'ID "{0}" du SGBD, le type de BdD "{1}"  appara\u00EEt plus d'une fois dans le fichier "{2}"  dans le n\u0153ud\u00A0:{3}
+ListPreferencePage.RemoveButtonName=Remove
+LogImageCacheAction.CacheImage=Image du cache\:
+LogImageCacheAction.CacheImageDesc=Desc. de l'image du cache :
 MappingFileLoader.DbmsIdAlreadyExists=Le SGBD d'ID "{0}" existe d\u00E9j\u00E0."
-MappingFileLoader.InvalidTalendType="{0}" n'est pas un type Talend valide {1} pour le SGBD d'ID "{2}" dans le n\u0153ud : {3}
-MappingFileLoader.UnbindedDbTypes=Dans le fichier de mapping du SGBD d'ID "{0}"," les types de BdD ci-dessous ne sont pas li\u00E9s avec les types Talend "{1}" : {2}
-MappingFileLoader.UnbindedTalendTypes=Dans le fichier de mapping du SGBD d'ID "{0}"," les types Talend ci-dessous ne sont pas li\u00E9s avec les types de BdD "{1}" : {2}
-MappingFileLoader.UndeclaredDbType="{0}" n'est pas un type de BdD d\u00E9clar\u00E9 pour le SGBD d'ID "{1}" dans le n\u0153ud : {2}
-MetadataDialog.CopyToInput.toolTipText=Copier toutes les colonnes du sch\u00E9ma de sortie dans le sch\u00E9ma d'entr\u00E9e
-MetadataDialog.CopySelectionToInput.toolTipText=Copier les colonnes s\u00E9lectionn\u00E9es du sch\u00E9ma de sortie dans le sch\u00E9ma d'entr\u00E9e
-MetadataDialog.CopyToOutput=Copier toutes les colonnes du sch\u00E9ma d'entr\u00E9e dans le sch\u00E9ma de sortie
-MetadataDialog.CopySelectionToOutput=Copier les colonnes s\u00E9lectionn\u00E9es du sch\u00E9ma d'entr\u00E9e dans le sch\u00E9ma de sortie
+MappingFileLoader.UndeclaredDbType="{0}" type non d\u00E9clar\u00E9 de BdD pour l'ID du SGBD "{1}" sur le noeud\: {2}
+MetadataDialog.CopyToInput.toolTipText=Copie  tout le sch\u00E9ma de sortie vers le sch\u00E9ma d'entr\u00E9e
+MetadataDialog.CopySelectionToInput.toolTipText=Copie de colonnes de sch\u00E9ma de sortie vers sch\u00E9ma d'entr\u00E9e
+MetadataDialog.CopyToOutput=Copie tout le sch\u00E9ma d'entr\u00E9e vers le sch\u00E9ma de sortie
+MetadataDialog.CopySelectionToOutput=Copie les colonnes s\u00E9lectionn\u00E9es du sch\u00E9ma source vers le sch\u00E9ma cible
 MetadataDialog.Message=Toutes les colonnes du sch\u00E9ma d'entr\u00E9e seront transf\u00E9r\u00E9es au sch\u00E9ma de sortie
 MetadataDialog.SchemaModification=Modification de sch\u00E9ma
-MetadataDialog.TransferMessage=Toutes les colonnes du sch\u00E9ma de sortie seront transf\u00E9r\u00E9es au sch\u00E9ma d'entr\u00E9e
-MetadataEmfTableEditor.ColumnInvalid=Le nom de colonne "{0}" est invalide.
-MetadataEmfTableEditor.ColumnNameExists=Le nom de colonne "{0}" existe d\u00E9j\u00E0.
-MetadataEmfTableEditor.ColumnNameIsNullError=Erreur : Le nom de la colonne est vide
-MetadataTableEditor.ColumnNameExists=Le nom de colonne '{0}' existe d\u00E9j\u00E0.
-MetadataTableEditor.ColumnNameIsInvalid=Le nom de colonne "{0}" est invalide.
-MetadataTableEditor.ColumnNameIsNull=Erreur : Le nom de la colonne est vide
+MetadataDialog.TransferMessage=Toutes les colonnes du sch
+MetadataEmfTableEditor.ColumnInvalid=Le nom de colonne "{0}" est invalide
+MetadataEmfTableEditor.ColumnNameExists=Le nom de colonne "{0}" existe d\u00E9j\u00E0
+MetadataTableEditor.ColumnNameExists=Le nom de colonne "{0}" existe d\u00E9j\u00E0.
+MetadataTableEditor.ColumnNameIsInvalid=Le nom de colonne "{0}" est invalide
 MetadataTableEditorView.ColumnTitle=Colonne
 MetadataTableEditorView.CommentTitle=Commentaire
-MetadataTableEditorView.DBTypeTitle=Type de BdD
-MetadataTableEditorView.DefaultTitle=Par d\u00E9faut
+MetadataTableEditorView.DBTypeTitle=Type de base de donn\u00E9es
+MetadataTableEditorView.DefaultTitle=D\u00E9faut
 MetadataTableEditorView.KeyTitle=Cl\u00E9
-MetadataTableEditorView.LengthTitle=Longueur
+MetadataTableEditorView.LengthTitle=Length
 MetadataTableEditorView.NullableTitle=Nullable
 MetadataTableEditorView.PatternTitle=Mod\u00E8le de date (Ctrl+Espace disponible)
-MetadataTableEditorView.PrecisionTitle=Pr\u00E9cision
+MetadataTableEditorView.PrecisionTitle=Precision
 MetadataTableEditorView.TypleTitle=Type
-MetadataTalendType.dbIdNotFound=SGBD d'ID : {0} introuvable !
+MetadataTalendType.dbIdNotFound=ID du SGBD : {0} introuvable.
 MetadataTalendType.DBMSNotSetted=SGBD non d\u00E9fini
-MetadataTalendTypeEditor.button.edit=Mo&difier
-MetadataTalendTypeEditor.button.export=E&xporter
-MetadataTalendTypeEditor.button.import=I&mporter
+MetadataTalendTypeEditor.button.edit=E&dit
+MetadataTalendTypeEditor.button.export=E&xport
+MetadataTalendTypeEditor.button.import=I&mport
 MetadataTalendTypeEditor.column1.Name=Fichier de mapping de m\u00E9tadonn\u00E9es
-MetadataTalendTypeEditor.editMappingDialog.title=Modifier le fichier de mapping
+MetadataTalendTypeEditor.editMappingDialog.title=Editer le fichier de mapping
 MetadataTalendTypeEditor.error.message=Message d'erreur
-MetadataTalendTypeEditor.fileIsImported=Ce fichier a d\u00E9j\u00E0 \u00E9t\u00E9 import\u00E9.
+MetadataTalendTypeEditor.fileIsImported=Le fichier a d\u00E9j\u00E0 \u00E9t\u00E9 import\u00E9.
 MetadataTalendTypeEditor.fileIsInvalid=Le fichier de m\u00E9tadonn\u00E9es import\u00E9 n'est pas valide.
 MetadataTalendTypeEditor.fileNameStartRule=Le nom de fichier doit commencer par 'mapping_'.
-MetadataTool.errorMessage=Impossible de cr\u00E9er le caract\u00E8re courant.
+MetadataTool.errorMessage=Impossible d'\u00E9crire le caract\u00E8re courant.
 MetadataTool.invalid=Valeur invalide
 MetadataTool.invalidChar=Caract\u00E8re invalide
 MetadataTool.nameNull=Le nom du sch\u00E9ma ne peut \u00EAtre null.
-MetadataTool.nullValue=Valeur nulle
+MetadataTool.nullValue=Valeur null
 MetadataTool.schemaExist=Le nom du sch\u00E9ma existe d\u00E9j\u00E0.
 MetadataTool.schemaIn=Le nom du sch\u00E9ma est invalide.
-MetadataTool.schemaInvalid=Le nom du sch\u00E9ma est invalide.
+MetadataTool.schemaInvalid=Nom de sch\u00E9ma invalide.
 MetadataTool.schemaNull=Le nom du sch\u00E9ma est null.
-NodeReturnProposal.Availability=\nDisponibilit\u00E9 : {4}
+NodeReturnProposal.Availability=\nDisponibilit\u00E9\: {4}
 NodeReturnProposal.Description=Description : {0}
 NodeReturnProposal.GlobalVariable=\n\nVariable globale, propri\u00E9t\u00E9 du composant {1} [{2}].
-NodeReturnProposal.Type=\nType : {3}
-NodeReturnProposal.VariableName=\n\nNom de la variable : {5}
-PaletteContentDialog.connection=Format de connexion par d\u00E9faut :
-PaletteContentDialog.hint=Format de l'astuce par d\u00E9faut :
+NodeReturnProposal.Type=\nType\: {3}
+NodeReturnProposal.VariableName=\n\nNom de la variable\: {5}
+PaletteContentDialog.connection=Format de connection par d\u00E9faut:
+PaletteContentDialog.hint=Format astuce par d\u00E9faut :
 PaletteContentDialog.lable=Format du libell\u00E9 par d\u00E9faut :
-Parameter.Comment=commentaire\u00A0:
+Parameter.Comment=\ commentaire \:
 Parameter.Name=Nom du param\u00E8tre
-Parameter.Type=type\u00A0:
-Parameter.Value=valeur\u00A0:
-PatternCalendar.dateFormat="yyyy-MM-dd HH:mm:ss"
+Parameter.Type=\ type \:
+Parameter.Value=\ valeur \:
+PatternCalendar.dateFormat="aaaa-MM-jj HH:mm:ss"
 PatternCalendar.example=Exemple :
 PatternCalendar.pattern=Mod\u00E8le :
-PerlDynamicProposalUtil.autoConvert= sera automatiquement converti en {0}->[index] dans le code g\u00E9n\u00E9r\u00E9
 PerlGlobalVariableProposal.Description=Description : {0}
-PerlGlobalVariableProposal.VariableName=\n\nNom de la variable : {1}
 PerspectiveMenuManager.dummy=Factice
 PerspectiveMenuManager.perspectiveLabel=&Perspective
-ProcessorUtilities.finalizeBuild=Finaliser le build...
-ProcessorUtilities.generatingJob=G\u00E9n\u00E9ration du Job en cours...
-ProcessorUtilities.loadingJob=Chargement du Job en cours...
-PropertiesWizard.EditPropertiesPageTitle=Modifier les propri\u00E9t\u00E9s
-PropertiesWizard.alreadyLockedByUser=Les propri\u00E9t\u00E9s sont en lecture seule parce que cet \u00E9l\u00E9ment est verrouill\u00E9 par un \u00E9diteur.
-PropertiesWizardPage.Author=Cr\u00E9\u00E9 par :
-PropertiesWizardPage.Locker=Verrouill\u00E9 par
+ProcessorUtilities.generatingJob=G\u00E9n\u00E9ration du job en cours...
+ProcessorUtilities.loadingJob=Chargement du job en cours...
+PropertiesWizard.EditPropertiesPageTitle=Editer les propri\u00E9t\u00E9s
+PropertiesWizard.alreadyLockedByUser=Les propri\u00E9t\u00E9s sont en lecture seule car cet objet est d\u00E9j\u00E0 verrouill\u00E9 par un \u00E9diteur.
+PropertiesWizardPage.Author=Auteur
+PropertiesWizardPage.Locker=Verrouill\u00E9 par :
 PropertiesWizardPage.Description=Description
-PropertiesWizardPage.EmptyDescWarning=Il est d\u00E9conseill\u00E9 de laisser le champ Description vide.
-PropertiesWizardPage.EmptyPurposeWarning=Il est d\u00E9conseill\u00E9 de laisser le champ Objectif vide.
-PropertiesWizardPage.ItemExistsError=Cet \u00E9l\u00E9ment existe d\u00E9j\u00E0. V\u00E9rifiez la Corbeille et videz-la si n\u00E9cessaire.
+PropertiesWizardPage.EmptyDescWarning=Il n'est pas recommand\u00E9 de laisser vide la description.
+PropertiesWizardPage.EmptyPurposeWarning=Il n'est pas recommand\u00E9 de laisser l'objectif vide.
+PropertiesWizardPage.ItemExistsError=Cet \u00E9l\u00E9ment existe d\u00E9j\u00E0. V\u00E9rifiez la corbeille et videz-la si besoin.
 PropertiesWizardPage.KeywordsError=Le nom n'est pas un identifiant valide.
 PropertiesWizardPage.Name=Nom
 PropertiesWizardPage.NameEmptyError=Le nom est vide.
 PropertiesWizardPage.NameFormatError=Le nom contient des caract\u00E8res incorrects.
-PropertiesWizardPage.Path=Chemin d'acc\u00E8s
+PropertiesWizardPage.Path=Chemin
 PropertiesWizardPage.Purpose=Objectif
 PropertiesWizardPage.Select=S\u00E9lectionner
-PropertiesWizardPage.SelectfolderMessage=S\u00E9lectionnez le dossier dans lequel l'\u00E9l\u00E9ment sera cr\u00E9\u00E9
-PropertiesWizardPage.SelectfolderTitle=S\u00E9lection du dossier
+PropertiesWizardPage.SelectfolderMessage=S\u00E9lectionner le dossier dans lequel l'\u00E9l\u00E9ment sera cr\u00E9\u00E9
+PropertiesWizardPage.SelectfolderTitle=S\u00E9lectionner dossier
 PropertiesWizardPage.Status=Statut
 PropertiesWizardPage.Version=Version
 PropertiesWizardPage.Version.Major=M
-PropertiesWizardPage.Version.Minor=m
+PropertiesWizardPage.Version.Minor=M
 PropertiesWizardPage.ImageSizeError=S\u00E9lectionnez une image de taille 32*32.
 RelationshipItemBuilder.buildingIndex=Construction de l'index...
-RelationshipItemBuilder.forItem=pour l'\u00E9l\u00E9ment
 RepositoryObject.NotImplemented=non impl\u00E9ment\u00E9
-RepositoryToComponentProperty.xmlFileSelection=S\u00E9lectionnez un fichier XML \u00E0 valider
+RepositoryToComponentProperty.xmlFileSelection=S\u00E9lectionner un fichier XML \u00E0 valider
 RepositoryUpdateManager.Title=Modification
 RepositoryUpdateManager.Check=V\u00E9rification...
-RepositoryUpdateManager.Messages=Voulez-vous propager les modifications \u00E0 tous les Jobs ? \n Cela peut prendre un moment.
-RepositoryUpdateManager.MessagesForTDQ=Propager les modifications \u00E0 tous les Jobs ?\nCertaines d\u00E9pendances d'analyses vont perdre des informations.\nCela peut prendre un moment.
+RepositoryUpdateManager.Messages=Propager les modifications \u00E0 tous les Jobs ? \n Cela peut prendre un moment.
+RepositoryUpdateManager.MessagesForTDQ=Propager les modifications \u00E0 tous les Jobs ? \nCertaines d\u00E9pendances d'analyses vont perdre des informations.\nCela peut prendre un moment.
 RepositoryUpdateManager.NoModificationTitle=Aucune modification n\u00E9cessaire
 RepositoryUpdateManager.NoModificationMessages=Aucune modification n\u00E9cessaire pour effectuer la mise \u00E0 jour.
 RepositoryUpdateManager.NotFoundMessages=Aucune relation \u00E0 trouver.
 RepositoryUpdateManager.NotFoundTitle=Introuvable
-RepositoryUpdateManager.RenameContextMessagesNoBuiltIn=Propager le renommage des variables \u00E0 tous les Jobs\u00A0? \n\n Si oui, la mise \u00E0 jour peut prendre du temps.
 RepositoryUpdateManager.RenameContextTitle=Renommer la question
 RepositoryUpdateManager.ItemsToUpdate=V\u00E9rification des \u00E9l\u00E9ments \u00E0 mettre \u00E0 jour
-RepositoryUpdateManager.job.title=Mise \u00E0 jour des \u00E9l\u00E9ments...
-RoutinesFunctionProposal.CreatedBy=Cr\u00E9\u00E9 par :
-RoutinesFunctionProposal.Description=Description :
-RoutinesFunctionProposal.Example=Exemple :
-RoutinesFunctionProposal.ReturnType=Type de retour :
-RoutinesFunctionProposal.System=Syst\u00E8me
+RoutinesFunctionProposal.CreatedBy=Cr\u00E9\u00E9 par\n:
+RoutinesFunctionProposal.Description=Description\:
+RoutinesFunctionProposal.Example=Exemple\n:
+RoutinesFunctionProposal.System=System
 RoutinesFunctionProposal.User=Utilisateur
-RoutinesFunctionProposal.VariableName=\n\nNom de la variable : {2}
-RuleOperationChoiceDialog.editRules=\u00C9diter les r\u00E8gles
+RuleOperationChoiceDialog.editRules=Editer les r\u00E8gles
 RuleOperationChoiceDialog.rule=R\u00E8gle :
-RuleOperationChoiceDialog.selectRulesFile=S\u00E9lectionner une r\u00E8gle depuis un fichier
+RuleOperationChoiceDialog.selectRulesFile=S\u00E9lectionner un r\u00E8gle depuis un fichier
 RuleOperationChoiceDialog.viewRules=Voir les r\u00E8gles (lecture seule)
 SchemaCellEditor.giveSchemaName=Donner le nom pour le sch\u00E9ma
 SchemaCellEditor.inputName=Saisir le nom
-SchemaCellEditor.nameExistOrInvalid=Le nom existe d\u00E9j\u00E0 ou est invalide
-SchemaCellEditor.schemaName=Nom du sch\u00E9ma
+SchemaCellEditor.nameExistOrInvalid=Ce nom existe d\u00E9j\u00E0 ou est invalide
+SchemaCellEditor.schemaName= Nom du sch\u00E9ma
 SchemaOperationChoiceDialog.ChangeBuiltInMessage=Changer le sch\u00E9ma en Built-In.
 SchemaOperationChoiceDialog.ChangeRepositoryMessage=Modifier le sch\u00E9ma \u00E0 partir du R\u00E9f\u00E9rentiel.
-SchemaOperationChoiceDialog.CreateBuiltInMessage=Cr\u00E9er un sch\u00E9ma Built-In.
+SchemaOperationChoiceDialog.CreateBuiltInMessage=Cr\u00E9er un sch\u00E9ma Built-In
 SchemaOperationChoiceDialog.CreateRepositoryMessage=Cr\u00E9er un sch\u00E9ma \u00E0 partir du R\u00E9f\u00E9rentiel.
-SchemaOperationChoiceDialog.EditSchemaMessage=Modifier le sch\u00E9ma
-SchemaOperationChoiceDialog.Message=S\u00E9lectionnez une option ou annulez.
+SchemaOperationChoiceDialog.EditSchemaMessage=Modifier le sch\u00E9ma.
+SchemaOperationChoiceDialog.Message=Choisissez une option, ou annulez
 SchemaOperationChoiceDialog.Option=Option
 SchemaOperationChoiceDialog.StatusMessage=Le sch\u00E9ma est invalide, ou il existe d\u00E9j\u00E0.
 SchemaOperationChoiceDialog.Title=Sch\u00E9ma
 SchemaOperationChoiceDialog.ViewSchemaMessage=Voir le sch\u00E9ma (lecture seule)
 SchemaXPathQuerysDialog.Mappings=Correspondances
 SelectRepositoryContextDialog.DeselectAll=D\u00E9s\u00E9lectionner tout
-SelectRepositoryContextDialog.CollapseAll=Tout r\u00E9duire
+SelectRepositoryContextDialog.CollapseAll=R\u00E9duire tous
 SelectRepositoryContextDialog.DuplicationMessage=Vous avez s\u00E9lectionn\u00E9 la variable "{0}" dans le contexte "{1}".
-SelectRepositoryContextDialog.DuplicationTitle=Avertissement de duplication !
 SelectRepositoryContextDialog.ExistenceMessage=La variable "{0}" a exist\u00E9 dans le Job(Contexte : "{1}").
-SelectRepositoryContextDialog.Label=S\u00E9lectionner les variables des contextes du r\u00E9f\u00E9rentiel.
-SelectRepositoryContextDialog.SelectAll=Tout s\u00E9lectionner
-SelectRepositoryContextDialog.ExpandAll=Tout d\u00E9velopper
-SelectRepositoryContextDialog.Title=S\u00E9lectionner les variables de contexte
+SelectRepositoryContextDialog.Label=S\u00E9lectionne les variables des contextes du r\u00E9f\u00E9rentiel
+SelectRepositoryContextDialog.SelectAll=S\u00E9lectionner tout
+SelectRepositoryContextDialog.ExpandAll=Agrandir tout
+SelectRepositoryContextDialog.Title=S\u00E9lectionne les variables du contexte
 SelectRepositoryContextDialog.View=Voir...
-SelectRepositoryContextGroupDialog.Default=Par d\u00E9faut
-SelectRepositoryContextGroupDialog.Messages=Dans le Job, ajoute le groupe de contextes inexistant au Job \u00E0 partir du contexte du R\u00E9f\u00E9rentiel
+SelectRepositoryContextGroupDialog.Default=D\u00E9faut
+SelectRepositoryContextGroupDialog.Messages=\ Ajoute le groupe de contextes inexistant au Job \u00E0 partir du contexte du R\u00E9f\u00E9rentiel
 SelectRepositoryContextGroupDialog.Title=Ajouter un groupe de contextes
 TalendDataCollectorPreferencePage_EnableCapture=Activer la capture
 TalendDataCollectorPreferencePage_Description=Le collecteur de donn\u00E9es d'utilisation collecte des informations concernant la mani\u00E8re dont une personne utilise les produits Talend. L'objectif est, via ces donn\u00E9es, d'aider Talend \u00E0 comprendre comment les utilisateurs et les entreprises utilisent les produits Talend.
@@ -357,49 +313,45 @@ TalendDataCollectorPreviewPreferencePage_Description=Les cl\u00E9s/valeurs suiva
 TalendDataCollectorPreviewPreferencePage_EmptyValue=<Vide>
 TalendDataCollectorPreviewPreferencePage_Key=Cl\u00E9
 TalendDataCollectorPreviewPreferencePage_Value=Valeur
-TalendDataCollectorUploadingPreferencePage_Description=Les informations rassembl\u00E9es par le Collecteur de donn\u00E9es d'utilisation sont r\u00E9guli\u00E8rement charg\u00E9es sur les serveurs h\u00E9berg\u00E9s par Talend.
+TalendDataCollectorUploadingPreferencePage_Description=Les informations rassembl\u00E9es par le Collecteur de donn\u00E9es d'utilisation est r\u00E9guli\u00E8rement charg\u00E9 sur les serveurs h\u00E9berg\u00E9s par Talend.
 TalendDataCollectorUploadingPreferencePage_LastUpload=Dernier chargement
 TalendDataCollectorUploadingPreferencePage_Uploadingtitile=Chargement
 TalendDataCollectorUploadingPreferencePage_UploadPeriod=P\u00E9riode de chargement
 TalendDataCollectorUploadingPreferencePage_Days=Jours
-TalendTabbedPropertyComposite.compactButton.toolTip=vue compacte
-TalendTabbedPropertyComposite.tableButton.toolTip=vue de la table
-TalendType.TypeName=Nom du type {0}
-VariableItemEditor.insertVariable=Ins\u00E9rer une valeur factice de &Variable...
+TalendTabbedPropertyComposite.compactButton.toolTip=Vue compacte
+TalendTabbedPropertyComposite.tableButton.toolTip=Vue de la table
+TalendType.TypeName=Nom de type {0}
 VariableItemEditor.name=Nom
 VariableItemEditor.new=Nouveau
-VariableItemEditor.remove=Supprimer
-VariableItemEditor.twmplatePattern=\u00C9chec de la g\u00E9n\u00E9ration des fichiers java :
+VariableItemEditor.remove=Remove
+VariableItemEditor.twmplatePattern=Echec de la generation des fichiers java
 VariableItemEditor.variable=Variables :
 VersionSection.CreationDate=Date de cr\u00E9ation
-VersionSection.ModificationDate=Date de modification :
+VersionSection.ModificationDate=Date de modification
 VersionSection.Version=Version
 VersionSection.Status=Statut
 XmlArray.InvalidFile=Fichier invalide.
-XPathQueryMetadataTableEditorViewExt.xpathQuerys=Requ\u00EAtes sch\u00E9ma XPath
 XSDValidater.IllegalArgument=Le fichier XSD d'entr\u00E9e n'existe pas.
 repository.context=Contextes
 repository.column=Colonne
 repository.documentation=Documentation
 repository.folder=Dossier
 repository.generated=G\u00E9n\u00E9r\u00E9
-repository.jobdoc=Documentation du Job
+repository.jobdoc=Documentation des Jobs
 repository.joblet=Joblets
 repository.recyclebin=Corbeille
-repository.jobletdoc=Documentation du Joblet
+repository.jobletdoc=Documentation des Joblets
 repository.joblets=Joblets
 repository.jobs=Jobs
 repository.metadata=M\u00E9tadonn\u00E9es
-repository.metadataConnections=Connexions de bases de donn\u00E9es
-repository.metadataConnections.alias=Bases de donn\u00E9es
+repository.metadataConnections=Bases de donn\u00E9es
+repository.metadataConnections.alias=BD
 repository.metadataFileEDCDIC=Copybook
 repository.metadataFileEDCDIC.alias=Copybook
 repository.concept=Concept
 repository.metadataSAPConnections=Connexions SAP
 repository.metadataSAPConnections.alias=SAP
 repository.SAPFunction=Fonction SAP
-repository.SAPIDoc=SAP IDoc
-repository.SAPTable=Table SAP
 repository.metadataSQLPatterns=Mod\u00E8les SQL
 repository.metadataSQLPatterns.alias=Mod\u00E8les SQL
 repository.metadataFileDelimited=Fichier d\u00E9limit\u00E9
@@ -407,7 +359,7 @@ repository.metadataFileDelimited.alias=DELIM
 repository.metadataTable=Sch\u00E9ma des m\u00E9tadonn\u00E9es
 repository.metadataColumn=Colonne de m\u00E9tadonn\u00E9es
 repository.metadataFileRules=R\u00E8gles embarqu\u00E9es
-repository.metadataFileRules.alias=R\u00C8GLE
+repository.metadataFileRules.alias=R\u00E8gle
 repository.metadataFileHL7=HL7
 repository.metadataFileHL7.alias=HL7
 repositorymetadataEDIFact=UN/EDIFACT
@@ -416,21 +368,15 @@ repository.metadataFileFTP=FTP
 repository.metadataFileFTP.alias=FTP
 repository.metadataFileBRMS=BRMS
 repository.metadataFileBRMS.alias=BRMS
-repository.metadataLinkFileRules=LinkRules
-repository.metadataLinkFileRules.alias=LinkRule
-repository.metadataRulesManagement=Gestion des r\u00E8gles
-repository.metadataRulesManagement.alias=Gestion des r\u00E8gles
 repository.metadataValidationRules=R\u00E8gles de validation
-repository.metadataValidationRules.alias=RV
 repository.process=Jobs
 repository.service=Services
 repository.query=Requ\u00EAte
 repository.CDC=CDC
-repository.gitroot=GIT
+repository.svnroot=SVN
 repository.referencedProjects=Projet r\u00E9f\u00E9renc\u00E9
 repository.beans=Beans
 repository.snippets=Snippets
-repository.tdqelement=\u00C9l\u00E9ment TDQ
 repository.tdqelement.analysis=Analyses TDQ
 repository.tdqelement.report=Rapports TDQ
 repository.tdqelement.dbconnection=Connexions bases de donn\u00E9es TDQ
@@ -438,19 +384,133 @@ repository.tdqelement.mdmconnection=Connexions MDM TDQ
 repository.tdqelement.businessrule=R\u00E8gles m\u00E9tier TDQ
 repository.tdqelement.indicator=Indicateurs TDQ
 repository.tdqelement.pattern=Mod\u00E8les TDQ
-repository.tdqelement.sourceFile=fichiers sources
+EUpdateItemType.Property=Propri\u00E9t\u00E9
+EUpdateItemType.Schema=Sch\u00E9ma
+EUpdateItemType.SAPFunction=Fonction SAP
+EUpdateItemType.SAPIDoc=SAP IDoc
+EUpdateItemType.Query=Requ\u00EAte
+EUpdateItemType.Variable=Variable
+EUpdateItemType.ContextGroup=Groupe de contexte
+EUpdateItemType.Components=Composants
+EUpdateItemType.Name=Nom
+EUpdateItemType.ValidationRule=R\u00E8gle de validation
+EUpdateResult.BuiltIn=Passer en mode built-in
+EUpdateResult.JobletUpdate=Mise \u00E0 jour des joblets
+EUpdateResult.Update=Mettre \u00E0 jour \u00E0 partir du r\u00E9f\u00E9rentiel
+EUpdateResult.Reload=Recharger les composants
+EUpdateResult.Rename=Changer le nom
+EUpdateResult.Add=Ajouter \u00E0 partir du r\u00E9f\u00E9rentiel
+EUpdateResult.Delete=Supprimer du r\u00E9f\u00E9rentiel
+UpdatesConstants.Context=Contexte
+UpdatesConstants.ContextGroup=Groupe de contextes
+UpdatesConstants.Component=Composant
+UpdatesConstants.Joblet=Joblet
+UpdatesConstants.Job=Job
+ProjectSettingsWizard.EditProjectPageTitle=Editer le projet
+MetadataTypeLengthConstants.FIELD_DEFAULT_TYPE=Default Type
+MetadataTypeLengthConstants.FIELD_DEFAULT_LENGTH=Default Length
+MetadataTypeLengthConstants.VALUE_DEFAULT_TYPE=Default Type
+MetadataTypeLengthConstants.VALUE_DEFAULT_LENGTH=Default Length
+MetadataTypeLengthPreferencePage.VALUE=Param\u00E8tres par d\u00E9faut pour les champs comprenant des valeurs nulls
+MetadataTypeLengthPreferencePage.FIELD=Param\u00E8tres par d\u00E9faut pour tous les champs
+MetadataTypeLengthPreferencePage.DBTYPE=Longueur par d\u00E9faut pour le type de donn\u00E9es
+MetadataTypeLengthConstants.BOOLEAN_LENGTH=Boolean
+MetadataTypeLengthConstants.BIGDECIMAL_LENGTH=BigDecimal
+MetadataTypeLengthConstants.BYTE_LENGTH=Byte
+MetadataTypeLengthConstants.INTEGER_LENGTH=Integer
+MetadataTypeLengthConstants.BYTEARRAY_LENGTH=byte[]
+MetadataTypeLengthConstants.LONG_LENGTH=Long
+MetadataTypeLengthConstants.CHARACTER_LENGTH=Character
+MetadataTypeLengthConstants.OBJECT_LENGTH=Object
+MetadataTypeLengthConstants.DATE_LENGHT=Date
+MetadataTypeLengthConstants.SHORT_LENGTH=Short
+MetadataTypeLengthConstants.DOUBLE_LENGTH=Double
+MetadataTypeLengthConstants.STRING_LENGTH=String
+MetadataTypeLengthConstants.FLOAT_LENGTH=Float
+MetadataTypeLengthConstants.LIST_LENGTH=liste
+MetadataTypeLengthConstants.DATETIME_LENGTH=Datetime
+ModuleListCellEditor.externalLabel=Modules externes
+ModuleListCellEditor.innerLabel=Modules internes
+ModuleListCellEditor.selectLabel=S\u00E9lectionner un module
+ModuleListCellEditor.title=S\u00E9lectionner un module
+MultiStringSelectionDialog.nameEmpty=Le nom ne peut \u00EAtre vide
+PromptDialog.stringTip=Le texte d'entr\u00E9e doit \u00EAtre entour\u00E9 de guillemets simples.
+ApplicationActionBarAdvisor.menuFileLabel=&Fichier
+ApplicationActionBarAdvisor.menuEditLabel=&Editer
+ApplicationActionBarAdvisor.navigateLabel=&Naviguer
+ApplicationActionBarAdvisor.projectLabel=&Projet
+ApplicationActionBarAdvisor.menuWindowLabel=Fe&n\u00EAtre
+ApplicationActionBarAdvisor.menuHelpLabel=&Aide
+BusinessAppearanceComposite.textAlignmentGroup=Alignement du texte
+BusinessAppearanceComposite.textAlignment.horizontal=Horizontal
+BusinessAppearanceComposite.textAlignment.vertical=Vertical
+BusinessAppearanceComposite.textAlignment.horizontal.left=Gauche
+BusinessAppearanceComposite.textAlignment.horizontal.right=Droite
+BusinessAppearanceComposite.textAlignment.horizontal.centre=Centr\u00E9
+BusinessAppearanceComposite.textAlignment.vertical.top=Haut
+BusinessAppearanceComposite.textAlignment.vertical.bottom=Bas
+BusinessAppearanceComposite.textAlignment.vertical.centre=Centr\u00E9
+ConnectionBean.Local=local
+ConnectionBean.Remote=Distant
+ConnectionBean.DefaultConnection=connexion par d\u00E9faut
+InegerCellEditorListener.NegativeNumberMessage=La valeur de {0} ne peut \u00EAtre un nombre n\u00E9gatif.
+InegerCellEditorListener.NumeralMessage=La valeur de {0} doit \u00EAtre num\u00E9rique.
+OpenXSDFileDialog.cancel=Annuler
+OpenXSDFileDialog.confirm=Confirmer
+OpenXSDFileDialog.fileName=Nom de fichier :
+OpenXSDFileDialog.xmlFileSelection=S\u00E9lectionner un fichier XML \u00E0 valider
+OpenXSDFileDialog.xmlSelectedOrNot=Comme vous avez s\u00E9lectionn\u00E9 un fichier de m\u00E9tadonn\u00E9es XSD, \n il doit y avoir un fichier XML \u00E0 valider.
+RepositoryContentProvider.repositoryLabel.Queries=Requ\u00EAtes
+repository.routes=Routes
+repository.servicesOperation=Op\u00E9ration
+repository.servicesPort=Port
+BinRepositoryNode.label=Corbeille
+HDFS=HDFS
+HCAT=HCAT
+AbstractRepositoryContentHandler.deleteNode.exception=Echec de la suppression des pertinences de noeud : {0}
+HadoopCustomVersionDialog.topTitle=D\u00E9finition de la version Hadoop personnalis\u00E9e
+HadoopCustomVersionDialog.title=D\u00E9finir la distribution Hadoop personnalis\u00E9e
+HadoopCustomVersionDialog.msg=Configurer les biblioth\u00E8ques n\u00E9cessaires \u00E0 la version personnalis\u00E9e de Hadoop
+HadoopCustomVersionDialog.table.descColumn=Description
+HadoopCustomVersionDialog.table.libNameColumn=Nom de la biblioth\u00E8que
+HadoopCustomVersionDialog.btn.addLibBtn.tooltip=Ajouter des biblioth\u00E8ques...
+HadoopCustomVersionDialog.btn.importLibBtn.tooltip=Importer des biblioth\u00E8ques depuis la d\u00E9finition existante
+HadoopCustomVersionDialog.btn.exportLibBtn.tooltip=Export de la d\u00E9finition de la version Hadoop personnalis\u00E9e
+HadoopCustomVersionDialog.importLibs=Importer les biblioth\u00E8ques...
+HadoopVersionDialog.importFromExistVersion=Importer depuis une version existante
+HadoopVersionDialog.msg=S\u00E9lectionnez une option pour importer la d\u00E9finition de la version personnalis\u00E9e de Hadoop.
+HadoopVersionDialog.zipLocation=Zip :
+HadoopVersionDialog.importFromZip=Importer depuis un .zip
+HadoopVersionDialog.title=Importer la d\u00E9finition personnalis\u00E9e
+HadoopVersionDialog.distribution=Distribution :
+HadoopVersionDialog.distribution.tooltip=Configurer la distribution Hadoop
+HadoopVersionDialog.version=Version :
+HadoopVersionDialog.version.tooltip=Configurer la version de la distribution
+HadoopVersionDialog.browseBtn=Pa&rcourir...
+HadoopVersionDialog.confirmMsg=La configuration actuelle sera remplac\u00E9e. Continuer ?
+HadoopCustomLibrariesUtil.cannotCreate=Impossible de cr\u00E9er {0}
+HadoopCustomLibrariesUtil.importFailed=Echec de l'import de la d\u00E9finition personnalis\u00E9e
+HadoopCustomLibrariesUtil.exmportFailed=Echec de l'export de la d\u00E9finition personnalis\u00E9e
+HadoopCustomLibrariesUtil.libMissing=Des Jar sont introuvables dans le studio : {0}, consultez la vue Modules pour les installer
+HadoopCustomLibrariesUtil.importConfirmMsg=Continuer ?
+LibrariesListSelectionDialog.title=S\u00E9lectionnez les biblioth\u00E8ques
+LibrariesListSelectionDialog.button.internal=Biblioth\u00E8ques int\u00E9gr\u00E9es
+LibrariesListSelectionDialog.button.external=Biblioth\u00E8ques externes
+LibrariesListSelectionDialog.selectLibFromOS=S\u00E9lectionnez les biblioth\u00E8ques
+LibrariesListSelectionDialog.browseButton.text=Parcourir...
+LibrariesListSelectionDialog.deployLibs=D\u00E9ployer les biblioth\u00E8ques...
+GenerateSelectSQLAction.NewQuery=Nouvelle requ\u00EAte {0}
+UpdatesConstants.MR=Map_Reduce
+AbstractBrandingService.routines_license_header_content2014=// ============================================================================\n//\n// Copyright (c) 2006-2014, Talend Inc.\n//\n// Ce code source a \u00E9t\u00E9 automatiquement g\u00E9n\u00E9r\u00E9 par_{0}\n// / JobDesigner (CodeGenerator version {1})\n// Vous pouvez trouver plus d'informations \u00E0 propos des produits Talend \u00E0 www.talend.com.\n// Vous pouvez distribuer ce code suivant les termes de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
+repository.tdqelement.sourceFile=Fichiers source
 repository.tdqelement.jrxml=Mod\u00E8le JRXML
 repository.dataprofiling=Profiling de donn\u00E9es
-repository.libraries=Biblioth\u00E8ques
+repository.libraries=Biblioh\u00E8ques
 repository.patternRegex=Regex
-repository.patternSql=SQL
 repository.rules=R\u00E8gles
 repository.rulesSql=SQL
-repository.rulesParser=Parser
-repository.rulesMatcher=Rapprochement
 repository.systemIndicators=Indicateurs syst\u00E8me
 repository.userDefineIndicators=Indicateurs personnalis\u00E9s
-repository.userDefineIndicators.lib=lib
 repository.systemIndicators.advancedStatistics=Statistiques avanc\u00E9es
 repository.systemIndicators.businessRules=R\u00E8gles m\u00E9tier
 repository.systemIndicators.correlation=Corr\u00E9lation
@@ -466,191 +526,42 @@ repository.systemIndicators.textStatistics=Statistiques de texte
 repository.tdqExchange=Exchange
 repository.systemIndicators.phoneNumberStatistics=Statistiques de num\u00E9ros de t\u00E9l\u00E9phone
 repository.systemIndicators.fraudDetection=D\u00E9tection de la fraude
-repository.metadataSalesforceModule=SalesforceModule(AccountHistory)
-EUpdateItemType.Property=Propri\u00E9t\u00E9
-EUpdateItemType.Batch=Lot
-EUpdateItemType.Streaming=Flux
-EUpdateItemType.Schema=Sch\u00E9ma
-EUpdateItemType.SAPFunction=Fonction SAP
-EUpdateItemType.SAPIDoc=SAP IDoc
-EUpdateItemType.Query=Requ\u00EAte
-EUpdateItemType.Variable=Variable
-EUpdateItemType.ContextGroup=Groupe de contextes
-EUpdateItemType.Components=Composants
-EUpdateItemType.MapPath=Chemin de la map
-EUpdateItemType.StructurePath=Chemin de la structure
-EUpdateItemType.Name=Nom
-EUpdateItemType.JobVersion=JobVersion
-EUpdateItemType.ValidationRule=R\u00E8gle de validation
-EUpdateResult.BuiltIn=Passer en mode built-in
-EUpdateResult.JobletUpdate=Mise \u00E0 jour des Joblets
-EUpdateResult.JobUpdate=Mise \u00E0 jour du n\u0153ud de Jobs
+EUpdateItemType.MapPath=Chemin du mapping
 EUpdateResult.PathUpdate=Mise \u00E0 jour du chemin du mapping
-EUpdateResult.StructurePathUpdate=Mise \u00E0 jour du chemin de structure
-EUpdateResult.Update=Mettre \u00E0 jour \u00E0 partir du r\u00E9f\u00E9rentiel
-EUpdateResult.Reload=Recharger les composants
-EUpdateResult.Rename=Changer le nom
-EUpdateResult.Add=Ajouter \u00E0 partir du r\u00E9f\u00E9rentiel
-EUpdateResult.Delete=Supprimer du r\u00E9f\u00E9rentiel
-UpdatesConstants.Context=Contexte
-UpdatesConstants.ContextGroup=Groupe de contextes
-UpdatesConstants.Component=Composant
-UpdatesConstants.Joblet=Joblet
-UpdatesConstants.Spark_Joblet=Spark_Joblet
-UpdatesConstants.Spark_Streaming_Joblet=Spark_Streaming_Joblet
-UpdatesConstants.Job=Job
-UpdatesConstants.MR=Map_Reduce
-UpdatesConstants.Storm=Storm
-UpdatesConstants.Spark=Spark
-UpdatesConstants.SparkStreaming=Spark_Streaming
-UpdatesConstants.JobVersion=JobVersion
-ProjectSettingsWizard.EditProjectPageTitle=\u00C9diter le projet
-MetadataTypeLengthConstants.FIELD_DEFAULT_TYPE=Type par d\u00E9faut
-MetadataTypeLengthConstants.FIELD_DEFAULT_LENGTH=Longueur par d\u00E9faut
-MetadataTypeLengthConstants.VALUE_DEFAULT_TYPE=Type par d\u00E9faut
-MetadataTypeLengthConstants.VALUE_DEFAULT_LENGTH=Longueur par d\u00E9faut
-MetadataTypeLengthPreferencePage.VALUE=Param\u00E8tres par d\u00E9faut pour les champs comprenant des valeurs nulles
-MetadataTypeLengthPreferencePage.FIELD=Param\u00E8tres par d\u00E9faut pour tous les champs
-MetadataTypeLengthPreferencePage.DBTYPE=Longueur par d\u00E9faut pour le type de donn\u00E9es
-MetadataTypeLengthConstants.BOOLEAN_LENGTH=Bool\u00E9en
-MetadataTypeLengthConstants.BIGDECIMAL_LENGTH=BigDecimal
-MetadataTypeLengthConstants.BYTE_LENGTH=Octet
-MetadataTypeLengthConstants.INTEGER_LENGTH=Entier
-MetadataTypeLengthConstants.BYTEARRAY_LENGTH=octet[]
-MetadataTypeLengthConstants.LONG_LENGTH=Long
-MetadataTypeLengthConstants.CHARACTER_LENGTH=Caract\u00E8re
-MetadataTypeLengthConstants.OBJECT_LENGTH=Object
-MetadataTypeLengthConstants.DATE_LENGHT=Date
-MetadataTypeLengthConstants.SHORT_LENGTH=Short
-MetadataTypeLengthConstants.DOUBLE_LENGTH=Double
-MetadataTypeLengthConstants.STRING_LENGTH=Cha\u00EEne de caract\u00E8res
-MetadataTypeLengthConstants.FLOAT_LENGTH=Float
-MetadataTypeLengthConstants.LIST_LENGTH=Liste
-MetadataTypeLengthConstants.DATETIME_LENGTH=Date/Heure
-ModuleListCellEditor.externalLabel=Modules externes
-ModuleListCellEditor.innerLabel=Modules internes
-ModuleListCellEditor.selectLabel=S\u00E9lectionner un module
-ModuleListCellEditor.title=S\u00E9lectionner un module
-MultiStringSelectionDialog.nameEmpty=Le nom ne peut \u00EAtre vide
-PromptDialog.stringTip=Le texte d'entr\u00E9e doit \u00EAtre entour\u00E9 par des guillemets.
-ApplicationActionBarAdvisor.menuFileLabel=&Fichier
-ApplicationActionBarAdvisor.menuEditLabel=&Modifier
-ApplicationActionBarAdvisor.navigateLabel=&Naviguer
-ApplicationActionBarAdvisor.gotoLabel=&Aller \u00E0
-ApplicationActionBarAdvisor.projectLabel=&Projet
-ApplicationActionBarAdvisor.menuWindowLabel=Fe&n\u00EAtre
-ApplicationActionBarAdvisor.menuHelpLabel=&Aide
-BusinessAppearanceComposite.textAlignmentGroup=Alignement du texte
-BusinessAppearanceComposite.textAlignment.horizontal=Horizontal
-BusinessAppearanceComposite.textAlignment.vertical=Vertical
-BusinessAppearanceComposite.textAlignment.horizontal.left=Gauche
-BusinessAppearanceComposite.textAlignment.horizontal.right=Droite
-BusinessAppearanceComposite.textAlignment.horizontal.centre=Centre
-BusinessAppearanceComposite.textAlignment.vertical.top=Haut
-BusinessAppearanceComposite.textAlignment.vertical.bottom=Bas
-BusinessAppearanceComposite.textAlignment.vertical.centre=Centre
-ConnectionBean.Local=Local
-ConnectionBean.Remote=Distant
-ConnectionBean.DefaultConnection=Connexion par d\u00E9faut
-InegerCellEditorListener.NegativeNumberMessage=La valeur de {0} ne peut \u00EAtre un nombre n\u00E9gatif.
-InegerCellEditorListener.NumeralMessage=La valeur de {0} doit \u00EAtre num\u00E9rique.
-OpenXSDFileDialog.cancel=Annuler
-OpenXSDFileDialog.confirm=Confirmer
-OpenXSDFileDialog.fileName=Nom de fichier\u00A0:
-OpenXSDFileDialog.xmlFileSelection=S\u00E9lectionnez un fichier XML \u00E0 valider
-OpenXSDFileDialog.xmlSelectedOrNot=Comme vous avez s\u00E9lectionn\u00E9 un fichier de m\u00E9tadonn\u00E9es XSD, \n il devrait y avoir un fichier XML \u00E0 valider.
-RepositoryContentProvider.repositoryLabel.Queries=Requ\u00EAtes
-RepositoryContentProvider.repositoryLabel.sapBapi=SAP Bapi
-RepositoryContentProvider.repositoryLabel.sapBapi.input=Lecture
-RepositoryContentProvider.repositoryLabel.sapBapi.output=Sortie
-RepositoryContentProvider.repositoryLabel.sapContentExtractor=Extracteur SAP BI Content
-RepositoryContentProvider.repositoryLabel.sapTable=Tables SAP
-RepositoryContentProvider.repositoryLabel.sapDataSource=Source des donn\u00E9es SAP
-RepositoryContentProvider.repositoryLabel.sapDSO=Objet Data Store SAP
-RepositoryContentProvider.repositoryLabel.sapInfoCube=InfoCube SAP
-RepositoryContentProvider.repositoryLabel.sapInfoObject=InfoObject SAP
-repository.routes=Routes
-repository.servicesOperation=Op\u00E9ration
-repository.servicesPort=Port
-BinRepositoryNode.label=Corbeille
-HDFS=HDFS
-HCAT=HCAT
-AbstractRepositoryContentHandler.deleteNode.exception=\u00C9chec de la suppression des pertinences de noeud\u00A0: {0}
-HadoopCustomVersionDialog.topTitle=D\u00E9finition de la version Hadoop personnalis\u00E9e
-HadoopCustomVersionDialog.title=D\u00E9finir la distribution Hadoop personnalis\u00E9e
-HadoopCustomVersionDialog.msg=Configurer les biblioth\u00E8ques n\u00E9cessaires \u00E0 la version personnalis\u00E9e de Hadoop
-HadoopCustomVersionDialog.table.descColumn=Description
-HadoopCustomVersionDialog.table.libNameColumn=Nom de la biblioth\u00E8que
-HadoopCustomVersionDialog.btn.addLibBtn.tooltip=Ajouter des biblioth\u00E8ques...
-HadoopCustomVersionDialog.btn.importLibBtn.tooltip=Importer des biblioth\u00E8ques depuis la d\u00E9finition existante
-HadoopCustomVersionDialog.btn.exportLibBtn.tooltip=Exporter la d\u00E9finition de la version Hadoop personnalis\u00E9e
-HadoopCustomVersionDialog.importLibs=Importer les biblioth\u00E8ques...
-HadoopVersionDialog.importFromExistVersion=Importer depuis une version existante
-HadoopVersionDialog.msg=S\u00E9lectionnez une option pour importer la d\u00E9finition de la version personnalis\u00E9e de Hadoop.
-HadoopVersionDialog.zipLocation=Zip :
-HadoopVersionDialog.importFromZip=Importer depuis un .zip
-HadoopVersionDialog.title=Importer la d\u00E9finition personnalis\u00E9e
-HadoopVersionDialog.distribution=Distribution :
-HadoopVersionDialog.distribution.tooltip=Configurer la distribution Hadoop
-HadoopVersionDialog.version=Version :
-HadoopVersionDialog.version.tooltip=Configurer la version de la distribution
-HadoopVersionDialog.browseBtn=Pa&rcourir
-HadoopVersionDialog.confirmMsg=La configuration actuelle sera remplac\u00E9e. Continuer ?
-HadoopCustomLibrariesUtil.cannotCreate=Impossible de cr\u00E9er {0}
-HadoopCustomLibrariesUtil.importFailed=\u00C9chec de l'import de la d\u00E9finition personnalis\u00E9e
-HadoopCustomLibrariesUtil.exmportFailed=\u00C9chec de l'export de la d\u00E9finition personnalis\u00E9e
-HadoopCustomLibrariesUtil.libMissing=Des JAR sont introuvables dans le Studio : {0}, consultez la vue Modules pour les installer
-HadoopCustomLibrariesUtil.importConfirmMsg=Continuer ?
-LibrariesListSelectionDialog.title=S\u00E9lectionner les biblioth\u00E8ques
-LibrariesListSelectionDialog.button.internal=Biblioth\u00E8ques internes
-LibrariesListSelectionDialog.button.external=Biblioth\u00E8ques externes
-LibrariesListSelectionDialog.selectLibFromOS=S\u00E9lectionnez les biblioth\u00E8ques
-LibrariesListSelectionDialog.browseButton.text=Parcourir...
-LibrariesListSelectionDialog.deployLibs=D\u00E9ployer les biblioth\u00E8ques...
-JavaFunctionParser.checkMethod=Routines\u00A0: "{0}.{1}" \u00E9chec de l'analyse. V\u00E9rifiez la M\u00E9thode.
-PigFunctionParser.checkMethod=Pig : "{0}.{1}\\" \u00E9chec de l'analyse. V\u00E9rifiez la M\u00E9thode.
-GenerateSelectSQLAction.NewQuery=Nouvelle requ\u00EAte {0}
-AContextualAction.EditorManager_saveChangesQuestion='{0}' a \u00E9t\u00E9 modifi\u00E9. Sauvegarder les modifications ?
+AContextualAction.EditorManager_saveChangesQuestion='{0}'" a \u00E9t\u00E9 modifi\u00E9. Sauvegarder ?
 AContextualAction.Save_Resource=Sauvegarder la ressource
+EComponentCategory.stormConfig=Configuration de Storm
+EComponentCategory.sparkConfig=Configuration Spark
+repository.SAPIDoc=SAP IDoc
+repository.SAPTable=Table SAP
 ProgressMonitorDialogWithCancel.executeMessage.default=Ex\u00E9cution...
-ProgressMonitorDialogWithCancel.waitingFinishMessage.default=Interruption de l'action de v\u00E9rification de la connexion impossible,\n
 ProgressMonitorDialogWithCancel.executeTimeout=Suspension de l'ex\u00E9cution, le Studio a essay\u00E9 d'interrompre la v\u00E9rification en t\u00E2che de fond.
 ProgressMonitorDialogWithCancel.CheckingConnectionJob.waitingFinish=en attente de la fin de {0}...
 ProgressMonitorDialogWithCancel.CheckingConnectionJob.emptyWaitingfinish=en attente de la fin...
+EComponentCategory.memoryRun=Ex\u00E9c. test m\u00E9moire
+EUpdateItemType.Batch=Batch
+EUpdateItemType.Streaming=Streaming
+UpdatesConstants.Storm=Storm
+UpdatesConstants.Spark=Spark
+UpdatesConstants.SparkStreaming=Spark_Streaming
 OverTimePopupDialogTask.title=Ex\u00E9cution...
 OverTimePopupDialogTask.message=T\u00E2che d'ex\u00E9cution en arri\u00E8re plan, patientez...
-OverTimePopupDialogTask.executeTimeout=Suspension de l'ex\u00E9cution, le Studio a essay\u00E9 d'interrompre la v\u00E9rification en t\u00E2che de fond.
 OverTimePopupDialogTask.killed=Ex\u00E9cution arr\u00EAt\u00E9e
-OverTimePopupDialogTask.waitingFinishMessage.default=Interruption impossible de la t\u00E2che en fond,\n
-OverTimePopupDialogTask.CheckingConnectionJob.waitingFinish=en attente de la fin de {0}...
-OverTimePopupDialogTask.CheckingConnectionJob.emptyWaitingfinish=en attente de la fin...
-ShareLibsJob.wrongUsernameOrPassword=\u00C9chec de l'autorisation li\u00E9 \u00E0 un identifiant ou mot de passe Nexus incorrect.
-RelationshipItemBuilder.unexpect.item=Type d'\u00E9l\u00E9ment inattendu : {0}
-RelationshipItemBuilder.unexpect.typesConflict=Trop nombreux types trouv\u00E9s pour {0} :{1}
-RelationshipItemBuilder.unexpect.relation=Type de relation inattendu : {0}
-ReferenceProjectProblemManager.ErrorMoreThanOneBranchUsing={0} plusieurs branches l'utilisent dans une cha\u00EEne de r\u00E9f\u00E9rence de projets.
+EComponentCategory_gitHistory=Historique Git
+repository.gitroot=GIT
+EComponentCategory.parameters=Param\u00E8tres
+EComponentCategory.actionInputOutput=Sch\u00E9ma d'entr\u00E9e/de sortie
+EConnectionType.RejectMenu=Reject
+RepositoryContentProvider.repositoryLabel.sapBapi.output=Sortie
+RepositoryContentProvider.repositoryLabel.sapTable=Tables SAP
+ComponentReturnVariableUtils.ErrorMessage=Message d'erreur
+ComponentReturnVariableUtils.NbReject=Nombre de rejets
+ComponentReturnVariableUtils.NbSuccess=Nombre de r\u00E9ussites
+ComponentReturnVariableUtils.NbLine=Nombre de lignes
+repository.metadataRulesManagement=Gestion des r\u00E8gles
+repository.metadataRulesManagement.alias=Gestion des r\u00E8gles
+EUpdateItemType.StructurePath=Chemin de la structure
+EComponentCategory_deployment=D\u00E9ploiement
 DynamicElement.incorrectInstance=L'objet JSON n'est pas une instance de {0} : {1}
-DynamicElement.tagName.empty=Le nom du tag est vide.
-DynamicPlugin.addExtension.empty=Le champ ExtensionPoint ou ID est vide.
-BigDataBasicUtil.loadDynamicDistribution.IDynamicDistributionManager.notFound=Instance de {0} introuvable
-TalendLibsServerManager.connectUserLibraryFailureMessage=\u00C9chec de la connexion au r\u00E9f\u00E9rentiel d'artefacts des bilioth\u00E8ques utilisateurs configur\u00E9 en tant qu'administrateur\u00A0: Connexion \u00E0 {0} refus\u00E9e.
-TalendLibsServerManager.cannotGetUserLibraryServer=Impossible d'obtenir le serveur de la biblioth\u00E8que utilisateur depuis l'administrateur distant
-MigrationReportAccessDialog.title=Migration des \u00E9l\u00E9ments du projet
-MigrationReportAccessDialog.migrateSuccess=Les \u00E9l\u00E9ments du projet ont bien \u00E9t\u00E9 migr\u00E9s.
-MigrationReportAccessDialog.completeReportAvailable=Consulter le rapport
-MigrationReportAccessDialog.accessReport=ici
-MigrationReportAccessDialog.provideAnalysisTool=Vous pouvez ex\u00E9cuter une analyse de projet pour analyser votre projet migr\u00E9. Cet outil exp\u00E9rimental va g\u00E9n\u00E9rer un rapport contenant\u00A0:
-MigrationReportAccessDialog.listOfProblems=- la liste des \u00E9l\u00E9ments \u00E0 corriger manuellement,
-MigrationReportAccessDialog.listItems=- la liste des \u00E9l\u00E9ments \u00E0 v\u00E9rifier.
-MigrationReportAccessDialog.analysisToolCanTrigger=Note : Vous pouvez \u00E9galement g\u00E9n\u00E9rer un rapport d'analyse depuis la vue Param\u00E8tres du projet > Audit.
-MigrationReportAccessDialog.doNotShowAnymore=Ne plus afficher
-MigrationReportAccessDialog.runAnalysisButton=Ex\u00E9cuter l'analyse
-MigrationReportAccessDialog.notNowButton=Pas maintenant
-ItemAnalysisReportManager.Information.title=Informations
-ItemAnalysisReportManager.Information.message=Analyse du projet termin\u00E9e. Aucun enregistrement d'exception g\u00E9n\u00E9r\u00E9.
-ItemAnalysisReportManager.Warning.title=Avertissement
-ItemAnalysisReportManager.Warning.message=Impossible d'ex\u00E9cuter une analyse. Attendez la fin de l'analyse courante et r\u00E9essayez.
-AnalysisReportAccessDialog.shellTitle=Analyse du projet
-AnalysisReportAccessDialog.generateSuccess=Analyse du projet termin\u00E9e.
-AnalysisReportAccessDialog.completeReportAvailable=Consulter le rapport
-AnalysisReportAccessDialog.accessReport=ici
+EComponentCategory_advanceSetting=Param\u00E8tres avanc\u00E9s
+TalendLibsServerManager.connectUserLibraryFailureMessage=\u00C9chec de la connexion au r\u00E9f\u00E9rentiel d\'artefacts des bilioth\u00E8ques utilisateurs configur\u00E9 en tant qu\'administrateur\u00A0: Connexion \u00E0 {0} refus\u00E9e.

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

@@ -1,9 +1,7 @@
-
-AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// \u7248\u6743\u6240\u6709 (c) 2005-2010, Talend Inc.\n//\n// \u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0}\u81EA\u52A8\u751F\u6210\n// / JobDesigner (CodeGenerator \u7248\u672C {1})\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3\u6709\u5173 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002.\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
-AbstractBrandingService.routines_license_header_content2014=\u7248\u6743\u6240\u6709 (c) 2006-2015, Talend Inc.\n//\n// \u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0}\u81EA\u52A8\u751F\u6210 \n// CodeGenerator \u7248\u672C {1}\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3\u6709\u5173 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002
+AbstractBrandingService_job_license_header_content=// ============================================================================\\\\n//\\\\n// Copyright (c) 2005-2010, Talend Inc.\\\\n//\\\\n// \u6B64\u6E90\u4EE3\u7801\u7531 _{0} \u81EA\u52A8\u751F\u6210\\\\n// / JobDesigner (CodeGenerator \u7248\u672C {1})\\\\n// \u60A8\u53EF\u4EE5\u5728 www.talend.com \u627E\u5230\u6709\u5173 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\\\\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\\\\n// http://www.gnu.org/licenses/lgpl.html)\u3002\\\\n//\\\\n// ============================================================================
 AbstractComponentsProvider.folderNotExist=\u6587\u4EF6\u5939 {0} \u4E0D\u5B58\u5728\u3002
 AbstractItemMigrationTask.taskFailed=\u8FC1\u79FB\u4EFB\u52A1 {0} \u5728\u8FC1\u79FB\u9879\u76EE {1} \u65F6\u5931\u8D25
-AdvancedSocketFactory.failedInitial=\u9519\u8BEF\uFF1A\u65E0\u6CD5\u521D\u59CB\u5316\uFF1A
+AdvancedSocketFactory.failedInitial=\u9519\u8BEF\uFF1A\u65E0\u6CD5\u521D\u59CB\u5316:
 ArchiveFileExportOperationFullPath.SpecialFile=spagic.properties
 ColorsCodeViewerPreferencePage.Comment1Color=\u6CE8\u91CA1 \u989C\u8272
 ColorsCodeViewerPreferencePage.Comment2Color=\u6CE8\u91CA2 \u989C\u8272
@@ -20,13 +18,9 @@ ColorsCodeViewerPreferencePage.fieldTip=\u7C97\u4F53(&B)
 ColorsCodeViewerPreferencePage.keyword1Color=\u5173\u952E\u5B57 1 \u989C\u8272
 ColorsCodeViewerPreferencePage.keyword2Color=\u5173\u952E\u5B57 2 \u989C\u8272
 ColorsCodeViewerPreferencePage.keyword3Color=\u5173\u952E\u5B57 3 \u989C\u8272
-ColumnNameChangedExt.columnChanged=\u8282\u70B9: {0}   \u5217\u5DF2\u66F4\u6539: {1}-> {2}
-ComponentReturnVariableUtils.ErrorMessage=\u9519\u8BEF\u6D88\u606F
-ComponentReturnVariableUtils.NbReject=\u62D2\u6536\u6570\u91CF
-ComponentReturnVariableUtils.NbSuccess=\u6210\u529F\u63A5\u6536\u6570\u91CF
-ComponentReturnVariableUtils.NbLine=\u884C\u6570
+ColumnNameChangedExt.columnChanged=\u8282\u70B9\uFF1A{0} \u5217\u5DF2\u66F4\u6539\uFF1A{1}-> {2}
 ComponentsFormatPreferencePage.add=\u6DFB\u52A0
-ComponentsFormatPreferencePage.errorCreateConnectionName=\u547D\u540D "{0}" \u65E0\u6548
+ComponentsFormatPreferencePage.errorCreateConnectionName=\u547D\u540D \"{0}\" \u65E0\u6548
 ComponentsFormatPreferencePage.formatConnection=\u683C\u5F0F\u8FDE\u63A5\u9ED8\u8BA4\u503C:
 ComponentsFormatPreferencePage.formatHint=\u683C\u5F0F\u63D0\u793A\u9ED8\u8BA4\u503C:
 ComponentsFormatPreferencePage.formatLable=\u683C\u5F0F\u6807\u7B7E\u9ED8\u8BA4\u503C:
@@ -34,16 +28,15 @@ ComponentsFormatPreferencePage.remove=\u79FB\u9664
 ComponentsFormatPreferencePage.ErrorTitle=\u9519\u8BEF
 ComponentToRepositoryProperty.error=\u9519\u8BEF
 ComponentToRepositoryProperty.ImpossibleUseOCI=\u4E0D\u80FD\u5728\u5B58\u50A8\u5E93\u4E2D\u4F7F\u7528 OCI \u7C7B\u578B\uFF01
-ComponentToRepositoryProperty.ImpossibleUseWALLET=\u4E0D\u80FD\u5728\u5B58\u50A8\u5E93\u4E2D\u4F7F\u7528 WALLET \u7C7B\u578B\uFF01
 ContextComposite.tableValue=\u8868\u683C\u5F0F\u503C
 ContextComposite.treeValue=\u6811\u683C\u5F0F\u503C
 ContextComposite.variable=\u53D8\u91CF
-ContextParameterProposal.ContextVariable=\n\n\u4E0A\u4E0B\u6587\u53D8\u91CF\u3002
+ContextParameterProposal.ContextVariable=\\n\\n\u4E0A\u4E0B\u6587\u53D8\u91CF\u3002
 ContextParameterProposal.Description=\u63CF\u8FF0\uFF1A{0}
 ContextValueErrorChecker.ErrorTitile=\u4E0A\u4E0B\u6587\u503C\u9519\u8BEF:
 ContextParameterProposal.NoCommentAvaiable=\u6CA1\u6709\u6CE8\u91CA\u3002
-ContextParameterProposal.Type=\n\u7C7B\u578B\uFF1A {1}
-ContextParameterProposal.VariableName=\n\n\u53D8\u91CF\u540D\uFF1A {2}
+ContextParameterProposal.Type=\\n\u7C7B\u578B\uFF1A{1}
+ContextParameterProposal.VariableName=\\r\\n\\r\\n\u53D8\u91CF\u540D\u79F0\uFF1A{2}
 ContextProcessSection.1=menuTable
 ContextProcessSection.12=\u91CD\u547D\u540D\u4E0A\u4E0B\u6587
 ContextProcessSection.13=\u4E3A\u4E0A\u4E0B\u6587\u6307\u5B9A\u65B0\u540D\u79F0 {0}
@@ -84,7 +77,6 @@ CorePreferencePage.runInMultiThread=\u591A\u7EBF\u7A0B\u6267\u884C (\u521B\u5EFA
 CorePreferencePage.temporaryFiles=\u4E34\u65F6\u6587\u4EF6(&T)
 DbTableSelectorDialog.textContent=\u9009\u62E9\u8868\u540D
 ECodeLanguage.unknowLanguage=\u672A\u77E5\u8BED\u8A00
-EComponentCategory_advanceSetting=\u9AD8\u7EA7\u8BBE\u7F6E
 EComponentCategory_appearance=\u5916\u89C2
 EComponentCategory_assignment=\u5206\u914D
 EComponentCategory_basicSetting=\u57FA\u672C\u8BBE\u7F6E
@@ -99,10 +91,9 @@ EComponentCategory_properties=\u5C5E\u6027
 EComponentCategory_rulerAndGrid=\u6807\u5C3A\u548C\u7F51\u683C
 EComponentCategory_sqlTemplate=SQL \u6A21\u677F
 EComponentCategory_statsAndLogs=\u7EDF\u8BA1\u53CA\u65E5\u5FD7
-EComponentCategory_gitHistory=Git \u5386\u53F2\u8BB0\u5F55
+EComponentCategory_svnHistory=SVN \u5386\u53F2\u8BB0\u5F55
 EComponentCategory_technical=\u6280\u672F
 EComponentCategory_version=\u7248\u672C
-EComponentCategory_deployment=\u90E8\u7F72
 EComponentCategory_headerFooter=\u6587\u4EF6\u5934/\u6587\u4EF6\u5C3E
 EComponentCategory_view=\u89C6\u56FE
 EComponentCategory.validationRules=\u9A8C\u8BC1\u89C4\u5219
@@ -112,29 +103,22 @@ EComponentCategory.breakpoint=\u65AD\u70B9
 EComponentCategory.parallelization=\u5E76\u884C
 EComponentCategory.debugRun=\u8C03\u8BD5\u8FD0\u884C
 EComponentCategory.targetExec=\u76EE\u6807\u6267\u884C
-EComponentCategory.memoryRun=\u5185\u5B58\u8FD0\u884C
 EComponentCategory.availableExtensions=\u53EF\u7528\u6269\u5C55
 EComponentCategory.downloadedExtensions=\u5DF2\u4E0B\u8F7D\u6269\u5C55
 EComponentCategory.myExtensions=\u6211\u7684\u6269\u5C55
 EComponentCategory.executeJob=\u6267\u884C\u4F5C\u4E1A
 EComponentCategory.monitoring=\u76D1\u63A7
 EComponentCategory.hadoopConfig=Hadoop \u914D\u7F6E
-EComponentCategory.stormConfig=Storm\u914D\u7F6E
-EComponentCategory.sparkConfig=Spark\u914D\u7F6E
-EComponentCategory.parameters=\u53C2\u6570
-EComponentCategory.actionInputOutput=\u8F93\u5165/\u8F93\u51FASchema
 EConnectionType.iteratorMenu=\u8FED\u4EE3
 EConnectionType.lookupMenu=\u67E5\u627E
-EConnectionType.RejectMenu=\u62D2\u7EDD
+EConnectionType.mainMenu=\u4E3B
 EConnectionType.onComponentErrorMenu=\u7EC4\u4EF6\u9519\u8BEF\u65F6
 EConnectionType.onComponentOkMenu=\u7EC4\u4EF6\u6B63\u5E38\u65F6
 EConnectionType.onSubjobErrorMenu=\u5B50\u4F5C\u4E1A\u9519\u8BEF\u65F6
 EConnectionType.onSubjobOkMenu=\u5B50\u4F5C\u4E1A\u6B63\u5E38\u65F6
 EConnectionType.runAfterMenu=\u8FD0\u884C\u540E
-EConnectionType.mainMenu=\u4E3B
 EConnectionType.runIfMenu=Run if
 EConnectionType.tableMenu=\u8868
-EConnectionType.tableRefMenu=Table_ref
 EConnectionType.onRowsEndMenu=\u884C\u7ED3\u675F\u65F6
 EConnectionType.mergeMenu=\u5408\u5E76
 EConnectionType.synchronize=\u540C\u6B65
@@ -148,7 +132,7 @@ EConnectionType.catch=Catch
 EConnectionType.finally=Finally
 EConnectionType.endblock=\u8DEF\u7531
 EMetadataEncoding.Arabic=\u963F\u62C9\u4F2F\u8BED
-EMetadataEncoding.Big5=\u7E41\u4F53\u4E2D\u6587
+EMetadataEncoding.Big5=\u5927\u4E94\u7801 (\u7E41\u4F53\u4E2D\u6587)
 EMetadataEncoding.Cyrillic=\u53E4\u4EE3\u65AF\u62C9\u592B\u8BED
 EMetadataEncoding.EUC_CN=\u7B80\u4F53\u4E2D\u6587 (\u6269\u5C55\u7684 Unix Code-CN)
 EMetadataEncoding.GB18030=\u4E2D\u56FD\u56FD\u5BB6\u6807\u51C6
@@ -172,18 +156,18 @@ ERepositoryObjectType.FolderNotFound=\u7C7B\u578B {0} \u7684\u6587\u4EF6\u5939\u
 ERepositoryObjectType.NotImplemented=\u672A\u5B9E\u73B0
 ExtractMetaDataFromDataBase.SchemaNoPresent=Schema \u5728\u6570\u636E\u5E93\u4E2D\u672A\u51FA\u73B0
 ExtractMetaDataFromDataBase.connectionSuccessful=\u8FDE\u63A5\u6210\u529F
-ExtractMetaDataFromDataBase.dbTypeNotFound=dbType '{0}' \u672A\u627E\u5230
+ExtractMetaDataFromDataBase.dbTypeNotFound=dbType \'{0}\' \u672A\u627E\u5230
 ExtractMetaDataUtils.1=\u65E0\u6CD5\u521D\u59CB\u5316\u8FDE\u63A5\uFF01
-Function.FunctionName=\u51FD\u6570\u540D{0}
+Function.FunctionName=\u51FD\u6570\u540D {0}
 FunctionManager.PurePerl.Desc=\u8BBE\u7F6E\u81EA\u5B9A\u4E49\u8868\u8FBE\u5F0F\u3002
 FunctionManager.PurePerl.ParaName=\u81EA\u5B9A\u4E49\u53C2\u6570
 GlobalServiceRegister.ServiceNotRegistered=\u670D\u52A1 {0} \u8FD8\u672A\u6CE8\u518C\u3002
 GroupByContextAction.groupContext=\u6309\u4E0A\u4E0B\u6587\u5206\u7EC4
 GroupByVariableAction.groupVariable=\u6309\u53D8\u91CF\u5206\u7EC4
-AbstractTalendFunctionParser.checkMethod=Runtines\uFF1A"{0}. {1}\\",\u89E3\u6790\u5931\u8D25\u3002 \u8BF7\u68C0\u67E5\u60A8\u7684\u65B9\u6CD5\u3002
+JavaFunctionParser.checkMethod=\u4F8B\u7A0B\uFF1A\"{0}.{1}\\\\\" \u89E3\u6790\u5931\u8D25\u3002\u8BF7\u68C0\u67E5\u60A8\u7684\u65B9\u6CD5\u3002
 JavaGlobalVariableProposal.Description=\u63CF\u8FF0\uFF1A{0}
-JavaGlobalVariableProposal.VariableName=\n\n\u53D8\u91CF\u540D\uFF1A {1}
-JavaSimpleDateFormatProposalProvider.displaySingleQuote= ' : \u663E\u793A\u5355\u5F15\u53F7
+JavaGlobalVariableProposal.VariableName=\\n\\r\\n\u53D8\u91CF\u540D\u79F0\uFF1A{1}
+JavaSimpleDateFormatProposalProvider.displaySingleQuote=\\ \'\'\uFF1A\u663E\u793A\u4E00\u4E2A\u5355\u5F15\u53F7
 JavaSimpleDateFormatProposalProvider.quoteDisplayError=\u4E24\u4E2A\u5355\u5F15\u53F7\u663E\u793A\u4E3A\u4E00\u4E2A\u5355\u5F15\u53F7
 JavaTypesManager.bigDecimal=BIGDECIMAL \u662F\u6570\u5B57\uFF1A
 JavaTypesManager.integer=INTEGER \u662F\u6570\u5B57:
@@ -195,19 +179,19 @@ LDAPCATruster.failedInitialTrust=\u65E0\u6CD5\u521B\u5EFA\u521D\u59CB\u4FE1\u4EF
 LDAPCATruster.failedLoadCert=\u65E0\u6CD5\u52A0\u8F7D\u8BC1\u4E66\u5E93:
 LDAPCATruster.failedSaveTrust=\u65E0\u6CD5\u4FDD\u5B58\u4FE1\u4EFB\u5E93:
 LDAPCATruster.locationInvalid=\u8BC1\u4E66\u5E93\u6587\u4EF6\u7684\u4F4D\u7F6E\u65E0\u6548:
-LDAPCATruster.noCertificate=\n\u8BF7\u4F7F\u7528 keytool \u547D\u4EE4\u5BFC\u5165\u670D\u52A1\u5668\u8BC1\u4E66\u3002
+LDAPCATruster.noCertificate=\\n\u8BF7\u4F7F\u7528 keytool \u547D\u4EE4\u5BFC\u5165\u670D\u52A1\u5668\u8BC1\u4E66\u3002
 LDAPCATruster.sslError1=SSL \u9519\u8BEF\uFF1A\u670D\u52A1\u5668\u8BC1\u4E66\u94FE\u9A8C\u8BC1\u5931\u8D25\u3002
-LDAPCATruster.sslError2=SSL \u9519\u8BEF\uFF1A\u670D\u52A1\u5668\u8BC1\u4E66\u94FE\u9A8C\u8BC1\u5931\u8D25\u4E14 \\nCA \u7F3A\u5931\u3002
+LDAPCATruster.sslError2=SSL \u9519\u8BEF\uFF1A\u670D\u52A1\u5668\u8BC1\u4E66\u94FE\u9A8C\u8BC1\u5931\u8D25\u4E14 \\\\nCA \u7F3A\u5931\u3002
 LDAPCATruster.sslError3=SSL \u9519\u8BEF\uFF1ACA \u8BC1\u4E66\u4E0D\u5728\u670D\u52A1\u5668\u8BC1\u4E66\u94FE\u4E2D\u3002
 ListPreferencePage.RemoveButtonName=\u79FB\u9664
 LogImageCacheAction.CacheImage=\u7F13\u5B58\u56FE\u50CF:
-LogImageCacheAction.CacheImageDesc=\u7F13\u5B58\u56FE\u7247\u4FE1\u606F\u63CF\u8FF0
-MappingFileLoader.DbTypeAlreadyExists=\u5728 dbms id "{0}" \u6620\u5C04\u4E2D\uFF0CDb \u7C7B\u578B "{1}"  \u591A\u6B21\u51FA\u73B0\u5728\u4EE5\u4E0B\u8282\u70B9 {3} \u4E0A\u7684\u6587\u4EF6 "{2}" 
-MappingFileLoader.DbmsIdAlreadyExists=ID \u4E3A "{0}" \u7684 Dbms \u5DF2\u7ECF\u5B58\u5728\uFF01"
-MappingFileLoader.InvalidTalendType="{0}" \u4E0D\u662F\u8282\u70B9\uFF1A{3} \u4E0A dbms id "{2}" \u7684\u6709\u6548 {1} Talend \u7C7B\u578B
-MappingFileLoader.UnbindedDbTypes=\u5728 dbms ID "{0}" \u6620\u5C04\u6587\u4EF6\u4E2D\uFF0C\u4EE5\u4E0B Db \u7C7B\u578B\u672A\u7ED1\u5B9A "{1}" Talend \u7C7B\u578B\uFF1A{2}
-MappingFileLoader.UnbindedTalendTypes=\u5728 dbms id "{0}" \u6620\u5C04\u6587\u4EF6\u4E2D\uFF0C\u4EE5\u4E0B Talend \u7C7B\u578B\u672A\u7ED1\u5B9A "{1}" Db \u7C7B\u578B\uFF1A{2}
-MappingFileLoader.UndeclaredDbType="{0}" \u6CA1\u6709\u88AB\u58F0\u660E\u4E3A\u8282\u70B9\uFF1A{2} \u4E0A dbms id "{1}" \u7684 Db \u7C7B\u578B
+LogImageCacheAction.CacheImageDesc=\u7F13\u5B58\u56FE\u50CF\u63CF\u8FF0:
+MappingFileLoader.DbTypeAlreadyExists=\u5728 dbms id \"{0}\" \u6620\u5C04\u4E2D\uFF0CDb \u7C7B\u578B \"{1}\" \u591A\u6B21\u51FA\u73B0\u5728\u4EE5\u4E0B\u8282\u70B9\u4E0A\u7684 \"{2}\" \u6587\u4EF6\u4E2D\uFF1A{3}
+MappingFileLoader.DbmsIdAlreadyExists=ID \u4E3A \"{0}\" \u7684 Dbms \u5DF2\u7ECF\u5B58\u5728\uFF01\"
+MappingFileLoader.InvalidTalendType=\"{0}\" \u4E0D\u662F\u8282\u70B9\uFF1A{3} \u4E0A dbms id \"{2}\" \u7684\u6709\u6548 {1} Talend \u7C7B\u578B
+MappingFileLoader.UnbindedDbTypes=\u5728 dbms ID \"{0}\" \u6620\u5C04\u6587\u4EF6\u4E2D\uFF0C\u4EE5\u4E0B Db \u7C7B\u578B\u672A\u7ED1\u5B9A \"{1}\" Talend \u7C7B\u578B\uFF1A{2}
+MappingFileLoader.UnbindedTalendTypes=\u5728 dbms id \"{0}\" \u6620\u5C04\u6587\u4EF6\u4E2D\uFF0C\u4EE5\u4E0B Talend \u7C7B\u578B\u672A\u7ED1\u5B9A \"{1}\" Db \u7C7B\u578B\uFF1A{2}
+MappingFileLoader.UndeclaredDbType=\"{0}\" \u6CA1\u6709\u88AB\u58F0\u660E\u4E3A\u8282\u70B9\uFF1A{2} \u4E0A dbms id \"{1}\" \u7684 Db \u7C7B\u578B
 MetadataDialog.CopyToInput.toolTipText=\u5C06\u8F93\u51FA schema \u7684\u6240\u6709\u5217\u590D\u5236\u5230\u8F93\u5165 schema
 MetadataDialog.CopySelectionToInput.toolTipText=\u5C06\u8F93\u51FA schema \u4E2D\u7684\u9009\u5B9A\u5217\u590D\u5236\u5230\u8F93\u5165 schema
 MetadataDialog.CopyToOutput=\u5C06\u8F93\u5165 schema \u7684\u6240\u6709\u5217\u590D\u5236\u5230\u8F93\u51FA schema
@@ -215,11 +199,11 @@ MetadataDialog.CopySelectionToOutput=\u5C06\u8F93\u5165 schema \u4E2D\u7684\u900
 MetadataDialog.Message=\u6240\u6709\u6765\u81EA\u8F93\u5165 Schema \u7684\u5217\u5C06\u88AB\u4F20\u8F93\u5230\u8F93\u51FA Schema
 MetadataDialog.SchemaModification=Schema \u7F16\u8F91
 MetadataDialog.TransferMessage=\u6240\u6709\u6765\u81EA\u8F93\u51FA Schema \u7684\u5217\u5C06\u88AB\u4F20\u8F93\u5230\u8F93\u5165 Schema
-MetadataEmfTableEditor.ColumnInvalid=\u5217\u540D\u79F0 '{0}' \u65E0\u6548\u3002
-MetadataEmfTableEditor.ColumnNameExists=\u5217\u540D"{0}" \u5DF2\u5B58\u5728
+MetadataEmfTableEditor.ColumnInvalid=\u5217\u540D\u79F0 \'\'{0}\'\' \u65E0\u6548\u3002
+MetadataEmfTableEditor.ColumnNameExists=\u5217\u540D\u79F0 \'\'{0}\'\' \u5DF2\u5B58\u5728\u3002
 MetadataEmfTableEditor.ColumnNameIsNullError=\u9519\u8BEF\uFF1A\u5217\u540D\u4E3A null
-MetadataTableEditor.ColumnNameExists=\u8BE5\u5217\u540D{0}\u5DF2\u7ECF\u5B58\u5728\uFF01
-MetadataTableEditor.ColumnNameIsInvalid=\u5217\u540D\u79F0 '{0}' \u65E0\u6548\u3002
+MetadataTableEditor.ColumnNameExists=\u5217\u540D\u79F0 \'\'{0}\'\' \u5DF2\u7ECF\u5B58\u5728\u3002
+MetadataTableEditor.ColumnNameIsInvalid=\u5217\u540D\u79F0 \'\'{0}\'\' \u65E0\u6548\u3002
 MetadataTableEditor.ColumnNameIsNull=\u9519\u8BEF\uFF1A\u5217\u540D\u4E3A null
 MetadataTableEditorView.ColumnTitle=\u5217
 MetadataTableEditorView.CommentTitle=\u6CE8\u91CA
@@ -241,7 +225,7 @@ MetadataTalendTypeEditor.editMappingDialog.title=\u7F16\u8F91\u6620\u5C04\u6587\
 MetadataTalendTypeEditor.error.message=\u9519\u8BEF\u6D88\u606F
 MetadataTalendTypeEditor.fileIsImported=\u6B64\u6587\u4EF6\u5DF2\u5BFC\u5165\u3002
 MetadataTalendTypeEditor.fileIsInvalid=\u5BFC\u5165\u7684\u5143\u6570\u636E\u6587\u4EF6\u65E0\u6548\u3002
-MetadataTalendTypeEditor.fileNameStartRule=\u6587\u4EF6\u540D\u5FC5\u987B\u4EE5 'mapping_' \u5F00\u5934\u3002
+MetadataTalendTypeEditor.fileNameStartRule=\u6587\u4EF6\u540D\u5FC5\u987B\u4EE5 \'mapping_\' \u5F00\u5934\u3002
 MetadataTool.errorMessage=\u65E0\u6CD5\u8F93\u5165\u5F53\u524D\u5B57\u7B26\u3002
 MetadataTool.invalid=\u65E0\u6548\u503C
 MetadataTool.invalidChar=\u65E0\u6548\u5B57\u7B26
@@ -251,24 +235,24 @@ MetadataTool.schemaExist=schema \u540D\u79F0\u5DF2\u5B58\u5728\u3002
 MetadataTool.schemaIn=schema \u540D\u79F0\u65E0\u6548\u3002
 MetadataTool.schemaInvalid=Schema \u540D\u79F0\u65E0\u6548\u3002
 MetadataTool.schemaNull=Schema \u540D\u79F0\u4E3A null\u3002
-NodeReturnProposal.Availability=\n\u53EF\u7528\u6027\uFF1A {4}
+NodeReturnProposal.Availability=\\n\u53EF\u7528\u6027\uFF1A{4}
 NodeReturnProposal.Description=\u63CF\u8FF0\uFF1A{0}
-NodeReturnProposal.GlobalVariable=\n\n\u5168\u5C40\u53D8\u91CF\uFF0C\u7EC4\u4EF6 {1} [{2}] \u7684\u5C5E\u6027\u3002
-NodeReturnProposal.Type=\n\u7C7B\u578B\uFF1A {3}
-NodeReturnProposal.VariableName=\n\n\u53D8\u91CF\u540D\uFF1A {5}
+NodeReturnProposal.GlobalVariable=\\n\\n\u5168\u5C40\u53D8\u91CF\uFF0C\u7EC4\u4EF6 {1} [{2}] \u7684\u5C5E\u6027\u3002
+NodeReturnProposal.Type=\\n\u7C7B\u578B\uFF1A{3}
+NodeReturnProposal.VariableName=\\r\\n\\r\\n\u53D8\u91CF\u540D\u79F0\uFF1A{5}
 PaletteContentDialog.connection=\u683C\u5F0F\u8FDE\u63A5\u9ED8\u8BA4\u503C:
 PaletteContentDialog.hint=\u683C\u5F0F\u63D0\u793A\u9ED8\u8BA4\u503C:
 PaletteContentDialog.lable=\u683C\u5F0F\u6807\u7B7E\u9ED8\u8BA4\u503C:
-Parameter.Comment=\u6CE8\u91CA\uFF1A
+Parameter.Comment=\\           \u6CE8\u91CA:
 Parameter.Name=\u53C2\u6570\u540D\u79F0
-Parameter.Type=\u7C7B\u578B:
-Parameter.Value=\u503C\uFF1A
-PatternCalendar.dateFormat="yyyy-MM-dd HH:mm:ss"
+Parameter.Type=\\      \u7C7B\u578B:
+Parameter.Value=\\      \u503C:
+PatternCalendar.dateFormat=\"yyyy-MM-dd HH:mm:ss\"
 PatternCalendar.example=\u793A\u4F8B:
 PatternCalendar.pattern=\u6A21\u5F0F:
-PerlDynamicProposalUtil.autoConvert= \u4F1A\u5728\u751F\u6210\u7684\u4EE3\u7801\u4E2D\u81EA\u52A8\u8F6C\u6362\u4E3A {0}->[index]
+PerlDynamicProposalUtil.autoConvert=\\ \u4F1A\u5728\u751F\u6210\u7684\u4EE3\u7801\u4E2D\u81EA\u52A8\u8F6C\u6362\u4E3A {0}->[index]
 PerlGlobalVariableProposal.Description=\u63CF\u8FF0\uFF1A{0}
-PerlGlobalVariableProposal.VariableName=\n\n\u53D8\u91CF\u540D\uFF1A {1}
+PerlGlobalVariableProposal.VariableName=\\r\\n\\r\\n\u53D8\u91CF\u540D\u79F0\uFF1A{1}
 PerspectiveMenuManager.dummy=\u865A\u62DF
 PerspectiveMenuManager.perspectiveLabel=\u900F\u89C6\u56FE(&P)
 ProcessorUtilities.finalizeBuild=\u6700\u7EC8\u786E\u5B9A\u6784\u5EFA...
@@ -302,23 +286,21 @@ RepositoryObject.NotImplemented=\u672A\u5B9E\u73B0
 RepositoryToComponentProperty.xmlFileSelection=\u9009\u62E9\u8981\u9A8C\u8BC1\u7684 XML \u6587\u4EF6
 RepositoryUpdateManager.Title=\u4FEE\u6539
 RepositoryUpdateManager.Check=\u68C0\u67E5\u4E2D...
-RepositoryUpdateManager.Messages=\u662F\u5426\u5C06\u4FEE\u6539\u4F20\u64AD\u5230\u6240\u6709\u4F5C\u4E1A\uFF1F\n\u53EF\u80FD\u8981\u5F88\u4E45\u3002
-RepositoryUpdateManager.MessagesForTDQ=\u662F\u5426\u8981\u5C06\u4FEE\u6539\u4F20\u64AD\u5230\u6240\u6709\u4F5C\u4E1A\uFF1F\n\u67D0\u4E9B\u5206\u6790\u4F9D\u8D56\u5173\u7CFB\u4F1A\u4E22\u5931\u4FE1\u606F\u3002\n\u53EF\u80FD\u8981\u5F88\u4E45
+RepositoryUpdateManager.Messages=\u662F\u5426\u5C06\u4FEE\u6539\u4F20\u64AD\u5230\u6240\u6709\u4F5C\u4E1A\uFF1F\\n\u53EF\u80FD\u8981\u5F88\u4E45\u3002
+RepositoryUpdateManager.MessagesForTDQ=\u662F\u5426\u8981\u5C06\u4FEE\u6539\u4F20\u64AD\u5230\u6240\u6709\u4F5C\u4E1A\uFF1F\\n\u67D0\u4E9B\u5206\u6790\u4F9D\u8D56\u5173\u7CFB\u4F1A\u4E22\u5931\u4FE1\u606F\u3002\\n\u53EF\u80FD\u8981\u5F88\u4E45
 RepositoryUpdateManager.NoModificationTitle=\u6CA1\u6709\u9700\u8981\u7684\u4FEE\u6539
 RepositoryUpdateManager.NoModificationMessages=\u6CA1\u6709\u66F4\u65B0\u6240\u9700\u7684\u4FEE\u6539\u3002
 RepositoryUpdateManager.NotFoundMessages=\u6CA1\u6709\u53EF\u5BFB\u627E\u7684\u5173\u7CFB\u3002
 RepositoryUpdateManager.NotFoundTitle=\u627E\u4E0D\u5230
-RepositoryUpdateManager.RenameContextMessagesNoBuiltIn=\u662F\u5426\u771F\u7684\u8981\u7ACB\u5373\u5C06\u91CD\u547D\u540D\u53D8\u91CF\u4F20\u64AD\u5230\u6240\u6709\u4F5C\u4E1A\uFF1F\n\n\u5982\u679C\u662F\uFF0C\u66F4\u65B0\u53EF\u80FD\u9700\u8981\u5F88\u957F\u65F6\u95F4\u3002
 RepositoryUpdateManager.RenameContextTitle=\u91CD\u547D\u540D\u95EE\u9898
 RepositoryUpdateManager.ItemsToUpdate=\u68C0\u67E5\u8981\u66F4\u65B0\u7684\u9879\u76EE
-RepositoryUpdateManager.job.title=\u6B63\u5728\u66F4\u65B0\u9879\u76EE...
 RoutinesFunctionProposal.CreatedBy=\u521B\u5EFA\u4EBA:
 RoutinesFunctionProposal.Description=\u63CF\u8FF0:
 RoutinesFunctionProposal.Example=\u793A\u4F8B:
 RoutinesFunctionProposal.ReturnType=\u8FD4\u56DE\u7C7B\u578B:
 RoutinesFunctionProposal.System=\u7CFB\u7EDF
 RoutinesFunctionProposal.User=\u7528\u6237
-RoutinesFunctionProposal.VariableName=\n\n\u53D8\u91CF\u540D\uFF1A {2}
+RoutinesFunctionProposal.VariableName=\\r\\n\\r\\n\u53D8\u91CF\u540D\u79F0\uFF1A{2}
 RuleOperationChoiceDialog.editRules=\u7F16\u8F91\u89C4\u5219
 RuleOperationChoiceDialog.rule=\u89C4\u5219:
 RuleOperationChoiceDialog.selectRulesFile=\u4ECE\u6587\u4EF6\u9009\u62E9\u89C4\u5219
@@ -329,7 +311,7 @@ SchemaCellEditor.nameExistOrInvalid=\u6B64\u540D\u79F0\u5DF2\u5B58\u5728\u6216\u
 SchemaCellEditor.schemaName=Schema \u540D\u79F0
 SchemaOperationChoiceDialog.ChangeBuiltInMessage=\u5C06 schema \u66F4\u6539\u4E3A\u5185\u7F6E\u3002
 SchemaOperationChoiceDialog.ChangeRepositoryMessage=\u4ECE\u5B58\u50A8\u5E93\u4E2D\u66F4\u6539 schema\u3002
-SchemaOperationChoiceDialog.CreateBuiltInMessage=\u4E3A "\u5185\u7F6E" \u521B\u5EFA schema
+SchemaOperationChoiceDialog.CreateBuiltInMessage=\u4E3A \"\u5185\u7F6E\" \u521B\u5EFA schema
 SchemaOperationChoiceDialog.CreateRepositoryMessage=\u4ECE\u5B58\u50A8\u5E93\u521B\u5EFA schema\u3002
 SchemaOperationChoiceDialog.EditSchemaMessage=\u7F16\u8F91 schema\u3002
 SchemaOperationChoiceDialog.Message=\u8BF7\u9009\u62E9\u4E00\u4E2A\u9009\u9879\u6216\u53D6\u6D88\u3002
@@ -340,16 +322,16 @@ SchemaOperationChoiceDialog.ViewSchemaMessage=\u67E5\u770B schema (\u53EA\u8BFB)
 SchemaXPathQuerysDialog.Mappings=\u6620\u5C04
 SelectRepositoryContextDialog.DeselectAll=\u53D6\u6D88\u5168\u9009
 SelectRepositoryContextDialog.CollapseAll=\u5168\u90E8\u6298\u53E0
-SelectRepositoryContextDialog.DuplicationMessage=\u60A8\u5DF2\u5728\u4E0A\u4E0B\u6587 "{1}" \u4E2D\u9009\u62E9\u53D8\u91CF "{0}"\u3002
+SelectRepositoryContextDialog.DuplicationMessage=\u60A8\u5DF2\u5728\u4E0A\u4E0B\u6587 \"{1}\" \u4E2D\u9009\u62E9\u53D8\u91CF \"{0}\"\u3002
 SelectRepositoryContextDialog.DuplicationTitle=\u91CD\u590D\u8B66\u544A\uFF01
-SelectRepositoryContextDialog.ExistenceMessage=\u4F5C\u4E1A\u4E2D\u5DF2\u7ECF\u5B58\u5728\u53D8\u91CF "{0}" (\u4E0A\u4E0B\u6587\uFF1A"{1}")\u3002
-SelectRepositoryContextDialog.Label=\u9009\u62E9\u5E93\u4E0A\u4E0B\u6587\u4E2D\u7684\u53D8\u91CF\u3002
+SelectRepositoryContextDialog.ExistenceMessage=\u4F5C\u4E1A\u4E2D\u5DF2\u7ECF\u5B58\u5728\u53D8\u91CF \"{0}\" (\u4E0A\u4E0B\u6587\uFF1A\"{1}\")\u3002
+SelectRepositoryContextDialog.Label=\u4ECE\u5B58\u50A8\u5E93\u4E0A\u4E0B\u6587\u4E2D\u9009\u62E9\u53D8\u91CF\u3002
 SelectRepositoryContextDialog.SelectAll=\u5168\u9009
 SelectRepositoryContextDialog.ExpandAll=\u5C55\u5F00\u5168\u90E8
 SelectRepositoryContextDialog.Title=\u9009\u62E9\u4E0A\u4E0B\u6587\u53D8\u91CF
 SelectRepositoryContextDialog.View=\u67E5\u770B...
 SelectRepositoryContextGroupDialog.Default=\u9ED8\u8BA4
-SelectRepositoryContextGroupDialog.Messages=\u5728\u4F5C\u4E1A\u4E2D\uFF0C\u4ECE\u5B58\u50A8\u5E93\u4E0A\u4E0B\u6587\u6DFB\u52A0\u4E00\u4E2A\u4E0D\u5B58\u5728\u7684\u4E0A\u4E0B\u6587\u7EC4
+SelectRepositoryContextGroupDialog.Messages=\\ \u5728\u4F5C\u4E1A\u4E2D\uFF0C\u4ECE\u5B58\u50A8\u5E93\u4E0A\u4E0B\u6587\u6DFB\u52A0\u4E00\u4E2A\u4E0D\u5B58\u5728\u7684\u4E0A\u4E0B\u6587\u7EC4
 SelectRepositoryContextGroupDialog.Title=\u6DFB\u52A0\u4E0A\u4E0B\u6587\u7EC4
 TalendDataCollectorPreferencePage_EnableCapture=\u542F\u7528\u6355\u83B7
 TalendDataCollectorPreferencePage_Description=Usage Data Collector \u91C7\u96C6\u4E2A\u4EBA\u5982\u4F55\u4F7F\u7528 Talend \u4EA7\u54C1\u7684\u76F8\u5173\u4FE1\u606F\u3002\u5176\u76EE\u7684\u662F\u901A\u8FC7\u8FD9\u4E9B\u6570\u636E\u5E2E\u52A9 Talend \u66F4\u597D\u5730\u4E86\u89E3\u7528\u6237\u548C\u7EC4\u7EC7\u5982\u4F55\u4F7F\u7528 Talend \u4EA7\u54C1\u3002
@@ -398,8 +380,6 @@ repository.concept=\u6982\u5FF5
 repository.metadataSAPConnections=SAP \u8FDE\u63A5
 repository.metadataSAPConnections.alias=SAP
 repository.SAPFunction=SAP \u51FD\u6570
-repository.SAPIDoc=SAP IDoc
-repository.SAPTable=SAP \u8868
 repository.metadataSQLPatterns=SQL \u6A21\u677F
 repository.metadataSQLPatterns.alias=SQLTemplates
 repository.metadataFileDelimited=\u5206\u9694\u6587\u4EF6
@@ -418,15 +398,13 @@ repository.metadataFileBRMS=BRMS
 repository.metadataFileBRMS.alias=BRMS
 repository.metadataLinkFileRules=LinkRules
 repository.metadataLinkFileRules.alias=LinkRule
-repository.metadataRulesManagement=\u89C4\u5219\u7BA1\u7406
-repository.metadataRulesManagement.alias=\u89C4\u5219\u7BA1\u7406
 repository.metadataValidationRules=\u9A8C\u8BC1\u89C4\u5219
 repository.metadataValidationRules.alias=VR
 repository.process=\u4F5C\u4E1A\u8BBE\u8BA1
 repository.service=\u670D\u52A1
 repository.query=\u67E5\u8BE2
 repository.CDC=CDC
-repository.gitroot=GIT
+repository.svnroot=SVN
 repository.referencedProjects=\u5F15\u7528\u7684\u5DE5\u7A0B
 repository.beans=Beans
 repository.snippets=\u7247\u65AD
@@ -438,38 +416,7 @@ repository.tdqelement.mdmconnection=TDQ MDM \u8FDE\u63A5
 repository.tdqelement.businessrule=TDQ \u4E1A\u52A1\u89C4\u5219
 repository.tdqelement.indicator=TDQ \u6307\u6807
 repository.tdqelement.pattern=TDQ \u6A21\u5F0F
-repository.tdqelement.sourceFile=\u6E90\u6587\u4EF6
-repository.tdqelement.jrxml=JRXML \u6A21\u677F
-repository.dataprofiling=\u6570\u636E\u5256\u6790
-repository.libraries=\u5E93
-repository.patternRegex=\u6B63\u5219\u8868\u8FBE\u5F0F
-repository.patternSql=SQL
-repository.rules=\u89C4\u5219
-repository.rulesSql=SQL
-repository.rulesParser=\u89E3\u6790\u5668
-repository.rulesMatcher=\u5339\u914D
-repository.systemIndicators=\u7CFB\u7EDF\u6307\u6807
-repository.userDefineIndicators=\u7528\u6237\u5B9A\u4E49\u7684\u6307\u6807
-repository.userDefineIndicators.lib=\u5E93
-repository.systemIndicators.advancedStatistics=\u9AD8\u7EA7\u7EDF\u8BA1
-repository.systemIndicators.businessRules=\u4E1A\u52A1\u89C4\u5219
-repository.systemIndicators.correlation=\u5173\u8054\u6027
-repository.systemIndicators.functionalDependency=\u51FD\u6570\u4F9D\u8D56\u5173\u7CFB
-repository.systemIndicators.overview=\u6982\u89C8
-repository.systemIndicators.patternFinder=\u6A21\u5F0F\u9891\u7387\u7EDF\u8BA1
-repository.systemIndicators.patternMatching=\u6A21\u5F0F\u5339\u914D
-repository.systemIndicators.rowComparison=\u884C\u6BD4\u8F83
-repository.systemIndicators.simpleStatistics=\u57FA\u7840\u7EDF\u8BA1
-repository.systemIndicators.soundex=Soundex
-repository.systemIndicators.summaryStatistics=\u6C47\u603B\u7EDF\u8BA1
-repository.systemIndicators.textStatistics=\u6587\u672C\u7EDF\u8BA1
-repository.tdqExchange=Exchange
-repository.systemIndicators.phoneNumberStatistics=\u7535\u8BDD\u53F7\u7801\u7EDF\u8BA1
-repository.systemIndicators.fraudDetection=\u6B3A\u8BC8\u68C0\u6D4B
-repository.metadataSalesforceModule=SalesforceModule(AccountHistory)
 EUpdateItemType.Property=\u5C5E\u6027
-EUpdateItemType.Batch=\u6279\u5904\u7406
-EUpdateItemType.Streaming=\u6D41\u5F0F\u5904\u7406
 EUpdateItemType.Schema=Schema
 EUpdateItemType.SAPFunction=SAP \u51FD\u6570
 EUpdateItemType.SAPIDoc=SAP IDoc
@@ -477,16 +424,11 @@ EUpdateItemType.Query=\u67E5\u8BE2
 EUpdateItemType.Variable=\u53D8\u91CF
 EUpdateItemType.ContextGroup=ContextGroup
 EUpdateItemType.Components=\u7EC4\u4EF6
-EUpdateItemType.MapPath=\u6620\u5C04\u8DEF\u5F84
-EUpdateItemType.StructurePath=\u7ED3\u6784\u8DEF\u5F84
 EUpdateItemType.Name=\u540D\u79F0
 EUpdateItemType.JobVersion=JobVersion
 EUpdateItemType.ValidationRule=\u9A8C\u8BC1\u89C4\u5219
 EUpdateResult.BuiltIn=\u66F4\u6539\u4E3A\u5185\u7F6E\u6A21\u5F0F
 EUpdateResult.JobletUpdate=\u66F4\u65B0\u5C0F\u4F5C\u4E1A\u8282\u70B9
-EUpdateResult.JobUpdate=\u9488\u5BF9\u4F5C\u4E1A\u8282\u70B9\u66F4\u65B0
-EUpdateResult.PathUpdate=\u9488\u5BF9\u6620\u5C04\u8DEF\u5F84\u66F4\u65B0
-EUpdateResult.StructurePathUpdate=\u9488\u5BF9\u7ED3\u6784\u8DEF\u5F84\u66F4\u65B0
 EUpdateResult.Update=\u4ECE\u5B58\u50A8\u5E93\u66F4\u65B0
 EUpdateResult.Reload=\u91CD\u65B0\u52A0\u8F7D\u7EC4\u4EF6
 EUpdateResult.Rename=\u66F4\u6539\u540D\u79F0
@@ -496,13 +438,7 @@ UpdatesConstants.Context=\u4E0A\u4E0B\u6587
 UpdatesConstants.ContextGroup=\u4E0A\u4E0B\u6587\u7EC4
 UpdatesConstants.Component=\u7EC4\u4EF6
 UpdatesConstants.Joblet=Joblet
-UpdatesConstants.Spark_Joblet=Spark_Joblet
-UpdatesConstants.Spark_Streaming_Joblet=Spark_Streaming_Joblet
 UpdatesConstants.Job=\u4F5C\u4E1A
-UpdatesConstants.MR=Map_Reduce
-UpdatesConstants.Storm=Storm
-UpdatesConstants.Spark=Spark
-UpdatesConstants.SparkStreaming=Spark_Streaming
 UpdatesConstants.JobVersion=JobVersion
 ProjectSettingsWizard.EditProjectPageTitle=\u7F16\u8F91\u5DE5\u7A0B
 MetadataTypeLengthConstants.FIELD_DEFAULT_TYPE=\u9ED8\u8BA4\u7C7B\u578B
@@ -558,17 +494,8 @@ OpenXSDFileDialog.cancel=\u53D6\u6D88
 OpenXSDFileDialog.confirm=\u786E\u8BA4
 OpenXSDFileDialog.fileName=\u6587\u4EF6\u540D:
 OpenXSDFileDialog.xmlFileSelection=\u9009\u62E9\u8981\u9A8C\u8BC1\u7684 XML \u6587\u4EF6
-OpenXSDFileDialog.xmlSelectedOrNot=\u7531\u4E8E\u60A8\u9009\u62E9\u4E86 XSD \u5143\u6570\u636E\u6587\u4EF6\uFF0C\n \u5E94\u8BE5\u6709\u4E00\u4E2A xml \u6587\u4EF6\u9700\u8981\u9A8C\u8BC1\u3002
+OpenXSDFileDialog.xmlSelectedOrNot=\u7531\u4E8E\u60A8\u9009\u62E9\u4E86 XSD \u5143\u6570\u636E\u6587\u4EF6\uFF0C\\n \u5E94\u8BE5\u6709\u4E00\u4E2A xml \u6587\u4EF6\u9700\u8981\u9A8C\u8BC1\u3002
 RepositoryContentProvider.repositoryLabel.Queries=\u67E5\u8BE2
-RepositoryContentProvider.repositoryLabel.sapBapi=SAP Bapi
-RepositoryContentProvider.repositoryLabel.sapBapi.input=\u8F93\u5165
-RepositoryContentProvider.repositoryLabel.sapBapi.output=\u8F93\u51FA
-RepositoryContentProvider.repositoryLabel.sapContentExtractor=SAP BI \u5185\u5BB9\u63D0\u53D6\u5668
-RepositoryContentProvider.repositoryLabel.sapTable=SAP \u8868
-RepositoryContentProvider.repositoryLabel.sapDataSource=SAP DataSource
-RepositoryContentProvider.repositoryLabel.sapDSO=SAP DSO
-RepositoryContentProvider.repositoryLabel.sapInfoCube=SAP InfoCube
-RepositoryContentProvider.repositoryLabel.sapInfoObject=SAP InfoObject
 repository.routes=\u8DEF\u7531
 repository.servicesOperation=\u64CD\u4F5C
 repository.servicesPort=\u7AEF\u53E3
@@ -607,50 +534,103 @@ LibrariesListSelectionDialog.button.external=\u5916\u90E8\u5E93
 LibrariesListSelectionDialog.selectLibFromOS=\u9009\u62E9\u5E93
 LibrariesListSelectionDialog.browseButton.text=\u6D4F\u89C8...
 LibrariesListSelectionDialog.deployLibs=\u90E8\u7F72\u5E93...
-JavaFunctionParser.checkMethod=\u4F8B\u7A0B\uFF1A"{0}.{1}" \u89E3\u6790\u5931\u8D25\u3002\u8BF7\u68C0\u67E5\u60A8\u7684\u65B9\u6CD5\u3002
-PigFunctionParser.checkMethod=Pig\uFF1A"{0}.{1}\\" \u89E3\u6790\u5931\u8D25\u3002\u8BF7\u68C0\u67E5\u60A8\u7684\u65B9\u6CD5\u3002
+PigFunctionParser.checkMethod=Pig\uFF1A\"{0}.{1}\\\\\" \u89E3\u6790\u5931\u8D25\u3002\u8BF7\u68C0\u67E5\u60A8\u7684\u65B9\u6CD5\u3002
 GenerateSelectSQLAction.NewQuery=\u65B0\u67E5\u8BE2 {0}
-AContextualAction.EditorManager_saveChangesQuestion='{0}' \u5DF2\u88AB\u4FEE\u6539\u3002\u662F\u5426\u4FDD\u5B58\u66F4\u6539\uFF1F
+AbstractTalendFunctionParser.checkMethod=Runtines\uFF1A\"{0}. {1}\\\\\",\u89E3\u6790\u5931\u8D25\u3002 \u8BF7\u68C0\u67E5\u60A8\u7684\u65B9\u6CD5\u3002
+UpdatesConstants.MR=Map_Reduce
+AbstractBrandingService.routines_license_header_content2014=\u672C\u6BB5\u6E90\u4EE3\u7801\u662F\u7531{0}\u81EA\u52A8\u751F\u6210\\n// / \u4F5C\u4E1A\u8BBE\u8BA1\u5668 (\u4EE3\u7801\u751F\u6210\u5668\u7248\u672C{1})\\n// \u4F60\u53EF\u4EE5\u627E\u5230\u66F4\u591ATalend\u4EA7\u54C1\u4FE1\u606F\u5728www.talend.com.\\n// \u60A8\u53EF\u4EE5\u6839\u636EGNU LGPL\u8BB8\u53EF\u7684\u6761\u6B3E\u53D1\u5E03\u6B64\u4EE3\u7801\\n// http://www.gnu.org/licenses/lgpl.html).
+repository.tdqelement.sourceFile=\u6E90\u6587\u4EF6
+repository.tdqelement.jrxml=JRXML \u6A21\u677F
+repository.dataprofiling=\u6570\u636E\u5256\u6790
+repository.libraries=\u5E93
+repository.patternRegex=\u6B63\u5219\u8868\u8FBE\u5F0F
+repository.patternSql=SQL
+repository.rules=\u89C4\u5219
+repository.rulesSql=SQL
+repository.rulesParser=\u89E3\u6790\u5668
+repository.rulesMatcher=\u5339\u914D
+repository.systemIndicators=\u7CFB\u7EDF\u6307\u6807
+repository.userDefineIndicators=\u7528\u6237\u5B9A\u4E49\u7684\u6307\u6807
+repository.userDefineIndicators.lib=\u5E93
+repository.systemIndicators.advancedStatistics=\u9AD8\u7EA7\u7EDF\u8BA1
+repository.systemIndicators.businessRules=\u4E1A\u52A1\u89C4\u5219
+repository.systemIndicators.correlation=\u5173\u8054\u6027
+repository.systemIndicators.functionalDependency=\u51FD\u6570\u4F9D\u8D56\u5173\u7CFB
+repository.systemIndicators.overview=\u6982\u89C8
+repository.systemIndicators.patternFinder=\u6A21\u5F0F\u9891\u7387\u7EDF\u8BA1
+repository.systemIndicators.patternMatching=\u6A21\u5F0F\u5339\u914D
+repository.systemIndicators.rowComparison=\u884C\u6BD4\u8F83
+repository.systemIndicators.simpleStatistics=\u57FA\u7840\u7EDF\u8BA1
+repository.systemIndicators.soundex=Soundex
+repository.systemIndicators.summaryStatistics=\u6C47\u603B\u7EDF\u8BA1
+repository.systemIndicators.textStatistics=\u6587\u672C\u7EDF\u8BA1
+repository.tdqExchange=Exchange
+repository.systemIndicators.phoneNumberStatistics=\u7535\u8BDD\u53F7\u7801\u7EDF\u8BA1
+repository.systemIndicators.fraudDetection=\u6B3A\u8BC8\u68C0\u6D4B
+EUpdateItemType.MapPath=\u6620\u5C04\u8DEF\u5F84
+EUpdateResult.PathUpdate=\u9488\u5BF9\u6620\u5C04\u8DEF\u5F84\u66F4\u65B0
+AContextualAction.EditorManager_saveChangesQuestion=\'\'{0}\'\' \u88AB\u4FEE\u6539.\u662F\u5426\u4FDD\u5B58?
 AContextualAction.Save_Resource=\u4FDD\u5B58\u8D44\u6E90
+EConnectionType.tableRefMenu=Table_ref
+EComponentCategory.stormConfig=Storm\u914D\u7F6E
+repository.metadataSalesforceModule=SalesforceModule(AccountHistory)
+EComponentCategory.sparkConfig=Spark\u914D\u7F6E
+repository.SAPIDoc=SAP IDoc
+repository.SAPTable=SAP \u8868
 ProgressMonitorDialogWithCancel.executeMessage.default=\u6B63\u5728\u6267\u884C...
-ProgressMonitorDialogWithCancel.waitingFinishMessage.default=\u65E0\u6CD5\u6B63\u5E38\u4E2D\u65AD\u68C0\u67E5\u8FDE\u63A5\u64CD\u4F5C\uFF0C\n
+ProgressMonitorDialogWithCancel.waitingFinishMessage.default=\u65E0\u6CD5\u6B63\u5E38\u4E2D\u65AD\u68C0\u67E5\u8FDE\u63A5\u64CD\u4F5C\uFF0C\\n
 ProgressMonitorDialogWithCancel.executeTimeout=\u6267\u884C\u8D85\u65F6\uFF0CStudio \u5DF2\u5C1D\u8BD5\u5728\u540E\u53F0\u4E2D\u65AD\u6B64\u68C0\u67E5\u64CD\u4F5C\u3002
 ProgressMonitorDialogWithCancel.CheckingConnectionJob.waitingFinish=\u6B63\u5728\u7B49\u5F85 {0} \u5B8C\u6210...
 ProgressMonitorDialogWithCancel.CheckingConnectionJob.emptyWaitingfinish=\u6B63\u5728\u7B49\u5F85\u5B8C\u6210...
+EComponentCategory.memoryRun=\u5185\u5B58\u8FD0\u884C
+EUpdateResult.JobUpdate=\u9488\u5BF9\u4F5C\u4E1A\u8282\u70B9\u66F4\u65B0
+EUpdateItemType.Batch=\u6279\u5904\u7406
+EUpdateItemType.Streaming=\u6D41\u5F0F\u5904\u7406
+UpdatesConstants.Storm=Storm
+UpdatesConstants.Spark=Spark
+UpdatesConstants.SparkStreaming=Spark_Streaming
 OverTimePopupDialogTask.title=\u6B63\u5728\u6267\u884C...
 OverTimePopupDialogTask.message=\u6B63\u5728\u540E\u53F0\u6267\u884C\u4EFB\u52A1\uFF0C\u8BF7\u7A0D\u5019...
 OverTimePopupDialogTask.executeTimeout=\u6267\u884C\u8D85\u65F6\uFF0CStudio \u5DF2\u5C1D\u8BD5\u5728\u540E\u53F0\u4E2D\u65AD\u6B64\u68C0\u67E5\u64CD\u4F5C\u3002
 OverTimePopupDialogTask.killed=\u6267\u884C\u88AB\u7EC8\u6B62
-OverTimePopupDialogTask.waitingFinishMessage.default=\u65E0\u6CD5\u6B63\u5E38\u4E2D\u65AD\u540E\u53F0\u4EFB\u52A1\uFF0C\n
+OverTimePopupDialogTask.waitingFinishMessage.default=\u65E0\u6CD5\u6B63\u5E38\u4E2D\u65AD\u540E\u53F0\u4EFB\u52A1\uFF0C\\n
 OverTimePopupDialogTask.CheckingConnectionJob.waitingFinish=\u6B63\u5728\u7B49\u5F85 {0} \u5B8C\u6210...
 OverTimePopupDialogTask.CheckingConnectionJob.emptyWaitingfinish=\u6B63\u5728\u7B49\u5F85\u5B8C\u6210...
+EComponentCategory_gitHistory=Git \u5386\u53F2\u8BB0\u5F55
+repository.gitroot=GIT
+EComponentCategory.parameters=\u53C2\u6570
+EComponentCategory.actionInputOutput=\u8F93\u5165/\u8F93\u51FASchema
+EConnectionType.RejectMenu=\u62D2\u7EDD
+RepositoryContentProvider.repositoryLabel.sapBapi=SAP Bapi
+RepositoryContentProvider.repositoryLabel.sapBapi.input=\u8F93\u5165
+RepositoryContentProvider.repositoryLabel.sapBapi.output=\u8F93\u51FA
+RepositoryContentProvider.repositoryLabel.sapTable=SAP \u8868
+RepositoryContentProvider.repositoryLabel.sapDataSource=SAP DataSource
+RepositoryContentProvider.repositoryLabel.sapDSO=SAP DSO
+RepositoryContentProvider.repositoryLabel.sapInfoCube=SAP InfoCube
+RepositoryContentProvider.repositoryLabel.sapInfoObject=SAP InfoObject
+ComponentReturnVariableUtils.ErrorMessage=\u9519\u8BEF\u6D88\u606F
+ComponentReturnVariableUtils.NbReject=\u62D2\u6536\u6570\u91CF
+ComponentReturnVariableUtils.NbSuccess=\u6210\u529F\u63A5\u6536\u6570\u91CF
+ComponentReturnVariableUtils.NbLine=\u884C\u6570
+repository.metadataRulesManagement=\u89C4\u5219\u7BA1\u7406
+repository.metadataRulesManagement.alias=\u89C4\u5219\u7BA1\u7406
+EUpdateItemType.StructurePath=\u7ED3\u6784\u8DEF\u5F84
+EUpdateResult.StructurePathUpdate=\u9488\u5BF9\u7ED3\u6784\u8DEF\u5F84\u66F4\u65B0
+UpdatesConstants.Spark_Joblet=Spark_Joblet
+UpdatesConstants.Spark_Streaming_Joblet=Spark_Streaming_Joblet
+EComponentCategory_deployment=\u90E8\u7F72
+RepositoryContentProvider.repositoryLabel.sapContentExtractor=SAP BI Content Extractor
 ShareLibsJob.wrongUsernameOrPassword=Nexus \u7528\u6237\u540D\u6216\u5BC6\u7801\u9519\u8BEF\u5BFC\u81F4\u6388\u6743\u5931\u8D25\u3002
 RelationshipItemBuilder.unexpect.item=\u5F02\u5E38\u7684\u9879\u76EE\u7C7B\u578B\uFF1A{0}
-RelationshipItemBuilder.unexpect.typesConflict=\u627E\u5230\u7684 {0} \u7C7B\u578B\u8FC7\u591A\uFF1A{1}
 RelationshipItemBuilder.unexpect.relation=\u5F02\u5E38\u7684\u5173\u7CFB\u7C7B\u578B\uFF1A{0}
-ReferenceProjectProblemManager.ErrorMoreThanOneBranchUsing={0} \u5DE5\u7A0B\u5F15\u7528\u94FE\u4E2D\u4F7F\u7528\u4E86\u591A\u4E2A\u5206\u652F\u3002
 DynamicElement.incorrectInstance=\u5F53\u524D json \u5BF9\u8C61\u4E0D\u662F {0} \u7684\u5B9E\u4F8B\uFF1A{1}
 DynamicElement.tagName.empty=tagName \u4E3A\u7A7A\uFF01
 DynamicPlugin.addExtension.empty=ExtensionPoint \u6216 Id \u4E3A\u7A7A\uFF01
+RelationshipItemBuilder.unexpect.typesConflict=\u627E\u5230\u7684 {0} \u7C7B\u578B\u8FC7\u591A\uFF1A{1}
+ReferenceProjectProblemManager.ErrorMoreThanOneBranchUsing={0} \u5DE5\u7A0B\u5F15\u7528\u94FE\u4E2D\u4F7F\u7528\u4E86\u591A\u4E2A\u5206\u652F\u3002
+EComponentCategory_advanceSetting=\u9AD8\u7EA7\u8BBE\u7F6E
+RepositoryUpdateManager.job.title=\u6B63\u5728\u66F4\u65B0\u9879\u76EE...
 BigDataBasicUtil.loadDynamicDistribution.IDynamicDistributionManager.notFound=\u672A\u627E\u5230 {0} \u7684\u5B9E\u4F8B
+ComponentToRepositoryProperty.ImpossibleUseWALLET=\u4E0D\u80FD\u5728\u5B58\u50A8\u5E93\u4E2D\u4F7F\u7528 WALLET \u7C7B\u578B\uFF01
 TalendLibsServerManager.connectUserLibraryFailureMessage=\u65E0\u6CD5\u8FDE\u63A5 Administrator \u4E2D\u7684\u7528\u6237\u5E93\u6784\u4EF6\u5E93\u96C6\uFF1A\u5230 {0} \u7684\u8FDE\u63A5\u88AB\u62D2
-TalendLibsServerManager.cannotGetUserLibraryServer=\u65E0\u6CD5\u4ECE\u8FDC\u7A0B\u7BA1\u7406\u5458\u83B7\u53D6\u7528\u6237\u5E93\u670D\u52A1\u5668
-MigrationReportAccessDialog.title=\u5DE5\u7A0B\u9879\u76EE\u8FC1\u79FB
-MigrationReportAccessDialog.migrateSuccess=\u5DE5\u7A0B\u9879\u76EE\u8FC1\u79FB\u6210\u529F\u3002
-MigrationReportAccessDialog.completeReportAvailable=\u8BF7\u68C0\u67E5\u62A5\u544A
-MigrationReportAccessDialog.accessReport=\u6B64\u5904
-MigrationReportAccessDialog.provideAnalysisTool=\u60A8\u73B0\u5728\u53EF\u4EE5\u8FD0\u884C\u5DE5\u7A0B\u5206\u6790\u4EE5\u5206\u6790\u8FC1\u79FB\u7684\u5DE5\u7A0B\u3002\u6B64\u5B9E\u9A8C\u6027\u5DE5\u5177\u5C06\u751F\u6210\u4E00\u4EFD\u5206\u6790\u62A5\u544A\uFF0C\u5176\u4E2D\u5305\u542B:
-MigrationReportAccessDialog.listOfProblems=- \u9700\u8981\u624B\u52A8\u4FEE\u590D\u7684\u9879\u76EE\u6E05\u5355\u3002
-MigrationReportAccessDialog.listItems=- \u9700\u8981\u68C0\u67E5\u7684\u9879\u76EE\u6E05\u5355\u3002
-MigrationReportAccessDialog.analysisToolCanTrigger=\u6CE8\uFF1A\u60A8\u8FD8\u53EF\u4EE5\u5728\u5DE5\u7A0B\u8BBE\u7F6E > \u5BA1\u8BA1\u9875\u9762\u751F\u6210\u5206\u6790\u62A5\u544A\u3002
-MigrationReportAccessDialog.doNotShowAnymore=\u4E0D\u518D\u663E\u793A\u6B64\u6D88\u606F
-MigrationReportAccessDialog.runAnalysisButton=\u8FD0\u884C\u5206\u6790
-MigrationReportAccessDialog.notNowButton=\u6682\u4E0D\u91CD\u542F
-ItemAnalysisReportManager.Information.title=\u4FE1\u606F
-ItemAnalysisReportManager.Information.message=\u5DE5\u7A0B\u5206\u6790\u6210\u529F\u5B8C\u6210\uFF0C\u672A\u751F\u6210\u5F02\u5E38\u8BB0\u5F55\u3002
-ItemAnalysisReportManager.Warning.title=\u8B66\u544A
-ItemAnalysisReportManager.Warning.message=\u73B0\u5728\u65E0\u6CD5\u8FD0\u884C\u65B0\u7684\u5206\u6790\uFF0C\u8BF7\u7B49\u5F85\u5F53\u524D\u6B63\u5728\u8FD0\u884C\u7684\u5206\u6790\u7ED3\u675F\u7136\u540E\u91CD\u8BD5\u3002
-AnalysisReportAccessDialog.shellTitle=\u5DE5\u7A0B\u5206\u6790
-AnalysisReportAccessDialog.generateSuccess=\u5DE5\u7A0B\u5206\u6790\u6210\u529F\u5B8C\u6210\u3002
-AnalysisReportAccessDialog.completeReportAvailable=\u8BF7\u68C0\u67E5\u62A5\u544A
-AnalysisReportAccessDialog.accessReport=\u6B64\u5904

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/JobInfoProperties.java

@@ -61,12 +61,6 @@ public class JobInfoProperties extends Properties {
 
     public static final String ADD_STATIC_CODE = "statistics"; //$NON-NLS-1$
 
-    public static final String GIT_AUTHOR = "gitAuthor";
-
-    public static final String GIT_COMMIT_ID = "gitCommitId";
-
-    public static final String GIT_COMMIT_DATE = "gitCommitDate";
-
     private final ProcessItem processItem;
 
     private final String contextName;
@@ -120,9 +114,6 @@ public class JobInfoProperties extends Properties {
             setProperty(ADD_STATIC_CODE, Boolean.TRUE.toString()); // TDI-23641, in studio, false always.
         }
         setProperty(COMMANDLINE_VERSION, VersionUtils.getVersion());
-        // add init git info for jobInfo
-        setProperty(GIT_AUTHOR, "");
-        setProperty(GIT_COMMIT_ID, "");
-        setProperty(GIT_COMMIT_DATE, "");
+
     }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/TalendProcessArgumentConstant.java

@@ -66,8 +66,6 @@ public interface TalendProcessArgumentConstant {
 
     static final String ARG_AVOID_BRANCH_NAME = "AVOID_BRANCH_NAME";
 
-    static final String ARG_CLEAR_PASSWORD_CONTEXT_PARAMETERS = "CLEAR_PASSWORD_CONTEXT_PARAMETERS";
-
     static final String CMD_ARG_STATS_PORT_PARAM = "stat_port";
 
     static final String CMD_ARG_TRACE_PORT_PARAM = "trace_port";

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

@@ -1,32 +1,39 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.service;
-
-import java.util.Map;
-
-import org.talend.core.IService;
-import org.talend.utils.sugars.TypedReturnCode;
-
-public interface IAuditService extends IService {
-
-    public void populateAudit(String url, String driver, String user, String password);
-
-    public Map<String, String> generateAuditReport(String path);
-
-    public TypedReturnCode<java.sql.Connection> checkConnection(String version, String url, String driver, String user,
-            String password);
-
-    public Map<Integer, String> listAllHistoryAudits(String url, String driver, String user, String password);
-
-    public void populateHistoryAudit(Integer auditId, String url, String driver, String user, String password);
-}
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.service;
+
+import java.util.Map;
+
+import org.talend.core.IService;
+import org.talend.utils.sugars.TypedReturnCode;
+
+/**
+ *
+ * created by hcyi on May 10, 2018 Detailled comment
+ *
+ */
+public interface ICommandLineService extends IService{
+
+    public void populateAudit(String url, String driver, String user, String password);
+
+    public Map<String, String> generateAuditReport(String path);
+
+    public boolean generateAuditReport(String path, String template);
+
+    public TypedReturnCode<java.sql.Connection> checkConnection(String version, String url, String driver, String user,
+            String password);
+
+    public Map<Integer, String> listAllHistoryAudits(String url, String driver, String user, String password);
+
+    public void populateHistoryAudit(Integer auditId, String url, String driver, String user, String password);
+}

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

@@ -1,27 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.service;
-
-import org.talend.core.IService;
-
-/**
- * Manage the download of sqlexplorer and top.chart jar files.
- */
-public interface IDQJarManagementService extends IService {
-
-    /**
-     * check and show the download page, this method should be called in TOP only.
-     */
-    public void checkSqlexplorerTopchartLibraries();
-
-}

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

@@ -34,8 +34,4 @@ public interface IRemoteService extends IService {
             LoginException, JSONException;
 
     boolean isAuthorized(String value);
-
-    boolean isTokenUsed(String adminUrl) throws Exception;
-
-    String getPendoKeyFromLicense() throws Exception;
 }

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

@@ -15,7 +15,6 @@ package org.talend.core.service;
 import java.net.URI;
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -28,6 +27,8 @@ import org.talend.core.model.general.Project;
  */
 public interface IStudioLiteP2Service extends IService {
 
+    public static final String PROP_USE_NEW_UPDATE_SYSTEM = "talend.studio.update.useNewUpdateSystem";
+
     public static final String CONFIG_STORAGE_FOLDER = "talend/studioLite/";
 
     public static final String BUNDLES_INFOS_STORAGE_FOLDER = CONFIG_STORAGE_FOLDER + "bundlesInfo/";
@@ -79,17 +80,6 @@ public interface IStudioLiteP2Service extends IService {
 
     int installRequiredFeatures(IProgressMonitor monitor, ValidateRequiredFeaturesHook hook, Project proj) throws Exception;
 
-    ValidateMergingFeaturesHook validateMergingFeatures(IProgressMonitor monitor, Project proj, Set<String> backupedFeaturesTempFiles) throws Exception;
-    
-    /**
-     * show merging features wizard
-     * 
-     * @return {@link IStudioLiteP2Service#RESULT_DONE}<br/>
-     * {@link IStudioLiteP2Service#RESULT_SKIP}<br/>
-     * {@link IStudioLiteP2Service#RESULT_CANCEL}<br/>
-     */
-    int showMergingFeaturesWizard(ValidateMergingFeaturesHook hook, Project proj) throws Exception;
-    
     /**
      * selected features will be write into the required feature list of project
      * 
@@ -106,22 +96,6 @@ public interface IStudioLiteP2Service extends IService {
 
     void setLocalPatches(Collection<String> localPatchUris) throws Exception;
 
-    URI toURI(String path) throws Exception;
-    
-    Set<String> getStudioInstalledFeatures(IProgressMonitor monitor, boolean includeTransitive) throws Exception;
-
-    void registCheckUpdateListener(AbsCheckUpdateListener listener) throws Exception;
-
-    void unregistCheckUpdateListener(AbsCheckUpdateListener listener) throws Exception;
-
-    void resetRestartParams();
-
-    void closingStudioGUI(boolean restart);
-
-    List<String> getCurrentProjectEnabledFeatures() throws Exception;
-
-    boolean checkProjectCompatibility(IProgressMonitor monitor, Project proj) throws Exception;
-
     public static IStudioLiteP2Service get() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IStudioLiteP2Service.class)) {
             return GlobalServiceRegister.getDefault().getService(IStudioLiteP2Service.class);
@@ -129,16 +103,14 @@ public interface IStudioLiteP2Service extends IService {
         return null;
     }
 
-    public static abstract class AbsCheckUpdateListener {
-
-        abstract public void beforeCheckUpdate(IProgressMonitor monitor) throws Exception;
-
-    }
-
     public static interface IInstallableUnitInfo {
 
+        String getName();
+
         String getId();
 
+        List<String> getRequired();
+
     }
 
     public static interface CheckUpdateHook {
@@ -159,6 +131,7 @@ public interface IStudioLiteP2Service extends IService {
         Collection<?> getUninstalledIUs();
 
         boolean performUpdate(IProgressMonitor monitor) throws Exception;
+
     }
 
     public static interface ValidatePotentialFeaturesHook {
@@ -176,15 +149,6 @@ public interface IStudioLiteP2Service extends IService {
         List<IInstallableUnitInfo> getMissingRequiredFeatures();
 
     }
-    
-    public static interface ValidateMergingFeaturesHook {
-
-        boolean showWizard();
-
-        Set<IInstallableUnitInfo> getNewlyActivatedFeatures();
-        Set<IInstallableUnitInfo> getDeActivatedFeatures();
-
-    }
 
     public static interface UpdateSiteConfig {
 
@@ -200,43 +164,6 @@ public interface IStudioLiteP2Service extends IService {
 
         void setUpdates(IProgressMonitor monitor, Collection<URI> uris) throws Exception;
 
-        void resetToDefault(IProgressMonitor monitor) throws Exception;
-
-    }
-    
-    
-    Set<IInstallableUnitInfo> calAllRequiredFeature(IProgressMonitor monitor, String projectPath, boolean isFilteByLicense) throws Exception;
-    
-    public boolean showMissingFeatureWizard(IProgressMonitor monitor, Set<IInstallableUnitInfo> requiredFeatureSet) throws Exception;
-
-    public static abstract class AbsStudioLiteP2Exception extends Exception {
-
-        public final static String ERR_CODE_UPDATE_REQUIRED = "UPDATE_REQUIRED";
-
-        private String errorCode;
-
-        /**
-         * if it is a critical issue which need to break/forbid the process
-         */
-        private boolean breakProcess = false;
-
-        public AbsStudioLiteP2Exception(String errCode, String errMessage) {
-            super(errMessage);
-            this.errorCode = errCode;
-        }
-
-        public String getErrorCode() {
-            return this.errorCode;
-        }
-
-        public void setBreakProcess(boolean breakProcess) {
-            this.breakProcess = breakProcess;
-        }
-
-        public boolean needBreakProcess() {
-            return breakProcess;
-        }
-
     }
 
 }

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

@@ -20,7 +20,9 @@ public interface IUpdateService extends IService {
     boolean checkComponentNexusUpdate();
     
     public boolean syncSharedStudioLibraryInPatch(IProgressMonitor monitor) throws Exception;
-
+    
+    public String getSharedStudioMissingPatchVersion();
+    
     public boolean updateArtifactsFileSha256Hex(IProgressMonitor monitor, String studioArtifactsFileShaCodeHex);
 
     public void checkThirdPartyLibraries();

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/sqlbuilder/util/TextUtil.java

@@ -262,8 +262,9 @@ public class TextUtil {
     public static boolean isDoubleQuotesNeededDbType(String dbType) {
         boolean isPostgresql = dbType.equalsIgnoreCase(EDatabaseTypeName.PSQL.getXmlName());
         boolean isGreenplum = dbType.equalsIgnoreCase(EDatabaseTypeName.GREENPLUM.getXmlName());
+        boolean isParaccel = dbType.equalsIgnoreCase(EDatabaseTypeName.PARACCEL.getXmlName());
         boolean isH2 = dbType.equalsIgnoreCase(EDatabaseTypeName.H2.getXmlName());
-        return isPostgresql || isGreenplum || isH2;
+        return isPostgresql || isGreenplum || isParaccel || isH2;
     }
 
     /**

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

@@ -12,9 +12,6 @@
 // ============================================================================
 package org.talend.core.ui;
 
-import java.io.IOException;
-
-import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.runtime.maven.MavenArtifact;
 
@@ -28,15 +25,4 @@ public interface IInstalledPatchService extends IService {
 	
     public MavenArtifact getLastIntalledP2Patch();
 
-    void updatePatchInstalled(String installedName, String installedVersion, String comment) throws IOException;
-
-    String getLatestInstalledPatchVersion();
-
-    public static IInstalledPatchService get() {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IInstalledPatchService.class)) {
-            return GlobalServiceRegister.getDefault().getService(IInstalledPatchService.class);
-        }
-        return null;
-    }
-
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/branding/IBrandingService.java

@@ -50,10 +50,6 @@ public interface IBrandingService extends IService {
 
     public boolean isPoweredOnlyCamel();
 
-    public default boolean isCloudLicense() {
-        return false;
-    }
-
     public String getStartingBrowserId();
 
     public URL getStartingHtmlURL();

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/utils/TalendCacheUtils.java

@@ -15,6 +15,8 @@ package org.talend.core.utils;
 import org.apache.commons.lang.ArrayUtils;
 import org.eclipse.core.runtime.Platform;
 import org.talend.commons.utils.system.EclipseCommandLine;
+import org.talend.core.BrandingChecker;
+import org.talend.core.model.utils.TalendPropertiesUtil;
 
 /**
  * DOC ggu class global comment. Detailled comment <br/>
@@ -35,8 +37,7 @@ public final class TalendCacheUtils {
     }
 
     public static boolean cleanComponentCache() {
-        // return TalendPropertiesUtil.isCleanCache() || isSetCleanComponentCache() || isSetClean()
-        // || BrandingChecker.isBrandingChanged();
-        return Boolean.getBoolean("talend.clean.index");
+        return TalendPropertiesUtil.isCleanCache() || isSetCleanComponentCache() || isSetClean()
+                || BrandingChecker.isBrandingChanged();
     }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/utils/TalendQuoteUtils.java

@@ -264,40 +264,6 @@ public final class TalendQuoteUtils {
         }
     }
 
-    public static boolean isStartEndsWithQuotation(String expression, boolean checkStart, boolean checkEnd) {
-        if (StringUtils.isBlank(expression)) {
-            return false;
-        }
-        boolean startsWith = false;
-        boolean endsWith = false;
-
-        ECodeLanguage language = LanguageManager.getCurrentLanguage();
-        switch (language) {
-        case JAVA:
-            startsWith = expression.startsWith(QUOTATION_MARK);
-            endsWith = expression.endsWith(QUOTATION_MARK);
-            if (checkStart && checkEnd) {
-                return startsWith & endsWith;
-            } else if (checkStart) {
-                return startsWith;
-            } else if (checkEnd) {
-                return endsWith;
-            }
-        default: // PERL
-            startsWith = expression.startsWith(SINGLE_QUOTE);
-            endsWith = expression.endsWith(SINGLE_QUOTE);
-            if (checkStart && checkEnd) {
-                return startsWith & endsWith;
-            } else if (checkStart) {
-                return startsWith;
-            } else if (checkEnd) {
-                return endsWith;
-            }
-        }
-
-        return false;
-    }
-
     public static String removeQuotes(String text, String quotation) {
         if (text == null) {
             return null;
@@ -438,6 +404,8 @@ public final class TalendQuoteUtils {
             return QUOTATION_MARK;
         case IBMDB2:
             return QUOTATION_MARK;
+        case INGRES:
+            return QUOTATION_MARK;
         case MSODBC:
             return QUOTATION_MARK;
         case MSSQL:
@@ -451,12 +419,15 @@ public final class TalendQuoteUtils {
             return QUOTATION_MARK;
         case PSQL:
         case GREENPLUM:
+        case PARACCEL:
         case PLUSPSQL:
             return QUOTATION_MARK;
         case SYBASEASE:
             return QUOTATION_MARK;
         case SYBASEIQ:
             return QUOTATION_MARK;
+        case INTERBASE:
+            return QUOTATION_MARK;
         case SQLITE:
             return QUOTATION_MARK;
         case FIREBIRD:
@@ -469,8 +440,6 @@ public final class TalendQuoteUtils {
             return QUOTATION_MARK;
         case H2:
             return QUOTATION_ESC_MARK;
-        case SNOWFLAKE:
-            return QUOTATION_MARK;
             // case JAVADB_DERBYCLIENT:
             // return QUOTATION_MARK;
             // case JAVADB_JCCJDBC:

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

@@ -94,8 +94,6 @@ public final class ProjectManager {
     private Set<Object> updatedRemoteHandlerRecords;
 
     private Set<Project> tempProjects;
-    
-    private static final Map<String, String> projectLabelWithOriginVersion = new HashMap<String, String> ();
 
     private WeakHashMap<IRepositoryViewObject, Boolean> cachedObjects = new WeakHashMap<IRepositoryViewObject, Boolean>();
 
@@ -737,7 +735,6 @@ public final class ProjectManager {
      */
     public void clearAll() {
         mapProjectUrlToBranchUrl.clear();
-        projectLabelWithOriginVersion.clear();
         clearFolderCache();
     }
 
@@ -835,9 +832,4 @@ public final class ProjectManager {
 		}
 		return null;
 	}
-
-    
-    public Map<String, String> getProjectLabelWithOriginVersion() {
-        return projectLabelWithOriginVersion;
-    }	
 }

main/plugins/org.talend.core.ui/plugin_fr.properties

@@ -1,5 +1,5 @@
 Metadata=M\u00E9tadonn\u00E9es
-TalendDataCollector=Collecteur de donn\u00E9es d'utilisation
+TalendDataCollector=Collection des donn\u00E9es d'utilisation
 TalendDataCollectorPreview=Aper\u00E7u
 TalendDataCollectorUploading=Chargement
 prefs=Talend

main/plugins/org.talend.core.ui/plugin_ja.properties

@@ -1,5 +1,5 @@
 Metadata=\u30E1\u30BF\u30C7\u30FC\u30BF
-TalendDataCollector=\u4F7F\u7528\u72B6\u6CC1\u30C7\u30FC\u30BF\u30B3\u30EC\u30AF\u30BF\u30FC
+TalendDataCollector=\u30C7\u30FC\u30BF\u30B3\u30EC\u30AF\u30BF\u306E\u4F7F\u7528\u65B9\u6CD5
 TalendDataCollectorPreview=\u30D7\u30EC\u30D3\u30E5\u30FC
 TalendDataCollectorUploading=\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u4E2D
 prefs=Talend

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.ui</artifactId>
@@ -30,17 +30,17 @@
 								<artifactItem>
 									<groupId>com.github.oshi</groupId>
 									<artifactId>oshi-core</artifactId>
-									<version>5.8.3</version>
+									<version>5.2.5</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>net.java.dev.jna</groupId>
 									<artifactId>jna</artifactId>
-									<version>5.9.0</version>
+									<version>5.6.0</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>net.java.dev.jna</groupId>
 									<artifactId>jna-platform</artifactId>
-									<version>5.9.0</version>
+									<version>5.6.0</version>
 								</artifactItem>
 							</artifactItems>
 						</configuration>

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

@@ -1,67 +1,69 @@
-AbstractBrandingService_job_license_header_content=Copyright (c) 2005-2011, Talend SA.\n//\n// Ce code source a \u00E9t\u00E9 automatiquement g\u00E9n\u00E9r\u00E9 par_\n\n// (CodeGenerator version{0}\n// Vous pouvez trouver plus d'informations \u00E0 propos des produits Talend sur https://www.talend.com/\nfr/. {1}// Vous pouvez distribuer ce code suivant les termes de la licence\nGNU LGPL\n// http://www.gnu.org/licenses/lgpl.\nhtml\n).
-AbstractBrandingService.routines_license_header_content=Copyright (c) 2006-2014, Talend SA.\n//\n// Ce code source a \u00E9t\u00E9 automatiquement g\u00E9n\u00E9r\u00E9 par_{0}\n// (CodeGenerator version {1}\n// Vous pouvez trouver plus d'informations \u00E0 propos des produits Talend sur https://www.talend.com/fr/.\n// Vous pouvez distribuer ce code suivant les termes de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).
+AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2011, Talend Inc.\n//\n// Ce code source a \u00E9t\u00E9 automatiquement g\u00E9n\u00E9r\u00E9 par_{0}\n// / JobDesigner (CodeGenerator version {1})\n// Vous pouvez trouver plus d'informations \u00E0 propos des produits Talend \u00E0 www.talend.com.\n// Vous pouvez distribuer ce code suivant les termes de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
+AbstractBrandingService.routines_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2011, Talend Inc.\n//\n// Ce code source a \u00E9t\u00E9 automatiquement g\u00E9n\u00E9r\u00E9 par_{0}\n// / JobDesigner (CodeGenerator version {1})\n// Vous pouvez trouver plus d'informations \u00E0 propos des produits Talend \u00E0 www.talend.com.\n// Vous pouvez distribuer ce code suivant les termes de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
 AbstractComponentsProvider.folderNotExist=Le dossier {0} n'existe pas.
-AbstractItemMigrationTask.taskFailed=La t\u00E2che de migration {0} a \u00E9chou\u00E9 \u00E0 l'\u00E9l\u00E9ment {1}
-AdvancedSocketFactory.failedInitial=Erreur : impossible d'initialiser :
+AbstractItemMigrationTask.taskFailed=La t\u00E2che de migration {0} a \u00E9chou\u00E9 sur l'\u00E9l\u00E9ment {1}
+AdvancedSocketFactory.failedInitial=Erreur. Impossible d'initialiser :
 ArchiveFileExportOperationFullPath.SpecialFile=spagic.properties
-ColumnNameChangedExt.columnChanged=N\u0153ud : {0}   Colonne modifi\u00E9e : {1}-> {2}
+ColumnNameChangedExt.columnChanged=N\u0153ud : {0} Colonne modifi\u00E9e : {1}-> {2}
 ComponentsFormatPreferencePage.add=Ajouter
-ComponentsFormatPreferencePage.errorCreateConnectionName=Le nom "{0}" n'est pas valide.
-ComponentsFormatPreferencePage.formatConnection=Format de connexion par d\u00E9faut :
-ComponentsFormatPreferencePage.formatHint=Format de l'astuce par d\u00E9faut :
+ComponentsFormatPreferencePage.errorCreateConnectionName=Le nom "{0}" est invalide.
+ComponentsFormatPreferencePage.formatConnection=Format de connection par d\u00E9faut:
+ComponentsFormatPreferencePage.formatHint=Format astuce par d\u00E9faut :
 ComponentsFormatPreferencePage.formatLable=Format du libell\u00E9 par d\u00E9faut :
-ComponentsFormatPreferencePage.remove=Supprimer
-ComponentsFormatPreferencePage.ErrorTitle=Erreur
-ComponentToRepositoryProperty.error=Erreur
+ComponentsFormatPreferencePage.remove=Remove
+ComponentsFormatPreferencePage.ErrorTitle=ERROR
+ComponentToRepositoryProperty.error=ERROR
 ComponentToRepositoryProperty.ImpossibleUseOCI=Impossible d'utiliser le type OCI dans le r\u00E9f\u00E9rentiel.
-ContextComposite.tableValue=Valeurs en table
-ContextComposite.treeValue=Valeurs en arbre
+ContextComposite.tableValue=Table des valeurs
+ContextComposite.treeValue=Arbre des valeurs
 ContextComposite.variable=Variables
-ContextValueErrorChecker.ErrorTitile=Erreur de la valeur de contexte\u00A0:
+ContextParameterProposal.ContextVariable=\n\nVariable de contexte.
+ContextParameterProposal.Description=Description :{0}
+ContextValueErrorChecker.ErrorTitile=Erreur de la valeur de contexte :
+ContextParameterProposal.NoCommentAvaiable=pas de commentaire disponible.
+ContextParameterProposal.Type=\nType\: {1}
+ContextParameterProposal.VariableName=\n\nNom de la variable\: {2}
 ContextProcessSection.1=menuTable
 ContextProcessSection.12=Renommer le contexte
-ContextProcessSection.13=Donner un nouveau nom au contexte {0}
+ContextProcessSection.13=Nouveau nom pour le contexte {0}
 ContextProcessSection.2=Demander confirmation ?
-ContextProcessSection.29=Erreur
+ContextProcessSection.29=ERROR
 ContextProcessSection.30=Ce nom existe d\u00E9j\u00E0
-ContextProcessSection.4=Ajouter un contexte \u00E0 partir de ->(
+ContextProcessSection.4=Ajouter un nouveau contexte \u00E0 partir de ->(
 ContextProcessSection.49=Contexte par d\u00E9faut
 ContextProcessSection.50=ContextProcessSection.14
 ContextProcessSection.51=ContextProcessSection.15
 ContextProcessSection.6=Nouveau contexte
-ContextProcessSection.7=Nommez le nouveau contexte
-ContextProcessSection.ParameterNameIsNotValid=Le nom du param\u00E8tre est invalide.
+ContextProcessSection.7=Nommer le nouveau contexte
+ContextProcessSection.ParameterNameIsNotValid=Le nom de param\u00E8tre n'est pas valide.
 ContextProcessSection.RemoveInformation={0} est le contexte par d\u00E9faut et ne peut \u00EAtre supprim\u00E9.
-ContextProcessSection.errorTitle=Erreur
+ContextProcessSection.errorTitle=ERROR
 ConextTableValuesComposite.nameLabel=Nom
 ConextTemplateComposite.OrderMessages=Si vous souhaitez r\u00E9organiser les variables, cela doit \u00EAtre s\u00E9lectionn\u00E9.
 ConextTemplateComposite.OrderText=Ordre d'origine
 ContextSetConfigurationDialog.nameNotValid=le nom est invalide
 ContextTemplateComposite.CommentLabel=Commentaire
 ContextTemplateComposite.nameLabel=Nom
-ContextTemplateComposite.scriptCodeLabel=Code script
+ContextTemplateComposite.scriptCodeLabel=Code du script
 ContextTemplateComposite.sourceLabel=Source
 ContextTemplateComposite.typeLabel=Type
 ContextTreeConstants.contextName=Contexte
-ContextTreeConstants.promptName=Prompt
+ContextTreeConstants.promptName=Invite
 ContextTreeConstants.valueName=Valeur
 ContextTreeConstants.variableName=Variable
 ConextTemplateComposite.addToRepositoryContextAction.label=Ajouter au contexte du r\u00E9f\u00E9rentiel
 CorePreferencePage.componentDefaultFileDirectory=R\u00E9pertoire par d\u00E9faut des composants
-CorePreferencePage.groupBySource="Regrouper par source" en contexte
+CorePreferencePage.groupBySource="regrouper par source" en contexte
 CorePreferencePage.iReportPath=Chemin d'acc\u00E8s iReport
-CorePreferencePage.alwaysWelcome.v2=Toujours afficher la vue Bienvenue lors du d\u00E9marrage
-CorePreferencePage.alwaysAskAtStartup=Toujours afficher la fen\u00EAtre des projets lors du d\u00E9marrage
 CorePreferencePage.javaInterpreter=Interpr\u00E9teur &Java
 CorePreferencePage.perlInterpreter=Interpr\u00E9teur Perl
-CorePreferencePage.previewLimit=Limite de l'aper\u00E7u
+CorePreferencePage.previewLimit=Aper\u00E7u limite
 CorePreferencePage.runInMultiThread=Ex\u00E9cution multi thread (valeur par d\u00E9faut lors de la cr\u00E9ation d'un Job)
 CorePreferencePage.temporaryFiles=Fichiers &temporaires
 DbTableSelectorDialog.textContent=Choisir le nom de la table
 ECodeLanguage.unknowLanguage=Langage inconnu
-EComponentCategory_advanceSetting=Param\u00E8tres avanc\u00E9s
 EComponentCategory_appearance=Apparence
-EComponentCategory_assignment=Attribution
+EComponentCategory_assignment=Affectation
 EComponentCategory_basicSetting=Param\u00E8tres simples
 EComponentCategory_context=Contexte
 EComponentCategory_doc=Documentation
@@ -69,34 +71,34 @@ EComponentCategory_dynamicSetting=Param\u00E8tres dynamiques
 EComponentCategory_errorRecovery=Reprise sur erreur
 EComponentCategory_extra=Extra
 EComponentCategory_logs=Logs
-EComponentCategory_main=Principal
+EComponentCategory_main=Main
 EComponentCategory_properties=Propri\u00E9t\u00E9s
-EComponentCategory_rulerAndGrid=Rulers & Grid
 EComponentCategory_sqlTemplate=Mod\u00E8le SQL
 EComponentCategory_statsAndLogs=Stats & Logs
+EComponentCategory_svnHistory=Historique SVN
 EComponentCategory_technical=Technique
 EComponentCategory_version=Version
 EComponentCategory_headerFooter=En-t\u00EAte/Pied de page
-EComponentCategory_view=Vue
+EComponentCategory_view=View
 EComponentCategory.advancedSettings=Param\u00E8tres avanc\u00E9s
 EComponentCategory.basicRun=Ex\u00E9cution simple
 EComponentCategory.breakpoint=Point d'arr\u00EAt
-EComponentCategory.debugRun=Ex\u00E9cution en mode Debug
-EComponentCategory.targetExec=Cible d'ex\u00E9cution
-EConnectionType.iteratorMenu=It\u00E9rer
-EConnectionType.lookupMenu=Rechercher
-EConnectionType.mainMenu=Principal
+EComponentCategory.debugRun=Ex\u00E9cution Debug
+EComponentCategory.targetExec=Ex\u00E9c distante
+EConnectionType.iteratorMenu=Iterate
+EConnectionType.lookupMenu=Look Up
+EConnectionType.mainMenu=Main
 EConnectionType.onComponentErrorMenu=On Component Error
 EConnectionType.onComponentOkMenu=On Component Ok
 EConnectionType.onSubjobErrorMenu=On Subjob Error
 EConnectionType.onSubjobOkMenu=On Subjob Ok
-EConnectionType.runAfterMenu=Run After
+EConnectionType.runAfterMenu=Ex\u00E9cuter apr\u00E8s
 EConnectionType.runIfMenu=Run if
 EConnectionType.tableMenu=Table
-EConnectionType.onRowsEndMenu=On Rows End
+EConnectionType.onRowsEndMenu=\u00C0 la fin des lignes
 EConnectionType.mergeMenu=Merge
-EConnectionType.synchronize=Synchronize
-EConnectionType.parallelize=Parallelize
+EConnectionType.synchronize=Synchroniser
+EConnectionType.parallelize=Parall\u00E9liser
 EMetadataEncoding.Arabic=Arabe
 EMetadataEncoding.Big5=Big-5 (Chinois traditionnel)
 EMetadataEncoding.Cyrillic=Cyrillique
@@ -105,204 +107,215 @@ EMetadataEncoding.GB18030=Chinois National Standard
 EMetadataEncoding.GB2312=Chinois
 EMetadataEncoding.Greek=Grec
 EMetadataEncoding.Hebrew=H\u00E9breu
-EMetadataEncoding.Latin1=Latin1 (Europe de l'Ouest)
-EMetadataEncoding.Latin2=Latin2 (Europe de l'Est)
-EMetadataEncoding.Latin3=Latin3 (Europe du Sud)
-EMetadataEncoding.Latin4=Latin4 (Europe du Nord)
+EMetadataEncoding.Latin1=Latin1 (Europe de l'ouest)
+EMetadataEncoding.Latin2=Latin2 (Europe de l'est)
+EMetadataEncoding.Latin3=Latin3 (Europe du sud)
+EMetadataEncoding.Latin4=Latin4 (Europe du nord)
 EMetadataEncoding.Latin5=Latin5 (Turc)
 EMetadataEncoding.Latin6=Latin6 (Nordique)
 EMetadataEncoding.Microsoft_Latin1=Microsoft (Latin-1)
-EMetadataEncoding.UTF16=Unicode 2.0 (16 bits)
-EMetadataEncoding.UTF16BE=Unicode BigEndian (16 bits)
-EMetadataEncoding.UTF16LE=Unicode (16 bits)
+EMetadataEncoding.UTF16=Unicode 2.0 (16 bit)
+EMetadataEncoding.UTF16BE=Unicode BigEndian (16 bit)
+EMetadataEncoding.UTF16LE=Unicode (16 bit)
 EMetadataEncoding.UTF7=Unicode 2.0 UTF-7
 EMetadataEncoding.UTF8=Unicode 2.0 UTF-8
 ERepositoryObjectType.FolderNotFound=Impossible de trouver le dossier pour le type {0}.
 ERepositoryObjectType.NotImplemented=non impl\u00E9ment\u00E9
 ExtractMetaDataFromDataBase.SchemaNoPresent=Le sch\u00E9ma n'est pas dans la base de donn\u00E9es
-ExtractMetaDataFromDataBase.connectionSuccessful=Connexion r\u00E9ussie
+ExtractMetaDataFromDataBase.connectionSuccessful=Connexion \u00E9tablie
 ExtractMetaDataFromDataBase.dbTypeNotFound=dbType '{0}' non trouv\u00E9
-ExtractMetaDataUtils.1=Impossible d'initialiser la connexion.
+ExtractMetaDataUtils.1=Impossible d'initialiser la connexion
 Function.FunctionName=Nom de la fonction {0}
-FunctionManager.PurePerl.Desc=Configurez votre expression.
-FunctionManager.PurePerl.ParaName=personnaliser le param\u00E8tre
+FunctionManager.PurePerl.Desc=D
+FunctionManager.PurePerl.ParaName=Param\u00E8tre personnalis\u00E9
 GlobalServiceRegister.ServiceNotRegistered=Le service {0} n'a pas \u00E9t\u00E9 enregistr\u00E9.
 GroupByContextAction.groupContext=Grouper par contexte
 GroupByVariableAction.groupVariable=Grouper par variable
-JavaFunctionParser.checkMethod=Routines\u00A0: "{0}.{1}" \u00E9chec de l'analyse. V\u00E9rifiez la M\u00E9thode.
-JavaGlobalVariableProposal.Description=Description : {0}
-JavaGlobalVariableProposal.VariableName=\n\nNom de la variable : {1}
-JavaSimpleDateFormatProposalProvider.displaySingleQuote= ' : affiche un guillemet simple
+JavaGlobalVariableProposal.Description=Description\: {0}
+JavaGlobalVariableProposal.VariableName=\n\nNom de la variable\: {1}
+JavaSimpleDateFormatProposalProvider.displaySingleQuote=\ ' : affiche un guillemet simple
 JavaSimpleDateFormatProposalProvider.quoteDisplayError=Deux apostrophes affichent uniquement une seule apostrophe
-JavaTypesManager.bigDecimal=BIGDECIMAL est nombre :
-JavaTypesManager.integer=INTEGER est nombre :
-JavaTypesManager.list=LIST est nombre :
-JavaTypesManager.string=STRING est nombre :
-LDAPCATruster.failedCreateCert=Impossible de cr\u00E9er le stockage du certificat
-LDAPCATruster.failedCreateTmp=Impossible de cr\u00E9er le
-LDAPCATruster.failedInitialTrust=\u00C9chec de cr\u00E9ation du gestionnaire de confiance initial :
-LDAPCATruster.failedLoadCert=Impossible de charger le stockage des certificats :
-LDAPCATruster.failedSaveTrust=Impossible de sauvegarder le Trust Store :
-LDAPCATruster.locationInvalid=L'emplacement du fichier du store de certificat est invalide :
-LDAPCATruster.noCertificate=\nUtilisez la commande Keytool pour importer le certificat du serveur.
+JavaTypesManager.bigDecimal=BIGDECIMAL est un nombre :
+JavaTypesManager.integer=INTEGER est un nombre :
+JavaTypesManager.list=LIST est un nombre :
+JavaTypesManager.string=STRING est un nombre :
 LDAPCATruster.sslError1=Erreur SSL : \u00E9chec de la v\u00E9rification de la cha\u00EEne de certification du serveur.
-LDAPCATruster.sslError2=Erreur SSL : \u00E9chec de la v\u00E9rification de la cha\u00EEne de certification du serveur et \\n l'autorit\u00E9 de certification est manquante.
-LDAPCATruster.sslError3=Erreur SSL : l'autorit\u00E9 de certification n'est pas dans la cha\u00EEne de certification du serveur.
-ListPreferencePage.RemoveButtonName=Supprimer
-LogImageCacheAction.CacheImage=Image du cache\u00A0:
-LogImageCacheAction.CacheImageDesc=Desc. de l'image du cache\u00A0:
-MappingFileLoader.DbTypeAlreadyExists=Dans le mapping d'ID "{0}" du SGBD, le type de BdD "{1}"  appara\u00EEt plus d'une fois dans le fichier "{2}"  dans le n\u0153ud\u00A0:{3}
-MappingFileLoader.DbmsIdAlreadyExists=Le SGBD d'ID "{0}" existe d\u00E9j\u00E0."
-MappingFileLoader.InvalidTalendType="{0}" n'est pas un type Talend valide {1} pour le SGBD d'ID "{2}" dans le n\u0153ud : {3}
-MappingFileLoader.UnbindedDbTypes=Dans le fichier de mapping du SGBD d'ID "{0}"," les types de BdD ci-dessous ne sont pas li\u00E9s avec les types Talend "{1}" : {2}
-MappingFileLoader.UnbindedTalendTypes=Dans le fichier de mapping du SGBD d'ID "{0}"," les types Talend ci-dessous ne sont pas li\u00E9s avec les types de BdD "{1}" : {2}
-MappingFileLoader.UndeclaredDbType="{0}" n'est pas un type de BdD d\u00E9clar\u00E9 pour le SGBD d'ID "{1}" dans le n\u0153ud : {2}
-MetadataTableEditorView.UsefulTitle=Colonne utilis\u00E9e
+ListPreferencePage.RemoveButtonName=Remove
+LogImageCacheAction.CacheImage=Image du cache :
+LogImageCacheAction.CacheImageDesc=Desc. de l'image du cache :
+MappingFileLoader.DbTypeAlreadyExists=Dans le mapping du SGBD d'ID "{0}", le type de base de donn\u00E9es "{1}" appara\u00EEt plus d'une fois dans le fichier "{2}" au n\u0153ud\:{3}
+MappingFileLoader.DbmsIdAlreadyExists=Le SGBD d'ID "{0}" existe d\u00E9j\u00E0.
+MappingFileLoader.InvalidTalendType="{0}" n'est pas un type Talend {1} valide pour le SGBD d'ID "{2}" au n\u0153ud\: {3}
+MappingFileLoader.UnbindedDbTypes=Dans le fichier de mapping du SGBD d'ID "{0}", les types de bases de donn\u00E9es ne sont pas li\u00E9s aux types Talend "{1}"\: {2}
+MappingFileLoader.UnbindedTalendTypes=Dans le fichier de mapping du SGBD d'ID "{0}", les types Talend ne sont pas li\u00E9s aux types de bases de donn\u00E9es "{1}"\: {2}
+MappingFileLoader.UndeclaredDbType="{0}" n'est pas un type de base de donn\u00E9es d\u00E9clar\u00E9 pour le SGBD d'ID "{1}" au n\u0153ud\: {2}
+MetadataDialog.CopyToInput.toolTipText=Copie  tout le sch\u00E9ma de sortie vers le sch\u00E9ma d'entr\u00E9e
+MetadataDialog.CopySelectionToInput.toolTipText=Copie de colonnes de sch\u00E9ma de sortie vers sch\u00E9ma d'entr\u00E9e
+MetadataDialog.CopyToOutput=Copie tout le sch\u00E9ma d'entr\u00E9e vers le sch\u00E9ma de sortie
+MetadataDialog.CopySelectionToOutput=Copie les colonnes s\u00E9lectionn\u00E9es du sch\u00E9ma source vers le sch\u00E9ma cible
+MetadataDialog.Message=Toutes les colonnes du sch\u00E9ma d'entr\u00E9e seront transf\u00E9r\u00E9es au sch\u00E9ma de sortie
+MetadataDialog.SchemaModification=Modification de sch\u00E9ma
+MetadataDialog.TransferMessage=Toutes les colonnes du sch
+MetadataEmfTableEditor.ColumnNameExists=Le nom de colonne "{0}" existe d\u00E9j\u00E0
+MetadataEmfTableEditor.ColumnNameIsNullError=Erreur\: le nom de la colonne est null.
+MetadataTableEditor.ColumnNameExists=Le nom de colonne "{0}" existe d\u00E9j\u00E0.
+MetadataTableEditor.ColumnNameIsInvalid=Le nom de colonne "{0}" est invalide
 MetadataTableEditorView.ColumnTitle=Colonne
 MetadataTableEditorView.CommentTitle=Commentaire
-MetadataTableEditorView.OriginalLengthTitle=OriginalLength
-MetadataTableEditorView.DBTypeTitle=Type de BdD
-MetadataTableEditorView.DefaultTitle=Par d\u00E9faut
-MetadataTableEditorView.ValueTitle=Valeur
+MetadataTableEditorView.DBTypeTitle=Type de base de donn\u00E9es
+MetadataTableEditorView.DefaultTitle=D\u00E9faut
 MetadataTableEditorView.KeyTitle=Cl\u00E9
-MetadataTableEditorView.LengthTitle=Longueur
+MetadataTableEditorView.LengthTitle=Length
 MetadataTableEditorView.NullableTitle=Nullable
 MetadataTableEditorView.PatternTitle=Mod\u00E8le de date (Ctrl+Espace disponible)
-MetadataTableEditorView.PrecisionTitle=Pr\u00E9cision
+MetadataTableEditorView.PrecisionTitle=Precision
 MetadataTableEditorView.TypleTitle=Type
-MetadataTableEditorView.RelationshipType=Type de relation
-MetadataTableEditorView.RelatedEntity=Entit\u00E9 associ\u00E9e
-MetadataTalendType.dbIdNotFound=SGBD d'ID : {0} introuvable !
+MetadataTalendType.dbIdNotFound=ID du SGBD : impossible de trouver {0}.
 MetadataTalendType.DBMSNotSetted=SGBD non d\u00E9fini
-MetadataTool.errorMessage=Impossible de cr\u00E9er le caract\u00E8re courant.
+MetadataTalendTypeEditor.button.edit=E&dit
+MetadataTalendTypeEditor.button.export=E&xport
+MetadataTalendTypeEditor.button.import=I&mport
+MetadataTalendTypeEditor.editMappingDialog.title=Editer le fichier de mapping
+MetadataTalendTypeEditor.error.message=Message d'erreur
+MetadataTalendTypeEditor.fileIsImported=Le fichier a d\u00E9j\u00E0 \u00E9t\u00E9 import\u00E9.
+MetadataTalendTypeEditor.fileIsInvalid=Le fichier de m\u00E9tadonn\u00E9es import\u00E9 n'est pas valide.
+MetadataTalendTypeEditor.fileNameStartRule=Le nom de fichier doit commencer par 'mapping_'.
+MetadataTool.errorMessage=Impossible d'\u00E9crire le caract\u00E8re courant.
 MetadataTool.invalid=Valeur invalide
 MetadataTool.invalidChar=Caract\u00E8re invalide
 MetadataTool.nameNull=Le nom du sch\u00E9ma ne peut \u00EAtre null.
-MetadataTool.nullValue=Valeur nulle
+MetadataTool.nullValue=Valeur null
 MetadataTool.schemaExist=Le nom du sch\u00E9ma existe d\u00E9j\u00E0.
 MetadataTool.schemaIn=Le nom du sch\u00E9ma est invalide.
-MetadataTool.schemaInvalid=Le nom du sch\u00E9ma est invalide.
+MetadataTool.schemaInvalid=Nom de sch\u00E9ma invalide.
 MetadataTool.schemaNull=Le nom du sch\u00E9ma est null.
-PaletteContentDialog.connection=Format de connexion par d\u00E9faut :
-PaletteContentDialog.hint=Format de l'astuce par d\u00E9faut :
+NodeReturnProposal.Availability=\nDisponibilit\u00E9\: {4}
+NodeReturnProposal.Description=Description : {0}
+NodeReturnProposal.GlobalVariable=\n\nVariable globale, propri\u00E9t\u00E9 du composant {1} [{2}].
+NodeReturnProposal.Type=\nType\: {3}
+NodeReturnProposal.VariableName=\n\nNom de la variable\: {5}
+PaletteContentDialog.connection=Format de connection par d\u00E9faut:
+PaletteContentDialog.hint=Format astuce par d\u00E9faut :
 PaletteContentDialog.lable=Format du libell\u00E9 par d\u00E9faut :
-Parameter.Comment=      commentaire\u00A0:
+Parameter.Comment=\ commentaire \:
 Parameter.Name=Nom du param\u00E8tre
-Parameter.Type=      type\u00A0:
-Parameter.Value=      valeur\u00A0:
-PatternCalendar.dateFormat="yyyy-MM-dd HH:mm:ss"
+Parameter.Type=\ type \:
+Parameter.Value=\ valeur \:
+PatternCalendar.dateFormat="aaaa-MM-jj HH:mm:ss"
 PatternCalendar.example=Exemple :
 PatternCalendar.pattern=Mod\u00E8le :
-PerlDynamicProposalUtil.autoConvert= sera automatiquement converti en {0}->[index] dans le code g\u00E9n\u00E9r\u00E9
+PerlDynamicProposalUtil.autoConvert=\ sera automatiquement converti en {0}->[index] dans le code g\u00E9n\u00E9r\u00E9
 PerlGlobalVariableProposal.Description=Description : {0}
-PerlGlobalVariableProposal.VariableName=\n\nNom de la variable : {1}
+PerlGlobalVariableProposal.VariableName=\n\nNom de la variable\: {1}
 PerspectiveMenuManager.dummy=Factice
 PerspectiveMenuManager.perspectiveLabel=&Perspective
-ProcessorUtilities.finalizeBuild=Finaliser le build...
-ProcessorUtilities.generatingJob=G\u00E9n\u00E9ration du Job en cours...
-ProcessorUtilities.loadingJob=Chargement du Job en cours...
-PropertiesWizard.EditPropertiesPageTitle=Modifier les propri\u00E9t\u00E9s
-PropertiesWizard.alreadyLockedByUser=Les propri\u00E9t\u00E9s sont en lecture seule parce que cet \u00E9l\u00E9ment est verrouill\u00E9 par un \u00E9diteur.
-PropertiesWizardPage.Author=Cr\u00E9\u00E9 par :
-PropertiesWizardPage.Locker=Verrouill\u00E9 par
+ProcessorUtilities.generatingJob=G\u00E9n\u00E9ration du job en cours...
+ProcessorUtilities.loadingJob=Chargement du job en cours...
+PropertiesWizard.EditPropertiesPageTitle=Editer les propri\u00E9t\u00E9s
+PropertiesWizard.alreadyLockedByUser=Ces propri\u00E9t\u00E9s sont en lecture seule car elles sont verrouill\u00E9es par un \u00E9diteur.
+PropertiesWizardPage.Author=Auteur
+PropertiesWizardPage.Locker=Verrouill\u00E9 par :
 PropertiesWizardPage.Description=Description
 PropertiesWizardPage.EmptyDescWarning=Il est recommand\u00E9 de ne pas laisser le champ Description vide.
-PropertiesWizardPage.EmptyPurposeWarning=Il est d\u00E9conseill\u00E9 de laisser vide le champ Objectif.
-PropertiesWizardPage.ItemExistsError=Cet \u00E9l\u00E9ment existe d\u00E9j\u00E0. V\u00E9rifiez la Corbeille et videz-la si n\u00E9cessaire.
+PropertiesWizardPage.EmptyPurposeWarning=Il est recommand\u00E9 de ne pas laisser le champ Objectif vide.
+PropertiesWizardPage.ItemExistsError=Cet \u00E9l\u00E9ment existe d\u00E9j\u00E0. V\u00E9rifiez la corbeille et videz-la si besoin.
 PropertiesWizardPage.KeywordsError=Le nom n'est pas un identifiant valide.
 PropertiesWizardPage.Name=Nom
 PropertiesWizardPage.NameEmptyError=Le nom est vide.
 PropertiesWizardPage.NameFormatError=Le nom contient des caract\u00E8res incorrects.
-PropertiesWizardPage.Path=Chemin d'acc\u00E8s
+PropertiesWizardPage.Path=Chemin
 PropertiesWizardPage.Purpose=Objectif
 PropertiesWizardPage.Select=S\u00E9lectionner
-PropertiesWizardPage.SelectfolderMessage=S\u00E9lectionnez le dossier dans lequel l'\u00E9l\u00E9ment sera cr\u00E9\u00E9
-PropertiesWizardPage.SelectfolderTitle=S\u00E9lection du dossier
+PropertiesWizardPage.SelectfolderMessage=S\u00E9lectionner le dossier dans lequel l'\u00E9l\u00E9ment sera cr\u00E9\u00E9
+PropertiesWizardPage.SelectfolderTitle=S\u00E9lectionner dossier
 PropertiesWizardPage.Status=Statut
 PropertiesWizardPage.Version=Version
 PropertiesWizardPage.Version.Major=M
-PropertiesWizardPage.Version.Minor=m
+PropertiesWizardPage.Version.Minor=M
 PropertiesWizardPage.ImageSizeError=S\u00E9lectionnez une image de taille 32*32.
 RelationshipItemBuilder.buildingIndex=Construction de l'index...
-RelationshipItemBuilder.forItem=pour l'\u00E9l\u00E9ment
 RepositoryObject.NotImplemented=non impl\u00E9ment\u00E9
-RepositoryToComponentProperty.xmlFileSelection=S\u00E9lectionnez un fichier XML \u00E0 valider
+RepositoryToComponentProperty.xmlFileSelection=S\u00E9lectionner un fichier XML \u00E0 valider
 RepositoryUpdateManager.Title=Modification
 RepositoryUpdateManager.Check=V\u00E9rification...
-RepositoryUpdateManager.Messages=Voulez-vous propager les modifications \u00E0 tous les Jobs ? \n Cela peut prendre un moment.
+RepositoryUpdateManager.Messages=Propager les modifications \u00E0 tous les Jobs ? \n Cela peut prendre un moment.
 RepositoryUpdateManager.NoModificationTitle=Aucune modification n\u00E9cessaire
 RepositoryUpdateManager.NoModificationMessages=Aucune modification n\u00E9cessaire pour effectuer la mise \u00E0 jour.
 RepositoryUpdateManager.NotFoundMessages=Aucune relation \u00E0 trouver.
 RepositoryUpdateManager.NotFoundTitle=Introuvable
-RepositoryUpdateManager.RenameContextMessages=Souhaitez-vous r\u00E9ellement propager le renommage des variables \u00E0 tous les Jobs ? \n\n Si oui, la mise \u00E0 jour peut prendre un moment.\n\n\u00A0Si non, les anciennes variables passeront en mode built-in dans le Job.
+RepositoryUpdateManager.RenameContextMessages=Voulez-vous vraiment propager la variable renomm\u00E9e \u00E0 tous les Jobs ? \n\nSi oui, la mise \u00E0 jour peut prendre un moment. \n\n Si non, les anciennes variables seront pass\u00E9es en Built-In dans les Jobs.
 RepositoryUpdateManager.RenameContextTitle=Renommer la question
 RepositoryUpdateManager.ItemsToUpdate=V\u00E9rification des \u00E9l\u00E9ments \u00E0 mettre \u00E0 jour
-RuleOperationChoiceDialog.editRules=\u00C9diter les r\u00E8gles
+RoutinesFunctionProposal.CreatedBy=Cr\u00E9\u00E9 par\:
+RoutinesFunctionProposal.Description=Description\:
+RoutinesFunctionProposal.ReturnType=Retourner le type\:
+RoutinesFunctionProposal.System=System
+RoutinesFunctionProposal.User=Utilisateur
+RoutinesFunctionProposal.VariableName=\n\nNom de la variable\: {2}
+RuleOperationChoiceDialog.editRules=Editer les r\u00E8gles
 RuleOperationChoiceDialog.rule=R\u00E8gle :
-RuleOperationChoiceDialog.selectRulesFile=S\u00E9lectionner une r\u00E8gle depuis un fichier
+RuleOperationChoiceDialog.selectRulesFile=S\u00E9lectionner un r\u00E8gle depuis un fichier
 RuleOperationChoiceDialog.viewRules=Voir les r\u00E8gles (lecture seule)
 SchemaCellEditor.giveSchemaName=Donner le nom pour le sch\u00E9ma
 SchemaCellEditor.inputName=Saisir le nom
-SchemaCellEditor.nameExistOrInvalid=Le nom existe d\u00E9j\u00E0 ou est invalide
-SchemaCellEditor.schemaName=Nom du sch\u00E9ma
+SchemaCellEditor.nameExistOrInvalid=Ce nom existe d\u00E9j\u00E0 ou est invalide
+SchemaCellEditor.schemaName= Nom du sch\u00E9ma
 SchemaOperationChoiceDialog.ChangeBuiltInMessage=Changer le sch\u00E9ma en Built-In.
 SchemaOperationChoiceDialog.ChangeRepositoryMessage=Modifier le sch\u00E9ma \u00E0 partir du R\u00E9f\u00E9rentiel.
-SchemaOperationChoiceDialog.CreateBuiltInMessage=Cr\u00E9er un sch\u00E9ma Built-In.
+SchemaOperationChoiceDialog.CreateBuiltInMessage=Cr\u00E9er un sch\u00E9ma Built-In
 SchemaOperationChoiceDialog.CreateRepositoryMessage=Cr\u00E9er un sch\u00E9ma \u00E0 partir du R\u00E9f\u00E9rentiel.
-SchemaOperationChoiceDialog.EditSchemaMessage=Modifier le sch\u00E9ma
-SchemaOperationChoiceDialog.Message=S\u00E9lectionnez une option ou annulez.
+SchemaOperationChoiceDialog.EditSchemaMessage=Modifier le sch\u00E9ma.
+SchemaOperationChoiceDialog.Message=Choisissez une option, ou annulez
 SchemaOperationChoiceDialog.Option=Option
 SchemaOperationChoiceDialog.StatusMessage=Le sch\u00E9ma est invalide, ou il existe d\u00E9j\u00E0.
 SchemaOperationChoiceDialog.Title=Sch\u00E9ma
 SchemaOperationChoiceDialog.ViewSchemaMessage=Voir le sch\u00E9ma (lecture seule)
 SchemaXPathQuerysDialog.Mappings=Correspondances
 SelectRepositoryContextDialog.DeselectAll=D\u00E9s\u00E9lectionner tout
-SelectRepositoryContextDialog.CollapseAll=Tout r\u00E9duire
+SelectRepositoryContextDialog.CollapseAll=D\u00E9velopper tout
 SelectRepositoryContextDialog.DuplicationMessage=Vous avez s\u00E9lectionn\u00E9 la variable "{0}" dans le contexte "{1}".
-SelectRepositoryContextDialog.DuplicationTitle=Avertissement de duplication !
-SelectRepositoryContextDialog.ExistenceMessage=La variable "{0}" existe dans le Job (Context :"{1}").
-SelectRepositoryContextDialog.Label=S\u00E9lectionner les variables des contextes du r\u00E9f\u00E9rentiel.
-SelectRepositoryContextDialog.SelectAll=Tout s\u00E9lectionner
-SelectRepositoryContextDialog.ExpandAll=Tout d\u00E9velopper
-SelectRepositoryContextDialog.Title=S\u00E9lectionner les variables de contexte
+SelectRepositoryContextDialog.ExistenceMessage=La variable "{0}" existe dans le Job (Context:"{1}").
+SelectRepositoryContextDialog.Label=S\u00E9lectionne les variables des contextes du r\u00E9f\u00E9rentiel
+SelectRepositoryContextDialog.SelectAll=S\u00E9lectionner tout
+SelectRepositoryContextDialog.ExpandAll=Agrandir tout
+SelectRepositoryContextDialog.Title=S\u00E9lectionne les variables du contexte
 SelectRepositoryContextDialog.View=Voir...
-SelectRepositoryContextGroupDialog.Default=Par d\u00E9faut
-SelectRepositoryContextGroupDialog.Messages=Dans le Job, ajoute le groupe de contextes inexistant au Job \u00E0 partir du contexte du R\u00E9f\u00E9rentiel
+SelectRepositoryContextGroupDialog.Default=D\u00E9faut
+SelectRepositoryContextGroupDialog.Messages=\ Ajouter le groupe de contexte inexistant du Job depuis le contexte du r\u00E9f\u00E9rentiel.
 SelectRepositoryContextGroupDialog.Title=Ajouter un groupe de contextes
-TalendTabbedPropertyComposite.compactButton.toolTip=vue compacte
-TalendTabbedPropertyComposite.tableButton.toolTip=vue de la table
-TalendType.TypeName=Nom du type {0}
-VariableItemEditor.insertVariable=Ins\u00E9rer une valeur factice de &Variable...
+TalendTabbedPropertyComposite.compactButton.toolTip=Vue compacte
+TalendTabbedPropertyComposite.tableButton.toolTip=Vue de la table
+TalendType.TypeName=Nom de type {0}
 VariableItemEditor.name=Nom
 VariableItemEditor.new=Nouveau
-VariableItemEditor.remove=Supprimer
-VariableItemEditor.twmplatePattern=\u00C9chec de la g\u00E9n\u00E9ration des fichiers java :
+VariableItemEditor.remove=Remove
+VariableItemEditor.twmplatePattern=Echec de la generation des fichiers java
 VariableItemEditor.variable=Variables :
 VersionSection.CreationDate=Date de cr\u00E9ation
-VersionSection.ModificationDate=Date de modification :
+VersionSection.ModificationDate=Date de modification
 VersionSection.Version=Version
 VersionSection.Status=Statut
 XmlArray.InvalidFile=Fichier invalide.
-XPathQueryMetadataTableEditorViewExt.xpathQuerys=Requ\u00EAtes sch\u00E9ma XPath
 XSDValidater.IllegalArgument=Le fichier XSD d'entr\u00E9e n'existe pas.
+repository.businessProcess=Business Models
 repository.context=Contextes
 repository.documentation=Documentation
 repository.folder=Dossier
 repository.generated=G\u00E9n\u00E9r\u00E9
-repository.jobdoc=Documentation du Job
+repository.jobdoc=Documentation des Jobs
 repository.joblet=Joblets
-repository.jobletdoc=Documentation du Joblet
+repository.jobletdoc=Documentation des Joblets
 repository.joblets=Joblets
 repository.jobs=Jobs
 repository.metadata=M\u00E9tadonn\u00E9es
-repository.metadataConnections=Connexions de bases de donn\u00E9es
-repository.metadataConnections.alias=Bases de donn\u00E9es
+repository.metadataConnections=Bases de donn\u00E9es
+repository.metadataConnections.alias=BD
 repository.headerFooterConnections=En-t\u00EAte/Pied de page
 repository.headerFooterConnections.alias=En-t\u00EAte/Pied de page
 repository.metadataFileEDCDIC=Copybook
 repository.metadataFileEDCDIC.alias=Copybook
 repository.metadataMDMConnections=Talend MDM
-repository.metadataMDMConnections.alias=Talend MDM (Fran\u00E7ais)
+repository.metadataMDMConnections.alias=Talend MDM
 repository.concept=Concept
 repository.metadataSAPConnections=Connexions SAP
 repository.metadataSAPConnections.alias=SAP
@@ -311,7 +324,7 @@ repository.metadataSQLPatterns=Mod\u00E8les SQL
 repository.metadataSQLPatterns.alias=Mod\u00E8les SQL
 repository.metadataFileDelimited=Fichier d\u00E9limit\u00E9
 repository.metadataFileDelimited.alias=DELIM
-repository.metadataFileLdif=File LDIF
+repository.metadataFileLdif=Fichier ldif
 repository.metadataFileLdif.alias=LDIF
 repository.metadataFileExcel=Fichier Excel
 repository.metadataFileExcel.alias=EXCEL
@@ -322,29 +335,28 @@ repository.metadataFileRegexp.alias=REGX
 repository.metadataFileXml=Fichier XML
 repository.metadataFileXml.alias=XML
 repository.metadataGenericSchema=Sch\u00E9mas g\u00E9n\u00E9riques
-repository.metadataGenericSchema.alias=G\u00C9N\u00C9RIQUE
+repository.metadataGenericSchema.alias=GENERIQUE
 repository.metadataLDAPSchema=LDAP
 repository.metadataLDAPSchema.alias=LDAP
 repository.metadataTable=Sch\u00E9ma des m\u00E9tadonn\u00E9es
 repository.metadataWSDLSchema=Service Web
 repository.metadataWSDLSchema.alias=Service Web
 repository.metadataFileRules=R\u00E8gles embarqu\u00E9es
-repository.metadataFileRules.alias=R\u00C8GLE
+repository.metadataFileRules.alias=R\u00E8gle
 repository.metadataFileHL7=HL7
 repository.metadataFileHL7.alias=HL7
 repository.metadataFileFTP=FTP
 repository.metadataFileFTP.alias=FTP
-repository.metadataLinkFileRules=LinkRules
-repository.metadataLinkFileRules.alias=LinkRule
-repository.metadataSalesforceSchema=salesforce
+repository.metadataSalesforceSchema=Salesforce
 repository.metadataSalesforceSchema.alias=Salesforce CRM
 repository.process=Jobs
 repository.query=Requ\u00EAte
 repository.CDC=CDC
+repository.svnroot=SVN
 repository.referencedProjects=Projet r\u00E9f\u00E9renc\u00E9
 repository.routines=Routines
 repository.snippets=Snippets
-repository.tdqelement=\u00C9l\u00E9ment TDQ
+repository.tdqelement=El\u00E9ment TDQ
 repository.tdqelement.analysis=Analyses TDQ
 repository.tdqelement.report=Rapports TDQ
 repository.tdqelement.dbconnection=Connexions bases de donn\u00E9es TDQ
@@ -358,38 +370,53 @@ EUpdateItemType.SAPFunction=Fonction SAP
 EUpdateItemType.SAPIDoc=SAP IDoc
 EUpdateItemType.Query=Requ\u00EAte
 EUpdateItemType.Variable=Variable
-EUpdateItemType.ContextGroup=Groupe de contextes
+EUpdateItemType.ContextGroup=Groupe de contexte
 EUpdateItemType.Components=Composants
 EUpdateItemType.Name=Nom
-EUpdateItemType.JobVersion=JobVersion
 EUpdateResult.BuiltIn=Passer en mode built-in
-EUpdateResult.JobletUpdate=Mise \u00E0 jour des Joblets
+EUpdateResult.JobletUpdate=Mise \u00E0 jour des joblets
 EUpdateResult.Update=Mettre \u00E0 jour \u00E0 partir du r\u00E9f\u00E9rentiel
 EUpdateResult.Reload=Recharger les composants
 EUpdateResult.Rename=Changer le nom
 EUpdateResult.Add=Ajouter \u00E0 partir du r\u00E9f\u00E9rentiel
 EUpdateResult.Delete=Supprimer du r\u00E9f\u00E9rentiel
 UpdatesConstants.Context=Contexte
-UpdatesConstants.ContextGroup=Groupe de contextes
+UpdatesConstants.ContextGroup=Groupe de contexte
 UpdatesConstants.Component=Composant
 UpdatesConstants.Joblet=Joblet
 UpdatesConstants.Job=Job
-UpdatesConstants.JobVersion=JobVersion
-ProjectSettingsWizard.EditProjectPageTitle=\u00C9diter le projet
+ProjectSettingsWizard.EditProjectPageTitle=Editer le projet
+MetadataTypeLengthConstants.FIELD_DEFAULT_TYPE=Default Type
+MetadataTypeLengthConstants.FIELD_DEFAULT_LENGTH=Default Length
+MetadataTypeLengthConstants.VALUE_DEFAULT_TYPE=Default Type
+MetadataTypeLengthConstants.VALUE_DEFAULT_LENGTH=Default Length
+MetadataTypeLengthPreferencePage.VALUE=Param\u00E8tres par d\u00E9faut pour les champs comprenant des valeurs nulls
+MetadataTypeLengthPreferencePage.FIELD=Param\u00E8tres par d\u00E9faut pour tous les champs
+MetadataTypeLengthPreferencePage.DBTYPE=Longueur par d\u00E9faut pour le type de donn\u00E9es
+MetadataTypeLengthConstants.BOOLEAN_LENGTH=Boolean
+MetadataTypeLengthConstants.BIGDECIMAL_LENGTH=BigDecimal
+MetadataTypeLengthConstants.BYTE_LENGTH=Byte
+MetadataTypeLengthConstants.INTEGER_LENGTH=Integer
+MetadataTypeLengthConstants.BYTEARRAY_LENGTH=byte[]
+MetadataTypeLengthConstants.LONG_LENGTH=Long
+MetadataTypeLengthConstants.CHARACTER_LENGTH=Character
+MetadataTypeLengthConstants.OBJECT_LENGTH=Object
+MetadataTypeLengthConstants.DATE_LENGHT=Date
+MetadataTypeLengthConstants.SHORT_LENGTH=Short
+MetadataTypeLengthConstants.DOUBLE_LENGTH=Double
+MetadataTypeLengthConstants.STRING_LENGTH=String
+MetadataTypeLengthConstants.FLOAT_LENGTH=Float
+MetadataTypeLengthConstants.LIST_LENGTH=liste
+MetadataTypeLengthConstants.DATETIME_LENGTH=Datetime
 ModuleListCellEditor.externalLabel=Modules externes
 ModuleListCellEditor.innerLabel=Modules internes
 ModuleListCellEditor.selectLabel=S\u00E9lectionner un module
 ModuleListCellEditor.title=S\u00E9lectionner un module
-ModuleListCellEditor.add=Ajouter
-ModuleListCellEditor.delete=Supprimer
-ModuleListCellEditor.warningTitle=S\u00E9lectionner les JAR des pilotes de la base de donn\u00E9es
-ModuleListCellEditor.warningMessage=Le JAR existe d\u00E9j\u00E0.
 MultiStringSelectionDialog.nameEmpty=Le nom ne peut \u00EAtre vide
-PromptDialog.stringTip=Le texte d'entr\u00E9e doit \u00EAtre entour\u00E9 par des guillemets.
+PromptDialog.stringTip=Le texte d'entr\u00E9e doit \u00EAtre entour\u00E9 de guillemets simples.
 ApplicationActionBarAdvisor.menuFileLabel=&Fichier
-ApplicationActionBarAdvisor.menuEditLabel=&Modifier
+ApplicationActionBarAdvisor.menuEditLabel=&Editer
 ApplicationActionBarAdvisor.navigateLabel=&Naviguer
-ApplicationActionBarAdvisor.gotoLabel=&Aller \u00E0
 ApplicationActionBarAdvisor.projectLabel=&Projet
 ApplicationActionBarAdvisor.menuWindowLabel=Fe&n\u00EAtre
 ApplicationActionBarAdvisor.menuHelpLabel=&Aide
@@ -401,19 +428,19 @@ BusinessAppearanceComposite.textAlignment.horizontal.right=Droite
 BusinessAppearanceComposite.textAlignment.horizontal.centre=Centre
 BusinessAppearanceComposite.textAlignment.vertical.top=Haut
 BusinessAppearanceComposite.textAlignment.vertical.bottom=Bas
-BusinessAppearanceComposite.textAlignment.vertical.centre=Centre
-ConnectionBean.Local=Local
-ConnectionBean.DefaultConnection=Connexion par d\u00E9faut
+BusinessAppearanceComposite.textAlignment.vertical.centre=Centr\u00E9
+ConnectionBean.Local=local
+ConnectionBean.DefaultConnection=connexion par d\u00E9faut
 InegerCellEditorListener.NegativeNumberMessage=La valeur de {0} ne peut \u00EAtre un nombre n\u00E9gatif.
 InegerCellEditorListener.NumeralMessage=La valeur de {0} doit \u00EAtre num\u00E9rique.
 OpenXSDFileDialog.cancel=Annuler
 OpenXSDFileDialog.confirm=Confirmer
-OpenXSDFileDialog.fileName=Nom de fichier\u00A0:
-OpenXSDFileDialog.xmlFileSelection=S\u00E9lectionnez un fichier XML \u00E0 valider
-OpenXSDFileDialog.xmlSelectedOrNot=Comme vous avez s\u00E9lectionn\u00E9 un fichier de m\u00E9tadonn\u00E9es XSD, \n il devrait y avoir un fichier XML \u00E0 valider.
+OpenXSDFileDialog.fileName=Nom de fichier :
+OpenXSDFileDialog.xmlFileSelection=S\u00E9lectionner un fichier XML \u00E0 valider
+OpenXSDFileDialog.xmlSelectedOrNot=Comme vous avez s\u00E9lectionn\u00E9 un fichier de m\u00E9tadonn\u00E9es XSD, \n vous devez avoir un fichier XML \u00E0 valider.
 repository.metadataFileBRMS=BRMS
 repository.metadataFileBRMS.alias=BRMS
-repository.jobscript=Scripts de Jobs
+repository.jobscript=Job Scripts
 repository.column=Colonne
 repository.recyclebin=Corbeille
 repository.metadataColumn=Colonne de m\u00E9tadonn\u00E9es
@@ -446,7 +473,7 @@ TalendDataCollectorPreviewPreferencePage_Description=Les cl\u00E9s/valeurs suiva
 TalendDataCollectorPreviewPreferencePage_EmptyValue=<Vide>
 TalendDataCollectorPreviewPreferencePage_Key=Cl\u00E9
 TalendDataCollectorPreviewPreferencePage_Value=Valeur
-TalendDataCollectorUploadingPreferencePage_Description=Les informations rassembl\u00E9es par le Collecteur de donn\u00E9es d'utilisation sont r\u00E9guli\u00E8rement charg\u00E9es sur les serveurs h\u00E9berg\u00E9s par Talend.
+TalendDataCollectorUploadingPreferencePage_Description=Les informations rassembl\u00E9es par le Collecteur de donn\u00E9es d'utilisation est r\u00E9guli\u00E8rement charg\u00E9 sur les serveurs h\u00E9berg\u00E9s par Talend.
 TalendDataCollectorUploadingPreferencePage_LastUpload=Dernier chargement
 TalendDataCollectorUploadingPreferencePage_Uploadingtitile=Chargement
 TalendDataCollectorUploadingPreferencePage_UploadPeriod=P\u00E9riode de chargement
@@ -457,127 +484,62 @@ RepositoryUpdateManager.MessagesForTDQ=Voulez-vous propager les modifications \u
 EComponentCategory.executeJob=Ex\u00E9cuter le Job
 EComponentCategory.monitoring=Monitoring
 BinRepositoryNode.label=Corbeille
-EMetadataEncoding.Latin9=Latin9
+EMetadataEncoding.Latin9=latin9
 HDFS=HDFS
 HCAT=HCAT
-EConnectionType.startsMenu=D\u00E9but
-MetadataTalendTypeEditor.button.edit=Mo&difier
-MetadataTalendTypeEditor.button.export=E&xporter
-MetadataTalendTypeEditor.button.import=I&mporter
 MetadataTalendTypeEditor.column.Name=Fichier de mapping de m\u00E9tadonn\u00E9es
-MetadataTalendTypeEditor.editMappingDialog.title=Modifier le fichier de mapping
-MetadataTalendTypeEditor.error.message=Message d'erreur
-MetadataTalendTypeEditor.fileIsImported=Ce fichier a d\u00E9j\u00E0 \u00E9t\u00E9 import\u00E9.
-MetadataTalendTypeEditor.fileIsInvalid=Le fichier de m\u00E9tadonn\u00E9es import\u00E9 n'est pas valide.
-MetadataTalendTypeEditor.fileNameStartRule=Le nom de fichier doit commencer par 'mapping_'.
-MetadataTypeLengthPreferencePage.VALUE=Param\u00E8tres par d\u00E9faut pour les champs comprenant des valeurs nulles
-MetadataTypeLengthPreferencePage.FIELD=Param\u00E8tres par d\u00E9faut pour tous les champs
-MetadataTypeLengthPreferencePage.DBTYPE=Longueur par d\u00E9faut pour le type de donn\u00E9es
-MetadataTypeLengthConstants.FIELD_DEFAULT_TYPE=Type par d\u00E9faut
-MetadataTypeLengthConstants.FIELD_DEFAULT_LENGTH=Longueur par d\u00E9faut
-MetadataTypeLengthConstants.VALUE_DEFAULT_TYPE=Type par d\u00E9faut
-MetadataTypeLengthConstants.VALUE_DEFAULT_LENGTH=Longueur par d\u00E9faut
-MetadataTypeLengthConstants.BOOLEAN_LENGTH=Bool\u00E9en
-MetadataTypeLengthConstants.BIGDECIMAL_LENGTH=BigDecimal
-MetadataTypeLengthConstants.BYTE_LENGTH=Octet
-MetadataTypeLengthConstants.INTEGER_LENGTH=Entier
-MetadataTypeLengthConstants.BYTEARRAY_LENGTH=octet[]
-MetadataTypeLengthConstants.LONG_LENGTH=Long
-MetadataTypeLengthConstants.CHARACTER_LENGTH=Caract\u00E8re
-MetadataTypeLengthConstants.OBJECT_LENGTH=Object
-MetadataTypeLengthConstants.DATE_LENGHT=Date
-MetadataTypeLengthConstants.SHORT_LENGTH=Short
-MetadataTypeLengthConstants.DOUBLE_LENGTH=Double
-MetadataTypeLengthConstants.STRING_LENGTH=Cha\u00EEne de caract\u00E8res
-MetadataTypeLengthConstants.FLOAT_LENGTH=Float
-MetadataTypeLengthConstants.LIST_LENGTH=Liste
-MetadataTypeLengthConstants.DATETIME_LENGTH=Date/Heure
-PigProposalProvider.defaultUDFDescription=Aucune fonction personnalis\u00E9e de cette cat\u00E9gorie, vous pouvez utiliser l'option Pig UDF pour en cr\u00E9er une.
-MetadataEmfTableEditor.ColumnNameIsNullError=Erreur : Le nom de la colonne est vide
-MetadataEmfTableEditor.ColumnNameExists=Le nom de colonne "{0}" existe d\u00E9j\u00E0.
-MetadataTableEditor.ColumnNameIsInvalid=Le nom de colonne "{0}" est invalide.
-MetadataTableEditor.ColumnNameIsNull=Erreur : Le nom de la colonne est vide
-MetadataTableEditor.ColumnNameExists=Le nom de colonne '{0}' existe d\u00E9j\u00E0.
-MetadataDialog.CopyToInput.toolTipText=Copier toutes les colonnes du sch\u00E9ma de sortie dans le sch\u00E9ma d'entr\u00E9e
-MetadataDialog.CopySelectionToInput.toolTipText=Copier les colonnes s\u00E9lectionn\u00E9es du sch\u00E9ma de sortie dans le sch\u00E9ma d'entr\u00E9e
-MetadataDialog.CopyToOutput=Copier toutes les colonnes du sch\u00E9ma d'entr\u00E9e dans le sch\u00E9ma de sortie
-MetadataDialog.CopySelectionToOutput=Copier les colonnes s\u00E9lectionn\u00E9es du sch\u00E9ma d'entr\u00E9e dans le sch\u00E9ma de sortie
-MetadataDialog.Message=Toutes les colonnes du sch\u00E9ma d'entr\u00E9e seront transf\u00E9r\u00E9es au sch\u00E9ma de sortie
-MetadataDialog.SchemaModification=Modification de sch\u00E9ma
-MetadataDialog.TransferMessage=Toutes les colonnes du sch\u00E9ma de sortie seront transf\u00E9r\u00E9es au sch\u00E9ma d'entr\u00E9e
-MetadataDialog.NeedDoGuessQuery=D\u00E9tection requise.
 ConnectionParameters.exceptionMessage=Ceci est un r\u00E9f\u00E9rentiel, il ne peut appeler cette m\u00E9thode.
-ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=R\u00E9initialiser le type de BdD
+ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=R\u00E9initialiser le type de la base de donn\u00E9es
 CreateRuleDialog.conditionLabel=Condition
 CreateRuleDialog.groupLabel=Cr\u00E9er une r\u00E8gle
 CreateRuleDialog.messageLabel=Cr\u00E9er une nouvelle r\u00E8gle
 CreateRuleDialog.nameLabel=Nom
 CreateRuleDialog.ruleComponentName=tRules
-CreateRuleDialog.title=Ajouter une r\u00E8gle
+CreateRuleDialog.title=Ajouter une nouvelle r\u00E8gle
 SchemaOperationChoiceDialog.newViewSchemaMessage=Voir le sch\u00E9ma
 ContextAddParameterCommand.label=Ajouter un param\u00E8tre
-ContextChangeDefaultCommand.label=Changer le contexte par d\u00E9faut
+ContextChangeDefaultCommand.label=Modifier le contexte par d\u00E9faut
 ContextRemoveParameterCommand.label=Supprimer le param\u00E8tre
 ContextRenameParameterCommand.renameParameter=Renommer le param\u00E8tre
-ContextBuiltinToRepositoryCommand.addRelation=Une variable de contexte du m\u00EAme nom existe dans le r\u00E9f\u00E9rentiel. Votre variable built-in sera remplac\u00E9e. Continuer ?
 ContextModifyCommand.label=Modifier le contexte
-MetadataExportXmlCommand.title=Avertissement
+ArchiveFileExportOperationFullPath.cannotCreateDir=Impossible de cr\u00E9er le r\u00E9pertoire '{0}'
 MetadataExportXmlCommand.message=Attention : ce fichier existe d\u00E9j\u00E0, l'\u00E9craser ?
-RoutinesFunctionProposal.Description.v1=Description : {0}\n
-RoutinesFunctionProposal.CreatedBy.v1=Cr\u00E9\u00E9e par : {1}\n\n
-RoutinesFunctionProposal.ReturnType.v1=Type de retour : {2}\n
-RoutinesFunctionProposal.VariableName.v1=Exemple : {3}\n\n
-RoutinesFunctionProposal.User=Utilisateur
-RoutinesFunctionProposal.System=Syst\u00E8me
-NodeReturnProposal.Description=Description : {0}
-NodeReturnProposal.GlobalVariable=\n\nVariable globale, propri\u00E9t\u00E9 du composant {1} [{2}].
-NodeReturnProposal.Type=\nType : {3}
-NodeReturnProposal.Availability=\nDisponibilit\u00E9 : {4}
-NodeReturnProposal.VariableName=\n\nNom de la variable : {5}
-ContextParameterProposal.NoCommentAvaiable=pas de commentaire disponible.
-ContextParameterProposal.Description.v1=Description : {0}
-ContextParameterProposal.ContextVariable.v1=Environnement du contexte par d\u00E9faut : {1}
-ContextParameterProposal.Type.v1=Type : {2}
-ContextParameterProposal.VariableName.v1=Valeur : {3}
-ArchiveFileExportOperationFullPath.cannotCreateDir=impossible de cr\u00E9er le r\u00E9pertoire '{0}'
 WorkingSetConfigurationDialog_new_label=&Nouveau...
-WorkingSetConfigurationDialog_edit_label=&Editer
-WorkingSetConfigurationDialog_remove_label=Supp&rimer
-WorkingSetConfigurationDialog_up_label=Ha&ut
+WorkingSetConfigurationDialog_edit_label=&Editer...
 WorkingSetConfigurationDialog_down_label=&Descendre
-WorkingSetConfigurationDialog_selectAll_label=S\u00E9lectionner &Tout
 WorkingSetConfigurationDialog_deselectAll_label=D\u00E9s\u00E9&lectionner tout
-WorkbenchMessages.FilteredTree_FilterMessage=Saisissez le texte du filtre
-WorkbenchMessages.FilteredTree_ClearToolTip=Effacer
+WorkbenchMessages.FilteredTree_FilterMessage=saisissez le filtre
+WorkbenchMessages.FilteredTree_ClearToolTip=Vider
 ContextTreeValuesComposite.Menu=Menu
-ContextMissSettingComposite.missingModuleMessages=cette vue de contextes requiert  l'installation d'un Jar externe
+ContextMissSettingComposite.missingModuleMessages=cette vue de contextes requiert l'installation d'un Jar externe 
 ContextMissSettingComposite.installName=Installer
 ContextMissSettingComposite.Title_Missing_jars_for_plugin=Biblioth\u00E8ques tierces manquantes
-ContextMissSettingComposite.description_jars_to_be_installed_in=Le Studio requiert l'installation de biblioth\u00E8ques tierces.\nVeuillez installer les JAR suivants avant de fermer cette fen\u00EAtre.
-ContextTreeTable.AddToBuildIn_label=Ajouter \u00E0 built-in
+ContextMissSettingComposite.description_jars_to_be_installed_in=Le Studio requiert l'installation de biblioth\u00E8ques tierces.\nInstallez les Jars suivants avant de fermer cette fen\u00EAtre.
 ContextTreeTable.AddToRepository_label=Ajouter au contexte du r\u00E9f\u00E9rentiel
 ContextNebulaComposite.ContextsUnAvailable=La vue Contextes n'est pas disponible.
-ContextNebulaComposite.ContextGroupLabel=Environnement du contexte par d\u00E9faut
-ContextTreeTable.PromptToolTips=activer le prompt sur variable
+MetadataTableEditorView.ValueTitle=Valeur
 ContextValidator.ParameterNotValid=le nom du param\u00E8tre n'est pas valide
+ModuleListCellEditor.add=Ajouter
+ModuleListCellEditor.delete=Supprimer
+ModuleListCellEditor.warningTitle=S\u00E9lectionner les Jar des pilotes de base de donn\u00E9es
+ContextBuiltinToRepositoryCommand.addRelation=Une variable de contexte du m\u00EAme nom existe dans le r\u00E9f\u00E9rentiel. Votre variable built-in sera remplac\u00E9e. Continuer ?
 WorkspaceMnu.switch.text=Changer de r\u00E9pertoire &Workspace
 WorkspaceMnu.switch.tooltip=Ouvrir le r\u00E9pertoire Workspace
-WorkspaceMnu.choose.text=&Choisir...
-WorkspaceMnu.choose.tooltip=S\u00E9lectionner un autre r\u00E9pertoire Workspace
+WorkspaceMnu.choose.text=&Choisir
+WorkspaceMnu.choose.tooltip=S\u00E9lectionnez un autre r\u00E9pertoire Workspace
 WorkspaceMnu.restart.error.title=Propri\u00E9t\u00E9 syst\u00E8me manquante
 WorkspaceMnu.restart.error.message=Impossible de relancer la plateforme car la propri\u00E9t\u00E9 {0} n'est pas configur\u00E9e.
-WorkspaceDlg.title=S\u00E9lectionner le r\u00E9pertoire Workspace
-WorkspaceDlg.Message=Le Studio Talend stocke vos donn\u00E9es dans un dossier nomm\u00E9 Workspace\nS\u00E9lectionnez le dossier Workspace.
-WorkspaceDlg.workspace.label=Espace de travail
-WorkspaceDlg.browse.button=P&arcourir
-WorkspaceDlg.browse.folder.title=S\u00E9lectionner un dossier Workspace
-WorkspaceDlg.use.this.as.default.cb.message=&Utiliser ce Workspace par d\u00E9faut et ne pas demander \u00E0 nouveau
+WorkspaceDlg.title=Choisir le r\u00E9pertoire Workspace
+WorkspaceDlg.Message=Le Studio Talend stocke vos donn\u00E9es dans un dossier nomm\u00E9 Workspace\nS\u00E9lectionnez le r\u00E9pertoire Workspace
+WorkspaceDlg.workspace.label=Workspace
+WorkspaceDlg.browse.button=Parcourir...
+WorkspaceDlg.browse.folder.title=S\u00E9lectionnez un r\u00E9pertoire Workspace
+WorkspaceDlg.use.this.as.default.cb.message=&Utiliser ce r\u00E9pertoire Workspace par d\u00E9faut et ne plus demander
+CorePreferencePage.alwaysWelcome.v2=Toujours afficher la vue Bienvenue lors du d\u00E9marrage
+CorePreferencePage.alwaysAskAtStartup=Toujours afficher la fen\u00EAtre des projets lors du d\u00E9marrage
+EComponentCategory_advanceSetting=Param\u00E8tres avanc\u00E9s
 I18nPreferencePage.needRestart=Langage local (red\u00E9marrage requis)
-I18nPreferencePage.translationInformation=Test des traductions Babili (fonctionne uniquement pour la langue courante, pour les autres langues un red\u00E9marrage est requis)
-I18nPreferencePage.importBabili=Importer les traductions de Babili
 I18nPreferencePage.restart=Red\u00E9marrer
-I18nPreferencePage.restartButton=Red\u00E9marrage requis pour prendre en compte les modifications.
-I18nPreferencePage.restoreDefault=Restaurer les param\u00E8tres par d\u00E9faut
 I18nPreferencePage.wait_process=Le processus va prendre plusieurs minutes, patientez...
-MetadataPreferencePage.EnableBasic.name=Autorise l'en-t\u00EAte d'authentification simple
-MetadataPreferencePage.MessageDialog.Restart=Le Studio doit red\u00E9marrer pour que ce param\u00E8tre soit pris en compte.\n\u00CAtes-vous s\u00FBr(e)\u00A0?
+MetadataPreferencePage.EnableBasic.name=Autorise l\'en-t\u00EAte d\'authentification simple
+MetadataPreferencePage.MessageDialog.Restart=Le Studio doit red\u00E9marrer pour que ce param\u00E8tre soit pris en compte.\\n\u00CAtes-vous s\u00FBr(e)\u00A0?