[472057] Use the new mechanism everywhere instead of NLS

This covers the following classes which used to extend
org.eclipse.osgi.util.NLS:
* org.eclipse.sirius.common.tools.api.find.FindMessages
* org.eclipse.sirius.diagram.ui.part.Messages
* org.eclipse.sirius.table.ui.tools.internal.editor.Messages
* org.eclipse.sirius.ui.tools.api.Messages

The corresponding properties have been moved directly inside the
plugin.properties, with @TranslatableMessages in the bundle's main
Messages class (initialized using our own I18N helper). All the original
fields have been kept, but instead of relying on NLS to set their value,
they directly reference the corresponding field in the main Messages
class. All usages of NLS.bind() for template substitution have been
converted to MessageFormat.format().

Bug: 472057
Change-Id: Ia0e689aa5cebf328652b968fc6233ae7ccd2ace3
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

30 files changed, 734 insertions, 705 deletions

diff --git a/plugins/org.eclipse.sirius.common/build.properties b/plugins/org.eclipse.sirius.common/build.properties
index eb6bce10a6..ec5335da66 100644
--- a/plugins/org.eclipse.sirius.common/build.properties
+++ b/plugins/org.eclipse.sirius.common/build.properties
@@ -1,5 +1,5 @@
 # ====================================================================
-# Copyright (c) 2007, 2008 THALES GLOBAL SERVICES
+# Copyright (c) 2007, 2015 THALES GLOBAL SERVICES and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -16,7 +16,8 @@ bin.includes = META-INF/,\
                plugin.xml,\
                schema/,\
                plugin.properties,\
-               about.html
+               about.html,\
+               plugin_fr.properties
 javacWarnings.. = none
 javacDefaultEncoding.. = US-ASCII
 javacProjectSettings = true
diff --git a/plugins/org.eclipse.sirius.common/plugin.properties b/plugins/org.eclipse.sirius.common/plugin.properties
index b78311dd60..0eb47c42d1 100644
--- a/plugins/org.eclipse.sirius.common/plugin.properties
+++ b/plugins/org.eclipse.sirius.common/plugin.properties
@@ -1,5 +1,5 @@
 # ====================================================================
-# Copyright (c) 2007-2013 THALES GLOBAL SERVICES
+# Copyright (c) 2007, 2015 THALES GLOBAL SERVICES and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -35,6 +35,15 @@ FeatureInterpreter_invalidFeature = The current element {0} does not have the fe
 FeatureInterpreter_unknownFeature = Unknown feature name {0}
 FileModificationValidatorDescriptor_creationError = Impossible to create the validator {0}
 FileStatusPrecommitListener_fileModificationValidationStatus = File modification validation status 
+FindMessages_abstractFindLabelDialogDialogTitle=Find
+FindMessages_abstractFindLabelDialogFindLabel=Find: 
+FindMessages_abstractFindLabelDialogDirectionGroup=Direction:
+FindMessages_abstractFindLabelDialogBackwardRadio=Backward
+FindMessages_abstractFindLabelDialogForwardRadio=Forward
+FindMessages_abstractFindLabelDialogNextButton=Find
+FindMessages_abstractFindLabelDialogErrorDialogTitle=Error
+FindMessages_abstractFindLabelDialogNoMatchingElementMessage=Unable to find matching element.
+FindMessages_abstractFindLabelDialogCancelButton=Close
 MonomorphicService_serviceError = Exception while calling service {0}.
 PolymorphicService_noCompatibleImplem = No compatible implementation of service {0} found for {1}
 PolymorphicService_toString = Polymorphic service {0} ({1} implementations).
@@ -56,4 +65,3 @@ TimeProfiler2_otherCategory = Other
 TimeProfiler2_otherTaskName = Other
 VariableInterpreter_unknownVariable = Unknown variable "{0}".
 VariableInterpreter_unkownVariable = The current context does not contains variable named: {0}
-
diff --git a/plugins/org.eclipse.sirius.common/plugin_fr.properties b/plugins/org.eclipse.sirius.common/plugin_fr.properties
new file mode 100644
index 0000000000..db2de36d5b
--- /dev/null
+++ b/plugins/org.eclipse.sirius.common/plugin_fr.properties
@@ -0,0 +1,67 @@
+# ====================================================================
+# Copyright (c) 2007-2015 THALES GLOBAL SERVICES
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Obeo - initial API and implementation
+# ====================================================================
+
+pluginName = Sirius Commons
+providerName = Eclipse Modeling Project
+
+extension-point.classloading_override.name = org.eclipse.sirius.common.classloading_override
+extension-point.dynamicPackages.name = Forked Ecore Package Registry for Dynamic Packages
+extension-point.editingDomainFactory.name = org.eclipse.sirius.common.editingDomainFactory
+extension-point.expressionInterpreter.name = org.eclipse.sirius.common.expressionInterpreter
+extension-point.fileModificationValidator.name = File Modification Validator
+extension-point.proposalProvider.name = org.eclipse.sirius.common.proposalProvider
+extension-point.resourceSetFactory.name = org.eclipse.sirius.common.resourceSetFactory
+
+BundleClassLoading_ignoredEPackageDeclaration = An EPackage declaration in project {0} has been ignored because of missing informations.
+ClassLoadingService_multipleOverridesDetected = Several overrides are contributed for the class loading override, {0} will be ignored
+CompoundInterpreter_impossibleToCreateInterpreter = Impossible to create the interpreter {0}
+DefaultExpressionProposal_nullProposal = The proposal must not be null
+DynamicEPackageService_missingLocationAttribute = No location attribute was specified.
+DynamicPackageRegistryReader_packageConflict = Both '{0}' and '{1}' register a package for '{2}'
+EObjectCouple_firstNull = the first eObject is null
+EObjectCouple_secondNull = the second eObject is null
+EclipseEditingDomainFactoryDescriptor_errorLoadingExtension = Error while loading the extension {0}
+EclipseUtil_extensionLoadError = Impossible to load the extension {0}
+EditingSessionWorkspaceListener_resourceRefreshError = Error while refreshing resource
+FeatureInterpreter_invalidFeature = The current element {0} does not have the feature named: {1}
+FeatureInterpreter_unknownFeature = Unknown feature name {0}
+FileModificationValidatorDescriptor_creationError = Impossible to create the validator {0}
+FileStatusPrecommitListener_fileModificationValidationStatus = File modification validation status 
+FindMessages_abstractFindLabelDialogDialogTitle=Rechercher
+FindMessages_abstractFindLabelDialogFindLabel=Rechercher : 
+FindMessages_abstractFindLabelDialogDirectionGroup=Direction :
+FindMessages_abstractFindLabelDialogBackwardRadio=Arri\u00e8re
+FindMessages_abstractFindLabelDialogForwardRadio=Avant
+FindMessages_abstractFindLabelDialogNextButton=Chercher
+FindMessages_abstractFindLabelDialogErrorDialogTitle=Erreur
+FindMessages_abstractFindLabelDialogNoMatchingElementMessage=Pas d'\u00e9l\u00e9ment correspondant trouv\u00e9
+FindMessages_abstractFindLabelDialogCancelButton=Fermer
+MonomorphicService_serviceError = Exception while calling service {0}.
+PolymorphicService_noCompatibleImplem = No compatible implementation of service {0} found for {1}
+PolymorphicService_toString = Polymorphic service {0} ({1} implementations).
+ProfilerTask_nullCategory = the category is null
+ProfilerTask_nullName = the name is null
+ProfilerTaskRegistry_keyConflict = ProfilerTaskRegistry key already in use: {0}
+ProfilerTaskRegistry_valueConflict = ProfilerTaskRegistry already contains value : {0}
+ResourceSetFactory_creationError = Impossible to create the resource factory {0}
+ResourceSetFactory_ignoredOverrides = Several overrides are contributed for the resource factory,  {0} will be ignored
+ResourceSyncClientNotifier_actionName = ResourceSyncClient notification
+ResourceUtil_backupFileAlreadyExists = the file already exists
+ResourceUtil_backupFileTask = Backup and refresh workspace
+ServiceInterpreter_invalidReceiver = The receiver of the service call {0} is not an EObject (it is a {1})
+ServiceInterpreter_javaClassNotFound = Could not find Java extension class {0}
+ServiceInterpreter_unknownService = Unknown service "{0}"
+TimeProfiler_nullListener = listener is null
+TimeProfiler2_emptyStackError = Empty stack in stopWork. Stopped task: {0}
+TimeProfiler2_otherCategory = Other
+TimeProfiler2_otherTaskName = Other
+VariableInterpreter_unknownVariable = Unknown variable "{0}".
+VariableInterpreter_unkownVariable = The current context does not contains variable named: {0}
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/Messages.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/Messages.java
index 08db83ebf6..adf819c25c 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/Messages.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/Messages.java
@@ -45,19 +45,19 @@ public final class Messages {
     public static String DynamicPackageRegistryReader_packageConflict;
 
     @TranslatableMessage
-    public static String EObjectCouple_firstNull;
+    public static String EclipseEditingDomainFactoryDescriptor_errorLoadingExtension;
 
     @TranslatableMessage
-    public static String EObjectCouple_secondNull;
+    public static String EclipseUtil_extensionLoadError;
 
     @TranslatableMessage
-    public static String EclipseEditingDomainFactoryDescriptor_errorLoadingExtension;
+    public static String EditingSessionWorkspaceListener_resourceRefreshError;
 
     @TranslatableMessage
-    public static String EclipseUtil_extensionLoadError;
+    public static String EObjectCouple_firstNull;
 
     @TranslatableMessage
-    public static String EditingSessionWorkspaceListener_resourceRefreshError;
+    public static String EObjectCouple_secondNull;
 
     @TranslatableMessage
     public static String FeatureInterpreter_invalidFeature;
@@ -72,6 +72,33 @@ public final class Messages {
     public static String FileStatusPrecommitListener_fileModificationValidationStatus;
 
     @TranslatableMessage
+    public static String FindMessages_abstractFindLabelDialogBackwardRadio;
+
+    @TranslatableMessage
+    public static String FindMessages_abstractFindLabelDialogCancelButton;
+
+    @TranslatableMessage
+    public static String FindMessages_abstractFindLabelDialogDialogTitle;
+
+    @TranslatableMessage
+    public static String FindMessages_abstractFindLabelDialogDirectionGroup;
+
+    @TranslatableMessage
+    public static String FindMessages_abstractFindLabelDialogErrorDialogTitle;
+
+    @TranslatableMessage
+    public static String FindMessages_abstractFindLabelDialogFindLabel;
+
+    @TranslatableMessage
+    public static String FindMessages_abstractFindLabelDialogForwardRadio;
+
+    @TranslatableMessage
+    public static String FindMessages_abstractFindLabelDialogNextButton;
+
+    @TranslatableMessage
+    public static String FindMessages_abstractFindLabelDialogNoMatchingElementMessage;
+
+    @TranslatableMessage
     public static String MonomorphicService_serviceError;
 
     @TranslatableMessage
@@ -88,7 +115,7 @@ public final class Messages {
 
     @TranslatableMessage
     public static String ProfilerTaskRegistry_keyConflict;
-    
+
     @TranslatableMessage
     public static String ProfilerTaskRegistry_valueConflict;
 
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/find/FindMessages.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/find/FindMessages.java
index 5453e99dc8..16b8f4f521 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/find/FindMessages.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/find/FindMessages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 THALES GLOBAL SERVICES.
+ * Copyright (c) 2007, 2015 THALES GLOBAL SERVICES and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.api.find;
 
-import org.eclipse.osgi.util.NLS;
+import org.eclipse.sirius.common.tools.Messages;
 
 /**
  * FindMessage NLS Class.
@@ -19,40 +19,24 @@ import org.eclipse.osgi.util.NLS;
  * 
  */
 // CHECKSTYLE:OFF
-public final class FindMessages extends NLS {
-    /** NLS String. */
-    public static String abstractFindLabelDialogBackwardRadio;
+public final class FindMessages {
+    public static String abstractFindLabelDialogBackwardRadio = Messages.FindMessages_abstractFindLabelDialogBackwardRadio;
 
-    /** NLS String. */
-    public static String abstractFindLabelDialogCancelButton;
+    public static String abstractFindLabelDialogCancelButton = Messages.FindMessages_abstractFindLabelDialogCancelButton;
 
-    /** NLS String. */
-    public static String abstractFindLabelDialogDialogTitle;
+    public static String abstractFindLabelDialogDialogTitle = Messages.FindMessages_abstractFindLabelDialogDialogTitle;
 
-    /** NLS String. */
-    public static String abstractFindLabelDialogDirectionGroup;
+    public static String abstractFindLabelDialogDirectionGroup = Messages.FindMessages_abstractFindLabelDialogDirectionGroup;
 
-    /** NLS String. */
-    public static String abstractFindLabelDialogErrorDialogTitle;
+    public static String abstractFindLabelDialogErrorDialogTitle = Messages.FindMessages_abstractFindLabelDialogErrorDialogTitle;
 
-    /** NLS String. */
-    public static String abstractFindLabelDialogFindLabel;
+    public static String abstractFindLabelDialogFindLabel = Messages.FindMessages_abstractFindLabelDialogFindLabel;
 
-    /** NLS String. */
-    public static String abstractFindLabelDialogForwardRadio;
+    public static String abstractFindLabelDialogForwardRadio = Messages.FindMessages_abstractFindLabelDialogForwardRadio;
 
-    /** NLS String. */
-    public static String abstractFindLabelDialogNextButton;
+    public static String abstractFindLabelDialogNextButton = Messages.FindMessages_abstractFindLabelDialogNextButton;
 
-    /** NLS String. */
-    public static String abstractFindLabelDialogNoMatchingElementMessage;
-    
-    private static final String BUNDLE_NAME = FindMessages.class.getPackage().getName() + ".findMessages"; //$NON-NLS-1$
-
-    static {
-        // initialize resource bundle
-        NLS.initializeMessages(BUNDLE_NAME, FindMessages.class);
-    }
+    public static String abstractFindLabelDialogNoMatchingElementMessage = Messages.FindMessages_abstractFindLabelDialogNoMatchingElementMessage;
 
     private FindMessages() {
     }
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/find/findMessages.properties b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/find/findMessages.properties
deleted file mode 100644
index 438382ee20..0000000000
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/find/findMessages.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# ====================================================================
-# Copyright (c) 2007-2013 THALES GLOBAL SERVICES
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Obeo - initial API and implementation
-# ====================================================================
-
-abstractFindLabelDialogDialogTitle=Find
-abstractFindLabelDialogFindLabel=Find: 
-abstractFindLabelDialogDirectionGroup=Direction:
-abstractFindLabelDialogBackwardRadio=Backward
-abstractFindLabelDialogForwardRadio=Forward
-abstractFindLabelDialogNextButton=Find
-abstractFindLabelDialogErrorDialogTitle=Error
-abstractFindLabelDialogNoMatchingElementMessage=Unable to find matching element.
-abstractFindLabelDialogCancelButton=Close
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/find/findMessages_fr.properties b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/find/findMessages_fr.properties
deleted file mode 100644
index fde2789e7b..0000000000
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/find/findMessages_fr.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# ====================================================================
-# Copyright (c) 2007-2013 THALES GLOBAL SERVICES
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Obeo - initial API and implementation
-# ====================================================================
-
-abstractFindLabelDialogDialogTitle=Rechercher
-abstractFindLabelDialogFindLabel=Rechercher : 
-abstractFindLabelDialogDirectionGroup=Direction :
-abstractFindLabelDialogBackwardRadio=Arri\u00e8re
-abstractFindLabelDialogForwardRadio=Avant
-abstractFindLabelDialogNextButton=Chercher
-abstractFindLabelDialogErrorDialogTitle=Erreur
-abstractFindLabelDialogNoMatchingElementMessage=Pas d'\u00e9l\u00e9ment correspondant trouv\u00e9
-abstractFindLabelDialogCancelButton=Fermer
diff --git a/plugins/org.eclipse.sirius.diagram.ui/build.properties b/plugins/org.eclipse.sirius.diagram.ui/build.properties
index 2e83050487..a2bb31c9f8 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/build.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui/build.properties
@@ -14,7 +14,6 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               messages.properties,\
                .options,\
                images/,\
                schema/,\
@@ -24,8 +23,7 @@ source.. = src-gen/,\
            src-diag/,\
            src/
 output.. = bin/
-src.includes = messages.properties,\
-               schema/
+src.includes = schema/
 javacWarnings.. = none
 additional.bundles = org.apache.batik.css,\
                      org.apache.batik.ext.awt
diff --git a/plugins/org.eclipse.sirius.diagram.ui/messages.properties b/plugins/org.eclipse.sirius.diagram.ui/messages.properties
deleted file mode 100644
index 1c488bd813..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/messages.properties
+++ /dev/null
@@ -1,88 +0,0 @@
-# ====================================================================
-# Copyright (c) 2007, 2008 THALES GLOBAL SERVICES
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Obeo - initial API and implementation
-# ====================================================================
-
-# TODO: manually put keys and values
-SiriusCreationWizardTitle=New Sirius Diagram
-SiriusCreationWizard_DiagramModelFilePageTitle=Create Sirius Diagram
-SiriusCreationWizard_DiagramModelFilePageDescription=Select file that will contain diagram model.
-SiriusCreationWizard_DomainModelFilePageTitle=Create Sirius Diagram
-SiriusCreationWizard_DomainModelFilePageDescription=Select file that will contain domain model.
-SiriusCreationWizardOpenEditorError=Error opening diagram editor
-SiriusCreationWizardCreationError=Creation Problems
-SiriusCreationWizardPageExtensionError=File name should have {0} extension.
-SiriusDiagramEditorUtil_OpenModelResourceErrorDialogTitle=Error
-SiriusDiagramEditorUtil_OpenModelResourceErrorDialogMessage=Failed to load model file {0}
-SiriusDiagramEditorUtil_CreateDiagramProgressTask=Creating diagram and model files
-SiriusDiagramEditorUtil_CreateDiagramCommandLabel=Creating diagram and model
-SiriusDocumentProvider_isModifiable=Updating cache failed
-SiriusDocumentProvider_handleElementContentChanged=Failed to refresh hierarchy for changed resource
-SiriusDocumentProvider_IncorrectInputError={1}
-SiriusDocumentProvider_NoDiagramInResourceError=Diagram is not present in resource
-SiriusDocumentProvider_DiagramLoadingError=Error loading diagram
-SiriusDocumentProvider_UnsynchronizedFileSaveError=The file has been changed on the file system
-SiriusDocumentProvider_SaveDiagramTask=Saving diagram
-SiriusDocumentProvider_SaveNextResourceTask=Saving {0}
-SiriusDocumentProvider_SaveAsOperation=Saving {0} diagram as
-SiriusInitDiagramFileAction_InitDiagramFileResourceErrorDialogTitle=Error
-SiriusInitDiagramFileAction_InitDiagramFileResourceErrorDialogMessage=Model file loading failed
-SiriusInitDiagramFileAction_InitDiagramFileWizardTitle=Initialize new {0} diagram file
-SiriusInitDiagramFileAction_OpenModelFileDialogTitle=Select domain model
-SiriusNewDiagramFileWizard_CreationPageName=Initialize new diagram file
-SiriusNewDiagramFileWizard_CreationPageTitle=Diagram file
-SiriusNewDiagramFileWizard_CreationPageDescription=Create new diagram based on {0} model content
-SiriusNewDiagramFileWizard_RootSelectionPageName=Select diagram root element
-SiriusNewDiagramFileWizard_RootSelectionPageTitle=Diagram root element
-SiriusNewDiagramFileWizard_RootSelectionPageDescription=Select semantic model element to be depicted on diagram
-SiriusNewDiagramFileWizard_RootSelectionPageSelectionTitle=Select diagram root element:
-SiriusNewDiagramFileWizard_RootSelectionPageNoSelectionMessage=Diagram root element is not selected
-SiriusNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage=Invalid diagram root element is selected
-SiriusNewDiagramFileWizard_InitDiagramCommand=Initializing diagram contents
-SiriusNewDiagramFileWizard_IncorrectRootError=Incorrect model object stored as a root resource object
-SiriusDiagramEditor_SavingDeletedFile=The original file "{0}" has been deleted.
-SiriusDiagramEditor_SaveAsErrorTitle=Problem During Save As...
-SiriusDiagramEditor_SaveAsErrorMessage=Save could not be completed. Target file is already open in another editor.
-SiriusDiagramEditor_SaveErrorTitle=Save Problems
-SiriusDiagramEditor_SaveErrorMessage=Could not save file.
-SiriusElementChooserDialog_SelectModelElementTitle=Select model element
-ModelElementSelectionPageMessage=Select model element:
-ValidateActionMessage=Validate
-DNodeContainerViewNodeContainerCompartmentEditPart_title=ViewNodeContainerCompartment
-DNodeContainerViewNodeContainerCompartment2EditPart_title=ViewNodeContainerCompartment
-DNodeListViewNodeListCompartmentEditPart_title=ViewNodeListCompartment
-DNodeListViewNodeListCompartment2EditPart_title=ViewNodeListCompartment
-
-CommandName_OpenDiagram=Open Diagram
-NavigatorGroupName_DDiagram_1000_links=links
-NavigatorGroupName_DNode_2001_incominglinks=incoming links
-NavigatorGroupName_DNode_2001_outgoinglinks=outgoing links
-NavigatorGroupName_DNodeContainer_2002_incominglinks=incoming links
-NavigatorGroupName_DNodeContainer_2002_outgoinglinks=outgoing links
-NavigatorGroupName_DNodeList_2003_incominglinks=incoming links
-NavigatorGroupName_DNodeList_2003_outgoinglinks=outgoing links
-NavigatorGroupName_DNode_3001_incominglinks=incoming links
-NavigatorGroupName_DNode_3001_outgoinglinks=outgoing links
-NavigatorGroupName_DNode_3007_incominglinks=incoming links
-NavigatorGroupName_DNode_3007_outgoinglinks=outgoing links
-NavigatorGroupName_DNodeContainer_3008_incominglinks=incoming links
-NavigatorGroupName_DNodeContainer_3008_outgoinglinks=outgoing links
-NavigatorGroupName_DNodeList_3009_incominglinks=incoming links
-NavigatorGroupName_DNodeList_3009_outgoinglinks=outgoing links
-NavigatorGroupName_DNode_3012_incominglinks=incoming links
-NavigatorGroupName_DNode_3012_outgoinglinks=outgoing links
-NavigatorGroupName_DEdge_4001_target=target
-NavigatorGroupName_DEdge_4001_source=source
-NavigatorActionProvider_OpenDiagramActionName=Open Diagram
-AbstractParser_UnexpectedValueTypeMessage=Value of type {0} is expected
-AbstractParser_WrongStringConversionMessage=String value does not convert to {0} value
-AbstractParser_UnknownLiteralMessage=Unknown literal: {0}
-MessageFormatParser_InvalidInputError=Invalid input at {0}
-SiriusModelingAssistantProviderTitle=Select domain model element
-SiriusModelingAssistantProviderMessage=Available domain model elements:
diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
index 45ffda0c57..11a9cf1aeb 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
@@ -751,6 +751,9 @@ AbstractLayoutProvider_arrangeAllProfilerTaskCategory = Generic Modeler
 AbstractLayoutProvider_arrangeAllProfilerTaskName = Arrange All
 AbstractLayoutProvider_layoutError = Layout Error
 AbstractModelChangeOperation_name = Unnamed operation
+AbstractParser_UnexpectedValueTypeMessage=Value of type {0} is expected
+AbstractParser_UnknownLiteralMessage=Unknown literal: {0}
+AbstractParser_WrongStringConversionMessage=String value does not convert to {0} value
 AbstractParser_setValuesCmdLabel = Set Values
 AbstractProviderDescriptor_missingAttributeMsg = The {0} attribute is missing
 AbstractSiriusLayoutDataManager_unhandledDiagramElementKind = This kind of diagram element ({0}) is not yet managed by the LayoutDataManager.
@@ -762,8 +765,8 @@ AirResizableEditPolicy_autoSizeCommandLabel = Auto Size
 AnonymousUserFixedColorName = <anonymous>
 ArrangeBorderNodesAction_actionText = Linked Border Nodes
 ArrangeBorderNodesAction_commandLabel = Arrange Linked Border Nodes
-ArrangeBorderNodesAction_toolbarActionText = Arrange Linked Border Nodes
 ArrangeBorderNodesAction_toolTipText = Arrange all the linked border nodes of the diagram.
+ArrangeBorderNodesAction_toolbarActionText = Arrange Linked Border Nodes
 BehaviorsPropertySection_activatedBehaviorsLabel = Activated Behaviors
 BehaviorsPropertySection_availableBehaviorsLabel = Available Behaviors
 BorderItemAwareLayoutProvider_invalidItemsPosition = Invalid items position.
@@ -788,6 +791,7 @@ ChildrenAdjustmentCommand_errorMsg = The adaptation of children location to shap
 ChildrenAdjustmentCommand_label = Adapt children location
 Column_wrongColumnViewError = The view is not in the column
 CommandFactory_doNothingLabel = Do nothing
+CommandName_OpenDiagram=Open Diagram
 CompoundEditPolicy_nullEditPolicyMsg = the edit policy is null
 ConcernComboContributionItem_tooltip = Current concern
 ConnectionsFactory_edgeNotCreatedMsg = GMF Edge not created between source element : {0}, and target element : {1}
@@ -815,11 +819,16 @@ DDiagramEditorImpl_noAssociatedGMFDiagramMsg = The gmf diagram is expected to be
 DDiagramEditorImpl_noSessionMsg = Error while getting the session.
 DDiagramEditorImpl_refreshJobInterruptedMsg = Refresh job got interrupted
 DDiagramEditorImpl_refreshJobLabel = Refresh
+DEdgeCreateCommand_executionErrorMsg = Invalid arguments in create link command
+DEdgeLabelItemProvider_label = label
+DNodeContainerViewNodeContainerCompartment2EditPart_title=ViewNodeContainerCompartment
+DNodeContainerViewNodeContainerCompartmentEditPart_title=ViewNodeContainerCompartment
+DNodeLayoutDataKey_wrongKeyMsg = The key uses to store this layout data can only be an AbstractDNode or a DDiagram.
+DNodeListViewNodeListCompartment2EditPart_title=ViewNodeListCompartment
+DNodeListViewNodeListCompartmentEditPart_title=ViewNodeListCompartment
 DeactivateBehaviorToolsCommand_label = Deactivate behavior tools
 DeactivateFiltersCommand_label = Deactivate filters
 DeactivateRulesCommand_label = Dectivate validation rules
-DEdgeCreateCommand_executionErrorMsg = Invalid arguments in create link command
-DEdgeLabelItemProvider_label = label
 DefaultLayerName = Default
 DeleteRelatedNoteAttachmentsTask_label = Delete Related GMF note attachments
 DeleteRelatedNotesTask_label = Delete Related GMF notes
@@ -833,10 +842,10 @@ DiagramAppearancePreferencePage_labelIconsGroupText = Label icons (does not affe
 DiagramConnectionsPreferencePage_enableOverrideLabel = Enable user specifc default values. These setting apply to all diagrams (does not affect existing elements).
 DiagramDialectEditorDialogFactory_forbiddenOperation = Forbidden operation
 DiagramDialectUIServices_diagramDescription = \n . {0}: diagram.DDiagram | the diagram of the current potential edge.
+DiagramDialectUIServices_diagramEditPartDeactivationError = Error while deactivating the representation, the remote server may be unreachable.
 DiagramDialectUIServices_diagramEditorClosingError = Error while closing the representation, the remote server may be unreachable.
 DiagramDialectUIServices_diagramEditorOpeningError = diagram editor opening error
 DiagramDialectUIServices_diagramEditorOpeningMonitorTaskName = diagram editor opening: {0}
-DiagramDialectUIServices_diagramEditPartDeactivationError = Error while deactivating the representation, the remote server may be unreachable.
 DiagramDialectUIServices_diagramOpeningMonitorTaskName = diagram opening
 DiagramDialectUIServices_exportedDiagramImageCreationError = The program was not able to create image file {0}
 DiagramDialectUIServices_refreshDiagram = Refresh diagram
@@ -848,9 +857,9 @@ DiagramDialectUIServices_sourceViewPreDescription = \n . {0}: diagram.EdgeTarget
 DiagramDialectUIServices_targetPreDescription = \n . {0}: ecore.EObject | (edge only) the semantic element of $preTargetView.
 DiagramDialectUIServices_targetViewPreDescription = \n . {0}: diagram.EdgeTarget | (edge only) the target view of the current potential edge.
 DiagramEdgeEditPartOperation_unknownRountingStyle = Unknown routing style: {0}
+DiagramEditPartService_imageExportException = Cannot export image ({0})
 DiagramEditorContextMenuProvider_arrangeMenuRenameError = Arrange menu is not renamed in Layout
 DiagramEditorContextMenuProvider_arrangeMenuText = Layout
-DiagramEditPartService_imageExportException = Cannot export image ({0})
 DiagramElementEditPartOperation_partDeactivationError = Error while connecting to remote CDO server
 DiagramElementsSelectionDialog_grayedElementDialogMessage = The wizard will have no effect on grayed elements.
 DiagramGeneralPreferencePage_arrangeAndAutoSizeContainersLabel = Auto-size containers during arrange-all action.
@@ -881,7 +890,6 @@ DistributeAction_gapsVerticallyLabel = Gaps Vertically
 DistributeCommand_errorMsg = The distribution of selected elements can not be done.
 DistributeMenuAction_text = &Distribute
 DistributeMenuAction_tooltip = Distribute selected shapes
-DNodeLayoutDataKey_wrongKeyMsg = The key uses to store this layout data can only be an AbstractDNode or a DDiagram.
 DocumentationPropertySection_defaultLabel = Documentation:
 DocumentationPropertySection_description = Use this field to save notes about this representation.
 EclipseImageSelectorDescriptor_extensionLoadingError = Error while loading the extension {0}
@@ -917,9 +925,9 @@ HierarchyLabelProvider_elementWihtoutNameLabel = Element whithout name
 IAbstractDiagramNodeEditPart_createViewCommandLabel = Create View
 IAbstractDiagramNodeEditPart_resizeCommandLabel = Resize
 IBorderItemLocatorWrapper_nullLocator = The locator is null
-Identifier_invalidNullObject = {0} cannot be null
 IDiagramOutlinePage_outlineTooltip = Outline
 IDiagramOutlinePage_overviewTooltip = Overview
+Identifier_invalidNullObject = {0} cannot be null
 InitializeHiddenElementsCommand_label = Initialize hidden elements
 InitializeLayoutCommand_label = Initialize layout
 ItemProvider_elementBasedEdge = Element Based Edge
@@ -930,19 +938,41 @@ LaunchBehaviorToolAction_label = Launch behavior rules
 LayersCellModifier_layerSelectionChangesTaskName = Apply layer modifications...
 LayersContribution_label = Layers
 LayersTableViewer_columnName = Layer
+LayoutDataHelperImpl_unkownLayoutData = Layoutdata of type {0} is unknown
 LayoutData_illegalTarget = The target of a LayoutData can only be an AbstractDNode, a DEdge or a DDiagram.
 LayoutData_unhandledDiagramElementKind = This kind of diagram element ({0}) is not yet managed by the LayoutDataManager.
-LayoutDataHelperImpl_unkownLayoutData = Layoutdata of type {0} is unknown
+LayoutProviderDescriptor_initializationErrorMsg = CoreException during the initialization of the AIR Layout Provider {0}
 LayoutingModeSwitchingAction_activate = Activate Layouting Mode
 LayoutingModeSwitchingAction_deactivate = Deactivate Layouting Mode
 LayoutingModeSwitchingAction_statusOn = Layouting Mode
-LayoutProviderDescriptor_initializationErrorMsg = CoreException during the initialization of the AIR Layout Provider {0}
 MarkerObserver_validationMarkerFailureMsg = Validation marker refresh failure
+MessageFormatParser_InvalidInputError=Invalid input at {0}
 MiscPropertySection_nullObject = null object
 MiscPropertySource_errorGettingValueMsg = Error while getting property value
+ModelElementSelectionPageMessage=Select model element:
 MoveViewOperation_nullMoveDeltaError = moveDelta cannot be null
 MoveViewOperation_nullViewError = view cannot be null
 NavigationItemProvider_labelWithDescriptionName = {0} to {1}
+NavigatorActionProvider_OpenDiagramActionName=Open Diagram
+NavigatorGroupName_DDiagram_1000_links=links
+NavigatorGroupName_DEdge_4001_source=source
+NavigatorGroupName_DEdge_4001_target=target
+NavigatorGroupName_DNodeContainer_2002_incominglinks=incoming links
+NavigatorGroupName_DNodeContainer_2002_outgoinglinks=outgoing links
+NavigatorGroupName_DNodeContainer_3008_incominglinks=incoming links
+NavigatorGroupName_DNodeContainer_3008_outgoinglinks=outgoing links
+NavigatorGroupName_DNodeList_2003_incominglinks=incoming links
+NavigatorGroupName_DNodeList_2003_outgoinglinks=outgoing links
+NavigatorGroupName_DNodeList_3009_incominglinks=incoming links
+NavigatorGroupName_DNodeList_3009_outgoinglinks=outgoing links
+NavigatorGroupName_DNode_2001_incominglinks=incoming links
+NavigatorGroupName_DNode_2001_outgoinglinks=outgoing links
+NavigatorGroupName_DNode_3001_incominglinks=incoming links
+NavigatorGroupName_DNode_3001_outgoinglinks=outgoing links
+NavigatorGroupName_DNode_3007_incominglinks=incoming links
+NavigatorGroupName_DNode_3007_outgoinglinks=outgoing links
+NavigatorGroupName_DNode_3012_incominglinks=incoming links
+NavigatorGroupName_DNode_3012_outgoinglinks=outgoing links
 NodeDeletionEditPolicy_deleteElementCommandLabel = Delete element
 NodeMappingItemProvider_borderedLabel = Bordered {0}
 OpenDiagramCommand_creationErrorMsg = Can''t create diagram of ''{0}'' kind
@@ -971,9 +1001,9 @@ RefreshDiagramAction_refreshDiagramError = Error while refreshing diagram
 RefreshDiagramOnOpeningCommand_label = Refresh diagram on opening
 RefreshRunnableWithProgress_commandLabel = Refresh
 RefreshRunnableWithProgress_taskName = Refresh
-RegionCollapseAwarePropertyHandlerEditPolicy_gmfSizeUpdateCommandLabel = Update notation bounds
-RegionCollapseAwarePropertyHandlerEditPolicy_expandRegionCommandLabel = Expand Region
 RegionCollapseAwarePropertyHandlerEditPolicy_collapseRegionCommandLabel = Collapse Region
+RegionCollapseAwarePropertyHandlerEditPolicy_expandRegionCommandLabel = Expand Region
+RegionCollapseAwarePropertyHandlerEditPolicy_gmfSizeUpdateCommandLabel = Update notation bounds
 RegionContainerResizableEditPolicy_regionContainerAutoSizeCommandLabel = Region Container Auto Size Command
 RegionContainerUpdateLayoutOperation_name = Layout Regions Operations
 RegionResizableEditPolicy_regionAutoSizeCommandLabel = Region Auto Size Composite Command
@@ -988,25 +1018,26 @@ ResourceMissingDocumentProvider_defaultMessage = This diagram was not saved. You
 RevealOutlineElementsAction_label = Show element
 RevealOutlineLabelsAction_label = Show label
 RootLayoutData_unhandledDiagramElementKind = This kind of diagram element ({0}) is not yet managed by the LayoutDataManager.
+SVGFigure_loadError = Error loading SVG file
 SafeStyleConfiguration_customStyleInvocationError = Error while invoking custom style configuration: {0}
 SaveAsImageFileAction_label = Export diagram as image
 SelectDiagramElementBackgroundImageDialog_browseButtonText = Browse
 SelectDiagramElementBackgroundImageDialog_pathLabelText = Path:
 SelectDiagramElementBackgroundImageDialog_title = Select background image from workspace
 SelectHiddenElementsAction_tooltip = Show/Hide
-SelectionWizardCommand_cancelExceptionMsg = User cancel operation
 SelectPinnedElementsAction_label = Diagram elements pinning
 SelectPinnedElementsAction_tooltip = Pin/Unpin
+SelectionWizardCommand_cancelExceptionMsg = User cancel operation
 SetBestHeightHeaderCommand_label = Refresh graphical layout
 SetConnectionBendpointsAccordingToExtremityMoveCommmand_sourceSidedLabel = Move first segment (on source side)
 SetConnectionBendpointsAccordingToExtremityMoveCommmand_targetSidedLabel = Move last segment (on target side)
 SetCurrentConcernCommand_label = Set current concern
 SetDefaultConcernCommand_label = Set current concern to default
 SetLabelsOffsetCommmand_label = Update labels offset
-SetLayoutingModeCommand_activateLabel = Activating Layouting mode
-SetLayoutingModeCommand_deactivateLabel = Deactivating Layouting mode
 SetLayoutingModeCommandAndUpdateActionImage_activateLabel = Activating Layouting mode
 SetLayoutingModeCommandAndUpdateActionImage_deactivateLabel = Deactivating  Layouting mode
+SetLayoutingModeCommand_activateLabel = Activating Layouting mode
+SetLayoutingModeCommand_deactivateLabel = Deactivating Layouting mode
 SetStyleToWorkspaceImageAction_text = Set style to workspace image
 ShiftDirectBorderedNodesOperation_name = Shift bordered nodes'' positions by {0}
 SimpleImageTranscoder_svgImageTranscodingError = Error transcoding SVG image
@@ -1019,6 +1050,14 @@ SiriusClipboardGlobalActionHandler_pasteCommandLabel = Paste ...
 SiriusClipboardGlobalActionHandler_severalFoundPasteToolError = There are more than one paste description that match the target container: {1} ({2} and {3}).
 SiriusContainerDropPolicy_dropElementsCommandLabel = Drop Elements
 SiriusContainerDropPolicy_saveEditPartLayoutCommandLabel = Save layout for edit part
+SiriusCreationWizardCreationError=Creation Problems
+SiriusCreationWizardOpenEditorError=Error opening diagram editor
+SiriusCreationWizardPageExtensionError=File name should have {0} extension.
+SiriusCreationWizardTitle=New Sirius Diagram
+SiriusCreationWizard_DiagramModelFilePageDescription=Select file that will contain diagram model.
+SiriusCreationWizard_DiagramModelFilePageTitle=Create Sirius Diagram
+SiriusCreationWizard_DomainModelFilePageDescription=Select file that will contain domain model.
+SiriusCreationWizard_DomainModelFilePageTitle=Create Sirius Diagram
 SiriusDiagramActionBarContributor_deleteFromDiagram = Delete from Diagram
 SiriusDiagramActionBarContributor_deleteFromModel = Delete from Model
 SiriusDiagramActionBarContributor_hideElement = Hide element
@@ -1026,13 +1065,36 @@ SiriusDiagramActionBarContributor_hideLabel = Hide label
 SiriusDiagramActionBarContributor_launchBehavior = Launch behavior
 SiriusDiagramActionBarContributor_refreshDiagram = Refresh diagram
 SiriusDiagramActionBarContributor_revealElement = Reveal elements
+SiriusDiagramEditorUtil_CreateDiagramCommandLabel=Creating diagram and model
+SiriusDiagramEditorUtil_CreateDiagramProgressTask=Creating diagram and model files
+SiriusDiagramEditorUtil_OpenModelResourceErrorDialogMessage=Failed to load model file {0}
+SiriusDiagramEditorUtil_OpenModelResourceErrorDialogTitle=Error
 SiriusDiagramEditorUtil_charsetError = Unable to set charset for file {0}
 SiriusDiagramEditorUtil_defaultFileName = default
 SiriusDiagramEditorUtil_modelAndDiagramCreationError = Unable to create model and diagram
 SiriusDiagramEditorUtil_modelAndDiagramResourceSaveError = Unable to store model and diagram resources
+SiriusDiagramEditor_SaveAsErrorMessage=Save could not be completed. Target file is already open in another editor.
+SiriusDiagramEditor_SaveAsErrorTitle=Problem During Save As...
+SiriusDiagramEditor_SaveErrorMessage=Could not save file.
+SiriusDiagramEditor_SaveErrorTitle=Save Problems
+SiriusDiagramEditor_SavingDeletedFile=The original file "{0}" has been deleted.
 SiriusDiagramSelectionCheckStateListener_errorMsg = You must select Diagrams
 SiriusDiagramSelectionCheckStateListener_unknwonCodeResult = Unknown code result
+SiriusDocumentProvider_DiagramLoadingError=Error loading diagram
+SiriusDocumentProvider_IncorrectInputError={1}
+SiriusDocumentProvider_NoDiagramInResourceError=Diagram is not present in resource
+SiriusDocumentProvider_SaveAsOperation=Saving {0} diagram as
+SiriusDocumentProvider_SaveDiagramTask=Saving diagram
+SiriusDocumentProvider_SaveNextResourceTask=Saving {0}
+SiriusDocumentProvider_UnsynchronizedFileSaveError=The file has been changed on the file system
+SiriusDocumentProvider_handleElementContentChanged=Failed to refresh hierarchy for changed resource
+SiriusDocumentProvider_isModifiable=Updating cache failed
+SiriusElementChooserDialog_SelectModelElementTitle=Select model element
 SiriusEnhancedPrintActionHelper_invalidIworkbenchPart = Invalid IWorkbenchPart
+SiriusInitDiagramFileAction_InitDiagramFileResourceErrorDialogMessage=Model file loading failed
+SiriusInitDiagramFileAction_InitDiagramFileResourceErrorDialogTitle=Error
+SiriusInitDiagramFileAction_InitDiagramFileWizardTitle=Initialize new {0} diagram file
+SiriusInitDiagramFileAction_OpenModelFileDialogTitle=Select domain model
 SiriusInitDiagramFileAction_loadResourceError = Unable to load resource: {0}
 SiriusLayoutDataManagerImpl_addCenterLayoutMarkerCommandLabel = Add center layout marker on view
 SiriusLayoutDataManagerImpl_addLayoutMarkerCommandLabel = Add layout marker on view
@@ -1040,6 +1102,19 @@ SiriusLayoutDataManagerImpl_addLayoutMarkerOnOpeningCommandLabel = Add layout ma
 SiriusLayoutDataManagerImpl_createdViewsArrangCommandLabel = Arrange created views
 SiriusLayoutDataManagerImpl_unhandledContainerKind = This kind of container  ({0}) is not yet managed by the LayoutDataManager.
 SiriusMarkerNavigationProvider_validationMarkerCreationError = Failed to create validation marker
+SiriusModelingAssistantProviderMessage=Available domain model elements:
+SiriusModelingAssistantProviderTitle=Select domain model element
+SiriusNewDiagramFileWizard_CreationPageDescription=Create new diagram based on {0} model content
+SiriusNewDiagramFileWizard_CreationPageName=Initialize new diagram file
+SiriusNewDiagramFileWizard_CreationPageTitle=Diagram file
+SiriusNewDiagramFileWizard_IncorrectRootError=Incorrect model object stored as a root resource object
+SiriusNewDiagramFileWizard_InitDiagramCommand=Initializing diagram contents
+SiriusNewDiagramFileWizard_RootSelectionPageDescription=Select semantic model element to be depicted on diagram
+SiriusNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage=Invalid diagram root element is selected
+SiriusNewDiagramFileWizard_RootSelectionPageName=Select diagram root element
+SiriusNewDiagramFileWizard_RootSelectionPageNoSelectionMessage=Diagram root element is not selected
+SiriusNewDiagramFileWizard_RootSelectionPageSelectionTitle=Select diagram root element:
+SiriusNewDiagramFileWizard_RootSelectionPageTitle=Diagram root element
 SiriusNewDiagramFileWizard_errorDuringCreation = Unable to create model and diagram
 SiriusNewDiagramFileWizard_errorDuringOpening = Unable to open editor
 SiriusNewDiagramFileWizard_invalidDiagramRootElement = Diagram root element must be specified
@@ -1065,9 +1140,8 @@ StyleConfigurationRegistry_profilerTaskName = get style configuration
 StyleConfigurationRegistry_styleConfigurationProviderLoadError = Impossible to load the style configuration provider: {0}
 SubDiagramDecorator_taskName = SubDiagramDecorator refresh
 SubDiagramMenu_newLabel = New
-SVGFigure_loadError = Error loading SVG file
-SynchronizedDiagramCommand_unsynchronizedLabel = Unsynchronized
 SynchronizeGMFModelCommand_label = Synchronize GMF Notation Model
+SynchronizedDiagramCommand_unsynchronizedLabel = Unsynchronized
 ToggleFoldingStateCommand_label = Toggle edges folding state
 ToggleUpdateManager_fieldAccessError = Error while getting the {0} field.
 TreeLayoutSetConnectionAnchorsCommand_nullChildInSetConnectionAnchorsCommand = Null child in SetConnectionAnchorsCommand
@@ -1075,6 +1149,7 @@ TreeLayoutSetConnectionAnchorsCommand_nullEdgeInSetConnectionAnchorsCommand = Nu
 UnpinElementsEclipseAction_text = Unpin selected elements
 UpdateGMFEdgeStyleCommand_label = Update GMF Edge Style
 UpdateVisibilityCommand_label = Update visibility
+ValidateActionMessage=Validate
 ValidateAction_failureMessage = Validation action failed
 ValidationFixResolution_editorOpeningError = Can't open editor for {0}
 ValidationPropertySection_activatedRulesLabel = Activated rules
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/parsers/AbstractParser.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/parsers/AbstractParser.java
index 743815c997..2c4258d752 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/parsers/AbstractParser.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/parsers/AbstractParser.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.ui.internal.parsers;
 
+import java.text.MessageFormat;
 import java.util.Arrays;
 
 import org.eclipse.core.runtime.IAdaptable;
@@ -31,7 +32,6 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.sirius.diagram.DiagramPlugin;
 import org.eclipse.sirius.diagram.ui.part.Messages;
 
@@ -228,7 +228,7 @@ public abstract class AbstractParser implements IParser {
                 } else if (value instanceof String) {
                     value = Boolean.valueOf((String) value);
                 } else {
-                    value = new InvalidValue(NLS.bind(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
+                    value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
                 }
             } else if (Character.TYPE.equals(iClass)) {
                 if (value instanceof Character) {
@@ -241,7 +241,7 @@ public abstract class AbstractParser implements IParser {
                         value = new Character(s.charAt(0));
                     }
                 } else {
-                    value = new InvalidValue(NLS.bind(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
+                    value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
                 }
             } else if (Byte.TYPE.equals(iClass)) {
                 if (value instanceof Byte) {
@@ -256,11 +256,11 @@ public abstract class AbstractParser implements IParser {
                         try {
                             value = Byte.valueOf(s);
                         } catch (NumberFormatException nfe) {
-                            value = new InvalidValue(NLS.bind(Messages.AbstractParser_WrongStringConversionMessage, iClass.getName()));
+                            value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_WrongStringConversionMessage, iClass.getName()));
                         }
                     }
                 } else {
-                    value = new InvalidValue(NLS.bind(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
+                    value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
                 }
             } else if (Short.TYPE.equals(iClass)) {
                 if (value instanceof Short) {
@@ -275,11 +275,11 @@ public abstract class AbstractParser implements IParser {
                         try {
                             value = Short.valueOf(s);
                         } catch (NumberFormatException nfe) {
-                            value = new InvalidValue(NLS.bind(Messages.AbstractParser_WrongStringConversionMessage, iClass.getName()));
+                            value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_WrongStringConversionMessage, iClass.getName()));
                         }
                     }
                 } else {
-                    value = new InvalidValue(NLS.bind(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
+                    value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
                 }
             } else if (Integer.TYPE.equals(iClass)) {
                 if (value instanceof Integer) {
@@ -294,11 +294,11 @@ public abstract class AbstractParser implements IParser {
                         try {
                             value = Integer.valueOf(s);
                         } catch (NumberFormatException nfe) {
-                            value = new InvalidValue(NLS.bind(Messages.AbstractParser_WrongStringConversionMessage, iClass.getName()));
+                            value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_WrongStringConversionMessage, iClass.getName()));
                         }
                     }
                 } else {
-                    value = new InvalidValue(NLS.bind(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
+                    value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
                 }
             } else if (Long.TYPE.equals(iClass)) {
                 if (value instanceof Long) {
@@ -313,11 +313,11 @@ public abstract class AbstractParser implements IParser {
                         try {
                             value = Long.valueOf(s);
                         } catch (NumberFormatException nfe) {
-                            value = new InvalidValue(NLS.bind(Messages.AbstractParser_WrongStringConversionMessage, iClass.getName()));
+                            value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_WrongStringConversionMessage, iClass.getName()));
                         }
                     }
                 } else {
-                    value = new InvalidValue(NLS.bind(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
+                    value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
                 }
             } else if (Float.TYPE.equals(iClass)) {
                 if (value instanceof Float) {
@@ -332,11 +332,11 @@ public abstract class AbstractParser implements IParser {
                         try {
                             value = Float.valueOf(s);
                         } catch (NumberFormatException nfe) {
-                            value = new InvalidValue(NLS.bind(Messages.AbstractParser_WrongStringConversionMessage, iClass.getName()));
+                            value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_WrongStringConversionMessage, iClass.getName()));
                         }
                     }
                 } else {
-                    value = new InvalidValue(NLS.bind(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
+                    value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
                 }
             } else if (Double.TYPE.equals(iClass)) {
                 if (value instanceof Double) {
@@ -351,22 +351,22 @@ public abstract class AbstractParser implements IParser {
                         try {
                             value = Double.valueOf(s);
                         } catch (NumberFormatException nfe) {
-                            value = new InvalidValue(NLS.bind(Messages.AbstractParser_WrongStringConversionMessage, iClass.getName()));
+                            value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_WrongStringConversionMessage, iClass.getName()));
                         }
                     }
                 } else {
-                    value = new InvalidValue(NLS.bind(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
+                    value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_UnexpectedValueTypeMessage, iClass.getName()));
                 }
             } else if (type instanceof EEnum) {
                 if (value instanceof String) {
                     EEnumLiteral literal = ((EEnum) type).getEEnumLiteralByLiteral((String) value);
                     if (literal == null) {
-                        value = new InvalidValue(NLS.bind(Messages.AbstractParser_UnknownLiteralMessage, value));
+                        value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_UnknownLiteralMessage, value));
                     } else {
                         value = literal.getInstance();
                     }
                 } else {
-                    value = new InvalidValue(NLS.bind(Messages.AbstractParser_UnexpectedValueTypeMessage, String.class.getName()));
+                    value = new InvalidValue(MessageFormat.format(Messages.AbstractParser_UnexpectedValueTypeMessage, String.class.getName()));
                 }
             }
         }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/parsers/MessageFormatParser.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/parsers/MessageFormatParser.java
index 9de2bd8a39..d085d62de5 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/parsers/MessageFormatParser.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/parsers/MessageFormatParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 THALES GLOBAL SERVICES.
+ * Copyright (c) 2007, 2015 THALES GLOBAL SERVICES and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
 import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.diagram.DDiagramElement;
@@ -217,7 +216,7 @@ public class MessageFormatParser extends AbstractParser {
         ParsePosition pos = new ParsePosition(0);
         Object[] values = getEditProcessor().parse(editString, pos);
         if (values == null) {
-            return new ParserEditStatus(DiagramPlugin.ID, IParserEditStatus.UNEDITABLE, NLS.bind(Messages.MessageFormatParser_InvalidInputError, new Integer(pos.getErrorIndex())));
+            return new ParserEditStatus(DiagramPlugin.ID, IParserEditStatus.UNEDITABLE, MessageFormat.format(Messages.MessageFormatParser_InvalidInputError, new Integer(pos.getErrorIndex())));
         }
         return validateNewValues(values);
     }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/Messages.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/Messages.java
index a8b5218fb1..97f6cbe14c 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/Messages.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/Messages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 THALES GLOBAL SERVICES.
+ * Copyright (c) 2007, 2015 THALES GLOBAL SERVICES and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,400 +10,161 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.ui.part;
 
-import org.eclipse.osgi.util.NLS;
-
 /**
  * @was-generated
  */
-public class Messages extends NLS {
-
-    /**
-     * @was-generated
-     */
-    static {
-        NLS.initializeMessages("messages", Messages.class); //$NON-NLS-1$
-    }
+public class Messages {
 
-    /**
-     * @was-generated
-     */
     private Messages() {
     }
 
-    /**
-     * @was-generated
-     */
-    public static String SiriusCreationWizardTitle;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusCreationWizard_DiagramModelFilePageTitle;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusCreationWizard_DiagramModelFilePageDescription;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusCreationWizard_DomainModelFilePageTitle;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusCreationWizard_DomainModelFilePageDescription;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusCreationWizardOpenEditorError;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusCreationWizardCreationError;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusCreationWizardPageExtensionError;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDiagramEditorUtil_OpenModelResourceErrorDialogTitle;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDiagramEditorUtil_OpenModelResourceErrorDialogMessage;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDiagramEditorUtil_CreateDiagramProgressTask;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDiagramEditorUtil_CreateDiagramCommandLabel;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDocumentProvider_isModifiable;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDocumentProvider_handleElementContentChanged;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDocumentProvider_IncorrectInputError;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDocumentProvider_NoDiagramInResourceError;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDocumentProvider_DiagramLoadingError;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDocumentProvider_UnsynchronizedFileSaveError;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDocumentProvider_SaveDiagramTask;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDocumentProvider_SaveNextResourceTask;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDocumentProvider_SaveAsOperation;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusInitDiagramFileAction_InitDiagramFileResourceErrorDialogTitle;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusInitDiagramFileAction_InitDiagramFileResourceErrorDialogMessage;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusInitDiagramFileAction_InitDiagramFileWizardTitle;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusInitDiagramFileAction_OpenModelFileDialogTitle;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusNewDiagramFileWizard_CreationPageName;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusNewDiagramFileWizard_CreationPageTitle;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusNewDiagramFileWizard_CreationPageDescription;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusNewDiagramFileWizard_RootSelectionPageName;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusNewDiagramFileWizard_RootSelectionPageTitle;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusNewDiagramFileWizard_RootSelectionPageDescription;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusNewDiagramFileWizard_RootSelectionPageSelectionTitle;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusNewDiagramFileWizard_RootSelectionPageNoSelectionMessage;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusNewDiagramFileWizard_InitDiagramCommand;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusNewDiagramFileWizard_IncorrectRootError;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDiagramEditor_SavingDeletedFile;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDiagramEditor_SaveAsErrorTitle;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDiagramEditor_SaveAsErrorMessage;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDiagramEditor_SaveErrorTitle;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusDiagramEditor_SaveErrorMessage;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusElementChooserDialog_SelectModelElementTitle;
-
-    /**
-     * @was-generated
-     */
-    public static String ModelElementSelectionPageMessage;
-
-    /**
-     * @was-generated
-     */
-    public static String ValidateActionMessage;
-
-    /**
-     * @was-generated
-     */
-    public static String DNodeContainerViewNodeContainerCompartmentEditPart_title;
-
-    /**
-     * @was-generated
-     */
-    public static String DNodeContainerViewNodeContainerCompartment2EditPart_title;
-
-    /**
-     * @was-generated
-     */
-    public static String DNodeListViewNodeListCompartmentEditPart_title;
-
-    /**
-     * @was-generated
-     */
-    public static String DNodeListViewNodeListCompartment2EditPart_title;
-
-    /**
-     * @was-generated
-     */
-    public static String CommandName_OpenDiagram;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DDiagram_1000_links;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNode_2001_incominglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNode_2001_outgoinglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNodeContainer_2002_incominglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNodeContainer_2002_outgoinglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNodeList_2003_incominglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNodeList_2003_outgoinglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNode_3001_incominglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNode_3001_outgoinglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNode_3007_incominglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNode_3007_outgoinglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNodeContainer_3008_incominglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNodeContainer_3008_outgoinglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNodeList_3009_incominglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNodeList_3009_outgoinglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNode_3012_incominglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DNode_3012_outgoinglinks;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DEdge_4001_target;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorGroupName_DEdge_4001_source;
-
-    /**
-     * @was-generated
-     */
-    public static String NavigatorActionProvider_OpenDiagramActionName;
-
-    /**
-     * @was-generated
-     */
-    public static String AbstractParser_UnexpectedValueTypeMessage;
-
-    /**
-     * @was-generated
-     */
-    public static String AbstractParser_WrongStringConversionMessage;
-
-    /**
-     * @was-generated
-     */
-    public static String AbstractParser_UnknownLiteralMessage;
-
-    /**
-     * @was-generated
-     */
-    public static String MessageFormatParser_InvalidInputError;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusModelingAssistantProviderTitle;
-
-    /**
-     * @was-generated
-     */
-    public static String SiriusModelingAssistantProviderMessage;
-
-    // TODO: put accessor fields manually
+    public static String SiriusCreationWizardTitle = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusCreationWizardTitle;
+
+    public static String SiriusCreationWizard_DiagramModelFilePageTitle = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusCreationWizard_DiagramModelFilePageTitle;
+
+    public static String SiriusCreationWizard_DiagramModelFilePageDescription = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusCreationWizard_DiagramModelFilePageDescription;
+
+    public static String SiriusCreationWizard_DomainModelFilePageTitle = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusCreationWizard_DomainModelFilePageTitle;
+
+    public static String SiriusCreationWizard_DomainModelFilePageDescription = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusCreationWizard_DomainModelFilePageDescription;
+
+    public static String SiriusCreationWizardOpenEditorError = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusCreationWizardOpenEditorError;
+
+    public static String SiriusCreationWizardCreationError = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusCreationWizardCreationError;
+
+    public static String SiriusCreationWizardPageExtensionError = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusCreationWizardPageExtensionError;
+
+    public static String SiriusDiagramEditorUtil_OpenModelResourceErrorDialogTitle = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDiagramEditorUtil_OpenModelResourceErrorDialogTitle;
+
+    public static String SiriusDiagramEditorUtil_OpenModelResourceErrorDialogMessage = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDiagramEditorUtil_OpenModelResourceErrorDialogMessage;
+
+    public static String SiriusDiagramEditorUtil_CreateDiagramProgressTask = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDiagramEditorUtil_CreateDiagramProgressTask;
+
+    public static String SiriusDiagramEditorUtil_CreateDiagramCommandLabel = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDiagramEditorUtil_CreateDiagramCommandLabel;
+
+    public static String SiriusDocumentProvider_isModifiable = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDocumentProvider_isModifiable;
+
+    public static String SiriusDocumentProvider_handleElementContentChanged = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDocumentProvider_handleElementContentChanged;
+
+    public static String SiriusDocumentProvider_IncorrectInputError = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDocumentProvider_IncorrectInputError;
+
+    public static String SiriusDocumentProvider_NoDiagramInResourceError = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDocumentProvider_NoDiagramInResourceError;
+
+    public static String SiriusDocumentProvider_DiagramLoadingError = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDocumentProvider_DiagramLoadingError;
+
+    public static String SiriusDocumentProvider_UnsynchronizedFileSaveError = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDocumentProvider_UnsynchronizedFileSaveError;
+
+    public static String SiriusDocumentProvider_SaveDiagramTask = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDocumentProvider_SaveDiagramTask;
+
+    public static String SiriusDocumentProvider_SaveNextResourceTask = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDocumentProvider_SaveNextResourceTask;
+
+    public static String SiriusDocumentProvider_SaveAsOperation = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDocumentProvider_SaveAsOperation;
+
+    public static String SiriusInitDiagramFileAction_InitDiagramFileResourceErrorDialogTitle = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusInitDiagramFileAction_InitDiagramFileResourceErrorDialogTitle;
+
+    public static String SiriusInitDiagramFileAction_InitDiagramFileResourceErrorDialogMessage = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusInitDiagramFileAction_InitDiagramFileResourceErrorDialogMessage;
+
+    public static String SiriusInitDiagramFileAction_InitDiagramFileWizardTitle = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusInitDiagramFileAction_InitDiagramFileWizardTitle;
+
+    public static String SiriusInitDiagramFileAction_OpenModelFileDialogTitle = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusInitDiagramFileAction_OpenModelFileDialogTitle;
+
+    public static String SiriusNewDiagramFileWizard_CreationPageName = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusNewDiagramFileWizard_CreationPageName;
+
+    public static String SiriusNewDiagramFileWizard_CreationPageTitle = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusNewDiagramFileWizard_CreationPageTitle;
+
+    public static String SiriusNewDiagramFileWizard_CreationPageDescription = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusNewDiagramFileWizard_CreationPageDescription;
+
+    public static String SiriusNewDiagramFileWizard_RootSelectionPageName = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusNewDiagramFileWizard_RootSelectionPageName;
+
+    public static String SiriusNewDiagramFileWizard_RootSelectionPageTitle = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusNewDiagramFileWizard_RootSelectionPageTitle;
+
+    public static String SiriusNewDiagramFileWizard_RootSelectionPageDescription = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusNewDiagramFileWizard_RootSelectionPageDescription;
+
+    public static String SiriusNewDiagramFileWizard_RootSelectionPageSelectionTitle = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusNewDiagramFileWizard_RootSelectionPageSelectionTitle;
+
+    public static String SiriusNewDiagramFileWizard_RootSelectionPageNoSelectionMessage = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusNewDiagramFileWizard_RootSelectionPageNoSelectionMessage;
+
+    public static String SiriusNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage;
+
+    public static String SiriusNewDiagramFileWizard_InitDiagramCommand = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusNewDiagramFileWizard_InitDiagramCommand;
+
+    public static String SiriusNewDiagramFileWizard_IncorrectRootError = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusNewDiagramFileWizard_IncorrectRootError;
+
+    public static String SiriusDiagramEditor_SavingDeletedFile = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDiagramEditor_SavingDeletedFile;
+
+    public static String SiriusDiagramEditor_SaveAsErrorTitle = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDiagramEditor_SaveAsErrorTitle;
+
+    public static String SiriusDiagramEditor_SaveAsErrorMessage = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDiagramEditor_SaveAsErrorMessage;
+
+    public static String SiriusDiagramEditor_SaveErrorTitle = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDiagramEditor_SaveErrorTitle;
+
+    public static String SiriusDiagramEditor_SaveErrorMessage = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusDiagramEditor_SaveErrorMessage;
+
+    public static String SiriusElementChooserDialog_SelectModelElementTitle = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusElementChooserDialog_SelectModelElementTitle;
+
+    public static String ModelElementSelectionPageMessage = org.eclipse.sirius.diagram.ui.provider.Messages.ModelElementSelectionPageMessage;
+
+    public static String ValidateActionMessage = org.eclipse.sirius.diagram.ui.provider.Messages.ValidateActionMessage;
+
+    public static String DNodeContainerViewNodeContainerCompartmentEditPart_title = org.eclipse.sirius.diagram.ui.provider.Messages.DNodeContainerViewNodeContainerCompartmentEditPart_title;
+
+    public static String DNodeContainerViewNodeContainerCompartment2EditPart_title = org.eclipse.sirius.diagram.ui.provider.Messages.DNodeContainerViewNodeContainerCompartment2EditPart_title;
+
+    public static String DNodeListViewNodeListCompartmentEditPart_title = org.eclipse.sirius.diagram.ui.provider.Messages.DNodeListViewNodeListCompartmentEditPart_title;
+
+    public static String DNodeListViewNodeListCompartment2EditPart_title = org.eclipse.sirius.diagram.ui.provider.Messages.DNodeListViewNodeListCompartment2EditPart_title;
+
+    public static String CommandName_OpenDiagram = org.eclipse.sirius.diagram.ui.provider.Messages.CommandName_OpenDiagram;
+
+    public static String NavigatorGroupName_DDiagram_1000_links = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DDiagram_1000_links;
+
+    public static String NavigatorGroupName_DNode_2001_incominglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNode_2001_incominglinks;
+
+    public static String NavigatorGroupName_DNode_2001_outgoinglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNode_2001_outgoinglinks;
+
+    public static String NavigatorGroupName_DNodeContainer_2002_incominglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNodeContainer_2002_incominglinks;
+
+    public static String NavigatorGroupName_DNodeContainer_2002_outgoinglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNodeContainer_2002_outgoinglinks;
+
+    public static String NavigatorGroupName_DNodeList_2003_incominglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNodeList_2003_incominglinks;
+
+    public static String NavigatorGroupName_DNodeList_2003_outgoinglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNodeList_2003_outgoinglinks;
+
+    public static String NavigatorGroupName_DNode_3001_incominglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNode_3001_incominglinks;
+
+    public static String NavigatorGroupName_DNode_3001_outgoinglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNode_3001_outgoinglinks;
+
+    public static String NavigatorGroupName_DNode_3007_incominglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNode_3007_incominglinks;
+
+    public static String NavigatorGroupName_DNode_3007_outgoinglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNode_3007_outgoinglinks;
+
+    public static String NavigatorGroupName_DNodeContainer_3008_incominglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNodeContainer_3008_incominglinks;
+
+    public static String NavigatorGroupName_DNodeContainer_3008_outgoinglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNodeContainer_3008_outgoinglinks;
+
+    public static String NavigatorGroupName_DNodeList_3009_incominglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNodeList_3009_incominglinks;
+
+    public static String NavigatorGroupName_DNodeList_3009_outgoinglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNodeList_3009_outgoinglinks;
+
+    public static String NavigatorGroupName_DNode_3012_incominglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNode_3012_incominglinks;
+
+    public static String NavigatorGroupName_DNode_3012_outgoinglinks = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DNode_3012_outgoinglinks;
+
+    public static String NavigatorGroupName_DEdge_4001_target = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DEdge_4001_target;
+
+    public static String NavigatorGroupName_DEdge_4001_source = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorGroupName_DEdge_4001_source;
+
+    public static String NavigatorActionProvider_OpenDiagramActionName = org.eclipse.sirius.diagram.ui.provider.Messages.NavigatorActionProvider_OpenDiagramActionName;
+
+    public static String AbstractParser_UnexpectedValueTypeMessage = org.eclipse.sirius.diagram.ui.provider.Messages.AbstractParser_UnexpectedValueTypeMessage;
+
+    public static String AbstractParser_WrongStringConversionMessage = org.eclipse.sirius.diagram.ui.provider.Messages.AbstractParser_WrongStringConversionMessage;
+
+    public static String AbstractParser_UnknownLiteralMessage = org.eclipse.sirius.diagram.ui.provider.Messages.AbstractParser_UnknownLiteralMessage;
+
+    public static String MessageFormatParser_InvalidInputError = org.eclipse.sirius.diagram.ui.provider.Messages.MessageFormatParser_InvalidInputError;
+
+    public static String SiriusModelingAssistantProviderTitle = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusModelingAssistantProviderTitle;
+
+    public static String SiriusModelingAssistantProviderMessage = org.eclipse.sirius.diagram.ui.provider.Messages.SiriusModelingAssistantProviderMessage;
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusInitDiagramFileAction.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusInitDiagramFileAction.java
index c8906e32ef..39e5421591 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusInitDiagramFileAction.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusInitDiagramFileAction.java
@@ -25,7 +25,6 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.sirius.common.tools.api.resource.ResourceSetFactory;
 import org.eclipse.sirius.diagram.DiagramPlugin;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.DDiagramEditPart;
@@ -98,7 +97,7 @@ public class SiriusInitDiagramFileAction implements IObjectActionDelegate {
             return;
         }
         Wizard wizard = new SiriusNewDiagramFileWizard(domainModelURI, diagramRoot, editingDomain);
-        wizard.setWindowTitle(NLS.bind(Messages.SiriusInitDiagramFileAction_InitDiagramFileWizardTitle, DDiagramEditPart.MODEL_ID));
+        wizard.setWindowTitle(MessageFormat.format(Messages.SiriusInitDiagramFileAction_InitDiagramFileWizardTitle, DDiagramEditPart.MODEL_ID));
         SiriusDiagramEditorUtil.runWizard(getShell(), wizard, "InitDiagramFile"); //$NON-NLS-1$
     }
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusNewDiagramFileWizard.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusNewDiagramFileWizard.java
index e77a231ea6..2fcb0135f7 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusNewDiagramFileWizard.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusNewDiagramFileWizard.java
@@ -36,7 +36,6 @@ import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.sirius.diagram.DiagramPlugin;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.DDiagramEditPart;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
@@ -73,7 +72,7 @@ public class SiriusNewDiagramFileWizard extends Wizard {
 
         myFileCreationPage = new WizardNewFileCreationPage(Messages.SiriusNewDiagramFileWizard_CreationPageName, StructuredSelection.EMPTY);
         myFileCreationPage.setTitle(Messages.SiriusNewDiagramFileWizard_CreationPageTitle);
-        myFileCreationPage.setDescription(NLS.bind(Messages.SiriusNewDiagramFileWizard_CreationPageDescription, DDiagramEditPart.MODEL_ID));
+        myFileCreationPage.setDescription(MessageFormat.format(Messages.SiriusNewDiagramFileWizard_CreationPageDescription, DDiagramEditPart.MODEL_ID));
         IPath filePath;
         String fileName = domainModelURI.trimFileExtension().lastSegment();
         if (domainModelURI.isPlatformResource()) {
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/resource/CustomSiriusDocumentProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/resource/CustomSiriusDocumentProvider.java
index 0c5175c13d..0a35ac35bd 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/resource/CustomSiriusDocumentProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/resource/CustomSiriusDocumentProvider.java
@@ -37,7 +37,6 @@ import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util.Diagram
 import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.sirius.business.api.dialect.DialectManager;
 import org.eclipse.sirius.business.api.session.Session;
 import org.eclipse.sirius.business.api.session.SessionStatus;
@@ -93,7 +92,7 @@ public class CustomSiriusDocumentProvider extends AbstractDocumentProvider imple
     protected IDocument createDocument(final Object element) throws CoreException {
         if (!(element instanceof FileEditorInput) && !(element instanceof URIEditorInput)) {
             throw new CoreException(new Status(IStatus.ERROR, DiagramPlugin.ID, 0,
-                    NLS.bind(Messages.SiriusDocumentProvider_IncorrectInputError, new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput", }), //$NON-NLS-1$ //$NON-NLS-2$
+                    MessageFormat.format(Messages.SiriusDocumentProvider_IncorrectInputError, new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput", }), //$NON-NLS-1$ //$NON-NLS-2$
                     null));
         }
         final IDocument document = createEmptyDocument();
@@ -144,7 +143,7 @@ public class CustomSiriusDocumentProvider extends AbstractDocumentProvider imple
                     caseURIEditorInput(document, (URIEditorInput) element, domain);
                 } else {
                     throw new CoreException(new Status(IStatus.ERROR, DiagramPlugin.ID, 0,
-                            NLS.bind(Messages.SiriusDocumentProvider_IncorrectInputError, new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput", }), //$NON-NLS-1$ //$NON-NLS-2$
+                            MessageFormat.format(Messages.SiriusDocumentProvider_IncorrectInputError, new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput", }), //$NON-NLS-1$ //$NON-NLS-2$
                             null));
                 }
             } finally {
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/provider/Messages.java b/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/provider/Messages.java
index 91e52daa39..0be97390fd 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/provider/Messages.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/provider/Messages.java
@@ -54,6 +54,15 @@ public final class Messages {
     public static String AbstractParser_setValuesCmdLabel;
 
     @TranslatableMessage
+    public static String AbstractParser_UnexpectedValueTypeMessage;
+
+    @TranslatableMessage
+    public static String AbstractParser_UnknownLiteralMessage;
+
+    @TranslatableMessage
+    public static String AbstractParser_WrongStringConversionMessage;
+
+    @TranslatableMessage
     public static String AbstractProviderDescriptor_missingAttributeMsg;
 
     @TranslatableMessage
@@ -162,6 +171,9 @@ public final class Messages {
     public static String CommandFactory_doNothingLabel;
 
     @TranslatableMessage
+    public static String CommandName_OpenDiagram;
+
+    @TranslatableMessage
     public static String CompoundEditPolicy_nullEditPolicyMsg;
 
     @TranslatableMessage
@@ -258,9 +270,6 @@ public final class Messages {
     public static String DEdgeLabelItemProvider_label;
 
     @TranslatableMessage
-    public static String ResourceMissingDocumentProvider_defaultMessage;
-
-    @TranslatableMessage
     public static String DefaultLayerName;
 
     @TranslatableMessage
@@ -444,9 +453,21 @@ public final class Messages {
     public static String DistributeMenuAction_tooltip;
 
     @TranslatableMessage
+    public static String DNodeContainerViewNodeContainerCompartment2EditPart_title;
+
+    @TranslatableMessage
+    public static String DNodeContainerViewNodeContainerCompartmentEditPart_title;
+
+    @TranslatableMessage
     public static String DNodeLayoutDataKey_wrongKeyMsg;
 
     @TranslatableMessage
+    public static String DNodeListViewNodeListCompartment2EditPart_title;
+
+    @TranslatableMessage
+    public static String DNodeListViewNodeListCompartmentEditPart_title;
+
+    @TranslatableMessage
     public static String DocumentationPropertySection_defaultLabel;
 
     @TranslatableMessage
@@ -615,12 +636,18 @@ public final class Messages {
     public static String MarkerObserver_validationMarkerFailureMsg;
 
     @TranslatableMessage
+    public static String MessageFormatParser_InvalidInputError;
+
+    @TranslatableMessage
     public static String MiscPropertySection_nullObject;
 
     @TranslatableMessage
     public static String MiscPropertySource_errorGettingValueMsg;
 
     @TranslatableMessage
+    public static String ModelElementSelectionPageMessage;
+
+    @TranslatableMessage
     public static String MoveViewOperation_nullMoveDeltaError;
 
     @TranslatableMessage
@@ -630,6 +657,66 @@ public final class Messages {
     public static String NavigationItemProvider_labelWithDescriptionName;
 
     @TranslatableMessage
+    public static String NavigatorActionProvider_OpenDiagramActionName;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DDiagram_1000_links;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DEdge_4001_source;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DEdge_4001_target;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNode_2001_incominglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNode_2001_outgoinglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNode_3001_incominglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNode_3001_outgoinglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNode_3007_incominglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNode_3007_outgoinglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNode_3012_incominglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNode_3012_outgoinglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNodeContainer_2002_incominglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNodeContainer_2002_outgoinglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNodeContainer_3008_incominglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNodeContainer_3008_outgoinglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNodeList_2003_incominglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNodeList_2003_outgoinglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNodeList_3009_incominglinks;
+
+    @TranslatableMessage
+    public static String NavigatorGroupName_DNodeList_3009_outgoinglinks;
+
+    @TranslatableMessage
     public static String NodeDeletionEditPolicy_deleteElementCommandLabel;
 
     @TranslatableMessage
@@ -714,13 +801,13 @@ public final class Messages {
     public static String RefreshRunnableWithProgress_taskName;
 
     @TranslatableMessage
-    public static String RegionCollapseAwarePropertyHandlerEditPolicy_gmfSizeUpdateCommandLabel;
+    public static String RegionCollapseAwarePropertyHandlerEditPolicy_collapseRegionCommandLabel;
 
     @TranslatableMessage
     public static String RegionCollapseAwarePropertyHandlerEditPolicy_expandRegionCommandLabel;
 
     @TranslatableMessage
-    public static String RegionCollapseAwarePropertyHandlerEditPolicy_collapseRegionCommandLabel;
+    public static String RegionCollapseAwarePropertyHandlerEditPolicy_gmfSizeUpdateCommandLabel;
 
     @TranslatableMessage
     public static String RegionContainerResizableEditPolicy_regionContainerAutoSizeCommandLabel;
@@ -753,6 +840,9 @@ public final class Messages {
     public static String ResizeImageCommand_label;
 
     @TranslatableMessage
+    public static String ResourceMissingDocumentProvider_defaultMessage;
+
+    @TranslatableMessage
     public static String RevealOutlineElementsAction_label;
 
     @TranslatableMessage
@@ -855,6 +945,30 @@ public final class Messages {
     public static String SiriusContainerDropPolicy_saveEditPartLayoutCommandLabel;
 
     @TranslatableMessage
+    public static String SiriusCreationWizard_DiagramModelFilePageDescription;
+
+    @TranslatableMessage
+    public static String SiriusCreationWizard_DiagramModelFilePageTitle;
+
+    @TranslatableMessage
+    public static String SiriusCreationWizard_DomainModelFilePageDescription;
+
+    @TranslatableMessage
+    public static String SiriusCreationWizard_DomainModelFilePageTitle;
+
+    @TranslatableMessage
+    public static String SiriusCreationWizardCreationError;
+
+    @TranslatableMessage
+    public static String SiriusCreationWizardOpenEditorError;
+
+    @TranslatableMessage
+    public static String SiriusCreationWizardPageExtensionError;
+
+    @TranslatableMessage
+    public static String SiriusCreationWizardTitle;
+
+    @TranslatableMessage
     public static String SiriusDiagramActionBarContributor_deleteFromDiagram;
 
     @TranslatableMessage
@@ -876,9 +990,30 @@ public final class Messages {
     public static String SiriusDiagramActionBarContributor_revealElement;
 
     @TranslatableMessage
+    public static String SiriusDiagramEditor_SaveAsErrorMessage;
+
+    @TranslatableMessage
+    public static String SiriusDiagramEditor_SaveAsErrorTitle;
+
+    @TranslatableMessage
+    public static String SiriusDiagramEditor_SaveErrorMessage;
+
+    @TranslatableMessage
+    public static String SiriusDiagramEditor_SaveErrorTitle;
+
+    @TranslatableMessage
+    public static String SiriusDiagramEditor_SavingDeletedFile;
+
+    @TranslatableMessage
     public static String SiriusDiagramEditorUtil_charsetError;
 
     @TranslatableMessage
+    public static String SiriusDiagramEditorUtil_CreateDiagramCommandLabel;
+
+    @TranslatableMessage
+    public static String SiriusDiagramEditorUtil_CreateDiagramProgressTask;
+
+    @TranslatableMessage
     public static String SiriusDiagramEditorUtil_defaultFileName;
 
     @TranslatableMessage
@@ -888,18 +1023,66 @@ public final class Messages {
     public static String SiriusDiagramEditorUtil_modelAndDiagramResourceSaveError;
 
     @TranslatableMessage
+    public static String SiriusDiagramEditorUtil_OpenModelResourceErrorDialogMessage;
+
+    @TranslatableMessage
+    public static String SiriusDiagramEditorUtil_OpenModelResourceErrorDialogTitle;
+
+    @TranslatableMessage
     public static String SiriusDiagramSelectionCheckStateListener_errorMsg;
 
     @TranslatableMessage
     public static String SiriusDiagramSelectionCheckStateListener_unknwonCodeResult;
 
     @TranslatableMessage
+    public static String SiriusDocumentProvider_DiagramLoadingError;
+
+    @TranslatableMessage
+    public static String SiriusDocumentProvider_handleElementContentChanged;
+
+    @TranslatableMessage
+    public static String SiriusDocumentProvider_IncorrectInputError;
+
+    @TranslatableMessage
+    public static String SiriusDocumentProvider_isModifiable;
+
+    @TranslatableMessage
+    public static String SiriusDocumentProvider_NoDiagramInResourceError;
+
+    @TranslatableMessage
+    public static String SiriusDocumentProvider_SaveAsOperation;
+
+    @TranslatableMessage
+    public static String SiriusDocumentProvider_SaveDiagramTask;
+
+    @TranslatableMessage
+    public static String SiriusDocumentProvider_SaveNextResourceTask;
+
+    @TranslatableMessage
+    public static String SiriusDocumentProvider_UnsynchronizedFileSaveError;
+
+    @TranslatableMessage
+    public static String SiriusElementChooserDialog_SelectModelElementTitle;
+
+    @TranslatableMessage
     public static String SiriusEnhancedPrintActionHelper_invalidIworkbenchPart;
 
     @TranslatableMessage
+    public static String SiriusInitDiagramFileAction_InitDiagramFileResourceErrorDialogMessage;
+
+    @TranslatableMessage
+    public static String SiriusInitDiagramFileAction_InitDiagramFileResourceErrorDialogTitle;
+
+    @TranslatableMessage
+    public static String SiriusInitDiagramFileAction_InitDiagramFileWizardTitle;
+
+    @TranslatableMessage
     public static String SiriusInitDiagramFileAction_loadResourceError;
 
     @TranslatableMessage
+    public static String SiriusInitDiagramFileAction_OpenModelFileDialogTitle;
+
+    @TranslatableMessage
     public static String SiriusLayoutDataManagerImpl_addCenterLayoutMarkerCommandLabel;
 
     @TranslatableMessage
@@ -918,12 +1101,33 @@ public final class Messages {
     public static String SiriusMarkerNavigationProvider_validationMarkerCreationError;
 
     @TranslatableMessage
+    public static String SiriusModelingAssistantProviderMessage;
+
+    @TranslatableMessage
+    public static String SiriusModelingAssistantProviderTitle;
+
+    @TranslatableMessage
+    public static String SiriusNewDiagramFileWizard_CreationPageDescription;
+
+    @TranslatableMessage
+    public static String SiriusNewDiagramFileWizard_CreationPageName;
+
+    @TranslatableMessage
+    public static String SiriusNewDiagramFileWizard_CreationPageTitle;
+
+    @TranslatableMessage
     public static String SiriusNewDiagramFileWizard_errorDuringCreation;
 
     @TranslatableMessage
     public static String SiriusNewDiagramFileWizard_errorDuringOpening;
 
     @TranslatableMessage
+    public static String SiriusNewDiagramFileWizard_IncorrectRootError;
+
+    @TranslatableMessage
+    public static String SiriusNewDiagramFileWizard_InitDiagramCommand;
+
+    @TranslatableMessage
     public static String SiriusNewDiagramFileWizard_invalidDiagramRootElement;
 
     @TranslatableMessage
@@ -933,6 +1137,24 @@ public final class Messages {
     public static String SiriusNewDiagramFileWizard_invalidEditingDomain;
 
     @TranslatableMessage
+    public static String SiriusNewDiagramFileWizard_RootSelectionPageDescription;
+
+    @TranslatableMessage
+    public static String SiriusNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage;
+
+    @TranslatableMessage
+    public static String SiriusNewDiagramFileWizard_RootSelectionPageName;
+
+    @TranslatableMessage
+    public static String SiriusNewDiagramFileWizard_RootSelectionPageNoSelectionMessage;
+
+    @TranslatableMessage
+    public static String SiriusNewDiagramFileWizard_RootSelectionPageSelectionTitle;
+
+    @TranslatableMessage
+    public static String SiriusNewDiagramFileWizard_RootSelectionPageTitle;
+
+    @TranslatableMessage
     public static String SiriusNewDiagramFileWizard_saveFailed;
 
     @TranslatableMessage
@@ -1026,6 +1248,9 @@ public final class Messages {
     public static String ValidateAction_failureMessage;
 
     @TranslatableMessage
+    public static String ValidateActionMessage;
+
+    @TranslatableMessage
     public static String ValidationFixResolution_editorOpeningError;
 
     @TranslatableMessage
diff --git a/plugins/org.eclipse.sirius.ext.e3.ui/src/org/eclipse/sirius/ext/e3/ui/dialogs/FilteredTree.java b/plugins/org.eclipse.sirius.ext.e3.ui/src/org/eclipse/sirius/ext/e3/ui/dialogs/FilteredTree.java
index 94dc44b9e5..41e0082a07 100644
--- a/plugins/org.eclipse.sirius.ext.e3.ui/src/org/eclipse/sirius/ext/e3/ui/dialogs/FilteredTree.java
+++ b/plugins/org.eclipse.sirius.ext.e3.ui/src/org/eclipse/sirius/ext/e3/ui/dialogs/FilteredTree.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2014 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.ext.e3.ui.dialogs;
 
+import java.text.MessageFormat;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -25,7 +27,6 @@ import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.ACC;
 import org.eclipse.swt.accessibility.AccessibleAdapter;
@@ -641,8 +642,7 @@ public class FilteredTree extends Composite {
                                 || filterTextString.equals(initialText)) {
                             e.result = initialText;
                         } else {
-                            e.result = NLS
-                                    .bind(
+                            e.result = MessageFormat.format(
                                             WorkbenchMessages.FilteredTree_AccessibleListenerFiltered,
                                             new String[] {
                                                     filterTextString,
diff --git a/plugins/org.eclipse.sirius.table.ui/build.properties b/plugins/org.eclipse.sirius.table.ui/build.properties
index 5a33ea06ec..2279a2ec46 100644
--- a/plugins/org.eclipse.sirius.table.ui/build.properties
+++ b/plugins/org.eclipse.sirius.table.ui/build.properties
@@ -14,7 +14,6 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               messages.properties,\
                about.html,\
                help/
 jars.compile.order = .
@@ -22,7 +21,6 @@ source.. = src/,\
            src-paperclips/,\
            src-gen/
 output.. = bin/
-src.includes = messages.properties
 javacWarnings.. = none
 javacDefaultEncoding.. = US-ASCII
 javacProjectSettings = true
diff --git a/plugins/org.eclipse.sirius.table.ui/messages.properties b/plugins/org.eclipse.sirius.table.ui/messages.properties
deleted file mode 100644
index f9bd747800..0000000000
--- a/plugins/org.eclipse.sirius.table.ui/messages.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# ====================================================================
-# Copyright (c) 2007, 2008 THALES GLOBAL SERVICES
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Obeo - initial API and implementation
-# ====================================================================
-
-# TODO: manually put keys and values
-dTableEditor_NoTableInResourceError=Table is not present in resource
-dTableEditor_TableLoadingError=Error loading table
-dTableEditor_SavingDeletedFile=The original file "{0}" has been deleted.
-dTableEditor_SaveAsErrorTitle=Problem During Save As...
-dTableEditor_SaveAsErrorMessage=Save could not be completed. Target file is already open in another editor.
-dTableEditor_SaveErrorTitle=Save Problems
-dTableEditor_SaveErrorMessage=Could not save file.
-dTableEditor_ErrorSaveDeletedTitle=Cannot Save
-dTableEditor_ErrorSaveDeletedMessage=The file has been deleted.
-dTableEditor_SaveTableTask=Saving table
-dTableEditor_SaveNextResourceTask=Saving {0}
-dTableEditor_handleElementContentChanged=Failed to refresh hierarchy for changed resource
-# Label for editing domain undo contexts
-editingDomainContext = Affected Editing Domain
diff --git a/plugins/org.eclipse.sirius.table.ui/plugin.properties b/plugins/org.eclipse.sirius.table.ui/plugin.properties
index c00366d25f..18cf184d4e 100644
--- a/plugins/org.eclipse.sirius.table.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.table.ui/plugin.properties
@@ -289,6 +289,18 @@ DeleteTargetColumnAction_tooltip = Delete the target semantic element
 DFeatureColumnEditingSupport_errorGettingPropertyValue = Error while getting the property value
 DFeatureColumnEditingSupport_errorSettingPropertyValue = Error while setting the property value
 DFeatureColumnEditingSupport_notValidValue = Null value is not a valid value for this cell.
+DTableEditor_NoTableInResourceError=Table is not present in resource
+DTableEditor_TableLoadingError=Error loading table
+DTableEditor_SavingDeletedFile=The original file "{0}" has been deleted.
+DTableEditor_SaveAsErrorTitle=Problem During Save As...
+DTableEditor_SaveAsErrorMessage=Save could not be completed. Target file is already open in another editor.
+DTableEditor_SaveErrorTitle=Save Problems
+DTableEditor_SaveErrorMessage=Could not save file.
+DTableEditor_ErrorSaveDeletedTitle=Cannot Save
+DTableEditor_ErrorSaveDeletedMessage=The file has been deleted.
+DTableEditor_SaveTableTask=Saving table
+DTableEditor_SaveNextResourceTask=Saving {0}
+DTableEditor_handleElementContentChanged=Failed to refresh hierarchy for changed resource
 DTableMenuListener_cvsExportException = export to csv command not found
 DTableMenuListener_exportMenuName = Export
 DTableMenuListener_newMenuName = New
@@ -335,4 +347,4 @@ TableUIHelper_unsupportedColor = unsupported color : {0}
 Table_SemanticColumnElement = The semantic element corresponding to the column (only available for Intersection Mapping).
 Table_SemanticLineElement = The semantic element corresponding to the line.
 Table_SemanticRootElement = The semantic root element of the table.
-Table_CurrentSemanticElement = The semantic currently edited element.
\ No newline at end of file
+Table_CurrentSemanticElement = The semantic currently edited element.
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/Messages.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/Messages.java
index c983f32f0b..901c0bb9ef 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/Messages.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/Messages.java
@@ -19,7 +19,6 @@ import org.eclipse.sirius.ext.base.I18N.TranslatableMessage;
  * @author <a href="mailto:laurent.redor@obeo.fr">Laurent Redor</a>
  */
 public final class Messages {
-
     static {
         I18N.initializeMessages(Messages.class, TableUIPlugin.INSTANCE);
     }
@@ -68,6 +67,42 @@ public final class Messages {
     public static String DFeatureColumnEditingSupport_notValidValue;
 
     @TranslatableMessage
+    public static String DTableEditor_ErrorSaveDeletedMessage;
+
+    @TranslatableMessage
+    public static String DTableEditor_ErrorSaveDeletedTitle;
+
+    @TranslatableMessage
+    public static String DTableEditor_handleElementContentChanged;
+
+    @TranslatableMessage
+    public static String DTableEditor_NoTableInResourceError;
+
+    @TranslatableMessage
+    public static String DTableEditor_SaveAsErrorMessage;
+
+    @TranslatableMessage
+    public static String DTableEditor_SaveAsErrorTitle;
+
+    @TranslatableMessage
+    public static String DTableEditor_SaveErrorMessage;
+
+    @TranslatableMessage
+    public static String DTableEditor_SaveErrorTitle;
+
+    @TranslatableMessage
+    public static String DTableEditor_SaveNextResourceTask;
+
+    @TranslatableMessage
+    public static String DTableEditor_SaveTableTask;
+
+    @TranslatableMessage
+    public static String DTableEditor_SavingDeletedFile;
+
+    @TranslatableMessage
+    public static String DTableEditor_TableLoadingError;
+
+    @TranslatableMessage
     public static String DTableMenuListener_cvsExportException;
 
     @TranslatableMessage
@@ -173,40 +208,40 @@ public final class Messages {
     public static String SortLinesByColumnAction_label;
 
     @TranslatableMessage
-    public static String TableDialectUIServices_newTableName;
+    public static String Table_CurrentSemanticElement;
 
     @TranslatableMessage
-    public static String TableDialectUIServices_tableOpening;
+    public static String Table_SemanticColumnElement;
 
     @TranslatableMessage
-    public static String TableDialectUIServices_tableOpeningError;
+    public static String Table_SemanticLineElement;
 
     @TranslatableMessage
-    public static String TableDialectUIServices_tableOpeningVar;
+    public static String Table_SemanticRootElement;
 
     @TranslatableMessage
-    public static String TableQuickOutlineHandler_selectLine;
+    public static String TableDialectUIServices_newTableName;
 
     @TranslatableMessage
-    public static String TableQuickOutlineHandler_selectColumn;
+    public static String TableDialectUIServices_tableOpening;
 
     @TranslatableMessage
-    public static String TableUIHelper_undefinedContent;
+    public static String TableDialectUIServices_tableOpeningError;
 
     @TranslatableMessage
-    public static String TableUIHelper_unsupportedColor;
+    public static String TableDialectUIServices_tableOpeningVar;
 
     @TranslatableMessage
-    public static String Table_CurrentSemanticElement;
+    public static String TableQuickOutlineHandler_selectColumn;
 
     @TranslatableMessage
-    public static String Table_SemanticColumnElement;
+    public static String TableQuickOutlineHandler_selectLine;
 
     @TranslatableMessage
-    public static String Table_SemanticLineElement;
+    public static String TableUIHelper_undefinedContent;
 
     @TranslatableMessage
-    public static String Table_SemanticRootElement;
+    public static String TableUIHelper_unsupportedColor;
 
     // CHECKSTYLE:ON
 
diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/AbstractDTableEditor.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/AbstractDTableEditor.java
index 91fac6762d..ec0a655cf7 100644
--- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/AbstractDTableEditor.java
+++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/AbstractDTableEditor.java
@@ -11,6 +11,7 @@
 package org.eclipse.sirius.table.ui.tools.internal.editor;
 
 import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -41,7 +42,6 @@ import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.sirius.business.api.dialect.command.RefreshRepresentationsCommand;
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
@@ -145,7 +145,7 @@ public abstract class AbstractDTableEditor extends AbstractDTreeEditor implement
         }
         dialog.create();
         if (isDeleted(input) && original != null) {
-            final String message = NLS.bind(Messages.dTableEditor_SavingDeletedFile, original.getName());
+            final String message = MessageFormat.format(Messages.dTableEditor_SavingDeletedFile, original.getName());
             dialog.setErrorMessage(null);
             dialog.setMessage(message, IMessageProvider.WARNING);
         }
diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/Messages.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/Messages.java
index 0628b352d8..a7de617d90 100644
--- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/Messages.java
+++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/Messages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008, 2009 THALES GLOBAL SERVICES.
+ * Copyright (c) 2007, 2015 THALES GLOBAL SERVICES and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.table.ui.tools.internal.editor;
 
-import org.eclipse.osgi.util.NLS;
 
 /**
  * Messages for the Table plugins.
@@ -18,43 +17,37 @@ import org.eclipse.osgi.util.NLS;
  * @author lredor
  */
 // CHECKSTYLE:OFF : message class, no pb with that.
-public final class Messages extends NLS {
-
-    static {
-        NLS.initializeMessages("messages", Messages.class); //$NON-NLS-1$
-    }
+public final class Messages {
 
     /**
      * Table is not present in resource.
      */
-    public static String dTableEditor_NoTableInResourceError;
+    public static String dTableEditor_NoTableInResourceError = org.eclipse.sirius.table.metamodel.table.provider.Messages.DTableEditor_NoTableInResourceError;
 
     /**
      * Error loading table.
      */
-    public static String dTableEditor_TableLoadingError;
-
-    public static String dTableEditor_SavingDeletedFile;
+    public static String dTableEditor_TableLoadingError = org.eclipse.sirius.table.metamodel.table.provider.Messages.DTableEditor_TableLoadingError;
 
-    public static String dTableEditor_SaveAsErrorTitle;
+    public static String dTableEditor_SavingDeletedFile = org.eclipse.sirius.table.metamodel.table.provider.Messages.DTableEditor_SavingDeletedFile;
 
-    public static String dTableEditor_SaveAsErrorMessage;
+    public static String dTableEditor_SaveAsErrorTitle = org.eclipse.sirius.table.metamodel.table.provider.Messages.DTableEditor_SaveAsErrorTitle;
 
-    public static String dTableEditor_SaveErrorTitle;
+    public static String dTableEditor_SaveAsErrorMessage = org.eclipse.sirius.table.metamodel.table.provider.Messages.DTableEditor_SaveAsErrorMessage;
 
-    public static String dTableEditor_SaveErrorMessage;
+    public static String dTableEditor_SaveErrorTitle = org.eclipse.sirius.table.metamodel.table.provider.Messages.DTableEditor_SaveErrorTitle;
 
-    public static String dTableEditor_ErrorSaveDeletedTitle;
+    public static String dTableEditor_SaveErrorMessage = org.eclipse.sirius.table.metamodel.table.provider.Messages.DTableEditor_SaveErrorMessage;
 
-    public static String dTableEditor_ErrorSaveDeletedMessage;
+    public static String dTableEditor_ErrorSaveDeletedTitle = org.eclipse.sirius.table.metamodel.table.provider.Messages.DTableEditor_ErrorSaveDeletedTitle;
 
-    public static String dTableEditor_SaveTableTask;
+    public static String dTableEditor_ErrorSaveDeletedMessage = org.eclipse.sirius.table.metamodel.table.provider.Messages.DTableEditor_ErrorSaveDeletedMessage;
 
-    public static String dTableEditor_SaveNextResourceTask;
+    public static String dTableEditor_SaveTableTask = org.eclipse.sirius.table.metamodel.table.provider.Messages.DTableEditor_SaveTableTask;
 
-    public static String editingDomainContext;
+    public static String dTableEditor_SaveNextResourceTask = org.eclipse.sirius.table.metamodel.table.provider.Messages.DTableEditor_SaveNextResourceTask;
 
-    public static String dTableEditor_handleElementContentChanged;
+    public static String dTableEditor_handleElementContentChanged = org.eclipse.sirius.table.metamodel.table.provider.Messages.DTableEditor_handleElementContentChanged;
 
     /**
      * Avoid instantiation.
diff --git a/plugins/org.eclipse.sirius.ui/plugin.properties b/plugins/org.eclipse.sirius.ui/plugin.properties
index 420256d53b..14edacaadd 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui/plugin.properties
@@ -162,6 +162,10 @@ LoadEMFResourceRunnableWithProgress_loadResourceTask = Loading resource
 LogThroughActiveDialectEditorLogListener_permissionError = Permission Issue
 MarkerDeletionJob_name = Remove modeling marker
 MenuHelper_anonymousRepresentation = (unnamed)
+Messages_createRepresentationInputDialog_NamePrefix=new 
+Messages_createRepresentationInputDialog_NewRepresentationNameLabel=Representation name: 
+Messages_createRepresentationInputDialog_RepresentationDescriptionLabel=Representation description: 
+Messages_createRepresentationInputDialog_Title=New Representation
 ModelingModelProvider_addAnotherRepresentationFile = Add another representations file to "{0}" may invalidate it.
 ModelingModelProvider_addAnotherRepresentationFileSeveralProjects = Add another representations file to {0} may invalidate them.
 ModelingModelProvider_mainRepresentationFileDeleted = Deletion of the main representations file of \"{0}\" will invalidate it.
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/Messages.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/Messages.java
index 389f21dd7c..616d2d5a07 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/Messages.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/Messages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,44 +10,36 @@
  *******************************************************************************/
 package org.eclipse.sirius.ui.tools.api;
 
-import org.eclipse.osgi.util.NLS;
-
 /**
  * Externalise String of UI.
  * 
  * @author <a href="mailto:laurent.redor@obeo.fr">Laurent Redor</a>
  * 
  */
-public final class Messages extends NLS {
+public final class Messages {
     // CHECKSTYLE:OFF
     /**
      * The String used to prefix the representation description name fore the
      * default name of the input dialog.
      */
-    public static String createRepresentationInputDialog_NamePrefix;
+    public static String createRepresentationInputDialog_NamePrefix = org.eclipse.sirius.viewpoint.provider.Messages.Messages_createRepresentationInputDialog_NamePrefix;
 
     /**
      * The label of the new representation name.
      */
-    public static String createRepresentationInputDialog_NewRepresentationNameLabel;
+    public static String createRepresentationInputDialog_NewRepresentationNameLabel = org.eclipse.sirius.viewpoint.provider.Messages.Messages_createRepresentationInputDialog_NewRepresentationNameLabel;
 
     /**
      * The label of the representation description documentation.
      */
-    public static String createRepresentationInputDialog_RepresentationDescriptionLabel;
+    public static String createRepresentationInputDialog_RepresentationDescriptionLabel = org.eclipse.sirius.viewpoint.provider.Messages.Messages_createRepresentationInputDialog_RepresentationDescriptionLabel;
 
     /**
      * The title of the input dialog.
      */
-    public static String createRepresentationInputDialog_Title;
+    public static String createRepresentationInputDialog_Title = org.eclipse.sirius.viewpoint.provider.Messages.Messages_createRepresentationInputDialog_Title;
 
     // CHECKSTYLE:ON
-    private static final String BUNDLE_NAME = "org.eclipse.sirius.ui.tools.api.messages"; //$NON-NLS-1$
-
-    static {
-        // initialize resource bundle
-        NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-    }
 
     private Messages() {
     }
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/messages.properties b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/messages.properties
deleted file mode 100644
index 08f72ba646..0000000000
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/messages.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-createRepresentationInputDialog_NamePrefix=new 
-createRepresentationInputDialog_NewRepresentationNameLabel=Representation name: 
-createRepresentationInputDialog_RepresentationDescriptionLabel=Representation description: 
-createRepresentationInputDialog_Title=New Representation
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/FilteredCommonTree.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/FilteredCommonTree.java
index 45dc4c0410..e4e2108e05 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/FilteredCommonTree.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/FilteredCommonTree.java
@@ -28,7 +28,6 @@ import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.sirius.ui.tools.internal.views.modelexplorer.TooltipAwareNavigatorDecoratingLabelProvider;
 import org.eclipse.sirius.viewpoint.provider.Messages;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
@@ -620,7 +619,7 @@ public class FilteredCommonTree extends Composite {
                 if (filterTextString.length() == 0 || filterTextString.equals(initialText)) {
                     e.result = initialText;
                 } else {
-                    e.result = NLS.bind(WorkbenchMessages.FilteredTree_AccessibleListenerFiltered, new String[] { filterTextString, String.valueOf(getFilteredItemsCount()) });
+                    e.result = MessageFormat.format(WorkbenchMessages.FilteredTree_AccessibleListenerFiltered, new String[] { filterTextString, String.valueOf(getFilteredItemsCount()) });
                 }
             }
 
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/NewModelingProjectCreationWizardPage.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/NewModelingProjectCreationWizardPage.java
index cf2ea7cc70..abb7c469e9 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/NewModelingProjectCreationWizardPage.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/NewModelingProjectCreationWizardPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 Obeo.
+ * Copyright (c) 2014, 2015 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,13 +12,13 @@
 package org.eclipse.sirius.ui.tools.internal.wizards.pages;
 
 import java.io.File;
+import java.text.MessageFormat;
 
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.internal.resources.Project;
 import org.eclipse.core.internal.utils.Messages;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
 import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
@@ -79,14 +79,14 @@ public class NewModelingProjectCreationWizardPage extends WizardNewProjectCreati
         // Return true if the project location have the same project name with
         // same case
         if (folder.getName().equals(getProjectName())) {
-            String msg = NLS.bind(Messages.localstore_fileExists, new Path(folder.toString()).removeLastSegments(1).append(folder.getName()).toOSString());
+            String msg = MessageFormat.format(Messages.localstore_fileExists, new Path(folder.toString()).removeLastSegments(1).append(folder.getName()).toOSString());
             // Set a warning message
             setMessage(msg, 2);
         } else {
             // Return true if the project location have the same project name in
             // different case
             if (folder.getName().toUpperCase().equals(getProjectName().toUpperCase()) && isMacOrWindowsOS()) {
-                String msg = NLS.bind(Messages.resources_existsLocalDifferentCase, new Path(folder.toString()).removeLastSegments(1).append(folder.getName()).toOSString());
+                String msg = MessageFormat.format(Messages.resources_existsLocalDifferentCase, new Path(folder.toString()).removeLastSegments(1).append(folder.getName()).toOSString());
                 setErrorMessage(msg);
                 return true;
             }
@@ -103,12 +103,12 @@ public class NewModelingProjectCreationWizardPage extends WizardNewProjectCreati
         if (folder.listFiles() != null) {
             for (int i = 0; i < folder.listFiles().length && !projectNameExistsInSameCase; i++) {
                 if (name != null && folder.listFiles()[i].getName().equals(getProjectName())) {
-                    String msg = NLS.bind(Messages.localstore_fileExists, new Path(folder.toString()).append(folder.listFiles()[i].getName()).toOSString());
+                    String msg = MessageFormat.format(Messages.localstore_fileExists, new Path(folder.toString()).append(folder.listFiles()[i].getName()).toOSString());
                     setMessage(msg, 2);
                     projectNameExistsInSameCase = true;
                 } else {
                     if (name != null && folder.listFiles()[i].getName().toUpperCase().equals(getProjectName().toUpperCase()) && isMacOrWindowsOS()) {
-                        String msg = NLS.bind(Messages.resources_existsLocalDifferentCase, new Path(folder.toString()).append(folder.listFiles()[i].getName()).toOSString());
+                        String msg = MessageFormat.format(Messages.resources_existsLocalDifferentCase, new Path(folder.toString()).append(folder.listFiles()[i].getName()).toOSString());
                         setErrorMessage(msg);
                         return true;
                     }
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/viewpoint/provider/Messages.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/viewpoint/provider/Messages.java
index 06672f1602..31e667150e 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/viewpoint/provider/Messages.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/viewpoint/provider/Messages.java
@@ -475,6 +475,18 @@ public final class Messages {
     public static String MenuHelper_anonymousRepresentation;
 
     @TranslatableMessage
+    public static String Messages_createRepresentationInputDialog_NamePrefix;
+
+    @TranslatableMessage
+    public static String Messages_createRepresentationInputDialog_NewRepresentationNameLabel;
+
+    @TranslatableMessage
+    public static String Messages_createRepresentationInputDialog_RepresentationDescriptionLabel;
+
+    @TranslatableMessage
+    public static String Messages_createRepresentationInputDialog_Title;
+
+    @TranslatableMessage
     public static String ModelingModelProvider_addAnotherRepresentationFile;
 
     @TranslatableMessage
@@ -943,6 +955,9 @@ public final class Messages {
     public static String ViewpointSelection_applySelectionTask;
 
     @TranslatableMessage
+    public static String ViewpointSelection_iconColumn;
+
+    @TranslatableMessage
     public static String ViewpointSelection_loadingViewpointsTask;
 
     @TranslatableMessage
@@ -952,9 +967,6 @@ public final class Messages {
     public static String ViewpointSelection_missingDependencies_requirements;
 
     @TranslatableMessage
-    public static String ViewpointSelection_iconColumn;
-
-    @TranslatableMessage
     public static String ViewpointSelection_viewpointColumn;
 
     @TranslatableMessage