Merge remote-tracking branch 'origin/maintenance/8.0' into jding/TUP-38424_test

feat(TUP-38424):for test
Add localized files (#6093 ) (#6098 )
2023-04-10 15:21:26 +08:00 · 2023-04-10 15:18:59 +08:00 · 2023-04-07 10:47:55 +08:00 · 2023-04-06 15:59:34 +08:00 · 2023-04-03 11:28:28 +08:00 · 2023-04-03 09:18:30 +08:00
43 changed files with 182 additions and 135 deletions
--- a/main/features/org.talend.utils.feature/feature.xml
+++ b/main/features/org.talend.utils.feature/feature.xml
@@ -5,7 +5,6 @@
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
  <requires>
-    <import plugin="org.bouncycastle.bcprov" version="1.70.0" match="greaterOrEqual"/>
    <import plugin="com.cedarsoftware.json-io" version="0.0.0" match="greaterOrEqual"/>
    <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.9.0" match="greaterOrEqual"/>
    <import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.8" match="greaterOrEqual"/>
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/ITalendThemeService.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/ITalendThemeService.java
@@ -15,6 +15,7 @@ package org.talend.commons.ui.runtime;
 import java.util.Optional;

 import org.apache.commons.lang.StringUtils;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.swt.graphics.Color;
 import org.osgi.framework.BundleContext;
@@ -29,6 +30,8 @@ public interface ITalendThemeService {

    public static String DEFAULT_PREFERENCE_ID = "org.eclipse.ui.workbench";

+    public static String THEME_PREFERENCE_ID = "org.eclipse.e4.ui.css.swt.theme";
+
    /**
     * Get color from instance scope preference of default bundleId, which managed by theme; the standard way eclipse
     * uses
@@ -132,6 +135,8 @@ public interface ITalendThemeService {

    void removePropertyChangeListenerFor(String bundleId, IPropertyChangeListener listener);

+    IPreferenceStore getThemePreferenceStore();
+
    static ITalendThemeService get() {
        try {
            BundleContext bc = FrameworkUtil.getBundle(ITalendThemeService.class).getBundleContext();
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/CommonExceptionHandler.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/CommonExceptionHandler.java
@@ -36,6 +36,11 @@ public final class CommonExceptionHandler {
        Priority priority = getPriority(ex);
        process(ex, priority);
    }
+    
+    public static void process(Throwable ex, String msg) {
+        Priority priority = getPriority(ex);
+        process(ex, msg, priority);
+    }

    public static void process(Throwable ex, Priority priority) {
        String message = ex.getMessage();
@@ -43,6 +48,13 @@ public final class CommonExceptionHandler {
        log.log(priority, message, ex);

    }
+    
+    public static void process(Throwable ex, String msg, Priority priority) {
+        String message = ex.getMessage() + ": " + msg;
+        
+        log.log(priority, message, ex);
+        
+    }

    public static void log(String message) {
        log.log(Level.INFO, message);
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java
@@ -33,6 +33,7 @@ import java.util.regex.Pattern;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.runtime.utils.io.FileCopyUtils;

@@ -108,6 +109,7 @@ public class NetworkUtil {
                return true;
            }
        } catch (Exception e) {
+            CommonExceptionHandler.process(e, getCheckUrl());
            return false;
        } finally {
            conn.disconnect();
@@ -144,6 +146,7 @@ public class NetworkUtil {
            conn.setRequestMethod("HEAD"); //$NON-NLS-1$
            conn.getResponseMessage();
        } catch (Exception e) {
+            CommonExceptionHandler.process(e, urlString);
            // if not reachable , will throw exception(time out/unknown host) .So if catched exception, make it a
            // invalid server
            return false;
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_fr.properties
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_fr.properties
@@ -204,3 +204,4 @@ RenameFolderAction.warning.cannotFind.title=Action non disponible
 ConvertJobsUtil.warning.title=Avertissement
 ConvertJobsUtil.warning.message=Le framework cible n'est pas totalement support\u00E9 dans cette version.
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=Cr\u00E9er des logs de stat et des param\u00E8tres implicites.
+WizardPageAPIDefinition_operationIdMissing=Des operationIds manquent dans l'API. Ces operationIds sont utilis\u00E9s pour initialiser les flux de sortie du tRESTRequest/cRest. Consultez l'aide en ligne des composants tRESTRequest/cRest.
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_ja.properties
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_ja.properties
@@ -204,3 +204,4 @@ RenameFolderAction.warning.cannotFind.title=\u4F7F\u7528\u3067\u304D\u306A\u3044
 ConvertJobsUtil.warning.title=\u8B66\u544A
 ConvertJobsUtil.warning.message=\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u306F\u3001\u30BF\u30FC\u30B2\u30C3\u30C8\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u304C\u5B8C\u5168\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=\u7D71\u8A08\u30ED\u30B0\u3068\u6697\u9ED9\u7684\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u4F5C\u6210
+WizardPageAPIDefinition_operationIdMissing=API\u3067operationIds\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002operationIds\u306F\u3001tRESTRequest/cRest\u51FA\u529B\u30D5\u30ED\u30FC\u3092\u521D\u671F\u5316\u3059\u308B\u305F\u3081\u306B\u4F7F\u308F\u308C\u307E\u3059\u3002tRESTRequest/cRest\u306E\u30AA\u30F3\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_zh_CN.properties
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_zh_CN.properties
@@ -204,3 +204,4 @@ RenameFolderAction.warning.cannotFind.title=\u64CD\u4F5C\u4E0D\u53EF\u7528
 ConvertJobsUtil.warning.title=\u8B66\u544A
 ConvertJobsUtil.warning.message=\u6B64\u7248\u672C\u4E0D\u5B8C\u5168\u652F\u6301\u76EE\u6807\u6846\u67B6.
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=\u521B\u5EFA\u7EDF\u8BA1\u65E5\u5FD7\u548C\u9690\u5F0F\u53C2\u6570
+WizardPageAPIDefinition_operationIdMissing=API \u7F3A\u5931 operationId \u53C2\u6570\uFF0C\u8FD9\u4E9B operationId \u53C2\u6570\u7528\u6765\u521D\u59CB\u5316 tRESTRequest \u6216 cRest \u8F93\u51FA\u6D41\u3002\u8BF7\u53C2\u89C1 tRESTRequest \u6216 cRest \u5728\u7EBF\u5E2E\u52A9\u6587\u6863\u3002
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java
@@ -240,14 +240,14 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
        return singleton;
    }

-    private ICoreService getCoreService() {
+    public ICoreService getCoreService() {
        if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
            return GlobalServiceRegister.getDefault().getService(ICoreService.class);
        }
        return null;
    }

-    private IRunProcessService getRunProcessService() {
+    public IRunProcessService getRunProcessService() {
        if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
            return GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
        }
@@ -352,7 +352,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
     * @param project
     * @throws LoginException
     */
-    private void checkProjectCompatibility(Project project) throws LoginException {
+    public void checkProjectCompatibility(Project project) throws LoginException {
        IMigrationToolService migrationToolService = GlobalServiceRegister.getDefault().getService(
                IMigrationToolService.class);
        // update migration system.
@@ -1849,7 +1849,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
     * @param project
     * @throws PersistenceException
     */
-    private void emptyTempFolder(Project project) throws PersistenceException {
+    public void emptyTempFolder(Project project) throws PersistenceException {
    	try {
            String str = SharedStudioUtils.getTempFolderPath().toPortableString();
            FilesUtils.deleteFolder(new File(str), false);
@@ -2528,7 +2528,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
        }
    }

-    private void checkReferenceProjectsProblems(Project project) throws BusinessException, PersistenceException {
+    public void checkReferenceProjectsProblems(Project project) throws BusinessException, PersistenceException {
        if (ReferenceProjectProblemManager.getInstance().getAllInvalidProjectReferenceSet().size() > 0) {
            StringBuffer sb = new StringBuffer();
            for (String technicalLabel : ReferenceProjectProblemManager.getInstance().getAllInvalidProjectReferenceSet()) {
@@ -3026,4 +3026,11 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
        this.repositoryFactoryFromProvider.saveProject(project);
    }
    
+    public void setCancelled(boolean cancelled) {
+        this.isCancelled = cancelled;
+    }
+
+    public boolean isCancelled() {
+        return this.isCancelled;
+    }
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/ERepositoryObjectType.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/ERepositoryObjectType.java
@@ -1477,12 +1477,8 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
        return allTypes;
    }

-    public static List<ERepositoryObjectType> getAllTypesOfJoblet() {
+    public static List<ERepositoryObjectType> getAllBigDataTypesOfJoblet(){
        List<ERepositoryObjectType> allTypes = new ArrayList<ERepositoryObjectType>();
-
-        if (ERepositoryObjectType.JOBLET != null) {
-            allTypes.add(ERepositoryObjectType.JOBLET);
-        }
        if (ERepositoryObjectType.SPARK_JOBLET != null) {
            allTypes.add(ERepositoryObjectType.SPARK_JOBLET);
        }
@@ -1492,6 +1488,15 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
        return allTypes;
    }

+    public static List<ERepositoryObjectType> getAllTypesOfJoblet() {
+        List<ERepositoryObjectType> allTypes = new ArrayList<ERepositoryObjectType>();
+        allTypes.addAll(getAllBigDataTypesOfJoblet());
+        if (ERepositoryObjectType.JOBLET != null) {
+            allTypes.add(ERepositoryObjectType.JOBLET);
+        }
+        return allTypes;
+    }
+
    public static List<ERepositoryObjectType> getAllTypesOfTestContainer() {
        List<ERepositoryObjectType> allTypes = new ArrayList<ERepositoryObjectType>();

--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_fr.properties
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_fr.properties
@@ -620,7 +620,7 @@ ProgressMonitorDialogWithCancel.executeTimeout=Suspension de l'ex\u00E9cution, l
 ProgressMonitorDialogWithCancel.CheckingConnectionJob.waitingFinish=en attente de la fin de {0}...
 ProgressMonitorDialogWithCancel.CheckingConnectionJob.emptyWaitingfinish=en attente de la fin...
 OverTimePopupDialogTask.title=Ex\u00E9cution...
-OverTimePopupDialogTask.message=T\u00E2che d'ex\u00E9cution en arri\u00E8re plan, patientez...
+OverTimePopupDialogTask.message=T\u00E2che d'ex\u00E9cution en arri\u00E8re-plan, patientez...
 OverTimePopupDialogTask.executeTimeout=Suspension de l'ex\u00E9cution, le Studio a essay\u00E9 d'interrompre la v\u00E9rification en t\u00E2che de fond.
 OverTimePopupDialogTask.killed=Ex\u00E9cution arr\u00EAt\u00E9e
 OverTimePopupDialogTask.waitingFinishMessage.default=Interruption impossible de la t\u00E2che en fond,\n
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/maven/MavenConstants.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/maven/MavenConstants.java
@@ -41,6 +41,8 @@ public interface MavenConstants {
    static final String DEFAULT_VERSION = "6.0.0";

    static final String SNAPSHOT = "-SNAPSHOT";
+    
+    static final String DOT_SNAPSHOT = ".SNAPSHOT";

    static final String POM_FILTER = "POM_FILTER";

--- a/main/plugins/org.talend.core.ui/src/main/java/messages_fr.properties
+++ b/main/plugins/org.talend.core.ui/src/main/java/messages_fr.properties
@@ -560,6 +560,7 @@ ContextNebulaComposite.ContextsUnAvailable=La vue Contextes n'est pas disponible
 ContextNebulaComposite.ContextGroupLabel=Environnement du contexte par d\u00E9faut
 ContextTreeTable.PromptToolTips=activer le prompt sur variable
 ContextValidator.ParameterNotValid=le nom du param\u00E8tre n'est pas valide
+ContextValidator.ParameterValueNotMatch=Mauvaise correspondance de type/valeur\u00A0: la valeur d'une variable doit correspondre \u00E0 son type
 WorkspaceMnu.switch.text=Changer de r\u00E9pertoire &Workspace
 WorkspaceMnu.switch.tooltip=Ouvrir le r\u00E9pertoire Workspace
 WorkspaceMnu.choose.text=&Choisir...
--- a/main/plugins/org.talend.core.ui/src/main/java/messages_ja.properties
+++ b/main/plugins/org.talend.core.ui/src/main/java/messages_ja.properties
@@ -560,6 +560,7 @@ ContextNebulaComposite.ContextsUnAvailable=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\
 ContextNebulaComposite.ContextGroupLabel=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u74B0\u5883
 ContextTreeTable.PromptToolTips=\u5909\u6570\u306E\u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u6709\u52B9\u5316
 ContextValidator.ParameterNotValid=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u540D\u304C\u7121\u52B9\u3067\u3059\u3002
+ContextValidator.ParameterValueNotMatch=\u578B\u3068\u5024\u306E\u4E0D\u4E00\u81F4: \u5909\u6570\u306E\u5024\u306F\u305D\u306E\u578B\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 WorkspaceMnu.switch.text=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u5207\u308A\u63DB\u3048(&W)
 WorkspaceMnu.switch.tooltip=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u958B\u304F
 WorkspaceMnu.choose.text=\u9078\u629E(&C)...
@@ -579,6 +580,6 @@ I18nPreferencePage.restart=\u518D\u8D77\u52D5
 I18nPreferencePage.restartButton=\u6709\u52B9\u5316\u306B\u306F\u518D\u8D77\u52D5\u304C\u5FC5\u8981\u3067\u3059\u3002
 I18nPreferencePage.restoreDefault=\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u5FA9\u5143
 I18nPreferencePage.wait_process=\u3053\u306E\u51E6\u7406\u306B\u306F\u6570\u5206\u304B\u304B\u308A\u307E\u3059\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044...
-MetadataPreferencePage.EnableBasic.name=\u57FA\u672C\u8A8D\u8A3C\u30D8\u30C3\u30C0\u30FC\u3092\u6709\u52B9\u306B\u3059\u308B
+MetadataPreferencePage.EnableBasic.name=\u57FA\u672C\u8A8D\u8A3C\u30D8\u30C3\u30C0\u30FC\u3092\u6709\u52B9\u5316
 MetadataPreferencePage.MessageDialog.Restart=\u3053\u306E\u8A2D\u5B9A\u304C\u6709\u52B9\u306B\u306A\u308B\u3088\u3046\u3001Studio\u3092\u518D\u8D77\u52D5\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u7D9A\u884C\u3057\u307E\u3059\u304B?
 TalendTabbedPropertyTitle.componentHelpTooltip=\u30AA\u30F3\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u3092\u958B\u304F
--- a/main/plugins/org.talend.core.ui/src/main/java/messages_zh_CN.properties
+++ b/main/plugins/org.talend.core.ui/src/main/java/messages_zh_CN.properties
@@ -560,6 +560,7 @@ ContextNebulaComposite.ContextsUnAvailable=\u4E0A\u4E0B\u6587\u89C6\u56FE\u4E0D\
 ContextNebulaComposite.ContextGroupLabel=\u9ED8\u8BA4\u4E0A\u4E0B\u6587\u73AF\u5883
 ContextTreeTable.PromptToolTips=\u6FC0\u6D3B\u63D0\u793A\u53D8\u91CF
 ContextValidator.ParameterNotValid=\u53C2\u6570\u540D\u65E0\u6548
+ContextValidator.ParameterValueNotMatch=\u7C7B\u578B/\u503C\u4E0D\u5339\u914D\uFF1A\u53D8\u91CF\u7684\u503C\u4E0E\u5176\u7C7B\u578B\u4E0D\u5339\u914D
 WorkspaceMnu.switch.text=\u5207\u6362\u5DE5\u4F5C\u533A(&W)
 WorkspaceMnu.switch.tooltip=\u6253\u5F00\u5DE5\u4F5C\u533A
 WorkspaceMnu.choose.text=\u9009\u62E9(&C)...
--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextTreeTable.java
+++ b/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextTreeTable.java
@@ -274,7 +274,7 @@ public class ContextTreeTable {
            final GridLayer gridLayer = new GridLayer(viewportLayer, sortHeaderLayer, rowHeaderLayer, cornerLayer);

            // config the column edit configuration
-            ContextValueLabelAccumulator labelAccumulator = new ContextValueLabelAccumulator(bodyDataLayer, bodyDataProvider);
+            ContextValueLabelAccumulator labelAccumulator = new ContextValueLabelAccumulator(bodyDataLayer, bodyDataProvider, manager.getContextManager(), columnGroupModel);
            bodyDataLayer.setConfigLabelAccumulator(labelAccumulator);
            registerColumnLabels(labelAccumulator, ContextRowDataListFixture.getContexts(manager.getContextManager()));

--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableConfiguration.java
+++ b/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableConfiguration.java
@@ -137,7 +137,6 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration

        Style cellStyleSelect = new Style();
        cellStyleSelect.setAttributeValue(CellStyleAttributes.BACKGROUND_COLOR, GUIHelper.COLOR_TITLE_INACTIVE_BACKGROUND);
-        cellStyleSelect.setAttributeValue(CellStyleAttributes.FOREGROUND_COLOR, GUIHelper.COLOR_RED);
        cellStyleSelect.setAttributeValue(CellStyleAttributes.FONT, GUIHelper.DEFAULT_FONT);
        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleSelect, DisplayMode.SELECT,
                ContextTableConstants.COLUMN_TYPE_PROPERTY);
@@ -162,7 +161,7 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
        configRegistry.registerConfigAttribute(EditConfigAttributes.DATA_VALIDATOR,
                new EventDataValidator(dataProvider, manager), DisplayMode.EDIT, ContextTableConstants.COLUMN_NAME_PROPERTY);
        configRegistry.registerConfigAttribute(EditConfigAttributes.DATA_VALIDATOR,
-                new EventDataValueValidator(dataProvider, manager), DisplayMode.EDIT, ContextTableConstants.COLUMN_CONTEXT_VALUE);
+                new EventDataValueValidator(dataProvider, manager, columnGroupModel), DisplayMode.EDIT, ContextTableConstants.COLUMN_CONTEXT_VALUE);
    }

    private void registerErrorHandlingStrategies(IConfigRegistry configRegistry) {
--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableStyleConfiguration.java
+++ b/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableStyleConfiguration.java
@@ -77,6 +77,7 @@ public class ContextNatTableStyleConfiguration extends AbstractRegistryConfigura
        Style cellStyleValueError = new Style();
        cellStyleValueError.setAttributeValue(CellStyleAttributes.FOREGROUND_COLOR, ColorConstants.ERROR_FONT_COLOR);
        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleValueError, DisplayMode.NORMAL, ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
+        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleValueError, DisplayMode.SELECT, ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
        
        Style cellStyleChangedForceGround = new Style();
        cellStyleChangedForceGround.setAttributeValue(CellStyleAttributes.FOREGROUND_COLOR, GUIHelper.COLOR_WIDGET_DARK_SHADOW);
--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableUtils.java
+++ b/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableUtils.java
@@ -203,34 +203,6 @@ public class ContextNatTableUtils {
            return ((ContextTableTabChildModel) element).getContextParameter().getName();
        }
    }
-    
-    private static IContextParameter getContextParameter(Object element, int index) {
-        if (element instanceof ContextTableTabParentModel) {
-            ContextTableTabParentModel parentMode = (ContextTableTabParentModel) element;
-            if (parentMode.getContextParameter() != null && parentMode.getContextParameter().getContext() != null) {
-                return parentMode.getContextParameter().getContext().getContextParameter(parentMode.getContextParameter().getName());
-            }
-        } else if (element instanceof ContextTableTabChildModel) {
-            return ((ContextTableTabChildModel) element).getContextParameter();
-        }
-        return null;
-    }
-    
-    public static String getCurrentContextDataType(Object element, int index) {
-        IContextParameter contextParameter = getContextParameter(element, index);
-        if (contextParameter != null) {
-            return contextParameter.getType();
-        }
-        return null;
-    }
-
-    public static String getCurrentContextValue(Object element, int index) {
-        IContextParameter contextParameter = getContextParameter(element, index);
-        if (contextParameter != null) {
-            return contextParameter.getValue();
-        }
-        return null;
-    }

    public static String getSpecialTypeDisplayValue(String parameterType, String parameterValue) {
        if (isResourceType(parameterType)) {
--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextValueLabelAccumulator.java
+++ b/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextValueLabelAccumulator.java
@@ -14,9 +14,12 @@ package org.talend.core.ui.context.nattableTree;

 import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
 import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsDataProvider;
+import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel;
 import org.eclipse.nebula.widgets.nattable.layer.ILayer;
 import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
 import org.eclipse.nebula.widgets.nattable.layer.cell.ColumnOverrideLabelAccumulator;
+import org.talend.core.model.process.IContextManager;
+import org.talend.core.model.process.IContextParameter;
 import org.talend.core.ui.context.ContextTreeTable.ContextTreeNode;
 import org.talend.core.ui.context.model.ContextTabChildModel;
 import org.talend.core.ui.context.model.table.ContextTableConstants;
@@ -27,10 +30,14 @@ import org.talend.core.ui.utils.ContextTypeValidator;
 public class ContextValueLabelAccumulator extends ColumnOverrideLabelAccumulator {

    private IDataProvider dataProvider;
-    
-    public ContextValueLabelAccumulator(ILayer layer, IDataProvider dataProvider) {
+    private ColumnGroupModel columnGroupModel;
+    private IContextManager manager;
+
+    public ContextValueLabelAccumulator(ILayer layer, IDataProvider dataProvider, IContextManager manager, ColumnGroupModel columnGroupModel) {
        super(layer);
        this.dataProvider = dataProvider;
+        this.manager = manager;
+        this.columnGroupModel = columnGroupModel;
    }

   
@@ -40,14 +47,18 @@ public class ContextValueLabelAccumulator extends ColumnOverrideLabelAccumulator
        boolean isAddedValueNotMatchStyle = false;        
        ContextTreeNode rowNode = ((GlazedListsDataProvider<ContextTreeNode>) dataProvider).getList().get(rowPosition);
        if (configLabels.contains(ContextTableConstants.COLUMN_CONTEXT_VALUE)) {
-            String dataType = ContextNatTableUtils.getCurrentContextDataType(rowNode.getTreeData(), rowPosition);
-            String value = ContextNatTableUtils.getCurrentContextValue(rowNode.getTreeData(), rowPosition);
-            boolean isValid = ContextTypeValidator.isMatchType(dataType, value);
-            if (isValid) {
-                configLabels.remove(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
-            } else {
-                configLabels.addLabel(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
-                isAddedValueNotMatchStyle = true;
+            if (columnGroupModel != null && columnGroupModel.isPartOfAGroup(columnPosition)) {
+                String columnGroupName = columnGroupModel.getColumnGroupByIndex(columnPosition).getName();
+                IContextParameter realPara = ContextNatTableUtils.getRealParameter(manager, columnGroupName, rowNode.getTreeData());
+                if (realPara != null) {
+                    boolean isValid = ContextTypeValidator.isMatchType(realPara.getType(), realPara.getValue());
+                    if (isValid) {
+                        configLabels.remove(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
+                    } else {
+                        configLabels.addLabel(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
+                        isAddedValueNotMatchStyle = true;
+                    }
+                }
            }
        }
        
--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/EventDataValueValidator.java
+++ b/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/EventDataValueValidator.java
@@ -16,29 +16,39 @@ import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
 import org.eclipse.nebula.widgets.nattable.data.validate.DataValidator;
 import org.eclipse.nebula.widgets.nattable.data.validate.ValidationFailedException;
 import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsDataProvider;
+import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel;
 import org.talend.core.model.process.IContextManager;
+import org.talend.core.model.process.IContextParameter;
 import org.talend.core.ui.context.ContextTreeTable.ContextTreeNode;
 import org.talend.core.ui.i18n.Messages;
 import org.talend.core.ui.utils.ContextTypeValidator;

 public class EventDataValueValidator extends DataValidator {

+    private ColumnGroupModel columnGroupModel;
    private IDataProvider dataProvider;

    private IContextManager manager;

-    EventDataValueValidator(IDataProvider bodyDataProvider, IContextManager manager) {
+    EventDataValueValidator(IDataProvider bodyDataProvider, IContextManager manager, ColumnGroupModel columnGroupModel) {
        this.dataProvider = bodyDataProvider;
        this.manager = manager;
+        this.columnGroupModel = columnGroupModel;
    }

    @Override
    public boolean validate(int columnIndex, int rowIndex, Object newValue) {
+        boolean isValid = true;
        ContextTreeNode rowNode = ((GlazedListsDataProvider<ContextTreeNode>) dataProvider).getList().get(rowIndex);
-        String dataType = ContextNatTableUtils.getCurrentContextDataType(rowNode.getTreeData(), rowIndex);
-        boolean isValid = ContextTypeValidator.isMatchType(dataType, newValue);
-        if (!isValid) {
-            throw new ValidationFailedException(Messages.getString("ContextValidator.ParameterValueNotMatch")); //$NON-NLS-1$
+        if (columnGroupModel != null && columnGroupModel.isPartOfAGroup(columnIndex)) {
+            String columnGroupName = columnGroupModel.getColumnGroupByIndex(columnIndex).getName();
+            IContextParameter realPara = ContextNatTableUtils.getRealParameter(manager, columnGroupName, rowNode.getTreeData());
+            if (realPara != null) {
+                isValid = ContextTypeValidator.isMatchType(realPara.getType(), newValue);
+                if (!isValid) {
+                    throw new ValidationFailedException(Messages.getString("ContextValidator.ParameterValueNotMatch")); //$NON-NLS-1$
+                }   
+            }
        }
        return isValid;
    }
--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ExtendedContextColumnPropertyAccessor.java
+++ b/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ExtendedContextColumnPropertyAccessor.java
@@ -425,6 +425,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                            && jobContextManager.isOriginalParameter(param.getName())) {
                        jobContextManager.setModified(true);
                        manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                    }
                }
            }
@@ -507,6 +508,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                            && jobContextManager.isOriginalParameter(param.getName())) {
                        jobContextManager.setModified(true);
                        manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                    }
                }
            }
@@ -588,6 +590,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                            && jobContextManager.isOriginalParameter(param.getName())) {
                        jobContextManager.setModified(true);
                        manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                    }
                }
            }
@@ -684,6 +687,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                            && jobContextManager.isOriginalParameter(param.getName())) {
                        jobContextManager.setModified(true);
                        manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                    }
                }
            }
--- a/main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java
+++ b/main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java
@@ -861,7 +861,7 @@ public class ProcessorUtilities {
                for (IContext context : list) {
                    if (context.getName().equals(currentContext.getName())) {
                        // override parameter value before generate current context
-                        IContext checkedContext = checkNeedOverrideContextParameterValue(currentContext, jobInfo);
+                        IContext checkedContext = checkNeedOverrideContextParameterValue(context, jobInfo);
                        checkedContext = checkCleanSecureContextParameterValue(checkedContext, jobInfo);
                        processor.setContext(checkedContext); // generate current context.
                    } else {
--- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomIdsHelper.java
+++ b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomIdsHelper.java
@@ -377,8 +377,8 @@ public class PomIdsHelper {
            if (version == null) {
                version = VersionUtils.getPublishVersion(property.getVersion());
            }
-            if (useSnapshot && version != null && !version.contains(MavenConstants.SNAPSHOT)) {
-                version += MavenConstants.SNAPSHOT;
+            if (useSnapshot && version != null && !version.contains(MavenConstants.DOT_SNAPSHOT)) {
+                version += MavenConstants.DOT_SNAPSHOT;
            }
        }
        return version;
--- a/main/plugins/org.talend.libraries.apache/.classpath
+++ b/main/plugins/org.talend.libraries.apache/.classpath
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/apache-mime4j-0.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/castor-1.0.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="lib/apache-mime4j-core-0.8.9.jar" sourcepath="lib/apache-mime4j-core-0.8.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/castor-1.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
--- a/main/plugins/org.talend.libraries.apache/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.libraries.apache/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Apache Plug-in
 Bundle-SymbolicName: org.talend.libraries.apache
 Bundle-Version: 8.0.1.qualifier
 Bundle-ClassPath: .,
- lib/apache-mime4j-0.6.jar,
+ lib/apache-mime4j-core-0.8.9.jar,
 lib/castor-1.0.3.jar,
 lib/jakarta-oro-2.0.8.jar
 Bundle-Vendor: .Talend SA.
@@ -16,21 +16,8 @@ Require-Bundle: org.apache.log4j;resolution:=optional,
 Export-Package: 
 org.apache.james.mime4j,
 org.apache.james.mime4j.codec,
- org.apache.james.mime4j.descriptor,
- org.apache.james.mime4j.field,
- org.apache.james.mime4j.field.address,
- org.apache.james.mime4j.field.address.parser,
- org.apache.james.mime4j.field.contentdisposition.parser,
- org.apache.james.mime4j.field.contenttype.parser,
- org.apache.james.mime4j.field.datetime,
- org.apache.james.mime4j.field.datetime.parser,
- org.apache.james.mime4j.field.language.parser,
- org.apache.james.mime4j.field.mimeversion.parser,
- org.apache.james.mime4j.field.structured.parser,
 org.apache.james.mime4j.io,
- org.apache.james.mime4j.message,
 org.apache.james.mime4j.parser,
- org.apache.james.mime4j.storage,
 org.apache.james.mime4j.util,
 org.apache.oro.io,
 org.apache.oro.text,
--- a/main/plugins/org.talend.libraries.apache/lib/apache-mime4j-0.6.jar
+++ b/main/plugins/org.talend.libraries.apache/lib/apache-mime4j-0.6.jar
--- a/main/plugins/org.talend.libraries.apache/pom.xml
+++ b/main/plugins/org.talend.libraries.apache/pom.xml
@@ -81,6 +81,11 @@
 			<artifactId>log4j-1.2-api</artifactId>
 			<version>${log4j2.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.james</groupId>
+			<artifactId>apache-mime4j-core</artifactId>
+			<version>0.8.9</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -109,7 +114,7 @@
 							<excludeTypes>pom</excludeTypes>
 							<excludeTransitive>true</excludeTransitive>
 							<outputDirectory>${project.basedir}/lib</outputDirectory>
-							<includeGroupIds>ch.qos.reload4j,org.slf4j,org.apache.logging.log4j</includeGroupIds>
+							<includeGroupIds>ch.qos.reload4j,org.slf4j,org.apache.logging.log4j,org.apache.james</includeGroupIds>
 						</configuration>
 					</execution>
 				</executions>
--- a/main/plugins/org.talend.libraries.csv/.classpath
+++ b/main/plugins/org.talend.libraries.csv/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/talendcsv-1.0.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/talendcsv-1.1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/csv-1.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
--- a/main/plugins/org.talend.libraries.csv/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.libraries.csv/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.talend.libraries.csv
 Bundle-Version: 8.0.1.qualifier
 Bundle-ClassPath: .,
 lib/csv-1.0.jar,
- lib/talendcsv-1.0.0.jar
+ lib/talendcsv-1.1.0.jar
+Require-Bundle: org.slf4j.api
 Export-Package: com.talend.csv,
 org.skife.csv
 Bundle-ActivationPolicy: lazy
--- a/main/plugins/org.talend.libraries.csv/build.properties
+++ b/main/plugins/org.talend.libraries.csv/build.properties
@@ -2,4 +2,4 @@ output.. = bin/
 bin.includes = META-INF/,\
               .,\
               lib/csv-1.0.jar,\
-               lib/talendcsv-1.0.0.jar
+               lib/talendcsv-1.1.0.jar
--- a/main/plugins/org.talend.libraries.csv/pom.xml
+++ b/main/plugins/org.talend.libraries.csv/pom.xml
@@ -29,7 +29,7 @@
                <artifactItem>
                  <groupId>org.talend.components</groupId>
                  <artifactId>talendcsv</artifactId>
-                  <version>1.0.0</version>
+                  <version>1.1.0</version>
                </artifactItem>
              </artifactItems>
            </configuration>
--- a/main/plugins/org.talend.metadata.managment.ui/src/main/java/messages_ja.properties
+++ b/main/plugins/org.talend.metadata.managment.ui/src/main/java/messages_ja.properties
@@ -250,7 +250,7 @@ FileStep2.fieldSeparatorNotFinishByComma=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5
 FileStep2.fieldSeparatorPositionalAlert=\u6570\u5B57\u3092\u30B3\u30F3\u30DE\u3067\u533A\u5207\u3063\u3066\u3001\u30AB\u30E9\u30E0\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.fieldSeparatorPositionalTip=\u5404\u30AB\u30E9\u30E0\u306E\u4F4D\u7F6E\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u4F4D\u7F6E\u306F\u6607\u9806\u3067\u8A18\u8FF0\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.filePathIncomplete=\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
-FileStep2.firstRowsIsCaption=\u5217\u540D\u3068\u3057\u3066\u5148\u982D\u884C\u3092\u8A2D\u5B9A
+FileStep2.firstRowsIsCaption=\u30AB\u30E9\u30E0\u540D\u3068\u3057\u3066\u5148\u982D\u884C\u3092\u8A2D\u5B9A
 FileStep2.footer=\u30D5\u30C3\u30BF\u30FC
 FileStep2.footerTip=\u30D5\u30C3\u30BF\u30FC
 FileStep2.groupDelimitedFileSettings=\u30D5\u30A1\u30A4\u30EB\u8A2D\u5B9A
@@ -271,10 +271,10 @@ FileStep2.previewProgress=\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u51E6\u7406\u4E2D
 FileStep2.refreshPreview=\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u66F4\u65B0
 FileStep2.removeEmptyRow=\u7A7A\u306E\u884C\u3092\u30B9\u30AD\u30C3\u30D7
 FileStep2.rowSeparator=\u884C\u533A\u5207\u308A
-FileStep2.rowSeparatorAlert=\u6587\u5B57\u306E\u30ED\u30A6\u30BB\u30D1\u30EC\u30FC\u30BF\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
+FileStep2.rowSeparatorAlert=\u6587\u5B57\u306E\u884C\u30BB\u30D1\u30EC\u30FC\u30BF\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.rowSeparatorIncomplete=\u884C\u533A\u5207\u308A\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.rowSeparatorTip=\u884C\u533A\u5207\u308A
-FileStep2.rowsToSkipTip=\u884C\u3092\u7121\u8996\u3059\u308B\u5834\u5408\u306F\u3001\u4EE5\u4E0B\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044,
+FileStep2.rowsToSkipTip=\u884C\u3092\u7121\u8996\u3059\u308B\u5834\u5408\u306F\u3001\u4EE5\u4E0B\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.settingsIncomplete=\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u3001\u8A2D\u5B9A\u3092\u5B8C\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 FileStep2.splitwayRecordForJavaFID=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u524D\u306E\u884C\u3092\u5206\u5272
 FileStep2.splitwayRecordForJavaFIDTip=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u304C\u884C\u533A\u5207\u308A\u306E\u4E00\u90E8\u3067\u3042\u308B\u5834\u5408\u306B\u6709\u52B9\u3067\u3059\u3002
@@ -471,7 +471,7 @@ WSDLSchemaStep1Form.TimeOutTitle=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u79D2)
 WSDLSchemaWizard.CreateNewWSDLSchema=\u65B0\u3057\u3044WSDL\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
 WSDLSchemaWizard.SaveAsWSDLSchema=WSDL\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
 WSDLSchemaWizard.UpdateWSDLSchema=WSDL\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-XPathProposalProvider.contentProposal=<< \u3042\u307E\u308A\u306B\u3082\u591A\u304F\u306E\u30CE\u30FC\u30C9\u3001\u5024\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093 ... >>,
+XPathProposalProvider.contentProposal=<< \u3042\u307E\u308A\u306B\u3082\u591A\u304F\u306E\u30CE\u30FC\u30C9\u3001\u5024\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093 ... >>
 XmlFileStep1.filepathXml=XML
 XmlFileStep1.groupFileViewer=\u30B9\u30AD\u30FC\u30DE\u30D3\u30E5\u30FC\u30A2\u30FC
 XmlFileStep1.groupSchemaTarget=\u30BF\u30FC\u30B2\u30C3\u30C8\u30B9\u30AD\u30FC\u30DE
--- a/main/plugins/org.talend.rcp/src/main/java/messages_fr.properties
+++ b/main/plugins/org.talend.rcp/src/main/java/messages_fr.properties
@@ -45,6 +45,7 @@ LinksToolbarItem_exchange=Lien vers Talend Exchange
 LinksToolbarItem_Learn=Talend Help Center - Doc et base de connaissances en ligne
 LinksToolbarItem_videos=Lien vers les tutoriels guid\u00E9s Talend
 RegisterWizard.windowTitle=Enregistrement de {0}
+ResourceToolbarHandler.documentationLink=https://document-link.us.cloud.talend.com/thc_studio-support-doc?version=cloud&lang=fr&env=prd
 tips.createJob=D'abord, cr\u00E9ez un Job pour votre flux de donn\u00E9es \u00E0 l'aide du <a>Job Designer</a>.
 tips.clickChoose=Cliquez-droit et s\u00E9lectionnez l'option
 tips.optionMenu=dans le menu
@@ -58,6 +59,7 @@ tips.welcome=Bienvenue dans
 tips.title=est un outil puissant et flexible qui vous permet de contr\u00F4ler vos donn\u00E9es.
 tips.getStart=Avant de commencer, voici les bases :
 tips.runJob=Ex\u00E9cuter le Job
+TalendHelpDocAction.documentationLink=https://document-link.us.cloud.talend.com/thc_studio-help-menu?version=cloud&lang=fr&env=prd
 starting.intro1=Bienvenue dans
 starting.intro2=Cet outil puissant et flexible vous permet de contr\u00F4ler vos donn\u00E9es
 starting.intro3=Avant de commencer, voici les bases
--- a/main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/intro/ApplicationWorkbenchAdvisor.java
+++ b/main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/intro/ApplicationWorkbenchAdvisor.java
@@ -90,7 +90,7 @@ public class ApplicationWorkbenchAdvisor extends IDEWorkbenchAdvisor {

    private void injectVariables() {
        IWorkbench workbench = PlatformUI.getWorkbench();
-        IEclipseContext activeContext = ((IEclipseContext) workbench.getService(IEclipseContext.class)).getActiveLeaf();
+        IEclipseContext activeContext = workbench.getService(IEclipseContext.class).getActiveLeaf();
        ContextInjectionFactory.inject(this, activeContext);
    }

@@ -227,7 +227,7 @@ public class ApplicationWorkbenchAdvisor extends IDEWorkbenchAdvisor {

    @Override
    public String getInitialWindowPerspectiveId() {
-        IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault().getService(
+        IBrandingService brandingService = GlobalServiceRegister.getDefault().getService(
                IBrandingService.class);
        if (brandingService != null) {
            IBrandingConfiguration brandingConfiguration = brandingService.getBrandingConfiguration();
@@ -288,12 +288,12 @@ public class ApplicationWorkbenchAdvisor extends IDEWorkbenchAdvisor {
        if (!ArrayUtils.contains(Platform.getApplicationArgs(), EclipseCommandLine.TALEND_DISABLE_LOGINDIALOG_COMMAND)) {
            RegisterManagement.getInstance().validateRegistration();
        }
-
+        PreferenceManager pm = PlatformUI.getWorkbench().getPreferenceManager();
        // not git project, do not show git settings preference page
        if (IGITProviderService.get() == null || !IGITProviderService.get().isProjectInGitMode()) {
-            PreferenceManager pm = PlatformUI.getWorkbench().getPreferenceManager();
            pm.remove("org.talend.core.prefs" + WorkbenchPlugin.PREFERENCE_PAGE_CATEGORY_SEPARATOR + "org.talend.repository.gitprovider.settings.GitPreferencePage");
        }
+        pm.remove("org.eclipse.equinox.internal.p2.ui.sdk.ProvisioningPreferencePage"); //$NON-NLS-1$
    }

    @Override
--- a/main/plugins/org.talend.repository.mdm/src/main/java/messages_ja.properties
+++ b/main/plugins/org.talend.repository.mdm/src/main/java/messages_ja.properties
@@ -71,7 +71,7 @@ ExtractionFieldsWithXPathEditorView.columnTitle.xPath=\u76F8\u5BFE\u307E\u305F\u
 ExtractionFieldsWithXPathEditorView.columnTitle.columnName=\u30AB\u30E9\u30E0\u540D
 ExtractionFieldsWithXPathEditorView.columnName=\u30AB\u30E9\u30E0\u540D
 ExtractionFieldsWithXPathEditorView.exist=\u304C\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u3002
-XPathProposalProvider.contentProposal=<< \u3042\u307E\u308A\u306B\u3082\u591A\u304F\u306E\u30CE\u30FC\u30C9\u3001\u5024\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093 ... >>,
+XPathProposalProvider.contentProposal=<< \u3042\u307E\u308A\u306B\u3082\u591A\u304F\u306E\u30CE\u30FC\u30C9\u3001\u5024\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093 ... >>
 XmlToXPathLinker.Loop=\u30EB\u30FC\u30D7\u30EA\u30F3\u30AF\u3092\u4F5C\u6210...
 XmlToXPathLinker.beginTask.fieldLinksCreation=\u30D5\u30A3\u30FC\u30EB\u30C9\u30EA\u30F3\u30AF\u306E\u4F5C\u6210...
 XmlToXPathLinker.illegalArgumentException=currentControl\u306E\u3053\u306E\u30BF\u30A4\u30D7\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
--- a/main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/metadata/i18n/messages_fr.properties
+++ b/main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/metadata/i18n/messages_fr.properties
@@ -159,7 +159,7 @@ DocumentationUpdateWizard.windowTitle=Mettre \u00E0 jour la documentation
 EbcdicForm.noDir=Le r\u00E9pertoire du fichier xc2j n'existe pas.
 EbcdicForm.genarateFailure=\u00C9chec lors de la g\u00E9n\u00E9ration du fichier xc2j.
 EbcdicForm.dataFile=Fichier de donn\u00E9es
-EbcdicForm.dataNotExist=Ficher de donn\u00E9es inexistant
+EbcdicForm.dataNotExist=Fichier de donn\u00E9es inexistant
 EbcdicForm.dataNull=Le chemin d'acc\u00E8s au fichier de donn\u00E9es doit \u00EAtre sp\u00E9cifi\u00E9
 EDemoProjectFileType.unknowType=Type de fichier inconnu
 EditContextAction.editContext=Modifier le groupe de contextes
--- a/main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/metadata/i18n/messages_ja.properties
+++ b/main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/metadata/i18n/messages_ja.properties
@@ -239,7 +239,7 @@ FileStep2.fieldSeparatorNotFinishByComma=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5
 FileStep2.fieldSeparatorPositionalAlert=\u6570\u5B57\u3092\u30B3\u30F3\u30DE\u3067\u533A\u5207\u3063\u3066\u3001\u30AB\u30E9\u30E0\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.fieldSeparatorPositionalTip=\u5404\u30AB\u30E9\u30E0\u306E\u4F4D\u7F6E\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u4F4D\u7F6E\u306F\u6607\u9806\u3067\u8A18\u8FF0\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.filePathIncomplete=\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
-FileStep2.firstRowsIsCaption=\u5217\u540D\u3068\u3057\u3066\u5148\u982D\u884C\u3092\u8A2D\u5B9A
+FileStep2.firstRowsIsCaption=\u30AB\u30E9\u30E0\u540D\u3068\u3057\u3066\u5148\u982D\u884C\u3092\u8A2D\u5B9A
 FileStep2.footer=\u30D5\u30C3\u30BF\u30FC
 FileStep2.footerTip=\u30D5\u30C3\u30BF\u30FC
 FileStep2.groupDelimitedFileSettings=\u30D5\u30A1\u30A4\u30EB\u8A2D\u5B9A
@@ -262,10 +262,10 @@ FileStep2.quoteDelimitedTip=\u30A8\u30B9\u30B1\u30FC\u30D7\u6587\u5B57\u306A\u30
 FileStep2.refreshPreview=\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u66F4\u65B0
 FileStep2.removeEmptyRow=\u7A7A\u306E\u884C\u3092\u30B9\u30AD\u30C3\u30D7
 FileStep2.rowSeparator=\u884C\u533A\u5207\u308A
-FileStep2.rowSeparatorAlert=\u6587\u5B57\u306E\u30ED\u30A6\u30BB\u30D1\u30EC\u30FC\u30BF\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
+FileStep2.rowSeparatorAlert=\u6587\u5B57\u306E\u884C\u30BB\u30D1\u30EC\u30FC\u30BF\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.rowSeparatorIncomplete=\u884C\u533A\u5207\u308A\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.rowSeparatorTip=\u884C\u533A\u5207\u308A
-FileStep2.rowsToSkipTip=\u884C\u3092\u7121\u8996\u3059\u308B\u5834\u5408\u306F\u3001\u4EE5\u4E0B\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044,
+FileStep2.rowsToSkipTip=\u884C\u3092\u7121\u8996\u3059\u308B\u5834\u5408\u306F\u3001\u4EE5\u4E0B\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 FileStep2.settingsIncomplete=\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u3001\u8A2D\u5B9A\u3092\u5B8C\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 FileStep2.splitwayRecordForJavaFID=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u524D\u306E\u884C\u3092\u5206\u5272
 FileStep2.splitwayRecordForJavaFIDTip=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u304C\u884C\u533A\u5207\u308A\u306E\u4E00\u90E8\u3067\u3042\u308B\u5834\u5408\u306B\u6709\u52B9\u3067\u3059\u3002
@@ -459,7 +459,7 @@ LoginComposite.projectTitle=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
 LoginComposite.errorTitle=\u30A8\u30E9\u30FC
 LoginComposite.errorMessages1=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
 LoginComposite.RESTART=\u518D\u8D77\u52D5
-LoginComposite.sharedRepositoryMessage=\u5171\u6709\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304C\u5FC5\u8981\u3067\u3059\u304B\uFF1F
+LoginComposite.sharedRepositoryMessage=\u5171\u6709\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304C\u5FC5\u8981\u3067\u3059\u304B?
 LoginComposite.Workspace_inuse=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306F\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059\u3002\u5225\u306E\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 LoginComposite.TisWorkspace_welcome={0}\u3078\u3088\u3046\u3053\u305D!
 LoginComposite.welcomeTitle=Talend Open Studio\u3078\u3088\u3046\u3053\u305D
@@ -558,7 +558,7 @@ OpenDocumentationAction.openDocAcitonTipText.openDoc=\u30C9\u30AD\u30E5\u30E1\u3
 OpenDocumentationAction.openDocAction.openDoc=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u958B\u304F
 OpenJobSelectionDialog.findJob=\u30B8\u30E7\u30D6\u3092\u691C\u7D22
 PaletteSettingPage.paletteSettings=\u30D1\u30EC\u30C3\u30C8\u8A2D\u5B9A
-PaletteSettingPage.selection1=\u975E\u8868\u793A\u9078\u629E\u3057\u305F\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3067\u4F7F\u7528\u3059\u308B\u5834\u5408\u3001\u305D\u308C\u3089\u3092\u8868\u793A\u3055\u305B\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059,,
+PaletteSettingPage.selection1=\u975E\u8868\u793A\u9078\u629E\u3057\u305F\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3067\u4F7F\u7528\u3059\u308B\u5834\u5408\u3001\u305D\u308C\u3089\u3092\u8868\u793A\u3055\u305B\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 PaletteSettingPage.selection2=\u3042\u308C\u3089\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F\u81EA\u52D5\u7684\u306B\u8868\u793A\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059
 PositionalTextTest.println.fieldValue=\u30D5\u30A3\u30FC\u30EB\u30C9\u5024
 ProjectSettingDialog.Title=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u8A2D\u5B9A
@@ -659,7 +659,7 @@ VersionManagementDialog.AllDependencies=\u4F9D\u5B58\u9805\u76EE\u3092\u3059\u30
 VersionManagementDialog.Subjob=\u30B5\u30D6\u30B8\u30E7\u30D6\u3092\u3059\u3079\u3066\u9078\u629E
 VersionManagementDialog.FixVersion=\u6700\u65B0\u306E\u5834\u5408\u306FtRunJob\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u540C\u4E00\u306B\u3059\u308B
 VersionManagementDialog.FixLastVersion=\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u6642\u306BtRunJob\u304C\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u3059\u3079\u3066\u6700\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u3053\u306E\u51E6\u7406\u3092\u884C\u3046\u3068\u524D\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u5FA9\u5143\u3055\u308C\u307E\u3059\u3002\n\u305F\u3068\u3048\u3070\u7236\u89AA\u304C1.0 (tRunJob<child, Latest>)\u3067\u3042\u308B\u3068\u3057\u307E\u3059\u3002\n\u30D0\u30FC\u30B8\u30E7\u30F31.1\u306B\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u3059\u308B\u5834\u5408:  \n  - \u89AA\u306E\u30D0\u30FC\u30B8\u30E7\u30F31.0\u306F(tRunJob<child, 1.0>)\u3092\u542B\u307F\u307E\u3059\u3002\u5B50\u3082\u30D0\u30FC\u30B8\u30E7\u30F31.0\u3067\u5B9F\u884C\u3059\u308B\u305F\u3081\u3067\u3059\u3002\n  - \u6700\u65B0\u7248\u3092\u4F7F\u3044\u7D9A\u3051\u308B\u305F\u3081\u3001\u7236\u89AA\u30D0\u30FC\u30B8\u30E7\u30F31.1\u306B\u306F(tRunJob<child, Latest>)\u304C\u542B\u307E\u308C\u308B\u3088\u3046\u306B\u306A\u308A\u307E\u3059\u3002\n\n\u6CE8\u610F: \u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u65E2\u306B\u56FA\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u304A\u3088\u3073\u6700\u65B0\u7248\u3092\u4F7F\u7528\u3057\u306A\u3044\u5834\u5408\u306F\u4F55\u3082\u3057\u307E\u305B\u3093\u3002
-XPathProposalProvider.contentProposal=<< \u3042\u307E\u308A\u306B\u3082\u591A\u304F\u306E\u30CE\u30FC\u30C9\u3001\u5024\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093 ... >>,
+XPathProposalProvider.contentProposal=<< \u3042\u307E\u308A\u306B\u3082\u591A\u304F\u306E\u30CE\u30FC\u30C9\u3001\u5024\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093 ... >>
 XmlFileStep1.groupSchemaTarget=\u30BF\u30FC\u30B2\u30C3\u30C8\u30B9\u30AD\u30FC\u30DE
 XmlFileStep1.sourceSchema=\u30BD\u30FC\u30B9\u30B9\u30AD\u30FC\u30DE
 XmlFileStep2Form.previewNotAvailable=XSD\u30D5\u30A1\u30A4\u30EB\u306B\u5229\u7528\u53EF\u80FD\u306A\u30D7\u30EC\u30D3\u30E5\u30FC\u306F\u3042\u308A\u307E\u305B\u3093
--- a/main/plugins/org.talend.repository.view.example/components/tExampleComponent/tExampleComponent_java.xml
+++ b/main/plugins/org.talend.repository.view.example/components/tExampleComponent/tExampleComponent_java.xml
@@ -201,8 +201,8 @@ SHOW_IF="USE_FILE_AMBIGUOUS=='true'">
 	<CODEGENERATION>
 		<IMPORTS>
 			<IMPORT NAME="Talen File Enhanced"
-				MODULE="talend_file_enhanced-1.2.jar"
-				MVN="mvn:org.talend.components.lib/talend_file_enhanced/1.2" REQUIRED="true" />
+				MODULE="talend_file_enhanced-1.3.jar"
+				MVN="mvn:org.talend.components.lib/talend_file_enhanced/1.3" REQUIRED="true" />
 			<IMPORT NAME="Talend_CSV" MODULE="talendcsv.jar"
 				MVN="mvn:org.talend.libraries/talendcsv/6.0.0"
 				REQUIRED="true" />
--- a/main/plugins/org.talend.themes.core/src/org/talend/themes/core/TalendThemeService.java
+++ b/main/plugins/org.talend.themes.core/src/org/talend/themes/core/TalendThemeService.java
@@ -106,6 +106,11 @@ public class TalendThemeService implements ITalendThemeService {
        }
    }

+    @Override
+    public IPreferenceStore getThemePreferenceStore() {
+        return getPreferenceStore(ITalendThemeService.THEME_PREFERENCE_ID);
+    }
+
    private IPreferenceStore getPreferenceStore(String bundleId) {
        IPreferenceStore prefStore = storeMap.get(bundleId);
        if (prefStore == null) {
--- a/main/plugins/org.talend.themes.core/src/org/talend/themes/core/elements/constants/TalendThemeConstants.java
+++ b/main/plugins/org.talend.themes.core/src/org/talend/themes/core/elements/constants/TalendThemeConstants.java
@@ -21,4 +21,6 @@ public class TalendThemeConstants {
    public static final String TALEND_THEME_PREFIX = "org.talend.themes."; //$NON-NLS-1$

    public static final String TALEND_DEFAULT_THEME_ID = TALEND_THEME_PREFIX + "css.talend.default"; //$NON-NLS-1$
+
+    public static final String TALEND_DARK_THEME_ID = "org.eclipse.e4.ui.css.theme.e4_dark"; //$NON-NLS-1$
 }
--- a/main/plugins/org.talend.themes.core/src/org/talend/themes/core/elements/utils/TalendThemeUtils.java
+++ b/main/plugins/org.talend.themes.core/src/org/talend/themes/core/elements/utils/TalendThemeUtils.java
@@ -12,6 +12,8 @@
 // ============================================================================
 package org.talend.themes.core.elements.utils;

+import org.eclipse.jface.preference.IPreferenceStore;
+import org.talend.commons.ui.runtime.ITalendThemeService;
 import org.talend.themes.core.elements.constants.TalendThemeConstants;

 /**
@@ -26,4 +28,13 @@ public class TalendThemeUtils {
        }
        return themeId.startsWith(TalendThemeConstants.TALEND_THEME_PREFIX);
    }
+
+    public static boolean isDarkModeTheme() {
+        IPreferenceStore themePreferenceStore = ITalendThemeService.get().getThemePreferenceStore();
+        if (themePreferenceStore != null
+                && TalendThemeConstants.TALEND_DARK_THEME_ID.equals(themePreferenceStore.getString("themeid"))) {
+            return true;
+        }
+        return false;
+    }
 }
--- a/main/plugins/org.talend.themes.css.talend/plugin.xml
+++ b/main/plugins/org.talend.themes.css.talend/plugin.xml
@@ -10,7 +10,6 @@
             label="%theme.default">
             <!-- please see: TalendThemeConstants.TALEND_DEFAULT_THEME_ID -->
       </theme>
-<!--
       <theme
            basestylesheeturi="themes/dark/e4-dark_linux.css"
            id="org.eclipse.e4.ui.css.theme.e4_dark"
@@ -36,7 +35,6 @@
            os="macosx"
            os_version="10.11,10.12,10.13">
        </theme>
-->
        <stylesheet
            uri="themes/dark/dark/e4-dark_preferencestyle.css">
            <themeid
--- a/main/plugins/org.talend.themes.css.talend/plugin_fr.properties
+++ b/main/plugins/org.talend.themes.css.talend/plugin_fr.properties
@@ -4,29 +4,29 @@ theme.dark=Th\u00E8me sombre Talend exp\u00E9rimental
 #New theme element definitions
 DARK_BACKGROUND=Couleur du fond sombre
 DARK_FOREGROUND=Couleur du premier plan sombre
-INACTIVE_UNSELECTED_TABS_COLOR_START=Inactive, unselected part color begin
-INACTIVE_UNSELECTED_TABS_COLOR_START=Inactive, unselected part color begin
-INACTIVE_UNSELECTED_TABS_COLOR_END=Inactive, unselected part color end
-INACTIVE_TAB_TEXT_COLOR=Inactive part text color
-INACTIVE_TAB_OUTER_KEYLINE_COLOR=Inactive part outer keyline color
-INACTIVE_TAB_INNER_KEYLINE_COLOR=Inactive part inner keyline color
-INACTIVE_TAB_OUTLINE_COLOR=Inactive part outline color
-ACTIVE_UNSELECTED_TABS_COLOR_START=Active, unselected part color begin
-ACTIVE_UNSELECTED_TABS_COLOR_END=Active, unselected part color end
-ACTIVE_TAB_TEXT_COLOR=Active part text color
-ACTIVE_TAB_OUTER_KEYLINE_COLOR=Active part outer keyline color
-ACTIVE_TAB_INNER_KEYLINE_COLOR=Active part inner keyline color
-ACTIVE_TAB_OUTLINE_COLOR=Active part outline color
-INACTIVE_TAB_BG_START=Inactive, selected part background begin
-INACTIVE_TAB_BG_END=Inactive, selected part background end
-INACTIVE_TAB_UNSELECTED_TEXT_COLOR=Inactive, unselected part foreground
-INACTIVE_TAB_SELECTED_TEXT_COLOR=Inactive, selected part foreground
-ACTIVE_TAB_BG_START=Active, selected part background begin
-ACTIVE_TAB_BG_END=Active, selected part background end
-ACTIVE_TAB_UNSELECTED_TEXT_COLOR=Active, unselected part foreground
-ACTIVE_TAB_SELECTED_TEXT_COLOR=Active, selected part foreground
-ACTIVE_NOFOCUS_TAB_TEXT_COLOR=Active (no focus), selected part text color
-ACTIVE_NOFOCUS_TAB_BG_START=Active (no focus), selected part background begin
-ACTIVE_NOFOCUS_TAB_BG_END=Active (no focus), selected part background end
-ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR=Active (no focus), selected part foreground
+INACTIVE_UNSELECTED_TABS_COLOR_START=Inactive, partie du d\u00E9but de couleur non s\u00E9lectionn\u00E9e
+INACTIVE_UNSELECTED_TABS_COLOR_START=Inactive, partie du d\u00E9but de couleur non s\u00E9lectionn\u00E9e
+INACTIVE_UNSELECTED_TABS_COLOR_END=Inactive, partie de fin de couleur non s\u00E9lectionn\u00E9e
+INACTIVE_TAB_TEXT_COLOR=Couleur inactive pour la partie du texte
+INACTIVE_TAB_OUTER_KEYLINE_COLOR=Couleur de la partie inactive pour la ligne de cl\u00E9 externe
+INACTIVE_TAB_INNER_KEYLINE_COLOR=Couleur de la partie inactive pour la ligne de cl\u00E9 interne
+INACTIVE_TAB_OUTLINE_COLOR=Couleur de la partie inactive pour la structure
+ACTIVE_UNSELECTED_TABS_COLOR_START=Active, partie du d\u00E9but de couleur non s\u00E9lectionn\u00E9e
+ACTIVE_UNSELECTED_TABS_COLOR_END=Active, partie de fin de couleur non s\u00E9lectionn\u00E9e
+ACTIVE_TAB_TEXT_COLOR=Couleur active pour la partie du texte
+ACTIVE_TAB_OUTER_KEYLINE_COLOR=Couleur de la partie active pour la ligne de cl\u00E9 externe
+ACTIVE_TAB_INNER_KEYLINE_COLOR=Couleur de la partie active pour la ligne de cl\u00E9 interne
+ACTIVE_TAB_OUTLINE_COLOR=Couleur de la partie active pour la structure
+INACTIVE_TAB_BG_START=Inactive, partie du d\u00E9but de l'arri\u00E8re-plan s\u00E9lectionn\u00E9e
+INACTIVE_TAB_BG_END=Inactive, partie de fin de l'arri\u00E8re-plan s\u00E9lectionn\u00E9e
+INACTIVE_TAB_UNSELECTED_TEXT_COLOR=Inactive, partie du premier plan non s\u00E9lectionn\u00E9e
+INACTIVE_TAB_SELECTED_TEXT_COLOR=Inactive, partie du premier plan s\u00E9lectionn\u00E9e
+ACTIVE_TAB_BG_START=Active, partie du d\u00E9but de l'arri\u00E8re-plan s\u00E9lectionn\u00E9e
+ACTIVE_TAB_BG_END=Active, partie de fin de l'arri\u00E8re-plan s\u00E9lectionn\u00E9e
+ACTIVE_TAB_UNSELECTED_TEXT_COLOR=Active, partie du premier plan non s\u00E9lectionn\u00E9e
+ACTIVE_TAB_SELECTED_TEXT_COLOR=Active, partie du premier plan s\u00E9lectionn\u00E9e
+ACTIVE_NOFOCUS_TAB_TEXT_COLOR=Active (aucun focus), couleur du texte pour la partie s\u00E9lectionn\u00E9e
+ACTIVE_NOFOCUS_TAB_BG_START=Active (aucun focus), partie du d\u00E9but de l'arri\u00E8re-plan s\u00E9lectionn\u00E9e
+ACTIVE_NOFOCUS_TAB_BG_END=Active (aucun focus), partie de fin de l'arri\u00E8re-plan s\u00E9lectionn\u00E9e
+ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR=Active (Aucun focus), partie du premier plan s\u00E9lectionn\u00E9e
 LINK_COLOR=Couleur du lien
Author	SHA1	Message	Date
jding-tlnd	c240c476e4	Merge remote-tracking branch 'origin/maintenance/8.0' into jding/TUP-38424_test	2023-04-10 15:21:26 +08:00
jding-tlnd	f935f7eb5b	feat(TUP-38424):for test	2023-04-10 15:18:59 +08:00
sbliu	98930c8c96	Add localized files (#6093 ) (#6098 ) Co-authored-by: Alexiane Yvonet <ayvonet@talend.com> Co-authored-by: build-talend-doc <build-talend-doc@talend.com>	2023-04-07 10:47:55 +08:00
sbliu	a7ab220672	fix(TUP-38212) using updated context (#6089 )	2023-04-06 15:59:34 +08:00
sbliu	553b2770c9	fix(TUP-37855) add log to network check exception (#5987 ) * fix(TUP-37855) add log to network check exception * fix(TUP-37855) add check ulr to networkutil error log	2023-04-03 11:28:28 +08:00
jding-tlnd	0e19b52527	feat(TUP-38424):Add dark mode info to the pendo of Login Project https://jira.talendforge.org/browse/TUP-38424	2023-04-03 09:18:30 +08:00
jiezhang-tlnd	dd851d3202	Add localized files (#6082 ) (#6084 ) Co-authored-by: tsasada-talend <51699524+tsasada-talend@users.noreply.github.com> Co-authored-by: build-talend-doc <build-talend-doc@talend.com>	2023-03-30 17:20:09 +08:00
vyu-talend	f47f991977	chore(TDI-49458):bump file enhanced. (#6076 )	2023-03-30 16:31:59 +08:00
Zhiwei Xue	a2e44cb5c2	fix(TUP-37990):remove custom bundle org.bouncycastle.bcprov (#6049 )	2023-03-29 17:08:03 +08:00
hcyi	e36f0690f0	fix(TUP-38199):Remove updates section from Studio preferences. (#6052 )	2023-03-29 11:49:58 +08:00
Jill Yan	9c4a9c1589	8.0/APPINT-35452 correct snapshot post fix (#6060 ) * APPINT-35452 correct snapshot post fix * APPINT-35452 correct snapshot post fix * APPINT-35452 correct snapshot post fix	2023-03-28 09:34:25 +08:00
sbliu	da4ba3f1a0	Add localized files (#6066 ) (#6071 ) Co-authored-by: Alexiane Yvonet <ayvonet@talend.com> Co-authored-by: build-talend-doc <build-talend-doc@talend.com>	2023-03-27 15:20:18 +08:00
bhe-talendbj	087dac391d	chore(TUP-38259): refactor proxyrepositoryfactory (#6057 )	2023-03-27 09:22:03 +08:00
dicarcab	ab843f7a55	fix(TBD-14951):OracleDB Migration task affecting DI Jobs (#6041 )	2023-03-23 09:16:02 +01:00
jiezhang-tlnd	5949ce647d	chore(TUP-38180)CVE-2022-45787,org.apache.james:apache-mime4j:0.6 (#6050 )	2023-03-21 17:05:55 +08:00
hcyi	f9e7be104e	fix(TUP-38139):context tab doesn't get updated after press 'undo'. (#6017 )	2023-03-21 09:48:48 +08:00
sbliu	774e6dea26	Add localized files (#6051 ) (#6056 ) Co-authored-by: Alexiane Yvonet <ayvonet@talend.com> Co-authored-by: build-talend-doc <build-talend-doc@talend.com>	2023-03-17 11:03:54 +08:00
Oleksandr Zhelezniak	3eccad0352	fix(TDI-31777): bump talendcsv (#5926 )	2023-03-10 12:46:52 +02:00
kjwang	ada4bcf7e3	Fix TUP-38298 Can't edit the two default contexts in testcase (#6046 ) * Fix TUP-38298 Can't edit the two default contexts in testcase https://jira.talendforge.org/browse/TUP-38298	2023-03-10 17:39:34 +08:00
jiezhang-tlnd	7c72d190de	Add localized files (#6040 ) (#6045 ) Co-authored-by: jzhangbj <jzhang@talend.com> Co-authored-by: build-talend-doc <build-talend-doc@talend.com>	2023-03-10 09:29:09 +08:00
jiezhang-tlnd	025cec4828	Add localized files (#6039 ) * Add localized files * Add localized files (#6038) Co-authored-by: build-talend-doc <build-talend-doc@talend.com> --------- Co-authored-by: build-talend-doc <build-talend-doc@talend.com> Co-authored-by: tsasada-talend <51699524+tsasada-talend@users.noreply.github.com>	2023-03-09 18:20:50 +08:00