Merge remote-tracking branch 'origin/maintenance/8.0' into jzhang/80/TUP-34021

* fix(TDI-46943): Dynamic schema fail's with Excel

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

@@ -9,4 +9,4 @@
   </parent>
   <artifactId>org.talend.gmf.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-</project>
+</project>

main/features/org.talend.studio.components.tcompv0.azurestorage.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.azurestorage.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.azurestorage.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.googledrive.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.googledrive.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.googledrive.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.jira.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.jira.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.jira.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.marketo.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.marketo.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.marketo.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.marklogic.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.marklogic.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.marklogic.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.netsuite.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.netsuite.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.netsuite.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.salesforce.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.salesforce.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.salesforce.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.snowflake.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.snowflake.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.snowflake.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.splunk.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.splunk.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.splunk.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -43,7 +43,6 @@
   <plugin id="org.talend.libraries.palo" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.persist.lookup" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.libraries.salesforce" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.servlet" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.slf4j" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.xml" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.zmq" download-size="0" install-size="0" version="0.0.0"/>

main/plugins/org.talend.designer.alfrescooutput/src/main/java/messages_ja.properties

@@ -4,7 +4,7 @@ AlfrescoOutputManager.schemaError.msg=\u6700\u521D\u306B\u30B9\u30AD\u30FC\u30DE
 AlfrescoOutputModelManager.alreadyAdded=\u3053\u306E\u30E2\u30C7\u30EB\u306F\u65E2\u306B\u8FFD\u52A0\u6E08\u307F\u3067\u3059\u3002
 AlfrescoOutputModelManager.errorReadingModel=Alfresco\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u8FBC\u307F\u30A8\u30E9\u30FC
 AlfrescoOutputModelManager.notYetAdded=\u3053\u306E\u30E2\u30C7\u30EB\u306F\u307E\u3060\u8FFD\u52A0\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-AlfrescoOutputModelManager.prefixConflict=\u5148\u306B\u8FFD\u52A0\u3055\u308C\u305F\u30E2\u30C7\u30EB\u306E\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u306E\u885D\u7A81\u306E\u305F\u3081\u3001\u30E2\u30C7\u30EB\u306E\u8FFD\u52A0\u304C\u51FA\u6765\u307E\u305B\u3093\u3002
+AlfrescoOutputModelManager.prefixConflict=\u5148\u306B\u8FFD\u52A0\u3055\u308C\u305F\u30E2\u30C7\u30EB\u306E\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u306E\u885D\u7A81\u306E\u305F\u3081\u3001\u30E2\u30C7\u30EB\u306E\u8FFD\u52A0\u304C\u3067\u304D\u307E\u305B\u3093\u3002
 AlfrescoModelDialog.type=\u30BF\u30A4\u30D7
 AlfrescoModelDialog.aspects=\u30A2\u30B9\u30DA\u30AF\u30C8
 AlfrescoModelDialog.availableAspects=\u53EF\u80FD\u306A\u30A2\u30B9\u30DA\u30AF\u30C8

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

@@ -364,6 +364,26 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return strReturn;
 	}
+	
+	private String readString(org.jboss.marshalling.Unmarshaller unmarshaller) throws IOException{
+		String strReturn = null;
+		int length = 0;
+        length = unmarshaller.readInt();
+		if (length == -1) {
+			strReturn = null;
+		} else {
+			if(length > commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>.length) {
+				if(length < 1024 && commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>.length == 0) {
+   					commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %> = new byte[1024];
+				} else {
+   					commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %> = new byte[2 * length];
+   				}
+			}
+			unmarshaller.readFully(commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>, 0, length);
+			strReturn = new String(commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>, 0, length, utf8Charset);
+		}
+		return strReturn;
+	}
 
     private void writeString(String str, ObjectOutputStream dos) throws IOException{
 		if(str == null) {
@@ -374,11 +394,21 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 			dos.write(byteArray);
     	}
     }
+    
+    private void writeString(String str, org.jboss.marshalling.Marshaller marshaller) throws IOException{
+		if(str == null) {
+			marshaller.writeInt(-1);
+		} else {
+            byte[] byteArray = str.getBytes(utf8Charset);
+            marshaller.writeInt(byteArray.length);
+            marshaller.write(byteArray);
+    	}
+    }
 <%
 					} else if(!hasString2 && (isLookup && !hashableColumnsNames.contains(column.getLabel()))){
 						hasString2 = true;
 %>
-
+	
 	private String readString(DataInputStream dis, ObjectInputStream ois) throws IOException{
 		String strReturn = null;
 		int length = 0;
@@ -392,6 +422,30 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return strReturn;
 	}
+	
+	private String readString(DataInputStream dis, org.jboss.marshalling.Unmarshaller unmarshaller) throws IOException{
+		String strReturn = null;
+		int length = 0;
+        length = unmarshaller.readInt();
+		if (length == -1) {
+			strReturn = null;
+		} else {
+			byte[] byteArray = new byte[length];
+			unmarshaller.read(byteArray);
+			strReturn = new String(byteArray, utf8Charset);
+		}
+		return strReturn;
+	}
+	
+	private void writeString(String str, DataOutputStream dos, org.jboss.marshalling.Marshaller marshaller) throws IOException{
+		if(str == null) {
+			marshaller.writeInt(-1);
+		} else {
+            byte[] byteArray = str.getBytes(utf8Charset);
+            marshaller.writeInt(byteArray.length);
+            marshaller.write(byteArray);
+    	}
+	}
 
 	private void writeString(String str, DataOutputStream dos, ObjectOutputStream oos) throws IOException{
 		if(str == null) {
@@ -420,6 +474,18 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return dateReturn;
 	}
+	
+	private java.util.Date readDate(org.jboss.marshalling.Unmarshaller unmarshaller) throws IOException{
+		java.util.Date dateReturn = null;
+        int length = 0;
+        length = unmarshaller.readByte();
+		if (length == -1) {
+			dateReturn = null;
+		} else {
+	    	dateReturn = new Date(unmarshaller.readLong());
+		}
+		return dateReturn;
+	}
 
     private void writeDate(java.util.Date date1, ObjectOutputStream dos) throws IOException{
 		if(date1 == null) {
@@ -429,6 +495,15 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 	    	dos.writeLong(date1.getTime());
     	}
     }
+    
+    private void writeDate(java.util.Date date1, org.jboss.marshalling.Marshaller marshaller) throws IOException{
+		if(date1 == null) {
+			marshaller.writeByte(-1);
+		} else {
+			marshaller.writeByte(0);
+			marshaller.writeLong(date1.getTime());
+    	}
+    }
 <%
 					}else if (!hasDate2 && (isLookup && !hashableColumnsNames.contains(column.getLabel()))) {
 						hasDate2 = true;
@@ -445,6 +520,18 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return dateReturn;
 	}
+	
+	private java.util.Date readDate(DataInputStream dis, org.jboss.marshalling.Unmarshaller unmarshaller ) throws IOException{
+		java.util.Date dateReturn = null;
+		int length = 0;
+        length = unmarshaller.readByte();
+		if (length == -1) {
+			dateReturn = null;
+		} else {
+	    	dateReturn = new Date(unmarshaller.readLong());
+		}
+		return dateReturn;
+	}
 
 	private void writeDate(java.util.Date date1, DataOutputStream dos, ObjectOutputStream oos) throws IOException{
 		if(date1 == null) {
@@ -454,6 +541,15 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 	    	dos.writeLong(date1.getTime());
     	}
 	}
+	
+	private void writeDate(java.util.Date date1, DataOutputStream dos, org.jboss.marshalling.Marshaller marshaller) throws IOException{
+		if(date1 == null) {
+			marshaller.writeByte(-1);
+		} else {
+			marshaller.writeByte(0);
+			marshaller.writeLong(date1.getTime());
+    	}
+	}
 <%
 					}
 				} else if(typeToGenerate.equals("byte[]")) {
@@ -473,6 +569,20 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return byteArrayReturn;
 	}
+	
+	private byte[] readByteArray(org.jboss.marshalling.Unmarshaller dis) throws IOException{
+		byte[] byteArrayReturn;
+		int length = 0;
+        length = dis.readInt();
+		if (length == -1) {
+			byteArrayReturn = null;
+		} else {
+			byte[] byteArray = new byte[length];
+			dis.readFully(byteArray);
+			byteArrayReturn = byteArray;
+		}
+		return byteArrayReturn;
+	}
 
     private void writeByteArray(byte[] byteArray, ObjectOutputStream dos) throws IOException{
 		if(byteArray == null) {
@@ -482,6 +592,15 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 			dos.write(byteArray);
     	}
     }
+    
+    private void writeByteArray(byte[] byteArray, org.jboss.marshalling.Marshaller marshaller) throws IOException{
+		if(byteArray == null) {
+			marshaller.writeInt(-1);
+		} else {
+			marshaller.writeInt(byteArray.length);
+			marshaller.write(byteArray);
+    	}
+    }
 <%
 					}else if (!hasByteArray2 && (isLookup && !hashableColumnsNames.contains(column.getLabel()))) {
 						hasByteArray2 = true;
@@ -499,6 +618,20 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return byteArrayReturn;
 	}
+	
+	private byte[] readByteArray(DataInputStream dis, org.jboss.marshalling.Unmarshaller unmarshaller ) throws IOException{
+		byte[] byteArrayReturn;
+        int length = 0;
+        length = unmarshaller.readInt();
+		if (length == -1) {
+			byteArrayReturn = null;
+		} else {
+			byte[] byteArray = new byte[length];
+			unmarshaller.read(byteArray);
+			byteArrayReturn = byteArray;
+		}
+		return byteArrayReturn;
+	}
 
 	private void writeByteArray(byte[] byteArray, DataOutputStream dos, ObjectOutputStream oos) throws IOException{
 		if(byteArray == null) {
@@ -508,6 +641,15 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 			dos.write(byteArray);
     	}
 	}
+	
+	private void writeByteArray(byte[] byteArray, DataOutputStream dos, org.jboss.marshalling.Marshaller marshaller) throws IOException{
+		if(byteArray == null) {
+			marshaller.writeInt(-1);
+		} else {
+			marshaller.writeInt(byteArray.length);
+			marshaller.write(byteArray);
+    	}
+	}
 <%
 					}
 				}else {
@@ -528,6 +670,18 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return intReturn;
 	}
+	
+	private Integer readInteger(org.jboss.marshalling.Unmarshaller dis) throws IOException{
+		Integer intReturn;
+        int length = 0;
+        length = dis.readByte();
+		if (length == -1) {
+			intReturn = null;
+		} else {
+	    	intReturn = dis.read<%= typeToGenerate %>();
+		}
+		return intReturn;
+	}
 
 	private void writeInteger(Integer intNum, ObjectOutputStream dos) throws IOException{
 		if(intNum == null) {
@@ -537,6 +691,15 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 	    	dos.write<%= typeToGenerate %>(intNum);
     	}
 	}
+	
+	private void writeInteger(Integer intNum, org.jboss.marshalling.Marshaller marshaller) throws IOException{
+		if(intNum == null) {
+			marshaller.writeByte(-1);
+		} else {
+			marshaller.writeByte(0);
+			marshaller.write<%= typeToGenerate %>(intNum);
+    	}
+	}
 <%
 						} else if(!hasInteger2 && (isLookup && !hashableColumnsNames.contains(column.getLabel()))){
 							hasInteger2 = true;
@@ -552,6 +715,18 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return intReturn;
 	}
+	
+	private Integer readInteger(DataInputStream dis, org.jboss.marshalling.Unmarshaller unmarshaller) throws IOException{
+		Integer intReturn;
+        int length = 0;
+        length = unmarshaller.readByte();
+		if (length == -1) {
+			intReturn = null;
+		} else {
+			intReturn = unmarshaller.read<%= typeToGenerate %>();
+		}
+		return intReturn;
+	}
 
 	private void writeInteger(Integer intNum, DataOutputStream dos, ObjectOutputStream oos) throws IOException{
 		if(intNum == null) {
@@ -561,6 +736,15 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 	    	dos.write<%= typeToGenerate %>(intNum);
     	}
 	}
+	
+	private void writeInteger(Integer intNum, DataOutputStream dos,org.jboss.marshalling.Marshaller marshaller ) throws IOException{
+		if(intNum == null) {
+			marshaller.writeByte(-1);
+		} else {
+			marshaller.writeByte(0);
+			marshaller.write<%= typeToGenerate %>(intNum);
+    	}
+	}
 <%
 						}
 					}
@@ -662,6 +846,101 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
       }
 
 
+    }
+    
+    public void <%= isLookup ? "readKeys" : "read" %>Data(org.jboss.marshalling.Unmarshaller dis) {
+
+		synchronized(commonByteArrayLock_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>) {
+
+        	try {
+
+        		int length = 0;
+		<%
+		 hasAtLeastOneRead = false;
+		 hasAtLeastOneObjectType = false;
+		if (metadata !=null) {
+			for (IMetadataColumn column: metadata.getListColumns()) {
+			  if (!isLookup || hashableColumnsNames.contains(column.getLabel())) {
+			  	hasAtLeastOneRead = true;
+				JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
+			 	String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
+
+				if (JavaTypesManager.isJavaPrimitiveType(column.getTalendType(), column.isNullable())) {
+					typeToGenerate=typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
+					%>
+			        this.<%=column.getLabel() %> = dis.read<%= typeToGenerate %>();
+					<%
+				} else if(typeToGenerate.equals("String")) {
+					%>
+					this.<%=column.getLabel() %> = readString(dis);
+					<%
+				} else if(typeToGenerate.equals("java.util.Date")) {
+					%>
+					this.<%=column.getLabel() %> = readDate(dis);
+					<%
+				} else if(typeToGenerate.equals("byte[]")) {
+					%>
+					this.<%=column.getLabel() %> = readByteArray(dis);
+					<%
+				} else if(javaType.isObjectBased() || typeToGenerate.equals("Geometry") || typeToGenerate.equals("Dynamic")) {
+			 		hasAtLeastOneObjectType = true;
+			 		if("id_Document".equals(javaType.getId()) || "id_Dynamic".equals(javaType.getId())) {
+			 			typeToGenerate = javaType.getNullableClass().getCanonicalName();
+			 		}
+					%>
+						this.<%=column.getLabel() %> = (<%= typeToGenerate %>) dis.readObject();
+					<%
+				} else {
+					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
+					typeToGenerate=typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
+					if(typeToGenerate.equals("Int")){
+					%>
+						this.<%=column.getLabel() %> = readInteger(dis);
+					<%
+					} else {
+					%>
+			            length = dis.readByte();
+           				if (length == -1) {
+           	    			this.<%=column.getLabel() %> = null;
+           				} else {
+           			    	this.<%=column.getLabel() %> = dis.read<%= typeToGenerate %>();
+           				}
+					<%
+					}
+				}
+			  }
+			}
+    	}
+	    if(hasAtLeastOneRead) {
+	    %>
+        	} catch (IOException e) {
+	            throw new RuntimeException(e);
+        <%
+        }
+        %>
+
+		<%
+		if(hasAtLeastOneObjectType) {
+		%>
+			} catch(ClassNotFoundException eCNFE) {
+				 throw new RuntimeException(eCNFE);
+		<%
+		}
+		%>
+
+        }
+
+		<%
+		if(!hasAtLeastOneRead) {
+		%>
+			finally {}
+		<%
+		}
+		%>
+
+      }
+
+
     }
 
     public void <%= isLookup ? "writeKeys" : "write" %>Data(ObjectOutputStream dos) {
@@ -739,6 +1018,82 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		%>
 
     }
+    
+    public void <%= isLookup ? "writeKeys" : "write" %>Data(org.jboss.marshalling.Marshaller dos) {
+        try {
+
+		<%
+		hasAtLeastOneWrite = false;
+		hasAtLeastOneObjectType = false;
+		if (metadata !=null) {
+			for (IMetadataColumn column: metadata.getListColumns()) {
+			  if (!isLookup || hashableColumnsNames.contains(column.getLabel())) {
+				JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
+				hasAtLeastOneWrite = true;
+			 	String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
+				%>
+					// <%=typeToGenerate %>
+				<%
+				if (JavaTypesManager.isJavaPrimitiveType(column.getTalendType(), column.isNullable())) {
+					typeToGenerate=typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
+					%>
+		            	dos.write<%= typeToGenerate %>(this.<%=column.getLabel() %>);
+					<%
+				} else if(typeToGenerate.equals("String")) {
+					%>
+						writeString(this.<%=column.getLabel() %>,dos);
+					<%
+				} else if(typeToGenerate.equals("java.util.Date")) {
+					%>
+						writeDate(this.<%=column.getLabel() %>,dos);
+					<%
+				} else if(typeToGenerate.equals("byte[]")) {
+					%>
+						writeByteArray(this.<%=column.getLabel() %>,dos);
+					<%
+				} else if(javaType.isObjectBased() || typeToGenerate.equals("Geometry") || typeToGenerate.equals("Dynamic")) {
+					%>
+       			    	dos.writeObject(this.<%=column.getLabel() %>);
+					<%
+				} else {
+					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
+					typeToGenerate = typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
+					if(typeToGenerate.equals("Int")){
+					%>
+						writeInteger(this.<%=column.getLabel() %>,dos);
+					<%
+					} else {
+					%>
+						if(this.<%=column.getLabel() %> == null) {
+			                dos.writeByte(-1);
+						} else {
+               				dos.writeByte(0);
+           			    	dos.write<%= typeToGenerate %>(this.<%=column.getLabel() %>);
+		            	}
+					<%
+					}
+				}
+			  }
+			}
+    	}
+	    if(hasAtLeastOneWrite) {
+	    %>
+        	} catch (IOException e) {
+	            throw new RuntimeException(e);
+        <%
+        }
+        %>
+        }
+
+        <%
+		if(!hasAtLeastOneWrite) {
+		%>
+			finally {}
+		<%
+		}
+		%>
+
+    }
 
     <%
 	if(isLookup) { // T SH 002
@@ -836,6 +1191,94 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
         %>
 
     }
+    
+    public void readValuesData(DataInputStream dis, org.jboss.marshalling.Unmarshaller objectIn) {
+        try {
+			int length = 0;
+		<%
+		hasAtLeastOneRead = false;
+		hasAtLeastOneObjectType = false;
+		if (metadata !=null) {
+			for (IMetadataColumn column: metadata.getListColumns()) {
+			  if (!hashableColumnsNames.contains(column.getLabel())) {
+				JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
+				hasAtLeastOneRead = true;
+			 	String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
+
+				if (JavaTypesManager.isJavaPrimitiveType(column.getTalendType(), column.isNullable())) {
+					typeToGenerate=typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
+					%>
+			            this.<%=column.getLabel() %> = objectIn.read<%= typeToGenerate %>();
+					<%
+				} else if(typeToGenerate.equals("String")) {
+					%>
+						this.<%=column.getLabel() %> = readString(dis,objectIn);
+					<%
+				} else if(typeToGenerate.equals("byte[]")) {
+					%>
+						this.<%=column.getLabel() %> = readByteArray(dis,objectIn);
+					<%
+				} else if(typeToGenerate.equals("java.util.Date")) {
+					%>
+						this.<%=column.getLabel() %> = readDate(dis,objectIn);
+					<%
+				} else if(typeToGenerate.equals("Object") || typeToGenerate.equals("Geometry") || typeToGenerate.equals("BigDecimal") || typeToGenerate.equals("List") || typeToGenerate.equals("Dynamic") || typeToGenerate.equals("Document")) {
+			 		hasAtLeastOneObjectType = true;
+			 		if("id_Document".equals(javaType.getId()) || "id_Dynamic".equals(javaType.getId())) {
+			 			typeToGenerate = javaType.getNullableClass().getCanonicalName();
+			 		}
+					%>
+       			    	this.<%=column.getLabel() %> = (<%= typeToGenerate %>) objectIn.readObject();
+					<%
+				} else {
+					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
+					typeToGenerate=typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
+					if(typeToGenerate.equals("Int")){
+					%>
+						this.<%=column.getLabel() %> = readInteger(dis,objectIn);
+					<%
+					} else {
+					%>
+			            length = objectIn.readByte();
+           				if (length == -1) {
+           	    			this.<%=column.getLabel() %> = null;
+           				} else {
+           			    	this.<%=column.getLabel() %> = objectIn.read<%= typeToGenerate %>();
+           				}
+					<%
+					}
+				}
+			  }
+			}
+    	}
+    	if(hasAtLeastOneRead) {
+	    %>
+        	} catch (IOException e) {
+	            throw new RuntimeException(e);
+        <%
+        }
+        %>
+
+		<%
+		if(hasAtLeastOneObjectType) {
+		%>
+			} catch(ClassNotFoundException eCNFE) {
+				 throw new RuntimeException(eCNFE);
+		<%
+		}
+		%>
+
+        }
+
+		<%
+    	if(!hasAtLeastOneRead) {
+	    %>
+        	finally {}
+        <%
+        }
+        %>
+
+    }
 
     /**
      * Return a byte array which represents Values data.
@@ -911,6 +1354,83 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
         %>
 
     }
+    
+    public void writeValuesData(DataOutputStream dos, org.jboss.marshalling.Marshaller objectOut){
+                try {
+
+		<%
+		hasAtLeastOneWrite = false;
+		if (metadata !=null) {
+			for (IMetadataColumn column: metadata.getListColumns()) {
+			  if (!hashableColumnsNames.contains(column.getLabel())) {
+				JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
+				hasAtLeastOneWrite = true;
+			 	String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
+				if (JavaTypesManager.isJavaPrimitiveType(column.getTalendType(), column.isNullable())) {
+					typeToGenerate=typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
+					%>
+					objectOut.write<%= typeToGenerate %>(this.<%=column.getLabel() %>);
+					<%
+				} else if(typeToGenerate.equals("String")) {
+					%>
+						writeString(this.<%=column.getLabel() %>, dos, objectOut);
+					<%
+				} else if(typeToGenerate.equals("byte[]")) {
+					%>
+						writeByteArray(this.<%=column.getLabel() %>, dos, objectOut);
+					<%
+				} else if(typeToGenerate.equals("java.util.Date")) {
+					%>
+						writeDate(this.<%=column.getLabel() %>, dos, objectOut);
+					<%
+				} else if(typeToGenerate.equals("Object") || typeToGenerate.equals("Geometry") || typeToGenerate.equals("BigDecimal") || typeToGenerate.equals("List") || typeToGenerate.equals("Dynamic") || typeToGenerate.equals("Document")) {
+					%>
+       			    	objectOut.writeObject(this.<%=column.getLabel() %>);
+					<%
+				} else {
+					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
+					typeToGenerate = typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
+					if(typeToGenerate.equals("Int")){
+					%>
+					writeInteger(this.<%=column.getLabel() %>, dos, objectOut);
+					<%
+					} else {
+					%>
+						if(this.<%=column.getLabel() %> == null) {
+							objectOut.writeByte(-1);
+						} else {
+							objectOut.writeByte(0);
+							objectOut.write<%= typeToGenerate %>(this.<%=column.getLabel() %>);
+		            	}
+					<%
+					}
+				}
+			  }
+			}
+    	}
+
+    	if(hasAtLeastOneRead) {
+	    %>
+        	} catch (IOException e) {
+	            throw new RuntimeException(e);
+        <%
+        }
+        %>
+        	}
+        <%
+    	if(!hasAtLeastOneRead) {
+	    %>
+        	finally {}
+        <%
+        }
+        %>
+    }
+
+
+    
+    public boolean supportMarshaller(){
+        return true;
+    }
 
     <%
 	} // T SH 002

main/plugins/org.talend.designer.components.exchange/src/main/java/messages_ja.properties

@@ -56,7 +56,7 @@ ShowInstalledExtensionsJob.ShowInstalledExtensions.Title=extensions\u3092\u30A4\
 ShowInstalledExtensionsJob.ShowInstalledExtensions.Message=exchange\u304B\u3089extensions\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u2026
 DeleteExtensionJob.DeleteExtensionJob.Title=Extension\u3092\u524A\u9664\u3057\u307E\u3059\u2026
 DeleteExtensionJob.DeleteExtensionJob.Message=Extension\u3092\u524A\u9664\u3057\u307E\u3059\u2026
-DeleteExtensionJob.DeleteFailure=\u524A\u9664\u51FA\u6765\u307E\u305B\u3093
+DeleteExtensionJob.DeleteFailure=\u524A\u9664\u3067\u304D\u307E\u305B\u3093
 DeleteExtensionJob.DeleteFailureTip=\u30C1\u30A7\u30C3\u30AF\u3092\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ModifyExtensionJob.Title=Extension\u3092\u4FEE\u6B63\u2026
 ModifyExtensionJob.Message=Extension\u3092\u4FEE\u6B63\u2026

main/plugins/org.talend.designer.components.libs/libs_src/talend-job-monitoring/pom.xml

@@ -69,13 +69,13 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.13.2</version>
+			<version>2.16.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.13.2</version>
+			<version>2.16.0</version>
 			<optional>true</optional>
 		</dependency>
 	</dependencies>
@@ -97,4 +97,4 @@
 		</pluginManagement>
 	</build>
 
-</project>
+</project>

main/plugins/org.talend.designer.components.localprovider/build.properties

@@ -35,6 +35,8 @@ extra.. = platform:/fragment/org.talend.libraries.jboss.jars
 jars.extra.classpath = platform:/plugin/org.talend.libraries.jboss.jars/lib/jboss-aop.jar,\
                        platform:/plugin/org.talend.libraries.jboss.jars/lib/jboss-common-core.jar,\
                        platform:/plugin/org.talend.libraries.jboss.jars/lib/jboss-j2ee-4.0.2.jar,\
+                       platform:/plugin/org.talend.libraries.jboss.jars/lib/jboss-marshalling-2.0.12.Final.jar,\
+                       platform:/plugin/org.talend.libraries.jboss.jars/lib/jboss-marshalling-river-2.0.12.Final.jar,\
                        platform:/plugin/org.talend.libraries.jboss.jars/lib/jboss-mdr.jar,\
                        platform:/plugin/org.talend.libraries.jboss.jars/lib/jboss-messaging-client.jar,\
                        platform:/plugin/org.talend.libraries.jboss.jars/lib/jboss-remoting.jar,\

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_java.xml

@@ -47,8 +47,6 @@
     <PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="2"
 			REPOSITORY_VALUE="DB_VERSION">
 			<ITEMS DEFAULT="V7R1_V7R3">
-				<ITEM NAME="V5R2_V5R4" VALUE="jt400_V5R2.jar"/>
-				<ITEM NAME="V5R3_V6R1" VALUE="jt400_V5R3.jar" />
                 <ITEM NAME="V6R1_V7R2" VALUE="jt400_V6R1.jar" />
                 <ITEM NAME="V7R1_V7R3" VALUE="jt400-9.8.jar" />
 			</ITEMS>
@@ -145,12 +143,10 @@
 
    <CODEGENERATION>
      <IMPORTS>
-       <IMPORT NAME="Driver-V5R2_V5R4" MODULE="jt400_V5R2.jar" MVN="mvn:org.talend.libraries/jt400_V5R2/6.0.0"  REQUIRED_IF="DB_VERSION == 'jt400_V5R2.jar'" />
-       <IMPORT NAME="Driver-V5R3_V6R1" MODULE="jt400_V5R3.jar" MVN="mvn:org.talend.libraries/jt400_V5R3/6.0.0"  REQUIRED_IF="DB_VERSION == 'jt400_V5R3.jar'" />
        <IMPORT NAME="Driver-V6R1_V7R2" MODULE="jt400_V6R1.jar" MVN="mvn:org.talend.libraries/jt400_V6R1/6.0.0"  REQUIRED_IF="DB_VERSION == 'jt400_V6R1.jar'" />
        <IMPORT NAME="Driver-V7R1_V7R3" MODULE="jt400-9.8.jar" MVN="mvn:net.sf.jt400/jt400/9.8"  REQUIRED_IF="DB_VERSION == 'jt400-9.8.jar'" />
-       <IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
-       <IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+       <IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+       <IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
      </IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages.properties

@@ -10,8 +10,6 @@ PORT.NAME=Port
 PROPERTIES.NAME=Additional JDBC Parameters
 USER.NAME=Username
 DB_VERSION.NAME=DB Version
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1 (Deprecated)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3
 USE_SHARED_CONNECTION.NAME=Use or register a shared DB Connection

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_fr.properties

@@ -10,8 +10,6 @@ PORT.NAME=Port
 PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
 USER.NAME=Utilisateur
 DB_VERSION.NAME=Version de la base de donn\u00E9es
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u00E0 V5R4 (d\u00E9pr\u00E9ci\u00E9e)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u00E0 V6R1 (D\u00E9pr\u00E9ci\u00E9)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u00E0 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u00E0 V7R3
 USE_SHARED_CONNECTION.NAME=Utiliser ou enregistrer une connexion partag\u00E9e \u00E0 une base de donn\u00E9es

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_ja.properties

@@ -10,8 +10,6 @@ PORT.NAME=\u30DD\u30FC\u30C8
 PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.V5R2_V5R4=V5R2\u304B\u3089V5R4 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3\u304B\u3089V6R1 (\u975E\u63A8\u5968)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
 USE_SHARED_CONNECTION.NAME=\u5171\u6709DB\u63A5\u7D9A\u306E\u4F7F\u7528\u307E\u305F\u306F\u767B\u9332

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_zh_CN.properties

@@ -10,8 +10,6 @@ PORT.NAME=\u7AEF\u53E3
 PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
 USER.NAME=\u7528\u6237\u540D
 DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u5230 V5R4 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u5230 V6R1 (\u5DF2\u5F03\u7528)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u81F3 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u5230 V7R3
 USE_SHARED_CONNECTION.NAME=\u4F7F\u7528\u6216\u6CE8\u518C\u5171\u4EAB\u6570\u636E\u5E93\u8FDE\u63A5

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_java.xml

@@ -64,8 +64,6 @@
     <PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="3"
 			REPOSITORY_VALUE="DB_VERSION" SHOW_IF="(USE_EXISTING_CONNECTION == 'false')">
 			<ITEMS DEFAULT="V7R1_V7R3">
-				<ITEM NAME="V5R2_V5R4" VALUE="jt400_V5R2.jar"/>
-				<ITEM NAME="V5R3_V6R1" VALUE="jt400_V5R3.jar" />
                 <ITEM NAME="V6R1_V7R2" VALUE="jt400_V6R1.jar" />
                 <ITEM NAME="V7R1_V7R3" VALUE="jt400-9.8.jar" />
 			</ITEMS>
@@ -199,12 +197,27 @@
 			<ITEM NAME="TRIM" FIELD="CHECK"></ITEM>
 		</ITEMS>
 	</PARAMETER>
+	
+	<PARAMETER
+      NAME="SET_QUERY_TIMEOUT"
+      FIELD="CHECK"
+      NUM_ROW="50"
+      >
+      <DEFAULT>false</DEFAULT>
+    </PARAMETER>
+
+    <PARAMETER
+      NAME="QUERY_TIMEOUT_IN_SECONDS"
+      FIELD="TEXT"
+      NUM_ROW="50"
+      SHOW_IF="SET_QUERY_TIMEOUT == 'true'"
+      >
+      <DEFAULT>30</DEFAULT>
+    </PARAMETER>
    </ADVANCED_PARAMETERS>
 
    <CODEGENERATION>
      <IMPORTS>
-       <IMPORT NAME="Driver-V5R2_V5R4" MODULE="jt400_V5R2.jar" MVN="mvn:org.talend.libraries/jt400_V5R2/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R2.jar')" />
-       <IMPORT NAME="Driver-V5R3_V6R1" MODULE="jt400_V5R3.jar" MVN="mvn:org.talend.libraries/jt400_V5R3/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R3.jar')" />
        <IMPORT NAME="Driver-V6R1_V7R2" MODULE="jt400_V6R1.jar" MVN="mvn:org.talend.libraries/jt400_V6R1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V6R1.jar')" />
        <IMPORT NAME="Driver-V7R1_V7R3" MODULE="jt400-9.8.jar" MVN="mvn:net.sf.jt400/jt400/9.8"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400-9.8.jar')" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages.properties

@@ -14,15 +14,15 @@ TRIM_COLUMN.NAME=Trim column
 TRIM_COLUMN.ITEM.TRIM=Trim
 TABLE.NAME=Table Name
 DB_VERSION.NAME=DB Version
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1 (Deprecated)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3
 MAPPING.NAME=Mapping
+SET_QUERY_TIMEOUT.NAME=Set Query Timeout
+QUERY_TIMEOUT_IN_SECONDS.NAME=Timeout (seconds)
 NB_LINE.NAME=Number of line
 GUESS_SCHEMA.NAME=Guess Schema
 CONNECTION.NAME=Component List
 PROPERTY.NAME=Property Type
 TYPE.NAME=Database Driver
 SCHEMA.NAME=Schema
-ENCODING.NAME=Encoding
+ENCODING.NAME=Encoding

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_fr.properties

@@ -14,8 +14,6 @@ TRIM_COLUMN.NAME=Colonnes \u00E0 rogner
 TRIM_COLUMN.ITEM.TRIM=Supprimer les espaces en d\u00E9but et en fin de champ
 TABLE.NAME=Nom de la table
 DB_VERSION.NAME=Version de la base de donn\u00E9es
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u00E0 V5R4 (d\u00E9pr\u00E9ci\u00E9e)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u00E0 V6R1 (D\u00E9pr\u00E9ci\u00E9)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u00E0 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u00E0 V7R3
 MAPPING.NAME=Mapping

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_ja.properties

@@ -14,11 +14,11 @@ TRIM_COLUMN.NAME=\u30AB\u30E9\u30E0\u306E\u30C8\u30EA\u30E0
 TRIM_COLUMN.ITEM.TRIM=\u30C8\u30EA\u30E0
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.V5R2_V5R4=V5R2\u304B\u3089V5R4 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3\u304B\u3089V6R1 (\u975E\u63A8\u5968)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
 MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
+SET_QUERY_TIMEOUT.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3092\u8A2D\u5B9A
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\uFF08\u79D2\uFF09
 NB_LINE.NAME=\u884C\u6570
 GUESS_SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u63A8\u6E2C
 CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_zh_CN.properties

@@ -14,11 +14,11 @@ TRIM_COLUMN.NAME=\u526A\u88C1\u5217
 TRIM_COLUMN.ITEM.TRIM=\u526A\u88C1
 TABLE.NAME=\u8868\u540D\u79F0
 DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u5230 V5R4 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u5230 V6R1 (\u5DF2\u5F03\u7528)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u81F3 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u5230 V7R3
 MAPPING.NAME=\u6620\u5C04
+SET_QUERY_TIMEOUT.NAME=\u8BBE\u7F6E\u67E5\u8BE2\u8D85\u65F6
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u8D85\u65F6 (\u79D2)
 NB_LINE.NAME=\u884C\u6570
 GUESS_SCHEMA.NAME=\u63A8\u6D4B Schema
 CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_begin.javajet

@@ -49,10 +49,14 @@ skeleton="../templates/db_output_bulk.skeleton"
 	String commitEvery = ElementParameterParser.getValue(node, "__COMMIT_EVERY__");
 
 	boolean isEnableDebug = ("true").equals(ElementParameterParser.getValue(node,"__ENABLE_DEBUG_MODE__"));
-
+	
 	boolean useBatchSize = "true".equals(ElementParameterParser.getValue(node,"__USE_BATCH_SIZE__"));
 	String batchSize=ElementParameterParser.getValue(node,"__BATCH_SIZE__");
 
+	boolean setQueryTimeOut = "true".equals(ElementParameterParser.getValue(node,"__SET_QUERY_TIMEOUT__"));
+	
+	String queryTimeOutInSeconds = ElementParameterParser.getValue(node,"__QUERY_TIMEOUT_IN_SECONDS__");
+	
 	String rejectConnName = null;
 	List<? extends IConnection> rejectConns = node.getOutgoingConnections("REJECT");
 	if(rejectConns != null && rejectConns.size() > 0) {
@@ -174,43 +178,47 @@ if(columnList != null && columnList.size() > 0) {
     StringBuilder updateSetStmt = actionSQLMap.get(UPDATE_SET_STMT);
     StringBuilder updateWhereStmt = actionSQLMap.get(UPDATE_WHERE_STMT);
     StringBuilder deleteWhereStmt = actionSQLMap.get(DELETE_WHERE_STMT);
-
+    %>
+    java.sql.PreparedStatement pstmt_<%=cid %> = null;
+    java.sql.PreparedStatement pstmtInsert_<%=cid %> = null;
+    java.sql.PreparedStatement pstmtUpdate_<%=cid %> = null;
+    <%
 	if(("INSERT").equals(dataAction)) {
 	    %>
 	    String insert_<%=cid%> = "INSERT INTO " + <%=table%> + " (<%=insertColName.toString()%>) VALUES (<%=insertValueStmt.toString()%>)";
-	    java.sql.PreparedStatement pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>, java.sql.Statement.RETURN_GENERATED_KEYS);
+	    pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>, java.sql.Statement.RETURN_GENERATED_KEYS);
 		resourceMap.put("pstmt_<%=cid %>", pstmt_<%=cid %>);
 	    <%
 	} else if (("UPDATE").equals(dataAction)) {
 	    %>
 	    String update_<%=cid%> = "UPDATE " + <%=table%> + " SET <%=updateSetStmt.toString()%> WHERE <%=updateWhereStmt.toString()%>";
-	    java.sql.PreparedStatement pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
+	    pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
 		resourceMap.put("pstmt_<%=cid %>", pstmt_<%=cid %>);
 	    <%
 	} else if (("INSERT_OR_UPDATE").equals(dataAction)) {
 	    %>
-	    java.sql.PreparedStatement pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement("SELECT COUNT(1) FROM " + <%=table%> + " WHERE <%=updateWhereStmt.toString()%>");
+	    pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement("SELECT COUNT(1) FROM " + <%=table%> + " WHERE <%=updateWhereStmt.toString()%>");
 		resourceMap.put("pstmt_<%=cid %>", pstmt_<%=cid %>);
 	    String insert_<%=cid%> = "INSERT INTO " + <%=table%> + " (<%=insertColName.toString()%>) VALUES (<%=insertValueStmt.toString()%>)";
-	    java.sql.PreparedStatement pstmtInsert_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>);
+	    pstmtInsert_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>);
 		resourceMap.put("pstmtInsert_<%=cid %>", pstmtInsert_<%=cid %>);
 	    String update_<%=cid%> = "UPDATE " + <%=table%> + " SET <%=updateSetStmt.toString()%> WHERE <%=updateWhereStmt.toString()%>";
-	    java.sql.PreparedStatement pstmtUpdate_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
+	    pstmtUpdate_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
 		resourceMap.put("pstmtUpdate_<%=cid %>", pstmtUpdate_<%=cid %>);
 	    <%
 	} else if (("UPDATE_OR_INSERT").equals(dataAction)) {
 	    %>
 	    String update_<%=cid%> = "UPDATE " + <%=table%> + " SET <%=updateSetStmt.toString()%> WHERE <%=updateWhereStmt.toString()%>";
-	    java.sql.PreparedStatement pstmtUpdate_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
+	    pstmtUpdate_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
 		resourceMap.put("pstmtUpdate_<%=cid %>", pstmtUpdate_<%=cid %>);
 	    String insert_<%=cid%> = "INSERT INTO " + <%=table%> + " (<%=insertColName.toString()%>) VALUES (<%=insertValueStmt.toString()%>)";
-	    java.sql.PreparedStatement pstmtInsert_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>);
+	    pstmtInsert_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>);
 		resourceMap.put("pstmtInsert_<%=cid %>", pstmtInsert_<%=cid %>);
 	    <%
 	} else if (("DELETE").equals(dataAction)) {
 	    %>
 	    String delete_<%=cid%> = "DELETE FROM " + <%=table%> + " WHERE <%=deleteWhereStmt.toString()%>";
-	    java.sql.PreparedStatement pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(delete_<%=cid%>);
+	    pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(delete_<%=cid%>);
 		resourceMap.put("pstmt_<%=cid %>", pstmt_<%=cid %>);
 	    <%
 	}
@@ -220,6 +228,20 @@ if(columnList != null && columnList.size() > 0) {
        	<%@ include file="../templates/DB/Output/splitSQLForAllDBInBegin.javajet" %>
         <%
     }
+    if(setQueryTimeOut) {
+    	if(("INSERT").equals(dataAction) || ("UPDATE").equals(dataAction) 
+			|| ("DELETE").equals(dataAction) || ("INSERT_OR_UPDATE").equals(dataAction)) {
+%>
+			pstmt_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+<%
+    	}
+    	if(("UPDATE_OR_INSERT").equals(dataAction) || ("INSERT_OR_UPDATE").equals(dataAction)) {
+%>
+			pstmtUpdate_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+			pstmtInsert_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+<%
+    	}
+	}
 }
 } // end isDynamic
 if(isDynamic) {

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_java.xml

@@ -51,8 +51,6 @@
     <PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="2"
 			REPOSITORY_VALUE="DB_VERSION" SHOW_IF="(USE_EXISTING_CONNECTION == 'false')">
 			<ITEMS DEFAULT="V7R1_V7R3">
-				<ITEM NAME="V5R2_V5R4" VALUE="jt400_V5R2.jar"/>
-				<ITEM NAME="V5R3_V6R1" VALUE="jt400_V5R3.jar" />
                 <ITEM NAME="V6R1_V7R2" VALUE="jt400_V6R1.jar" />
                 <ITEM NAME="V7R1_V7R3" VALUE="jt400-9.8.jar" />
 			</ITEMS>
@@ -322,13 +320,28 @@
 		NUM_ROW="20">
 		  <DEFAULT>false</DEFAULT>
 	</PARAMETER>
+	
+	<PARAMETER
+      NAME="SET_QUERY_TIMEOUT"
+      FIELD="CHECK"
+      NUM_ROW="30"
+      >
+      <DEFAULT>false</DEFAULT>
+    </PARAMETER>
+
+    <PARAMETER
+      NAME="QUERY_TIMEOUT_IN_SECONDS"
+      FIELD="TEXT"
+      NUM_ROW="30"
+      SHOW_IF="SET_QUERY_TIMEOUT == 'true'"
+      >
+      <DEFAULT>30</DEFAULT>
+    </PARAMETER>
 
   </ADVANCED_PARAMETERS>
 
    <CODEGENERATION>
      <IMPORTS>
-       <IMPORT NAME="Driver-V5R2_V5R4" MODULE="jt400_V5R2.jar" MVN="mvn:org.talend.libraries/jt400_V5R2/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R2.jar')" />
-       <IMPORT NAME="Driver-V5R3_V6R1" MODULE="jt400_V5R3.jar" MVN="mvn:org.talend.libraries/jt400_V5R3/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R3.jar')" />
        <IMPORT NAME="Driver-V6R1_V7R2" MODULE="jt400_V6R1.jar" MVN="mvn:org.talend.libraries/jt400_V6R1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V6R1.jar')" />
        <IMPORT NAME="Driver-V7R1_V7R3" MODULE="jt400-9.8.jar" MVN="mvn:net.sf.jt400/jt400/9.8"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400-9.8.jar')" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_main.javajet

@@ -41,10 +41,13 @@ skeleton="../templates/db_output_bulk.skeleton"
     String batchSize =ElementParameterParser.getValue(node, "__BATCH_SIZE__");
     boolean useExistingConnection = "true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"));
     boolean isEnableDebug = ("true").equals(ElementParameterParser.getValue(node,"__ENABLE_DEBUG_MODE__"));
-
 	//feature:2880
     getManager(dbmsId, cid, node);
     boolean whereSupportNull = ElementParameterParser.getValue(node, "__SUPPORT_NULL_WHERE__").equals("true");
+    
+    boolean setQueryTimeOut = "true".equals(ElementParameterParser.getValue(node,"__SET_QUERY_TIMEOUT__"));
+    
+    String queryTimeOutInSeconds = ElementParameterParser.getValue(node,"__QUERY_TIMEOUT_IN_SECONDS__");
 
 	String incomingConnName = null;
 	List<IMetadataColumn> columnList = getColumnList(node);
@@ -227,6 +230,20 @@ skeleton="../templates/db_output_bulk.skeleton"
        	<%@ include file="../templates/DB/Output/splitSQLForAllDBInDynamicMain.javajet" %>
         <%
     }
+    if(setQueryTimeOut) {
+    	if(("INSERT").equals(dataAction) || ("UPDATE").equals(dataAction) 
+			|| ("DELETE").equals(dataAction) || ("INSERT_OR_UPDATE").equals(dataAction)) {
+%>
+			pstmt_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+<%
+    	}
+    	if(("UPDATE_OR_INSERT").equals(dataAction) || ("INSERT_OR_UPDATE").equals(dataAction)) {
+%>
+			pstmtUpdate_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+			pstmtInsert_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+<%
+    	}
+	}
 }
 %>
 	}

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages.properties

@@ -58,8 +58,6 @@ USE_EXISTING_CONNECTION.NAME=Using an existing connection
 USE_FIELD_OPTIONS.NAME=Use field options
 ENABLE_DEBUG_MODE.NAME=Debug query mode
 DB_VERSION.NAME=DB Version
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1 (Deprecated)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3
 NB_LINE_UPDATED.NAME=NB Line Updated
@@ -73,3 +71,5 @@ CONNECTION.NAME=Component List
 USE_BATCH_SIZE.NAME=Use Batch Size
 BATCH_SIZE.NAME=Batch Size
 NB_LINE_REJECTED.NAME=NB Line Rejected
+SET_QUERY_TIMEOUT.NAME=Set Query Timeout
+QUERY_TIMEOUT_IN_SECONDS.NAME=Timeout (seconds)

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_fr.properties

@@ -40,7 +40,7 @@ PASS.NAME=Mot de passe
 PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
 QUERY.NAME=Requ\u00EAte
 REJECT.LINK=Rejects
-REJECT.MENU=Reject
+REJECT.MENU=Rejects
 SCHEMA_FLOW.NAME=Sch\u00E9ma
 SCHEMA_REJECT.NAME=Rejeter le sch\u00E9ma
 STANDARD_SYNTAX.NAME=G\u00E9n\u00E9ration de syntaxe standard sql
@@ -58,8 +58,6 @@ USE_EXISTING_CONNECTION.NAME=Utiliser une connexion existante
 USE_FIELD_OPTIONS.NAME=Utiliser les options de champ
 ENABLE_DEBUG_MODE.NAME=Mode de d\u00E9bogage de requ\u00EAte
 DB_VERSION.NAME=Version de la base de donn\u00E9es
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u00E0 V5R4 (d\u00E9pr\u00E9ci\u00E9e)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u00E0 V6R1 (D\u00E9pr\u00E9ci\u00E9)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u00E0 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u00E0 V7R3
 NB_LINE_UPDATED.NAME=Nombre de lignes mises \u00E0 jour

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_ja.properties

@@ -58,8 +58,6 @@ USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
 USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528
 ENABLE_DEBUG_MODE.NAME=\u30C7\u30D0\u30C3\u30B0\u30AF\u30A8\u30EA\u30FC\u30E2\u30FC\u30C9
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.V5R2_V5R4=V5R2\u304B\u3089V5R4 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3\u304B\u3089V6R1 (\u975E\u63A8\u5968)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
 NB_LINE_UPDATED.NAME=NB\u884C\u66F4\u65B0\u6E08\u307F
@@ -73,3 +71,5 @@ CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
 USE_BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30B5\u30A4\u30BA\u3092\u4F7F\u7528
 BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30B5\u30A4\u30BA
 NB_LINE_REJECTED.NAME=\u30EA\u30B8\u30A7\u30AF\u30C8\u884C\u6570
+SET_QUERY_TIMEOUT.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3092\u8A2D\u5B9A
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\uFF08\u79D2\uFF09

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_zh_CN.properties

@@ -58,8 +58,6 @@ USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u73B0\u6709\u8FDE\u63A5
 USE_FIELD_OPTIONS.NAME=\u4F7F\u7528\u5B57\u6BB5\u9009\u9879
 ENABLE_DEBUG_MODE.NAME=\u8C03\u8BD5\u67E5\u8BE2\u6A21\u5F0F
 DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u5230 V5R4 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u5230 V6R1 (\u5DF2\u5F03\u7528)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u81F3 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u5230 V7R3
 NB_LINE_UPDATED.NAME=\u66F4\u65B0\u7684\u884C\u6570
@@ -73,3 +71,5 @@ CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
 USE_BATCH_SIZE.NAME=\u4F7F\u7528\u6279\u5904\u7406\u5927\u5C0F
 BATCH_SIZE.NAME=\u6279\u5904\u7406\u5927\u5C0F
 NB_LINE_REJECTED.NAME=\u62D2\u7EDD\u7684\u884C\u6570
+SET_QUERY_TIMEOUT.NAME=\u8BBE\u7F6E\u67E5\u8BE2\u8D85\u65F6
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u8D85\u65F6 (\u79D2)

main/plugins/org.talend.designer.components.localprovider/components/tAS400Row/tAS400Row_java.xml

@@ -67,8 +67,6 @@
     <PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="3"
 			REPOSITORY_VALUE="DB_VERSION" SHOW_IF="(USE_EXISTING_CONNECTION == 'false')">
 			<ITEMS DEFAULT="V7R1_V7R3">
-				<ITEM NAME="V5R2_V5R4" VALUE="jt400_V5R2.jar"/>
-				<ITEM NAME="V5R3_V6R1" VALUE="jt400_V5R3.jar"/>
                 <ITEM NAME="V6R1_V7R2" VALUE="jt400_V6R1.jar"/>
                 <ITEM NAME="V7R1_V7R3" VALUE="jt400-9.8.jar" />
 			</ITEMS>
@@ -251,12 +249,27 @@
 		REQUIRED="true" SHOW_IF="USE_EXISTING_CONNECTION == 'false'">
 		<DEFAULT>10000</DEFAULT>
 	</PARAMETER>
+	
+	<PARAMETER
+      NAME="SET_QUERY_TIMEOUT"
+      FIELD="CHECK"
+      NUM_ROW="10"
+      >
+      <DEFAULT>false</DEFAULT>
+    </PARAMETER>
+
+    <PARAMETER
+      NAME="QUERY_TIMEOUT_IN_SECONDS"
+      FIELD="TEXT"
+      NUM_ROW="10"
+      SHOW_IF="SET_QUERY_TIMEOUT == 'true'"
+      >
+      <DEFAULT>30</DEFAULT>
+    </PARAMETER>
   </ADVANCED_PARAMETERS>
 
    <CODEGENERATION>
      <IMPORTS>
-       <IMPORT NAME="Driver-V5R2_V5R4" MODULE="jt400_V5R2.jar" MVN="mvn:org.talend.libraries/jt400_V5R2/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R2.jar')" />
-       <IMPORT NAME="Driver-V5R3_V6R1" MODULE="jt400_V5R3.jar" MVN="mvn:org.talend.libraries/jt400_V5R3/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R3.jar')" />
        <IMPORT NAME="Driver-V6R1_V7R2" MODULE="jt400_V6R1.jar" MVN="mvn:org.talend.libraries/jt400_V6R1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V6R1.jar')" />
        <IMPORT NAME="Driver-V7R1_V7R3" MODULE="jt400-9.8.jar" MVN="mvn:net.sf.jt400/jt400/9.8"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400-9.8.jar')" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tAS400Row/tAS400Row_messages.properties

@@ -1,52 +1,53 @@
-COMMIT_EVERY.NAME=Commit every
-DBD-DB2.INFO=Required
-DBNAME.NAME=Database
-DIE_ON_ERROR.NAME=Die on error
-ENCODING.NAME=Encoding
-HELP=org.talend.help.tAS400Row
-HOST.NAME=Host
-LONG_NAME=Executes an SQL query at each of Talend flow's iterations
-NB_LINE.NAME=Number of line
-PASS.NAME=Password
-PROPERTIES.NAME=Additional JDBC Parameters
-QUERY.NAME=Query
-REJECT.LINK=Rejects
-REJECT.MENU=Rejects
-SCHEMA_DB.NAME=Schema
-USER.NAME=Username
-USE_EXISTING_CONNECTION.NAME=Using an existing connection
-PROPAGATE_RECORD_SET.NAME=Propagate QUERY's recordset
-RECORD_SET_COLUMN.NAME=use column
-TABLE.NAME=Table Name
-DB_VERSION.NAME=DB Version
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1 (Deprecated)
-DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
-DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3
-TYPE.NAME=Database Driver
-PROPERTY.NAME=Property Type
-CONNECTION.NAME=Component List
-SCHEMA_FLOW.NAME=Schema
-SCHEMA_REJECT.NAME=Reject Schema
-QUERYSTORE.NAME=Query Type
-USE_PREPAREDSTATEMENT.NAME=Use PreparedStatement
-SET_PREPAREDSTATEMENT_PARAMETERS.NAME=Set PreparedStatement Parameters
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=Parameter Index
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=Parameter Type
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Boolean
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Byte
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=Date
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Float=Float
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Int=Int
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Long=Long
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Object=Object
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Short=Short
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=String
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=Time
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=Parameter Value
+COMMIT_EVERY.NAME=Commit every
+DBD-DB2.INFO=Required
+DBNAME.NAME=Database
+DIE_ON_ERROR.NAME=Die on error
+ENCODING.NAME=Encoding
+HELP=org.talend.help.tAS400Row
+HOST.NAME=Host
+LONG_NAME=Executes an SQL query at each of Talend flow's iterations
+NB_LINE.NAME=Number of line
+PASS.NAME=Password
+PROPERTIES.NAME=Additional JDBC Parameters
+QUERY.NAME=Query
+REJECT.LINK=Rejects
+REJECT.MENU=Rejects
+SCHEMA_DB.NAME=Schema
+USER.NAME=Username
+USE_EXISTING_CONNECTION.NAME=Using an existing connection
+PROPAGATE_RECORD_SET.NAME=Propagate QUERY's recordset
+RECORD_SET_COLUMN.NAME=use column
+TABLE.NAME=Table Name
+DB_VERSION.NAME=DB Version
+DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
+DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3
+TYPE.NAME=Database Driver
+PROPERTY.NAME=Property Type
+CONNECTION.NAME=Component List
+SCHEMA_FLOW.NAME=Schema
+SCHEMA_REJECT.NAME=Reject Schema
+QUERYSTORE.NAME=Query Type
+USE_PREPAREDSTATEMENT.NAME=Use PreparedStatement
+SET_PREPAREDSTATEMENT_PARAMETERS.NAME=Set PreparedStatement Parameters
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=Parameter Index
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=Parameter Type
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Boolean
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Byte
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=Date
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Float=Float
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Int=Int
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Long=Long
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Object=Object
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Short=Short
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=String
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=Time
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=Parameter Value
+
+SET_QUERY_TIMEOUT.NAME=Set Query Timeout
+QUERY_TIMEOUT_IN_SECONDS.NAME=Timeout (seconds)

main/plugins/org.talend.designer.components.localprovider/components/tAS400Row/tAS400Row_messages_fr.properties

@@ -11,7 +11,7 @@ PASS.NAME=Mot de passe
 PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
 QUERY.NAME=Requ\u00EAte
 REJECT.LINK=Rejects
-REJECT.MENU=Reject
+REJECT.MENU=Rejects
 SCHEMA_DB.NAME=Sch\u00E9ma
 USER.NAME=Utilisateur
 USE_EXISTING_CONNECTION.NAME=Utiliser une connexion existante
@@ -19,8 +19,6 @@ PROPAGATE_RECORD_SET.NAME=Ins\u00E9rer les r\u00E9sultats de la requ\u00EAte dan
 RECORD_SET_COLUMN.NAME=Utiliser colonne
 TABLE.NAME=Nom de la table
 DB_VERSION.NAME=Version de la base de donn\u00E9es
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u00E0 V5R4 (d\u00E9pr\u00E9ci\u00E9e)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u00E0 V6R1 (D\u00E9pr\u00E9ci\u00E9)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u00E0 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u00E0 V7R3
 TYPE.NAME=Pilote de la base de donn\u00E9es

main/plugins/org.talend.designer.components.localprovider/components/tAS400Row/tAS400Row_messages_ja.properties

@@ -1,52 +1,53 @@
-COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
-DBD-DB2.INFO=\u5FC5\u9808
-DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
-DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u4E86
-ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
-HELP=org.talend.help.tAS400Row
-HOST.NAME=\u30DB\u30B9\u30C8
-LONG_NAME=\u5404Talend\u30D5\u30ED\u30FC\u306E\u53CD\u5FA9\u3067SQL\u30AF\u30A8\u30EA\u30FC\u3092\u5B9F\u884C\u3057\u307E\u3059
-NB_LINE.NAME=\u884C\u6570
-PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
-PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
-QUERY.NAME=\u30AF\u30A8\u30EA\u30FC
-REJECT.LINK=\u30EA\u30B8\u30A7\u30AF\u30C8
-REJECT.MENU=\u30EA\u30B8\u30A7\u30AF\u30C8
-SCHEMA_DB.NAME=\u30B9\u30AD\u30FC\u30DE
-USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
-USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
-PROPAGATE_RECORD_SET.NAME=QUERY\u306E\u30EC\u30B3\u30FC\u30C9\u30BB\u30C3\u30C8\u3092\u4F1D\u64AD
-RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u306E\u4F7F\u7528
-TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
-DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.V5R2_V5R4=V5R2\u304B\u3089V5R4 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3\u304B\u3089V6R1 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
-DB_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
-TYPE.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C9\u30E9\u30A4\u30D0\u30FC
-PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
-CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
-SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
-SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
-QUERYSTORE.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30D7
-USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u3046
-SET_PREPAREDSTATEMENT_PARAMETERS.NAME=PreparedStatement\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u8A2D\u5B9A
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30BF\u30A4\u30D7
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=\u30D6\u30FC\u30EB\u5024
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=\u30D0\u30A4\u30C8
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=\u30D0\u30A4\u30C8
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=\u65E5\u4ED8
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=\u500D\u6570
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Float=Float
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Int=\u6574\u6570
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Long=Long
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Object=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Short=Short
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=\u6587\u5B57\u5217
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=\u6642\u9593
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u5024
+COMMIT_EVERY.NAME=\u30B3\u30DF\u30C3\u30C8\u3059\u308B\u9593\u9694
+DBD-DB2.INFO=\u5FC5\u9808
+DBNAME.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
+DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u4E86
+ENCODING.NAME=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
+HELP=org.talend.help.tAS400Row
+HOST.NAME=\u30DB\u30B9\u30C8
+LONG_NAME=\u5404Talend\u30D5\u30ED\u30FC\u306E\u53CD\u5FA9\u3067SQL\u30AF\u30A8\u30EA\u30FC\u3092\u5B9F\u884C\u3057\u307E\u3059
+NB_LINE.NAME=\u884C\u6570
+PASS.NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
+PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+QUERY.NAME=\u30AF\u30A8\u30EA\u30FC
+REJECT.LINK=\u30EA\u30B8\u30A7\u30AF\u30C8
+REJECT.MENU=\u30EA\u30B8\u30A7\u30AF\u30C8
+SCHEMA_DB.NAME=\u30B9\u30AD\u30FC\u30DE
+USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
+USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
+PROPAGATE_RECORD_SET.NAME=QUERY\u306E\u30EC\u30B3\u30FC\u30C9\u30BB\u30C3\u30C8\u3092\u4F1D\u64AD
+RECORD_SET_COLUMN.NAME=\u30AB\u30E9\u30E0\u306E\u4F7F\u7528
+TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
+DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
+DB_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
+DB_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
+TYPE.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C9\u30E9\u30A4\u30D0\u30FC
+PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
+CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
+SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
+SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
+QUERYSTORE.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30D7
+USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u3046
+SET_PREPAREDSTATEMENT_PARAMETERS.NAME=PreparedStatement\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u8A2D\u5B9A
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30BF\u30A4\u30D7
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=\u30D6\u30FC\u30EB\u5024
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=\u30D0\u30A4\u30C8
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=\u30D0\u30A4\u30C8
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=\u65E5\u4ED8
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=\u500D\u6570
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Float=Float
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Int=\u6574\u6570
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Long=Long
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Object=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Short=Short
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=\u6587\u5B57\u5217
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=\u6642\u9593
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u5024
+
+SET_QUERY_TIMEOUT.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3092\u8A2D\u5B9A
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\uFF08\u79D2\uFF09

main/plugins/org.talend.designer.components.localprovider/components/tAS400Row/tAS400Row_messages_zh_CN.properties

@@ -1,52 +1,53 @@
-COMMIT_EVERY.NAME=\u63D0\u4EA4\u95F4\u9694
-DBD-DB2.INFO=\u5FC5\u9700
-DBNAME.NAME=\u6570\u636E\u5E93
-DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
-ENCODING.NAME=\u7F16\u7801
-HELP=org.talend.help.tAS400Row
-HOST.NAME=\u4E3B\u673A
-LONG_NAME=\u5728\u6BCF\u4E2A Talend \u6D41\u8FED\u4EE3\u65F6\u6267\u884C SQL \u67E5\u8BE2
-NB_LINE.NAME=\u884C\u6570
-PASS.NAME=\u5BC6\u7801
-PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
-QUERY.NAME=\u67E5\u8BE2
-REJECT.LINK=\u62D2\u7EDD
-REJECT.MENU=\u62D2\u7EDD
-SCHEMA_DB.NAME=Schema
-USER.NAME=\u7528\u6237\u540D
-USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u73B0\u6709\u8FDE\u63A5
-PROPAGATE_RECORD_SET.NAME=\u4F20\u64AD QUERY \u7684\u8BB0\u5F55\u96C6
-RECORD_SET_COLUMN.NAME=\u4F7F\u7528\u5217
-TABLE.NAME=\u8868\u540D\u79F0
-DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u5230 V5R4 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u5230 V6R1 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u81F3 V7R2
-DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u5230 V7R3
-TYPE.NAME=\u6570\u636E\u5E93\u9A71\u52A8
-PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B
-CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
-SCHEMA_FLOW.NAME=Schema
-SCHEMA_REJECT.NAME=\u62D2\u7EDD Schema
-QUERYSTORE.NAME=\u67E5\u8BE2\u7C7B\u578B
-USE_PREPAREDSTATEMENT.NAME=\u4F7F\u7528 PreparedStatement
-SET_PREPAREDSTATEMENT_PARAMETERS.NAME=\u8BBE\u7F6E PreparedStatement \u53C2\u6570
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u53C2\u6570\u7D22\u5F15
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=\u53C2\u6570\u7C7B\u578B
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Boolean
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Byte
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=\u65E5\u671F
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Float=Float
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Int=Int
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Long=Long
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Object=\u5BF9\u8C61
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Short=Short
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=String
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=\u65F6\u95F4
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
-SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=\u53C2\u6570\u503C
+COMMIT_EVERY.NAME=\u63D0\u4EA4\u95F4\u9694
+DBD-DB2.INFO=\u5FC5\u9700
+DBNAME.NAME=\u6570\u636E\u5E93
+DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
+ENCODING.NAME=\u7F16\u7801
+HELP=org.talend.help.tAS400Row
+HOST.NAME=\u4E3B\u673A
+LONG_NAME=\u5728\u6BCF\u4E2A Talend \u6D41\u8FED\u4EE3\u65F6\u6267\u884C SQL \u67E5\u8BE2
+NB_LINE.NAME=\u884C\u6570
+PASS.NAME=\u5BC6\u7801
+PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
+QUERY.NAME=\u67E5\u8BE2
+REJECT.LINK=\u62D2\u7EDD
+REJECT.MENU=\u62D2\u7EDD
+SCHEMA_DB.NAME=Schema
+USER.NAME=\u7528\u6237\u540D
+USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u73B0\u6709\u8FDE\u63A5
+PROPAGATE_RECORD_SET.NAME=\u4F20\u64AD QUERY \u7684\u8BB0\u5F55\u96C6
+RECORD_SET_COLUMN.NAME=\u4F7F\u7528\u5217
+TABLE.NAME=\u8868\u540D\u79F0
+DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
+DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u81F3 V7R2
+DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u5230 V7R3
+TYPE.NAME=\u6570\u636E\u5E93\u9A71\u52A8
+PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B
+CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
+SCHEMA_FLOW.NAME=Schema
+SCHEMA_REJECT.NAME=\u62D2\u7EDD Schema
+QUERYSTORE.NAME=\u67E5\u8BE2\u7C7B\u578B
+USE_PREPAREDSTATEMENT.NAME=\u4F7F\u7528 PreparedStatement
+SET_PREPAREDSTATEMENT_PARAMETERS.NAME=\u8BBE\u7F6E PreparedStatement \u53C2\u6570
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u53C2\u6570\u7D22\u5F15
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE=\u53C2\u6570\u7C7B\u578B
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.BigDecimal=BigDecimal
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Blob=Blob
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Boolean=Boolean
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Byte=Byte
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Bytes=Bytes
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Clob=Clob
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Date=\u65E5\u671F
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Double=Double
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Float=Float
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Int=Int
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Long=Long
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Object=\u5BF9\u8C61
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Short=Short
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=String
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=\u65F6\u95F4
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=\u53C2\u6570\u503C
+
+SET_QUERY_TIMEOUT.NAME=\u8BBE\u7F6E\u67E5\u8BE2\u8D85\u65F6
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u8D85\u65F6 (\u79D2)

main/plugins/org.talend.designer.components.localprovider/components/tAccessConnection/tAccessConnection_java.xml

@@ -118,14 +118,14 @@
 		<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED="true"/>
 		
 		<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED="true"/>
-		<IMPORT NAME="bcprov-jdk15on-1.68" MODULE="bcprov-jdk15on-1.68.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.68" REQUIRED="true"/>
+		<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED="true"/>
 		<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED="true"/>
 		
 		<IMPORT NAME="common2.6" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6"   UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED="true"/>
 		<IMPORT NAME="common-logging1.1.3" MODULE="commons-logging-1.1.3.jar" MVN="mvn:commons-logging/commons-logging/1.1.3"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar" REQUIRED="true"/>
 		
-		<IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
-		<IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+		<IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+		<IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
 	</IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tAccessInput/tAccessInput_java.xml

@@ -121,7 +121,7 @@
 		<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
-		<IMPORT NAME="bcprov-jdk15on-1.68" MODULE="bcprov-jdk15on-1.68.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.68" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
+		<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="common2.6" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6"   UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>

main/plugins/org.talend.designer.components.localprovider/components/tAccessOutput/tAccessOutput_java.xml

@@ -207,7 +207,7 @@
 		<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
-		<IMPORT NAME="bcprov-jdk15on-1.68" MODULE="bcprov-jdk15on-1.68.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.68" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
+		<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="common2.6" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6"   UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>

main/plugins/org.talend.designer.components.localprovider/components/tAccessOutput/tAccessOutput_messages_fr.properties

@@ -23,7 +23,7 @@ LONG_NAME=Ins\u00E8re ou met \u00E0 jour des lignes dans une table Access
 PASS.NAME=Mot de passe
 QUERY.NAME=Requ\u00EAte
 REJECT.LINK=Rejects
-REJECT.MENU=Reject
+REJECT.MENU=Rejects
 SCHEMA_FLOW.NAME=Sch\u00E9ma
 SCHEMA_REJECT.NAME=Rejeter le sch\u00E9ma
 TABLE.NAME=Table

main/plugins/org.talend.designer.components.localprovider/components/tAccessRow/tAccessRow_java.xml

@@ -181,7 +181,7 @@
 		<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
-		<IMPORT NAME="bcprov-jdk15on-1.68" MODULE="bcprov-jdk15on-1.68.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.68" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
+		<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="common2.6" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6"   UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>

main/plugins/org.talend.designer.components.localprovider/components/tAccessRow/tAccessRow_messages_fr.properties

@@ -8,7 +8,7 @@ LONG_NAME=Ex\u00E9cute une requ\u00EAte SQL \u00E0 chaque it\u00E9ration de flux
 PASS.NAME=Mot de passe
 QUERY.NAME=Requ\u00EAte
 REJECT.LINK=Rejects
-REJECT.MENU=Reject
+REJECT.MENU=Rejects
 SCHEMA_DB.NAME=Sch\u00E9ma
 USER.NAME=Nom d'utilisateur
 PROPAGATE_RECORD_SET.NAME=Ins\u00E9rer les r\u00E9sultats de la requ\u00EAte dans une colonne du flux en cours

main/plugins/org.talend.designer.components.localprovider/components/tAdvancedHash/tAdvancedHash_java.xml

@@ -46,34 +46,12 @@
 
    <CODEGENERATION>
     <IMPORTS>
-      <IMPORT
-        NAME="Advanced_Persistent_Lookup"
-        MODULE="advancedPersistentLookupLib-1.2.jar" MVN="mvn:org.talend.libraries/advancedPersistentLookupLib-1.2/6.0.0" 
-        UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.2.jar" 
-        REQUIRED="true"
-      />
-      <IMPORT
-        NAME="ApacheCommonsCollection32"
-        MODULE="commons-collections-3.2.2.jar" MVN="mvn:commons-collections/commons-collections/3.2.2"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-3.2.2.jar"
-        REQUIRED="true"
-        BundleID=""
-      />
-      <IMPORT
-        NAME="Jboss"
-        MODULE="jboss-serialization.jar" MVN="mvn:org.talend.libraries/jboss-serialization/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jboss/lib/jboss-serialization.jar"
-        REQUIRED="true"
-      />
-      <IMPORT
-        NAME="Trove"
-        MODULE="trove.jar" MVN="mvn:org.talend.libraries/trove/6.0.0" 
-        REQUIRED="true"
-      />
-      <IMPORT
-        NAME="Log4j"
-        MODULE="log4j-1.2.17.jar" MVN="mvn:log4j/log4j/1.2.17"  UrlPath="platform:/plugin/org.talend.libraries.apache/lib/log4j-1.2.17.jar"
-        REQUIRED="true"
-        BundleID=""
-      />
+        <IMPORT NAME="Advanced_Persistent_Lookup" MODULE="advancedPersistentLookupLib-1.4.jar" MVN="mvn:org.talend.libraries/advancedPersistentLookupLib-1.4/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.4.jar" REQUIRED="true"/>
+        <IMPORT NAME="ApacheCommonsCollection32" MODULE="commons-collections-3.2.2.jar" MVN="mvn:commons-collections/commons-collections/3.2.2" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-3.2.2.jar" REQUIRED="true" BundleID=""/>
+        <IMPORT NAME="Jboss_Marshalling" MODULE="jboss-marshalling-2.0.12.Final.jar" MVN="mvn:org.jboss.marshalling/jboss-marshalling/2.0.12.Final" REQUIRED="true"/>
+        <IMPORT NAME="Jboss_River" MODULE="jboss-marshalling-river-2.0.12.Final.jar" MVN="mvn:org.jboss.marshalling/jboss-marshalling-river/2.0.12.Final" REQUIRED="true"/>
+        <IMPORT NAME="Trove" MODULE="trove.jar" MVN="mvn:org.talend.libraries/trove/6.0.0" REQUIRED="true"/>
+        <IMPORT NAME="Log4j" MODULE="log4j-1.2.17.jar" MVN="mvn:log4j/log4j/1.2.17" UrlPath="platform:/plugin/org.talend.libraries.apache/lib/log4j-1.2.17.jar" REQUIRED="true" BundleID=""/>
     </IMPORTS>
   </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tAdvancedXMLMapHash/tAdvancedXMLMapHash_java.xml

@@ -47,8 +47,8 @@
     <IMPORTS>
       <IMPORT
         NAME="Advanced_Persistent_Lookup"
-        MODULE="advancedPersistentLookupLib-1.2.jar" MVN="mvn:org.talend.libraries/advancedPersistentLookupLib-1.2/6.0.0" 
-        UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.2.jar" 
+        MODULE="advancedPersistentLookupLib-1.4.jar" MVN="mvn:org.talend.libraries/advancedPersistentLookupLib-1.4/6.0.0" 
+        UrlPath="platform:/plugin/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.4.jar" 
         REQUIRED="true"
       />
       <IMPORT
@@ -57,11 +57,6 @@
         REQUIRED="true"
         BundleID=""
       />
-      <IMPORT
-        NAME="Jboss"
-        MODULE="jboss-serialization.jar" MVN="mvn:org.talend.libraries/jboss-serialization/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jboss/lib/jboss-serialization.jar"
-        REQUIRED="true"
-      />
       <IMPORT
         NAME="Trove"
         MODULE="trove.jar" MVN="mvn:org.talend.libraries/trove/6.0.0" 

main/plugins/org.talend.designer.components.localprovider/components/tAmazonAuroraConnection/tAmazonAuroraConnection_java.xml

@@ -215,8 +215,8 @@
     </TEMPLATES>
      <IMPORTS>
        <IMPORT NAME="Driver-MysqlConnector" MODULE="mysql-connector-java-5.1.49.jar" MVN="mvn:mysql/mysql-connector-java/5.1.49" />
-       <IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
-       <IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
+       <IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
+       <IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
      </IMPORTS>
     </CODEGENERATION>
    <RETURNS/>

main/plugins/org.talend.designer.components.localprovider/components/tAmazonAuroraConnection/tAmazonAuroraConnection_messages_ja.properties

@@ -14,4 +14,4 @@ DATASOURCE.NAME=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
 AUTO_COMMIT.NAME=\u81EA\u52D5\u30B3\u30DF\u30C3\u30C8
 PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.MYSQL_5=MySQL5.6
+DB_VERSION.ITEM.MYSQL_5=Mysql 5.6

main/plugins/org.talend.designer.components.localprovider/components/tAmazonAuroraInput/tAmazonAuroraInput_messages_ja.properties

@@ -30,7 +30,7 @@ CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
 PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
 MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.MYSQL_5=MySQL5.6
+DB_VERSION.ITEM.MYSQL_5=Mysql 5.6
 SPECIFY_DATASOURCE_ALIAS.NAME=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u30A8\u30A4\u30EA\u30A2\u30B9\u3092\u6307\u5B9A
 DATASOURCE_ALIAS.NAME=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u30A8\u30A4\u30EA\u30A2\u30B9
 DATASOURCE.NAME=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9

main/plugins/org.talend.designer.components.localprovider/components/tAmazonAuroraOutput/tAmazonAuroraOutput_messages_fr.properties

@@ -43,7 +43,7 @@ PASS.NAME=Mot de passe
 PORT.NAME=Port
 QUERY.NAME=Requ\u00EAte
 REJECT.LINK=Rejects
-REJECT.MENU=Reject
+REJECT.MENU=Rejects
 SCHEMA_FLOW.NAME=Sch\u00E9ma
 SCHEMA_REJECT.NAME=Rejeter le sch\u00E9ma
 TABLE.NAME=Table

main/plugins/org.talend.designer.components.localprovider/components/tAmazonAuroraOutput/tAmazonAuroraOutput_messages_ja.properties

@@ -94,7 +94,7 @@ HINT_OPTIONS.ITEM.SQL_STMT.ITEM.INSERT=INSERT
 HINT_OPTIONS.ITEM.SQL_STMT.ITEM.UPDATE=UPDATE
 HINT_OPTIONS.ITEM.SQL_STMT.ITEM.DELETE=DELETE
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.MYSQL_5=MySQL5.6
+DB_VERSION.ITEM.MYSQL_5=Mysql 5.6
 SUPPORT_NULL_WHERE.NAME="SQL WHERE"\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u3067Null\u3092\u30B5\u30DD\u30FC\u30C8
 USE_BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30B5\u30A4\u30BA\u3092\u4F7F\u7528
 BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30B5\u30A4\u30BA

main/plugins/org.talend.designer.components.localprovider/components/tAmazonAuroraRow/tAmazonAuroraRow_messages_fr.properties

@@ -15,7 +15,7 @@ PORT.NAME=Port
 PREPARED_STATEMENT.NAME=Instruction pr\u00E9par\u00E9e
 QUERY.NAME=Requ\u00EAte
 REJECT.LINK=Rejects
-REJECT.MENU=Reject
+REJECT.MENU=Rejects
 SCHEMA_DB.NAME=Sch\u00E9ma
 STATEMENT_PARAMS.ITEM.INPUT_COLUMN=Colonne d'entr\u00E9e
 STATEMENT_PARAMS.NAME=Param\u00E8tres

main/plugins/org.talend.designer.components.localprovider/components/tAmazonAuroraRow/tAmazonAuroraRow_messages_ja.properties

@@ -35,7 +35,7 @@ SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 QUERYSTORE.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30D7
 
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.MYSQL_5=MySQL5
+DB_VERSION.ITEM.MYSQL_5=Mysql 5
 
 USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u3046
 SET_PREPAREDSTATEMENT_PARAMETERS.NAME=PreparedStatement\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u8A2D\u5B9A

main/plugins/org.talend.designer.components.localprovider/components/tAmazonAuroraRow/tAmazonAuroraRow_messages_zh_CN.properties

@@ -1,31 +1,42 @@
+#Created by JInto - www.guh-software.de
+#Thu Aug 30 19:54:54 CST 2007
 COMMIT_EVERY.NAME=\u63D0\u4EA4\u95F4\u9694
+DBD-mysql.INFO=\u4E3A MySQL \u6240\u5FC5\u9700
 DBNAME.NAME=\u6570\u636E\u5E93
 DBTABLE.NAME=\u8868\u540D\u79F0
 DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
 ENCODING.NAME=\u7F16\u7801
-HELP=org.talend.help.InterbaseRow
+HELP=org.talend.help.tAmazonAuroraRow
 HOST.NAME=\u4E3B\u673A
 LONG_NAME=\u5728\u6BCF\u4E2A Talend \u6D41\u8FED\u4EE3\u65F6\u6267\u884C SQL \u67E5\u8BE2
+NB_LINE.NAME=\u884C\u6570
 PASS.NAME=\u5BC6\u7801
+PORT.NAME=\u7AEF\u53E3
+PREPARED_STATEMENT.NAME=\u51C6\u5907\u8BED\u53E5
 QUERY.NAME=\u67E5\u8BE2
 REJECT.LINK=\u62D2\u7EDD
 REJECT.MENU=\u62D2\u7EDD
 SCHEMA_DB.NAME=Schema
-USER.NAME=\u7528\u6237\u540D
-PORT.NAME=\u7AEF\u53E3
-USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
-PREPARED_STATEMENT.NAME=\u51C6\u5907\u8BED\u53E5
 STATEMENT_PARAMS.ITEM.INPUT_COLUMN=\u8F93\u5165\u5217
 STATEMENT_PARAMS.NAME=\u53C2\u6570
+TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc \u9A71\u52A8)
+TYPE.ITEM.MYSQL=MySQL
+TYPE.NAME=\u6570\u636E\u5E93\u9A71\u52A8
+USER.NAME=\u7528\u6237\u540D
+USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
+PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
 PROPAGATE_RECORD_SET.NAME=\u4F20\u64AD QUERY \u7684\u8BB0\u5F55\u96C6
 RECORD_SET_COLUMN.NAME=\u4F7F\u7528\u5217
 TABLE.NAME=\u8868\u540D\u79F0
-TYPE.NAME=\u6570\u636E\u5E93\u9A71\u52A8
 PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B
 CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
 SCHEMA_FLOW.NAME=Schema
 SCHEMA_REJECT.NAME=\u62D2\u7EDD Schema
 QUERYSTORE.NAME=\u67E5\u8BE2\u7C7B\u578B
+
+DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
+DB_VERSION.ITEM.MYSQL_5=Mysql 5
+
 USE_PREPAREDSTATEMENT.NAME=\u4F7F\u7528 PreparedStatement
 SET_PREPAREDSTATEMENT_PARAMETERS.NAME=\u8BBE\u7F6E PreparedStatement \u53C2\u6570
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u53C2\u6570\u7D22\u5F15
@@ -47,4 +58,3 @@ SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=String
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=\u65F6\u95F4
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=\u53C2\u6570\u503C
-PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRListInstances/tAmazonEMRListInstances_messages_zh_CN.properties

@@ -20,7 +20,7 @@ REGION.ITEM.AP_SOUTHEAST_1=\u4E9A\u592A\u5730\u533A (\u65B0\u52A0\u5761)
 REGION.ITEM.AP_SOUTHEAST_2=\u4E9A\u592A\u5730\u533A (\u6089\u5C3C)
 REGION.ITEM.AP_NORTHEAST_1=\u4E9A\u592A\u5730\u533A (\u4E1C\u4EAC)
 REGION.ITEM.SA_EAST_1=\u5357\u7F8E\u6D32 (\u5723\u4FDD\u7F57)
-CLUSTER_ID.NAME=\u96C6\u7FA4 id
+CLUSTER_ID.NAME=\u96C6\u7FA4 ID
 ENABLE_LOG.NAME=\u542F\u7528\u65E5\u5FD7
 ENABLE_KEY_PAIR.NAME=\u4F7F\u7528 EC2 \u5BC6\u94A5\u5BF9
 INSTANCE_CONFIGURATION.NAME=\u5B9E\u4F8B\u914D\u7F6E

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRManage/tAmazonEMRManage_messages_zh_CN.properties

@@ -123,7 +123,7 @@ ADDITIONAL_MASTER_SECURITY_GROUPS.NAME=\u5176\u4ED6\u7684\u4E3B\u8981\u5B89\u516
 SLAVE_SECURITY_GROUP.NAME=\u4ECE\u52A8\u5B89\u5168\u7EC4
 ADDITIONAL_SLAVE_SECURITY_GROUPS.NAME=\u5176\u4ED6\u4ECE\u5C5E\u5B89\u5168\u7EC4
 SERVICE_ACCESS_SECURITY_GROUP.NAME=\u670D\u52A1\u8BBF\u95EE\u5B89\u5168\u7EC4
-CLUSTER_FINAL_ID.NAME=\u96C6\u7FA4 id
+CLUSTER_FINAL_ID.NAME=\u96C6\u7FA4 ID
 CLUSTER_FINAL_NAME.NAME=\u96C6\u7FA4\u540D\u79F0
 PREDICATES.NAME=\u8C13\u8BCD
 PREDICATES.ITEM.RUNNING=\u6240\u6709\u6B63\u5728\u8FD0\u884C\u7684\u96C6\u7FA4
@@ -146,7 +146,7 @@ STEP_TABLE.ITEM.ACTION_ON_FAILURE.ITEM.TERMINATE_CLUSTER=\u7EC8\u6B62\u96C6\u7FA
 STEP_TABLE.ITEM.ACTION_ON_FAILURE.ITEM.CANCEL_AND_WAIT=\u53D6\u6D88\u5E76\u7B49\u5F85
 KEEP_ALIVE.NAME=\u6B65\u9AA4\u5B8C\u6210\u540E\u4FDD\u6301\u6D3B\u52A8\u72B6\u6001
 WAIT_FOR_STEPS_COMPLETE.NAME=\u7B49\u5F85\u6B65\u9AA4\u5B8C\u6210
-SUBNET_ID.NAME=\u5B50\u7F51 id
+SUBNET_ID.NAME=\u5B50\u7F51 ID
 BOOTSTRAP_GROUP.NAME=Bootstrap
 BOOTSTRAP_ACTIONS.NAME=\u64CD\u4F5C
 BOOTSTRAP_ACTIONS.ITEM.NAME=\u540D\u79F0

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRResize/tAmazonEMRResize_messages_zh_CN.properties

@@ -20,7 +20,7 @@ REGION.ITEM.AP_SOUTHEAST_1=\u4E9A\u592A\u5730\u533A (\u65B0\u52A0\u5761)
 REGION.ITEM.AP_SOUTHEAST_2=\u4E9A\u592A\u5730\u533A (\u6089\u5C3C)
 REGION.ITEM.AP_NORTHEAST_1=\u4E9A\u592A\u5730\u533A (\u4E1C\u4EAC)
 REGION.ITEM.SA_EAST_1=\u5357\u7F8E\u6D32 (\u5723\u4FDD\u7F57)
-CLUSTER_ID.NAME=\u96C6\u7FA4 id
+CLUSTER_ID.NAME=\u96C6\u7FA4 ID
 GROUP_ID.NAME=\u7EC4 ID
 GROUP_NAME.NAME=\u7EC4\u540D\u79F0
 ENABLE_KEY_PAIR.NAME=\u4F7F\u7528 EC2 \u5BC6\u94A5\u5BF9
@@ -63,7 +63,7 @@ TASK_INSTANCE_TYPE.ITEM.cr1.8xlarge=cr1.8xlarge
 TASK_INSTANCE_TYPE.ITEM.hi1.4xlarge=hi1.4xlarge
 ADVANCED_CONFIGURATION.NAME=\u9AD8\u7EA7\u914D\u7F6E
 ADVANCED_INSTANCE_CONFIGURATION.NAME=\u9AD8\u7EA7\u5B9E\u4F8B\u914D\u7F6E
-TASK_GROUP_ID.NAME=\u4EFB\u52A1\u7EC4 id
+TASK_GROUP_ID.NAME=\u4EFB\u52A1\u7EC4 ID
 TASK_GROUP_NAME.NAME=\u4EFB\u52A1\u7EC4\u540D\u79F0
 NAME_OF_CLUSTER.NAME=\u96C6\u7FA4\u540D\u79F0
 ID_OF_CLUSTER.NAME=\u96C6\u7FA4 id

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlConnection/tAmazonMysqlConnection_java.xml

@@ -164,8 +164,8 @@
      <IMPORTS>
        <IMPORT NAME="Driver-MysqlConnector" MODULE="mysql-connector-java-5.1.49.jar" MVN="mvn:mysql/mysql-connector-java/5.1.49"  REQUIRED_IF="DB_VERSION == 'MYSQL_5'" />
        <IMPORT NAME="Driver-MysqlConnector_Old" MODULE="mysql-connector-java-5.1.0-bin.jar" MVN="mvn:org.talend.libraries/mysql-connector-java-5.1.0-bin/6.0.0"  REQUIRED="false" />
-       <IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
-       <IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+       <IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+       <IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
      </IMPORTS>
     </CODEGENERATION>
    <RETURNS/>

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlConnection/tAmazonMysqlConnection_messages_ja.properties

@@ -30,4 +30,4 @@ SHARED_CONNECTION_NAME.NAME=\u5171\u6709DB\u63A5\u7D9A\u540D
 AUTO_COMMIT.NAME=\u81EA\u52D5\u30B3\u30DF\u30C3\u30C8
 PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.MYSQL_5=MySQL5
+DB_VERSION.ITEM.MYSQL_5=Mysql 5

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlInput/tAmazonMysqlInput_messages_ja.properties

@@ -37,4 +37,4 @@ CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
 PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
 MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.MYSQL_5=MySQL5
+DB_VERSION.ITEM.MYSQL_5=Mysql 5

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlOutput/tAmazonMysqlOutput_messages_fr.properties

@@ -48,7 +48,7 @@ PASS.NAME=Mot de passe
 PORT.NAME=Port
 QUERY.NAME=Requ\u00EAte
 REJECT.LINK=Rejects
-REJECT.MENU=Reject
+REJECT.MENU=Rejects
 SCHEMA_FLOW.NAME=Sch\u00E9ma
 SCHEMA_REJECT.NAME=Rejeter le sch\u00E9ma
 SQL_SYNTAX.NAME=Syntaxe SQL

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlOutput/tAmazonMysqlOutput_messages_ja.properties

@@ -101,7 +101,7 @@ HINT_OPTIONS.ITEM.SQL_STMT.ITEM.INSERT=INSERT
 HINT_OPTIONS.ITEM.SQL_STMT.ITEM.UPDATE=UPDATE
 HINT_OPTIONS.ITEM.SQL_STMT.ITEM.DELETE=DELETE
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.MYSQL_5=MySQL5
+DB_VERSION.ITEM.MYSQL_5=Mysql 5
 SUPPORT_NULL_WHERE.NAME="SQL WHERE"\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u3067Null\u3092\u30B5\u30DD\u30FC\u30C8
 USE_BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30B5\u30A4\u30BA\u3092\u4F7F\u7528
 BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30B5\u30A4\u30BA

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlRow/tAmazonMysqlRow_messages_fr.properties

@@ -16,7 +16,7 @@ PORT.NAME=Port
 PREPARED_STATEMENT.NAME=Instruction pr\u00E9par\u00E9e
 QUERY.NAME=Requ\u00EAte
 REJECT.LINK=Rejects
-REJECT.MENU=Reject
+REJECT.MENU=Rejects
 SCHEMA_DB.NAME=Sch\u00E9ma
 STATEMENT_PARAMS.ITEM.INPUT_COLUMN=Colonne d'entr\u00E9e
 STATEMENT_PARAMS.NAME=Param\u00E8tres

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlRow/tAmazonMysqlRow_messages_ja.properties

@@ -38,7 +38,7 @@ SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
 SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 QUERYSTORE.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30D7
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.MYSQL_5=MySQL5
+DB_VERSION.ITEM.MYSQL_5=Mysql 5
 USE_PREPAREDSTATEMENT.NAME=PreparedStatement\u3092\u4F7F\u3046
 SET_PREPAREDSTATEMENT_PARAMETERS.NAME=PreparedStatement\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u8A2D\u5B9A
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_INDEX=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9

main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleConnection/tAmazonOracleConnection_java.xml

@@ -243,8 +243,8 @@
        <IMPORT NAME="ORACLE_18"     MODULE="ojdbc8-19.3.0.0.jar" MVN="mvn:com.oracle.ojdbc/ojdbc8/19.3.0.0" REQUIRED_IF="(DB_VERSION == 'ORACLE_18')" />
        <IMPORT NAME="Driver-Ojdbc7" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0"  REQUIRED_IF="(DB_VERSION == 'ORACLE_12')" />
        <IMPORT NAME="Driver-Ojdbc6" MODULE="ojdbc6.jar" MVN="mvn:org.talend.libraries/ojdbc6/6.0.0"  REQUIRED_IF="(DB_VERSION == 'ORACLE_11')" />
-       <IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
-       <IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+       <IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+       <IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
     </IMPORTS>
    </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleOutput/tAmazonOracleOutput_messages_fr.properties

@@ -42,7 +42,7 @@ PASS.NAME=Mot de passe
 PORT.NAME=Port
 QUERY.NAME=Requ\u00EAte
 REJECT.LINK=Rejects
-REJECT.MENU=Reject
+REJECT.MENU=Rejects
 SCHEMA_FLOW.NAME=Sch\u00E9ma
 SCHEMA_REJECT.NAME=Rejeter le sch\u00E9ma
 SQL_SYNTAX.NAME=Syntaxe SQL

main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleRow/tAmazonOracleRow_messages_fr.properties

@@ -21,7 +21,7 @@ PROPAGATE_RECORD_SET.NAME=Ins\u00E9rer les r\u00E9sultats de la requ\u00EAte dan
 QUERY.NAME=Requ\u00EAte
 RECORD_SET_COLUMN.NAME=Utiliser colonne
 REJECT.LINK=Rejects
-REJECT.MENU=Reject
+REJECT.MENU=Rejects
 SCHEMA_DB.NAME=Sch\u00E9ma
 STATEMENT_PARAMS.ITEM.INPUT_COLUMN=Colonne d'entr\u00E9e
 STATEMENT_PARAMS.NAME=Param\u00E8tres

main/plugins/org.talend.designer.components.localprovider/components/tAmazonRedshiftManage/tAmazonRedshiftManage_messages_zh_CN.properties

@@ -27,7 +27,7 @@ REGION.ITEM.AP_NORTHEAST_1=\u4E9A\u592A\u5730\u533A (\u4E1C\u4EAC)
 REGION.ITEM.SA_EAST_1=\u5357\u7F8E\u6D32 (\u5723\u4FDD\u7F57)
 CREATE_SNAPSHOT_WHEN_DELETE_CLUSTER.NAME=\u521B\u5EFA\u5FEB\u7167
 SNAPSHOT_ID.NAME=\u5FEB\u7167ID
-CLUSTER_ID.NAME=\u96C6\u7FA4 id
+CLUSTER_ID.NAME=\u96C6\u7FA4 ID
 DBNAME.NAME=\u6570\u636E\u5E93
 PORT.NAME=\u7AEF\u53E3
 USER.NAME=\u4E3B\u7528\u6237\u540D
@@ -42,7 +42,7 @@ NODE_TYPE.ITEM.ds1.8xlarge=ds1.8xlarge
 NODE_TYPE.ITEM.ra3.4xlarge=ra3.4xlarge
 NODE_TYPE.ITEM.ra3.16xlarge=ra3.16xlarge
 NODE_COUNT.NAME=\u8282\u70B9\u8BA1\u6570
-CLUSTER_FINAL_ID.NAME=\u96C6\u7FA4 id
+CLUSTER_FINAL_ID.NAME=\u96C6\u7FA4 ID
 ADVANCED_CONFIGURATION.NAME=\u9AD8\u7EA7\u914D\u7F6E
 WAIT_FOR_CLUSTER_READY.NAME=\u7B49\u5F85\u96C6\u7FA4\u51C6\u5907\u5C31\u7EEA
 PARAMETER_GROUP_NAME.NAME=\u53C2\u6570\u7EC4\u540D\u79F0

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseBulkExec/tAzureSynapseBulkExec_java.xml

@@ -381,11 +381,12 @@
 	<CODEGENERATION>
 		<IMPORTS>
 			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="DRIVER=='MSSQL_PROP'" />
-            <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="adal4j" MODULE="adal4j-1.6.7.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseBulkExec/tAzureSynapseBulkExec_messages_fr.properties

@@ -67,7 +67,7 @@ PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
 PROPERTY.NAME=Type de propri\u00E9t\u00E9
 QUERY.NAME=Requ\u00EAte
 REJECT.LINK=Rejects
-REJECT.MENU=Reject
+REJECT.MENU=Rejects
 REJECT_SAMPLE_VALUE.NAME=Rejeter la valeur de l'\u00E9chantillon
 REJECT_TYPE.ITEM.Percentage=Pourcentage
 REJECT_TYPE.ITEM.Value=Valeur

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseBulkExec/tAzureSynapseBulkExec_messages_zh_CN.properties

@@ -0,0 +1,141 @@
+ACCOUNT_NAME.NAME=\u5E10\u6237\u540D\u79F0
+AZURE_CONNECTION.NAME=Azure \u5B58\u50A8\u8FDE\u63A5
+AZURE_LOCATION.NAME=Azure \u5B58\u50A8\u4F4D\u7F6E
+AZURE_STORAGE.ITEM.ADLS=Data Lake Storage Gen1
+AZURE_STORAGE.ITEM.ADLS_GEN2=Data Lake Storage Gen2
+AZURE_STORAGE.ITEM.BLOB=Blob \u5B58\u50A8
+AZURE_STORAGE.NAME=Azure \u5B58\u50A8
+CLIENT_ID.NAME=\u5BA2\u6237\u7AEF ID
+COMPRESS.NAME=\u538B\u7F29\u7C7B\u578B
+COMPRESSION_ORC.ITEM.DEFAULT=\u9ED8\u8BA4
+COMPRESSION_ORC.ITEM.SNAPPY=Snappy
+COMPRESSION_ORC.NAME=
+COMPRESSION_PARQUET.ITEM.GZIP=GZip
+COMPRESSION_PARQUET.ITEM.SNAPPY=Snappy
+COMPRESSION_PARQUET.NAME=
+COMPRESSION_RC.ITEM.DEFAULT=\u9ED8\u8BA4
+COMPRESSION_RC.NAME=
+COMPRESSION_TEXT.ITEM.DEFAULT=\u9ED8\u8BA4
+COMPRESSION_TEXT.ITEM.GZIP=GZip
+COMPRESSION_TEXT.NAME=
+CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
+CONTAINER.NAME=\u5BB9\u5668
+DATE_FORMAT.ITEM.NONE=\u65E0
+DATE_FORMAT.ITEM.PATTERN=\u6A21\u5F0F
+DATE_FORMAT.NAME=\u65E5\u671F\u683C\u5F0F
+DATE_PATTERN.NAME=
+DBNAME.NAME=\u6570\u636E\u5E93
+DBTABLE.NAME=\u8868\u540D\u79F0
+DB_CONFIG.NAME=\u6570\u636E\u5E93\u8BBE\u7F6E
+DB_SCHEMA.NAME=Schema
+DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
+DISTRIBUTION.ITEM.HASH=\u54C8\u5E0C
+DISTRIBUTION.ITEM.REPLICATE=\u590D\u5236
+DISTRIBUTION.ITEM.ROUND_ROBIN=\u8F6E\u8F6C
+DISTRIBUTION.NAME=\u5206\u914D\u9009\u9879
+DISTRIBUTION_COLUMN_NAME.NAME=\u5206\u914D\u5217\u540D\u79F0
+DRIVER.NAME=JDBC \u63D0\u4F9B\u7A0B\u5E8F
+DRIVER.ITEM.MSSQL_PROP=Microsoft
+DW_TABLE_PROPERTIES.NAME=Synapse Analytics \u8868\u5C5E\u6027
+ENABLE_SSL.NAME=\u9700\u8981\u5B89\u5168\u4F20\u8F93
+ENDPOINT.NAME=OAuth 2.0 \u4EE4\u724C\u7AEF\u70B9
+EXT_TABLE_OPTIONS.NAME=\u6570\u636E\u5BFC\u5165\u62D2\u7EDD\u9009\u9879
+FIELDSEPARATOR.NAME=\u5B57\u6BB5\u5206\u9694\u7B26
+FILENAME.NAME=\u672C\u5730\u6587\u4EF6\u8DEF\u5F84
+HELP=org.talend.help.tAzureSynapseBulkExec
+HOST.NAME=\u4E3B\u673A
+IMPORT_TYPE.ITEM.DELIMITED_TEXT=\u5206\u9694\u6587\u672C
+IMPORT_TYPE.ITEM.HIVE_ORC=Hive ORC
+IMPORT_TYPE.ITEM.HIVE_RCFILE=Hive RCFile
+IMPORT_TYPE.ITEM.PARQUET=Parquet
+IMPORT_TYPE.NAME=\u6587\u4EF6\u683C\u5F0F
+INDEX_COLUMNS.NAME=\u7D22\u5F15\u5217
+LOAD_DETAILS.NAME=\u52A0\u8F7D\u53C2\u6570
+LONG_NAME=\u901A\u8FC7 PolyBase \u52A0\u8F7D\u6570\u636E\u5230 Azure Synapse Analytics
+MAPPING.NAME=\u6620\u5C04
+NB_LINE_INSERTED.NAME=\u63D2\u5165\u884C\u6570
+PARTITION.NAME=\u5206\u533A
+PARTITION_COLUMN_NAME.NAME=\u5206\u533A\u5217\u540D\u79F0
+PARTITION_COLUMN_NAME_RANGE.ITEM.LEFT=\u5DE6
+PARTITION_COLUMN_NAME_RANGE.ITEM.RIGHT=\u53F3
+PARTITION_COLUMN_NAME_RANGE.NAME=\u8303\u56F4
+PARTITION_VALUES.NAME=\u503C\u5206\u533A
+PASS.NAME=\u5BC6\u7801
+PORT.NAME=\u7AEF\u53E3
+PRINCIPAL_KEY.NAME=\u8EAB\u4EFD\u9A8C\u8BC1\u5BC6\u94A5
+PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
+PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B
+QUERY.NAME=\u67E5\u8BE2
+REJECT.LINK=\u62D2\u7EDD
+REJECT.MENU=\u62D2\u7EDD
+REJECT_SAMPLE_VALUE.NAME=\u62D2\u7EDD\u793A\u4F8B\u503C
+REJECT_TYPE.ITEM.Percentage=\u767E\u5206\u6BD4
+REJECT_TYPE.ITEM.Value=\u503C
+REJECT_TYPE.NAME=\u62D2\u7EDD\u7C7B\u578B
+REJECT_VALUE.NAME=\u62D2\u7EDD\u503C
+ROWSEPARATOR.NAME=\u884C\u5206\u9694\u7B26
+SCHEMA_FLOW.NAME=Schema
+SECRET_KEY.NAME=\u8BBF\u95EE\u5BC6\u94A5
+SERDE_METHOD.ITEM.COLUMNAR=\u5206\u680F\u5F0F
+SERDE_METHOD.ITEM.LAZY=\u60F0\u6027\u4E8C\u8FDB\u5236
+SERDE_METHOD.NAME=Serde \u65B9\u6CD5
+SQL_SYNTAX.NAME=Sql \u8BED\u6CD5
+STRINGDELIMITER.NAME=
+STRING_QUOTE.NAME=\u5B57\u7B26\u4E32\u5F15\u7528
+TABLE.NAME=\u8868
+TABLE_ACTION.ITEM.CLEAR=\u6E05\u9664\u8868
+TABLE_ACTION.ITEM.CREATE=\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5982\u679C\u8868\u4E0D\u5B58\u5728\u5219\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.DROP_CREATE=\u5220\u9664\u5E76\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5982\u679C\u8868\u5B58\u5728\uFF0C\u5219\u5148\u5220\u9664\u518D\u521B\u5EFA
+TABLE_ACTION.ITEM.NONE=\u65E0
+TABLE_ACTION.ITEM.TRUNCATE=\u622A\u65AD\u8868
+TABLE_ACTION.NAME=\u8868\u64CD\u4F5C
+TABLE_OPTION.ITEM.CLUSTERED_COLUMNSTORE_INDEX=\u96C6\u7FA4\u5217\u5B58\u50A8\u7D22\u5F15
+TABLE_OPTION.ITEM.CLUSTERED_INDEX=\u96C6\u7FA4\u7D22\u5F15
+TABLE_OPTION.ITEM.HEAP=\u5806
+TABLE_OPTION.NAME=\u8868\u9009\u9879
+TYPE.NAME=\u6570\u636E\u5E93\u9A71\u52A8
+USER.NAME=\u7528\u6237\u540D
+USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
+USE_STRING_DELIMITER.NAME=\u56F4\u680F
+USE_TYPE_DEFAULT.ITEM.FALSE=\u5426
+USE_TYPE_DEFAULT.ITEM.TRUE=\u662F
+USE_TYPE_DEFAULT.NAME=\u4F7F\u7528\u7C7B\u578B\u9ED8\u8BA4\u503C
+ACTIVE_DIR_AUTH.NAME=\u4F7F\u7528 Azure Active Directory \u8FDB\u884C\u8EAB\u4EFD\u9A8C\u8BC1
+LOAD_METHOD.NAME=\u52A0\u8F7D\u65B9\u6CD5
+LOAD_METHOD.ITEM.POLYBASE=PolyBase
+LOAD_METHOD.ITEM.COPY=\u590D\u5236
+AUTH_METHOD.NAME=\u8EAB\u4EFD\u9A8C\u8BC1\u65B9\u6CD5
+AUTH_METHOD.ITEM.SAS=\u5171\u4EAB\u8BBF\u95EE\u7B7E\u540D
+AUTH_METHOD.ITEM.KEY=\u5B58\u50A8\u5E10\u6237\u5BC6\u94A5
+AUTH_METHOD.ITEM.AAD=Azure Active Directory
+SAS_TOKEN.NAME=SAS \u4EE4\u724C
+ENDPOINT_SUFFIX.NAME=\u7AEF\u70B9\u540E\u7F00
+EXTERNAL_LOCATIONS.NAME=\u5916\u90E8\u8DEF\u5F84
+EXTERNAL_LOCATIONS.ITEM.EXTERNAL_LOCATION=\u8DEF\u5F84
+SPECIFY_FIELDS_MAPPING.NAME=\u6307\u5B9A\u6620\u5C04\u5230\u6E90\u8868\u5B57\u6BB5
+COLUMN_MAP_FIELD.NAME=
+COLUMN_MAP_FIELD.ITEM.FIELD_INDEX=\u6E90\u5B57\u6BB5\u7D22\u5F15
+FILE_TYPE.NAME=\u6587\u4EF6\u7C7B\u578B
+FILE_TYPE.ITEM.CSV=CSV
+FILE_TYPE.ITEM.ORC=ORC
+FILE_TYPE.ITEM.PARQUET=PARQUET
+FIRST_ROW.NAME=\u7B2C\u4E00\u884C
+FIELD_QUOTE.NAME=\u5B57\u6BB5\u5F15\u7528
+FIELD_TERMINATOR.NAME=\u5B57\u6BB5\u7EC8\u6B62\u7B26
+ROW_TERMINATOR.NAME=\u884C\u7EC8\u6B62\u7B26
+COPY_CSV_DATE_FORMAT.NAME=\u65E5\u671F\u683C\u5F0F
+COPY_CSV_DATE_FORMAT.ITEM.SESSION_DATEFORMAT=\u4F1A\u8BDD\u65E5\u671F\u683C\u5F0F
+COPY_CSV_DATE_FORMAT.ITEM.MDY=mdy
+COPY_CSV_DATE_FORMAT.ITEM.DMY=dmy
+COPY_CSV_DATE_FORMAT.ITEM.YMD=ymd
+COPY_CSV_DATE_FORMAT.ITEM.YDM=ydm
+COPY_CSV_DATE_FORMAT.ITEM.MYD=myd
+COPY_CSV_DATE_FORMAT.ITEM.DYM=dym
+ENCODING.NAME=\u7F16\u7801
+ENCODING.ITEM.UTF8=UTF8
+ENCODING.ITEM.UTF16=UTF16
+IDENTITY_INSERT.NAME=\u6807\u8BC6\u63D2\u5165
+MAX_ERRORS.NAME=\u6700\u5927\u9519\u8BEF\u6570
+ERROR_FILE.NAME=\u9519\u8BEF\u6587\u4EF6\u4F4D\u7F6E

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseClose/tAzureSynapseClose_messages_zh_CN.properties

@@ -0,0 +1,3 @@
+HELP=org.talend.help.tAzureSynapseClose
+LONG_NAME=\u5173\u95ED\u9009\u5B9A\u7684 MSSql \u8FDE\u63A5\u3002
+CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseCommit/tAzureSynapseCommit_messages_zh_CN.properties

@@ -0,0 +1,4 @@
+HELP=org.talend.help.tAzureSynapseCommit
+LONG_NAME=\u63D0\u4EA4\u9009\u5B9A\u7684 MSSQL \u8FDE\u63A5\u4E2D\u5C1A\u672A\u63D0\u4EA4\u7684\u6240\u6709\u4E8B\u52A1
+CLOSE.NAME=\u5173\u95ED\u8FDE\u63A5
+CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseConnection/tAzureSynapseConnection_java.xml

@@ -202,13 +202,14 @@
    <CODEGENERATION>
      <IMPORTS>
      	<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="DRIVER=='MSSQL_PROP'" />
-     	<IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
-     	<IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
-        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+     	<IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
+     	<IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
+        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.7.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
-        <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseConnection/tAzureSynapseConnection_messages_zh_CN.properties

@@ -0,0 +1,26 @@
+DBNAME.NAME=\u6570\u636E\u5E93
+ENCODING.NAME=\u7F16\u7801
+HELP=org.talend.help.tAzureSynapseConnection
+HOST.NAME=\u4E3B\u673A
+LONG_NAME=\u521B\u5EFA\u5230 MSSQL \u6570\u636E\u5E93\u7684\u8FDE\u63A5
+NB_LINE.NAME=\u884C\u6570
+NULL_CHAR.NAME=Null \u5B57\u7B26
+PASS.NAME=\u5BC6\u7801
+PORT.NAME=\u7AEF\u53E3
+USER.NAME=\u7528\u6237\u540D
+INSTANCE.NAME=\u5B9E\u4F8B
+PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
+SCHEMA_DB.NAME=Schema
+USE_SHARED_CONNECTION.NAME=\u4F7F\u7528\u6216\u6CE8\u518C\u5171\u4EAB\u6570\u636E\u5E93\u8FDE\u63A5
+SHARED_CONNECTION_NAME.NAME=\u5171\u4EAB\u6570\u636E\u5E93\u8FDE\u63A5\u540D\u79F0
+AUTO_COMMIT.NAME=\u81EA\u52A8\u63D0\u4EA4
+SHARE_IDENTITY_SETTING.NAME=\u5728\u591A\u8868\u4E2D\u5171\u4EAB\u6807\u8BC6\u63D2\u5165
+TYPE.NAME=\u6570\u636E\u5E93\u9A71\u52A8
+PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B
+SPECIFY_DATASOURCE_ALIAS.NAME=\u6307\u5B9A\u6570\u636E\u6E90\u522B\u540D
+DATASOURCE.NAME=\u6570\u636E\u6E90
+DATASOURCE_ALIAS.NAME=\u6570\u636E\u6E90\u522B\u540D
+DRIVER.NAME=JDBC \u63D0\u4F9B\u7A0B\u5E8F
+DRIVER.ITEM.JTDS=\u5F00\u6E90 JTDS
+DRIVER.ITEM.MSSQL_PROP=Microsoft
+ACTIVE_DIR_AUTH.NAME=\u4F7F\u7528 Azure Active Directory \u8FDB\u884C\u8EAB\u4EFD\u9A8C\u8BC1

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseInput/tAzureSynapseInput_java.xml

@@ -264,11 +264,12 @@
      <IMPORTS>
         <IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="Talend_MssqlUtil" MODULE="talend_DB_mssqlUtil-1.4.jar" MVN="mvn:org.talend.components.lib/talend_DB_mssqlUtil/1.4" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend_DB_mssqlUtil-1.4.jar" REQUIRED="true" />
-        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.7.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseInput/tAzureSynapseInput_messages_zh_CN.properties

@@ -1,14 +1,13 @@
-CURSOR_SIZE.NAME=\u5149\u6807\u5927\u5C0F
 DBD-ODBC.INFO=\u4E3A\u7C7B\u4F3C ODBC \u8FDE\u63A5\u6240\u5FC5\u9700
 DBD-Oracle.INFO=\u4E3A Oracle \u6240\u5FC5\u9700
-DBD-Pg.INFO=\u4E3A ParAccel \u6240\u5FC5\u9700
+DBD-Pg.INFO=\u4E3A PostgresSQL \u6240\u5FC5\u9700
 DBD-mysql.INFO=\u4E3A MySQL \u6240\u5FC5\u9700
 DBNAME.NAME=\u6570\u636E\u5E93
-DBTABLE.NAME=\u8868\u540D\u79F0
+DSN.NAME=\u6570\u636E\u6E90
 ENCODING.NAME=\u7F16\u7801
-HELP=org.talend.help.tParAccelInput
+HELP=org.talend.help.tAzureSynapseInput
 HOST.NAME=\u4E3B\u673A
-LONG_NAME=\u8BFB\u53D6 ParAccel \u8868\u5E76\u57FA\u4E8E SQL \u67E5\u8BE2\u63D0\u53D6\u5B57\u6BB5
+LONG_NAME=\u8BFB\u53D6 MSSQL \u8868\u5E76\u57FA\u4E8E SQL \u67E5\u8BE2\u63D0\u53D6\u5B57\u6BB5
 NB_LINE.NAME=\u884C\u6570
 NULL_CHAR.NAME=Null \u5B57\u7B26
 PASS.NAME=\u5BC6\u7801
@@ -23,27 +22,28 @@ TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc \u9A71\u52A8)
 TYPE.ITEM.MYSQL=MySQL
 TYPE.ITEM.ODBC=\u901A\u7528 ODBC
 TYPE.ITEM.ORACLE=\u5B9E\u6570\u7EDD\u5BF9\u503C
-TYPE.ITEM.PGSQL=ParAccel
+TYPE.ITEM.PGSQL=PostgreSQL
 TYPE.NAME=\u6570\u636E\u5E93\u9A71\u52A8
 USER.NAME=\u7528\u6237\u540D
-USE_CURSOR.NAME=\u4F7F\u7528\u6E38\u6807
+DBTABLE.NAME=\u8868\u540D\u79F0
 USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
+INSTANCE.NAME=\u5B9E\u4F8B
+PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
+DB_SCHEMA.NAME=Schema
 TRIM_ALL_COLUMN.NAME=\u526A\u88C1\u6240\u6709\u7684\u5B57\u7B26\u4E32/\u5B57\u7B26\u5217
 TRIM_COLUMN.NAME=\u526A\u88C1\u5217
 TRIM_COLUMN.ITEM.TRIM=\u526A\u88C1
 TABLE.NAME=\u8868\u540D\u79F0
-MAPPING.NAME=\u6620\u5C04
-LOG_FILE.NAME=\u65E5\u5FD7\u6587\u4EF6
-LOG_LEVEL.NAME=\u65E5\u5FD7\u7EA7\u522B
-LOG_LEVEL.ITEM.NONE=\u9ED8\u8BA4
-LOG_LEVEL.ITEM.INFO=\u4FE1\u606F
-LOG_LEVEL.ITEM.DEBUG=\u8C03\u8BD5
-LOG_LEVEL.ITEM.PROTOCOL=\u534F\u8BAE
-LOG_LEVEL.ITEM.INFO_DEBUG=\u4FE1\u606F\u548C\u8C03\u8BD5
-LOG_LEVEL.ITEM.INFO_PROTOCOL=\u4FE1\u606F\u548C\u534F\u8BAE
-LOG_LEVEL.ITEM.DEBUG_PROTOCOL=\u8C03\u8BD5\u548C\u534F\u8BAE
-LOG_LEVEL.ITEM.ALL=\u4FE1\u606F\u548C\u8C03\u8BD5\u53CA\u534F\u8BAE
+USE_FETCH.NAME=\u4F7F\u7528\u6293\u53D6
+FETCH_SIZE.NAME=\u6293\u53D6\u5C3A\u5BF8
 PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B
 GUESS_SCHEMA.NAME=\u63A8\u6D4B Schema
 CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
-PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
+MAPPING.NAME=\u6620\u5C04
+SPECIFY_DATASOURCE_ALIAS.NAME=\u6307\u5B9A\u6570\u636E\u6E90\u522B\u540D
+DATASOURCE.NAME=\u6570\u636E\u6E90
+DATASOURCE_ALIAS.NAME=\u6570\u636E\u6E90\u522B\u540D
+ACTIVE_DIR_AUTH.NAME=\u4F7F\u7528 Azure Active Directory \u8FDB\u884C\u8EAB\u4EFD\u9A8C\u8BC1
+DRIVER.NAME=JDBC \u63D0\u4F9B\u7A0B\u5E8F
+DRIVER.ITEM.JTDS=\u5F00\u6E90 JTDS
+DRIVER.ITEM.MSSQL_PROP=Microsoft

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_java.xml

@@ -335,11 +335,12 @@
 	<CODEGENERATION>
 		<IMPORTS>
 			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="adal4j" MODULE="adal4j-1.6.7.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_messages_fr.properties

@@ -53,7 +53,7 @@ PORT.NAME=Port
 PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
 QUERY.NAME=Requ\u00EAte
 REJECT.LINK=Rejects
-REJECT.MENU=Reject
+REJECT.MENU=Rejects
 SCHEMA_FLOW.NAME=Sch\u00E9ma
 SCHEMA_REJECT.NAME=Rejeter le sch\u00E9ma
 SQL_SYNTAX.NAME=Syntaxe SQL

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_messages_zh_CN.properties

@@ -1,14 +1,14 @@
-ADD_COLS.ITEM.NAME=\u540D\u79F0
 ADD_COLS.ITEM.DATATYPE=\u6570\u636E\u7C7B\u578B
+ADD_COLS.ITEM.NAME=\u540D\u79F0
 ADD_COLS.ITEM.OPERATOR=\u64CD\u4F5C\u7B26
 ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL==
-ADD_COLS.ITEM.OPERATOR.ITEM.NOT_EQUAL=<>
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_THAN=\u5C0F\u4E8E
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_EQUAL_THAN=\u5C0F\u4E8E
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=\u5927\u4E8E\u6216\u7B49\u4E8E
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=\u5927\u4E8E\u6216\u7B49\u4E8E
+ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=>=
+ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=>
 ADD_COLS.ITEM.OPERATOR.ITEM.IS=IS
 ADD_COLS.ITEM.OPERATOR.ITEM.IS_NOT=IS NOT
+ADD_COLS.ITEM.OPERATOR.ITEM.LESS_EQUAL_THAN=<=
+ADD_COLS.ITEM.OPERATOR.ITEM.LESS_THAN=<
+ADD_COLS.ITEM.OPERATOR.ITEM.NOT_EQUAL=<>
 ADD_COLS.ITEM.POS=\u4F4D\u7F6E
 ADD_COLS.ITEM.POS.ITEM.AFTER=After
 ADD_COLS.ITEM.POS.ITEM.BEFORE=Before
@@ -20,28 +20,40 @@ CLEAR_TABLE.NAME=\u6E05\u9664\u8868\u4E2D\u7684\u6570\u636E
 COMMIT_EVERY.NAME=\u63D0\u4EA4\u95F4\u9694
 DATA_ACTION.ITEM.DELETE=\u5220\u9664
 DATA_ACTION.ITEM.INSERT=\u63D2\u5165
+DATA_ACTION.ITEM.SINGLE_INSERT=\u5355\u63D2\u5165\u67E5\u8BE2
 DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u63D2\u5165\u6216\u66F4\u65B0
 DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
 DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66F4\u65B0\u6216\u63D2\u5165
+DATA_ACTION.ITEM.INSERT_IF_NOT_EXIST=\u4E0D\u5B58\u5728\u65F6\u63D2\u5165
 DATA_ACTION.NAME=\u6570\u636E\u64CD\u4F5C
 DBD-ODBC.INFO=\u4E3A\u7C7B\u4F3C ODBC \u8FDE\u63A5\u6240\u5FC5\u9700
 DBD-Oracle.INFO=\u4E3A Oracle \u6240\u5FC5\u9700
-DBD-Pg.INFO=\u4E3A ParAccel \u6240\u5FC5\u9700
+DBD-Pg.INFO=\u4E3A PostgreSQL \u6240\u5FC5\u9700
 DBD-mysql.INFO=\u4E3A MySQL \u6240\u5FC5\u9700
 DBNAME.NAME=\u6570\u636E\u5E93
+DBTABLE.NAME=\u8868\u540D\u79F0
+DB_SCHEMA.NAME=Schema
 DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
+DSN.NAME=\u6570\u636E\u6E90
 ENCODING.NAME=\u7F16\u7801
-HELP=org.talend.help.tParAccelOutput
+FIELD_OPTIONS.ITEM.DELETE_KEY=\u5220\u9664\u952E
+FIELD_OPTIONS.ITEM.INSERTABLE=\u53EF\u63D2\u5165\u7684
+FIELD_OPTIONS.ITEM.UPDATABLE=\u53EF\u66F4\u65B0\u7684
+FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u952E
+FIELD_OPTIONS.NAME=\u5B57\u6BB5\u9009\u9879
+HELP=org.talend.help.tAzureSynapseOutput
 HOST.NAME=\u4E3B\u673A
-LONG_NAME=\u5C06\u884C\u63D2\u5165\u6216\u66F4\u65B0\u5230 ParAccel \u8868
+IDENTITY_INSERT.NAME=\u6253\u5F00\u6807\u8BC6\u63D2\u5165
+INSTANCE.NAME=\u5B9E\u4F8B
+LONG_NAME=\u5C06\u884C\u63D2\u5165\u6216\u66F4\u65B0\u5230 MSSQL \u8868
 NB_LINE.NAME=\u884C\u6570
 NULL_CHAR.NAME=Null \u5B57\u7B26
 PASS.NAME=\u5BC6\u7801
 PORT.NAME=\u7AEF\u53E3
+PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
 QUERY.NAME=\u67E5\u8BE2
 REJECT.LINK=\u62D2\u7EDD
 REJECT.MENU=\u62D2\u7EDD
-SCHEMA_DB.NAME=Schema
 SCHEMA_FLOW.NAME=Schema
 SCHEMA_REJECT.NAME=\u62D2\u7EDD Schema
 SQL_SYNTAX.NAME=Sql \u8BED\u6CD5
@@ -50,35 +62,35 @@ TABLE.NAME=\u8868
 TABLE_ACTION.ITEM.CLEAR=\u6E05\u9664\u8868
 TABLE_ACTION.ITEM.TRUNCATE=\u622A\u65AD\u8868
 TABLE_ACTION.ITEM.CREATE=\u521B\u5EFA\u8868
-TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219\u521B\u5EFA\u8868
-TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5982\u679C\u8868\u5B58\u5728\uFF0C\u5219\u5148\u5220\u9664\u518D\u521B\u5EFA
+TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5982\u679C\u8868\u4E0D\u5B58\u5728\u5219\u521B\u5EFA\u8868
 TABLE_ACTION.ITEM.DROP_CREATE=\u5220\u9664\u5E76\u521B\u5EFA\u8868
-TABLE_ACTION.ITEM.NONE=\u9ED8\u8BA4
+TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5982\u679C\u8868\u5B58\u5728\uFF0C\u5219\u5148\u5220\u9664\u518D\u521B\u5EFA
+TABLE_ACTION.ITEM.NONE=\u65E0
 TABLE_ACTION.NAME=\u8868\u64CD\u4F5C
-TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc \u9A71\u52A8)
-TYPE.ITEM.MYSQL=MySQL
-TYPE.ITEM.ODBC=\u901A\u7528 ODBC
-TYPE.ITEM.ORACLE=\u5B9E\u6570\u7EDD\u5BF9\u503C
-TYPE.ITEM.PGSQL=ParAccel
-TYPE.NAME=\u6570\u636E\u5E93\u9A71\u52A8
 USER.NAME=\u7528\u6237\u540D
 USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
 USE_FIELD_OPTIONS.NAME=\u4F7F\u7528\u5B57\u6BB5\u9009\u9879
-FIELD_OPTIONS.NAME=\u5B57\u6BB5\u9009\u9879
-FIELD_OPTIONS.ITEM.UPDATE_KEY=\u66F4\u65B0\u79D8\u94A5
-FIELD_OPTIONS.ITEM.DELETE_KEY=\u5220\u9664\u952E
-FIELD_OPTIONS.ITEM.UPDATABLE=\u53EF\u66F4\u65B0\u7684
-FIELD_OPTIONS.ITEM.INSERTABLE=\u53EF\u63D2\u5165\u7684
+ENABLE_DEBUG_MODE.NAME=\u8C03\u8BD5\u67E5\u8BE2\u6A21\u5F0F
+SPECIFY_IDENTITY_FIELD.NAME=\u6307\u5B9A\u6807\u8BC6\u5B57\u6BB5
+IDENTITY_FIELD.NAME=\u6807\u8BC6\u5B57\u6BB5
+START_VALUE.NAME=\u8D77\u59CB\u503C
+STEP.NAME=\u6B65\u9AA4
 NB_LINE_UPDATED.NAME=\u66F4\u65B0\u7684\u884C\u6570
 NB_LINE_INSERTED.NAME=\u63D2\u5165\u7684\u884C\u6570
 NB_LINE_DELETED.NAME=\u5220\u9664\u7684\u884C\u6570
-CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
-MAPPING.NAME=\u6620\u5C04
-PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B
 SUPPORT_NULL_WHERE.NAME=\u5728 "SQL WHERE" \u8BED\u53E5\u4E2D\u652F\u6301 null
-NB_LINE_REJECTED.NAME=\u62D2\u7EDD\u7684\u884C\u6570
-USE_BATCH.NAME=\u4F7F\u7528\u6279\u5904\u7406
+USE_BATCH_SIZE.NAME=\u4F7F\u7528\u6279\u5904\u7406\u5927\u5C0F
 BATCH_SIZE.NAME=\u6279\u5904\u7406\u5927\u5C0F
-PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
-USE_ALTERNATE_SCHEMA.NAME=\u4F7F\u7528\u5907\u7528 schema
-ALTERNATE_SCHEMA.NAME=Schema
+PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B
+TYPE.NAME=\u6570\u636E\u5E93\u9A71\u52A8
+MAPPING.NAME=\u6620\u5C04
+CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
+IGNORE_DATE_OUTOF_RANGE.NAME=\u5FFD\u7565\u65E5\u671F\u9A8C\u8BC1
+NB_LINE_REJECTED.NAME=\u62D2\u7EDD\u7684\u884C\u6570
+SPECIFY_DATASOURCE_ALIAS.NAME=\u6307\u5B9A\u6570\u636E\u6E90\u522B\u540D
+DATASOURCE.NAME=\u6570\u636E\u6E90
+DATASOURCE_ALIAS.NAME=\u6570\u636E\u6E90\u522B\u540D
+DRIVER.NAME=JDBC \u63D0\u4F9B\u7A0B\u5E8F
+DRIVER.ITEM.JTDS=\u5F00\u6E90 JTDS
+DRIVER.ITEM.MSSQL_PROP=Microsoft
+ACTIVE_DIR_AUTH.NAME=\u4F7F\u7528 Azure Active Directory \u8FDB\u884C\u8EAB\u4EFD\u9A8C\u8BC1

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRollback/tAzureSynapseRollback_messages_zh_CN.properties

@@ -0,0 +1,4 @@
+HELP=org.talend.help.tAzureSynapseRollback
+LONG_NAME=\u56DE\u6EDA\u9009\u5B9A\u7684 MSSql \u8FDE\u63A5\u4E2D\u5C1A\u672A\u63D0\u4EA4\u7684\u6240\u6709\u4E8B\u52A1
+CLOSE.NAME=\u5173\u95ED\u8FDE\u63A5
+CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRow/tAzureSynapseRow_java.xml

@@ -320,11 +320,12 @@
   <CODEGENERATION>
     <IMPORTS>
         <IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="(DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.7.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRow/tAzureSynapseRow_messages_fr.properties

@@ -17,7 +17,7 @@ PORT.NAME=Port
 PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
 QUERY.NAME=Requ\u00EAte
 REJECT.LINK=Rejects
-REJECT.MENU=Reject
+REJECT.MENU=Rejects
 SCHEMA_DB.NAME=Sch\u00E9ma
 USER.NAME=Utilisateur
 USE_EXISTING_CONNECTION.NAME=Utiliser une connexion existante

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRow/tAzureSynapseRow_messages_zh_CN.properties

@@ -1,30 +1,33 @@
 COMMIT_EVERY.NAME=\u63D0\u4EA4\u95F4\u9694
+DBD-ODBC.INFO=\u5FC5\u9700
 DBNAME.NAME=\u6570\u636E\u5E93
 DBTABLE.NAME=\u8868\u540D\u79F0
+DB_SCHEMA.NAME=Schema
 DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
+DSN.NAME=\u6570\u636E\u6E90
 ENCODING.NAME=\u7F16\u7801
-HELP=org.talend.help.tVectorWiseRow
+HELP=org.talend.help.tAzureSynapseRow
 HOST.NAME=\u4E3B\u673A
+IDENTITY_INSERT.NAME=\u6253\u5F00\u6807\u8BC6\u63D2\u5165
+INSTANCE.NAME=\u5B9E\u4F8B
 LONG_NAME=\u5728\u6BCF\u4E2A Talend \u6D41\u8FED\u4EE3\u65F6\u6267\u884C SQL \u67E5\u8BE2
 NB_LINE.NAME=\u884C\u6570
 PASS.NAME=\u5BC6\u7801
 PORT.NAME=\u7AEF\u53E3
+PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
 QUERY.NAME=\u67E5\u8BE2
 REJECT.LINK=\u62D2\u7EDD
 REJECT.MENU=\u62D2\u7EDD
 SCHEMA_DB.NAME=Schema
-TYPE.ITEM.MSSQL_ODBC=Microsoft SQL (Odbc \u9A71\u52A8)
-TYPE.ITEM.MYSQL=MySQL
-TYPE.ITEM.ODBC=\u901A\u7528 ODBC
-TYPE.ITEM.ORACLE=\u5B9E\u6570\u7EDD\u5BF9\u503C
-TYPE.ITEM.PGSQL=PostgreSQL
-TYPE.NAME=\u6570\u636E\u5E93\u9A71\u52A8
 USER.NAME=\u7528\u6237\u540D
+USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
 PROPAGATE_RECORD_SET.NAME=\u4F20\u64AD QUERY \u7684\u8BB0\u5F55\u96C6
 RECORD_SET_COLUMN.NAME=\u4F7F\u7528\u5217
 TABLE.NAME=\u8868\u540D\u79F0
+TYPE.NAME=\u6570\u636E\u5E93\u9A71\u52A8
 PROPERTY.NAME=\u5C5E\u6027\u7C7B\u578B
-SCHEMA.NAME=Schema
+CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
+SCHEMA_FLOW.NAME=Schema
 SCHEMA_REJECT.NAME=\u62D2\u7EDD Schema
 QUERYSTORE.NAME=\u67E5\u8BE2\u7C7B\u578B
 USE_PREPAREDSTATEMENT.NAME=\u4F7F\u7528 PreparedStatement
@@ -48,6 +51,10 @@ SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.String=String
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=\u65F6\u95F4
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Null=Null
 SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_VALUE=\u53C2\u6570\u503C
-USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
-CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
-PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
+SPECIFY_DATASOURCE_ALIAS.NAME=\u6307\u5B9A\u6570\u636E\u6E90\u522B\u540D
+DATASOURCE.NAME=\u6570\u636E\u6E90
+DATASOURCE_ALIAS.NAME=\u6570\u636E\u6E90\u522B\u540D
+DRIVER.NAME=JDBC \u63D0\u4F9B\u7A0B\u5E8F
+DRIVER.ITEM.JTDS=\u5F00\u6E90 JTDS
+DRIVER.ITEM.MSSQL_PROP=Microsoft
+ACTIVE_DIR_AUTH.NAME=\u4F7F\u7528 Azure Active Directory \u8FDB\u884C\u8EAB\u4EFD\u9A8C\u8BC1

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_java.xml

@@ -165,32 +165,11 @@
       SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false')"
       >
       <ITEMS DEFAULT="GS_SERVICE_ACCOUNT">
-        <ITEM NAME="USER_ACCOUNT_HMAC" VALUE="USER_ACCOUNT_HMAC"/>
         <ITEM NAME="GS_SERVICE_ACCOUNT" VALUE="GS_SERVICE_ACCOUNT"/>
         <ITEM NAME="TOKEN" VALUE="TOKEN" />
       </ITEMS>
     </PARAMETER>
 
-    <PARAMETER 
-      NAME="GS_ACCESS_KEY" 
-      FIELD="TEXT" 
-      NUM_ROW="60" 
-      REQUIRED="true" 
-      GROUP="GS_CONF" 
-      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'USER_ACCOUNT_HMAC')">
-      <DEFAULT>""</DEFAULT>
-    </PARAMETER>
-
-    <PARAMETER 
-      NAME="GS_SECRET_KEY" 
-      FIELD="PASSWORD" 
-      NUM_ROW="61" 
-      REQUIRED="true" 
-      GROUP="GS_CONF" 
-      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'USER_ACCOUNT_HMAC')">
-      <DEFAULT>""</DEFAULT>
-    </PARAMETER>
-
     <PARAMETER
       NAME="GS_SERVICE_ACCOUNT_KEY"
       FIELD="FILE"
@@ -315,7 +294,7 @@
       <IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
       <IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED="true" />
       <IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
-      <IMPORT NAME="protobuf-java-2.5.0" MODULE="protobuf-java-2.5.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/2.5.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
+      <IMPORT NAME="protobuf-java-3.4.0" MODULE="protobuf-java-3.4.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.4.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
       <IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
       <IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED="true" />
       <IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED="true" />

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_messages.properties

@@ -36,7 +36,6 @@ CUSTOM_NULL_MARKER.NAME=
 DROP.NAME=Drop table if exists
 DIE_ON_ERROR.NAME=Die on error
 AUTH_TYPE.NAME=Credential type
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC key (deprecated)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Service account
 GS_SERVICE_ACCOUNT_KEY.NAME=Service account key
 GS_ACCESS_TOKEN.NAME=OAuth Access Token

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_messages_fr.properties

@@ -36,7 +36,6 @@ CUSTOM_NULL_MARKER.NAME=
 DROP.NAME=Supprimer la table si elle existe
 DIE_ON_ERROR.NAME=Arr\u00EAter en cas d'erreur
 AUTH_TYPE.NAME=Type d'identifiant
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=Cl\u00E9 HMAC (d\u00E9pr\u00E9ci\u00E9e)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Compte de service
 GS_SERVICE_ACCOUNT_KEY.NAME=Cl\u00E9 du compte de service
 GS_ACCESS_TOKEN.NAME=Jeton d'acc\u00E8s OAuth

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_messages_ja.properties

@@ -36,7 +36,6 @@ CUSTOM_NULL_MARKER.NAME=
 DROP.NAME=\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u30C9\u30ED\u30C3\u30D7
 DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u4E86
 AUTH_TYPE.NAME=\u8A8D\u8A3C\u60C5\u5831\u306E\u30BF\u30A4\u30D7
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC\u30AD\u30FC(\u975E\u63A8\u5968)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8
 GS_SERVICE_ACCOUNT_KEY.NAME=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u30AD\u30FC
 GS_ACCESS_TOKEN.NAME=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_messages_zh_CN.properties

@@ -6,7 +6,7 @@ AUTH_MODE.NAME=\u8EAB\u4EFD\u9A8C\u8BC1\u6A21\u5F0F
 AUTH_MODE.ITEM.SERVICEACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_MODE.ITEM.OAUTH=OAuth 2.0
 AUTH_MODE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
-CLIENT_ID.NAME=\u5BA2\u6237\u7AEF Id
+CLIENT_ID.NAME=\u5BA2\u6237\u7AEF ID
 CLIENT_SECRET.NAME=\u5BA2\u6237\u7AEF\u5BC6\u94A5
 PROJECT_ID.NAME=\u5DE5\u7A0B ID
 AUTHORIZATION_CODE.NAME=\u6388\u6743\u7801
@@ -36,7 +36,6 @@ CUSTOM_NULL_MARKER.NAME=
 DROP.NAME=\u5982\u679C\u8868\u5B58\u5728\u5219\u5220\u9664
 DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
 AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC \u5BC6\u94A5 (\u5DF2\u5F03\u7528)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 GS_SERVICE_ACCOUNT_KEY.NAME=\u670D\u52A1\u5E10\u6237\u5BC6\u94A5
 GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryInput/BigQueryInputQueryHelper.javajet

@@ -257,7 +257,9 @@ class BigQueryUtil_<%=cid%> {
             <%
                 }
             %>
-            jobList.add(job);
+            if (job.getStatistics().getScriptStatistics() == null || !"EXPRESSION".equals(job.getStatistics().getScriptStatistics().getEvaluationKind())){
+                jobList.add(job);
+            }
             statistics_<%=cid %>.add(job.getStatistics().toString());
         }
         java.util.Collections.reverse(jobList);

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryInput/tBigQueryInput_begin.javajet

@@ -339,8 +339,11 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",ee_<%=cid%>.getMessage());
                         %>
                         continue;
                     }
-
+                    if (job_iterable_<%=cid%>.getStatistics().getScriptStatistics() != null && "EXPRESSION".equals(job_iterable_<%=cid%>.getStatistics().getScriptStatistics().getEvaluationKind())){
+                        continue;
+                    }
                     com.google.cloud.bigquery.TableResult result_<%=cid%> = job_iterable_<%=cid%>.getQueryResults();
+
 		//Dynamic start
 
 		<%

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryInput/tBigQueryInput_messages_zh_CN.properties

@@ -6,7 +6,7 @@ AUTH_MODE.NAME=\u8EAB\u4EFD\u9A8C\u8BC1\u6A21\u5F0F
 AUTH_MODE.ITEM.SERVICEACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_MODE.ITEM.OAUTH=OAuth 2.0
 AUTH_MODE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
-CLIENT_ID.NAME=\u5BA2\u6237\u7AEF Id
+CLIENT_ID.NAME=\u5BA2\u6237\u7AEF ID
 CLIENT_SECRET.NAME=\u5BA2\u6237\u7AEF\u5BC6\u94A5
 PROJECT_ID.NAME=\u5DE5\u7A0B ID
 AUTHORIZATION_CODE.NAME=\u6388\u6743\u7801

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutput/tBigQueryOutput_java.xml

@@ -183,32 +183,11 @@
       GROUP="GS_CONF"
       SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false')">
       <ITEMS DEFAULT="GS_SERVICE_ACCOUNT">
-        <ITEM NAME="USER_ACCOUNT_HMAC" VALUE="USER_ACCOUNT_HMAC"/>
         <ITEM NAME="GS_SERVICE_ACCOUNT" VALUE="GS_SERVICE_ACCOUNT"/>
         <ITEM NAME="TOKEN" VALUE="TOKEN" />
       </ITEMS>
     </PARAMETER>
 
-    <PARAMETER
-      NAME="GS_ACCESS_KEY"
-      FIELD="TEXT"
-      NUM_ROW="60"
-      REQUIRED="true"
-      GROUP="GS_CONF"
-      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'USER_ACCOUNT_HMAC')">
-      <DEFAULT>""</DEFAULT>
-    </PARAMETER>
-
-    <PARAMETER
-      NAME="GS_SECRET_KEY"
-      FIELD="PASSWORD"
-      NUM_ROW="61"
-      REQUIRED="true"
-      GROUP="GS_CONF"
-      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'USER_ACCOUNT_HMAC')">
-      <DEFAULT>""</DEFAULT>
-    </PARAMETER>
-
     <PARAMETER
       NAME="GS_SERVICE_ACCOUNT_KEY"
       FIELD="FILE"
@@ -366,8 +345,6 @@
       <TEMPLATE_PARAM SOURCE="self.GS_SERVICE_ACCOUNT_KEY"  TARGET="tBQBE.GS_SERVICE_ACCOUNT_KEY" />
       <TEMPLATE_PARAM SOURCE="self.GS_ACCESS_TOKEN"  TARGET="tBQBE.GS_ACCESS_TOKEN" />
       <TEMPLATE_PARAM SOURCE="self.GS_ACCESS_TOKEN_WARNING"  TARGET="tBQBE.GS_ACCESS_TOKEN_WARNING" />
-      <TEMPLATE_PARAM SOURCE="self.GS_ACCESS_KEY"  TARGET="tBQBE.GS_ACCESS_KEY" />
-      <TEMPLATE_PARAM SOURCE="self.GS_SECRET_KEY"  TARGET="tBQBE.GS_SECRET_KEY" />
       <TEMPLATE_PARAM SOURCE="self.BUCKET_NAME"  TARGET="tBQBE.BUCKET_NAME" />
       <TEMPLATE_PARAM SOURCE="self.GS_FILE"  TARGET="tBQBE.GS_FILE" />
       <TEMPLATE_PARAM SOURCE="self.GS_FILE_HEADER"  TARGET="tBQBE.GS_FILE_HEADER" />

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutput/tBigQueryOutput_messages.properties

@@ -48,7 +48,6 @@ TOKEN_NAME.NAME=token properties File Name
 CHECK_DISK_SPACE.NAME=Check disk space
 DIE_ON_ERROR.NAME=Die on error
 AUTH_TYPE.NAME=Credential type
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC key (deprecated)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Service account
 AUTH_TYPE.ITEM.TOKEN=OAuth Access Token
 GS_SERVICE_ACCOUNT_KEY.NAME=Service account key

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutput/tBigQueryOutput_messages_fr.properties

@@ -48,10 +48,10 @@ TOKEN_NAME.NAME=Nom du fichier de propri\u00E9t\u00E9s du jeton
 CHECK_DISK_SPACE.NAME=V\u00E9rifier l'espace disque
 DIE_ON_ERROR.NAME=Arr\u00EAter en cas d'erreur
 AUTH_TYPE.NAME=Type d'identifiant
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=Cl\u00E9 HMAC (d\u00E9pr\u00E9ci\u00E9e)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Compte de service
 AUTH_TYPE.ITEM.TOKEN=Jeton d'acc\u00E8s OAuth
 GS_SERVICE_ACCOUNT_KEY.NAME=Cl\u00E9 du compte de service
 GS_ACCESS_TOKEN.NAME=Jeton d'acc\u00E8s OAuth
 JOBID.NAME=ID du Job BigQuery
 STATISTICS.NAME=Statistiques de la requ\u00EAte principale
+USE_12_HOUR_FORMAT.NAME=Utiliser le format 12\u00A0heures pour les colonnes dynamiques

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutput/tBigQueryOutput_messages_ja.properties

@@ -48,10 +48,10 @@ TOKEN_NAME.NAME=\u30C8\u30FC\u30AF\u30F3\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30
 CHECK_DISK_SPACE.NAME=\u30C7\u30A3\u30B9\u30AF\u5BB9\u91CF\u306E\u78BA\u8A8D
 DIE_ON_ERROR.NAME=\u30A8\u30E9\u30FC\u767A\u751F\u6642\u306B\u5F37\u5236\u7D42\u4E86
 AUTH_TYPE.NAME=\u8A8D\u8A3C\u60C5\u5831\u306E\u30BF\u30A4\u30D7
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC\u30AD\u30FC(\u975E\u63A8\u5968)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8
 AUTH_TYPE.ITEM.TOKEN=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
 GS_SERVICE_ACCOUNT_KEY.NAME=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AB\u30A6\u30F3\u30C8\u30AD\u30FC
 GS_ACCESS_TOKEN.NAME=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
 JOBID.NAME=BigQuery JobId
 STATISTICS.NAME=\u30E1\u30A4\u30F3\u30AF\u30A8\u30EA\u30FC\u306E\u7D71\u8A08
+USE_12_HOUR_FORMAT.NAME=\u30C0\u30A4\u30CA\u30DF\u30C3\u30AF\u30AB\u30E9\u30E0\u306B\u306F12\u6642\u9593\u5F62\u5F0F\u3092\u4F7F\u7528

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutput/tBigQueryOutput_messages_zh_CN.properties

@@ -21,7 +21,7 @@ AUTH_MODE.NAME=\u8EAB\u4EFD\u9A8C\u8BC1\u6A21\u5F0F
 AUTH_MODE.ITEM.SERVICEACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_MODE.ITEM.OAUTH=OAuth 2.0
 AUTH_MODE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
-CLIENT_ID.NAME=\u5BA2\u6237\u7AEF Id
+CLIENT_ID.NAME=\u5BA2\u6237\u7AEF ID
 CLIENT_SECRET.NAME=\u5BA2\u6237\u7AEF\u5BC6\u94A5
 PROJECT_ID.NAME=\u5DE5\u7A0B ID
 AUTHORIZATION_CODE.NAME=\u6388\u6743\u7801
@@ -48,10 +48,10 @@ TOKEN_NAME.NAME=\u4EE4\u724C\u5C5E\u6027\u6587\u4EF6\u540D
 CHECK_DISK_SPACE.NAME=\u68C0\u67E5\u78C1\u76D8\u7A7A\u95F4
 DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
 AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
-AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC \u5BC6\u94A5 (\u5DF2\u5F03\u7528)
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
 GS_SERVICE_ACCOUNT_KEY.NAME=\u670D\u52A1\u5E10\u6237\u5BC6\u94A5
 GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C
 JOBID.NAME=BigQuery JobId
 STATISTICS.NAME=\u4E3B\u67E5\u8BE2\u7EDF\u8BA1
+USE_12_HOUR_FORMAT.NAME=\u5BF9\u52A8\u6001\u5217\u91C7\u7528 12 \u5C0F\u65F6\u683C\u5F0F