[472057] Externalize translatable strings from org.eclipse.sirius.tree.ui

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

21 files changed, 249 insertions, 293 deletions

diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index 926efe0812..a632d82692 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -298,6 +298,9 @@
 					<li>
 						<code>org.eclipse.sirius.interpreter</code>
 					</li>
+					<li>
+						<code>org.eclipse.sirius.tree.ui</code>
+					</li>
 				</ul>
 			</li>
 		</ul>
@@ -1870,4 +1873,4 @@
 			</li>
 		</ul>
 	</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
index 13d3407d48..6579e347a1 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -71,6 +71,7 @@ Additional non-breaking changes:
 ** @org.eclipse.sirius.common.ui@
 ** @org.eclipse.sirius.eef.adapters@
 ** @org.eclipse.sirius.interpreter@
+** @org.eclipse.sirius.tree.ui@
 
 h4. Changes in @org.eclipse.sirius.common@
 
diff --git a/plugins/org.eclipse.sirius.tree.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.tree.ui/.settings/org.eclipse.jdt.core.prefs
index fc8c7f3ddc..39e1d0d4d4 100644
--- a/plugins/org.eclipse.sirius.tree.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.sirius.tree.ui/.settings/org.eclipse.jdt.core.prefs
@@ -32,7 +32,7 @@ org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
diff --git a/plugins/org.eclipse.sirius.tree.ui/plugin.properties b/plugins/org.eclipse.sirius.tree.ui/plugin.properties
index 97af395f39..98d9503fcc 100644
--- a/plugins/org.eclipse.sirius.tree.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.tree.ui/plugin.properties
@@ -1,5 +1,5 @@
 # ====================================================================
-# Copyright (c) 2013 THALES GLOBAL SERVICES
+# Copyright (c) 2013, 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
@@ -12,6 +12,35 @@
 pluginName = Sirius Tree Specification Editor
 providerName = Eclipse Modeling Project
 
+DTreeEditor_treeModelUnsaved = This tree was not saved. You can close the editor
+DTreeItemDropListener_ambigousDropWarning = There are more than one drop description that match the dropped element : {0} ({1} and {2}).
+DTreeItemDropListener_dragAndDropCommand = Drag And Drop
+DTreeItemEditingSupport_directEditCommand = Direct Edit on {0}
+DTreeItemLabelProvider_iconFileNotFound=Icon file \"{0}\" not found
+DTreeMenuListener_new = New
+DTreeMenuListener_open = Open
+DeleteTreeItemsAction_deleteTargetSemanticElement = Delete the target semantic element
+DeleteTreeItemsAction_deleteTargetSemanticElements = Delete the target semantic elements
+DeleteTreeItemsAction_deleteTreeItem = Delete tree item
+DeleteTreeItemsAction_deleteTreeItems = Delete tree items
+EditorCreateTreeItemMenuAction_name = Create root tree items
+EditorRefreshAction_error = Error
+EditorRefreshAction_refreshCancelled = Cancelled
+EditorRefreshAction_treeRefreshError = Error while refreshing tree
+ExpandDTreeItemRunnableWithProgress_expandTreeItem = Expand {0} tree item
+ExpandDTreeItemRunnableWithProgress_treeItemCollapsing = Tree item collapsing
+ExpandDTreeItemRunnableWithProgress_treeItemExpanding = Tree item expanding
+HierarchyLabelTreeProvider_elementWithoutName = Element whithout name
+RefreshAction_refreshTreeElement = Refresh Tree Element
+TreeDialectUIServices_errorOpeningEditor = tree editor opening error
+TreeDialectUIServices_newTree = New Tree
+TreeDialectUIServices_treeOpening = tree opening
+TreeItemExpansionManager_expandOrCollaseError = Error while {0}
+TreeItemExpansionManager_treeCollapsing = collapsing the tree.
+TreeItemExpansionManager_treeExpanding = expanding the tree.
+TreeItemStyleDescriptionItemProvider_noLabel = no label
+TreeQuickOutlineHandler_quickOutline=Quick Outline
+
 DTreeContext.description = Sirius DTree Editing
 DTreeContext.name = DTree Editing
 TreeEditorQuickOutlineCommand = Tree Editor Quick Outline Command
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemStyleDescriptionItemProvider.java
index e705b4adb3..04d3be9091 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemStyleDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeItemStyleDescriptionItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007-2013 THALES GLOBAL SERVICES.
+ * 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
@@ -29,6 +29,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.tree.description.DescriptionPackage;
 import org.eclipse.sirius.tree.description.TreeItemStyleDescription;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.tree.ui.provider.TreeUIPlugin;
 import org.eclipse.sirius.viewpoint.description.style.StylePackage;
 
@@ -206,7 +207,7 @@ IItemPropertySource {
     @Override
     public String getText(Object object) {
         TreeItemStyleDescription style = (TreeItemStyleDescription) object;
-        String txt = "no label";
+        String txt = Messages.TreeItemStyleDescriptionItemProvider_noLabel;
         if (!StringUtil.isEmpty(style.getLabelExpression())) {
             txt = style.getLabelExpression();
         }
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/HierarchyLabelTreeProvider.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/HierarchyLabelTreeProvider.java
index 6857aaef58..3f0d6ca171 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/HierarchyLabelTreeProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/HierarchyLabelTreeProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 THALES GLOBAL SERVICES.
+ * Copyright (c) 2009, 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
@@ -17,6 +17,7 @@ import org.eclipse.sirius.business.api.query.IdentifiedElementQuery;
 import org.eclipse.sirius.tree.description.TreeDescription;
 import org.eclipse.sirius.tree.description.TreeMapping;
 import org.eclipse.sirius.tree.description.TreeNavigationDescription;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.viewpoint.description.Group;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.RepresentationExtensionDescription;
@@ -43,21 +44,11 @@ public class HierarchyLabelTreeProvider extends LabelProvider {
         this.wrappedProvider = wrappedLabelProvider;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
-     */
     @Override
     public Image getImage(final Object element) {
         return wrappedProvider != null ? wrappedProvider.getImage(element) : super.getImage(element);
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
-     */
     @Override
     public String getText(final Object element) {
         if (element instanceof TreeMapping || element instanceof TreeDescription || element instanceof TreeNavigationDescription) {
@@ -82,7 +73,7 @@ public class HierarchyLabelTreeProvider extends LabelProvider {
         } else if (eObject instanceof RepresentationExtensionDescription) {
             label = ((RepresentationExtensionDescription) eObject).getName();
         }
-        return label != null ? label : "Element whithout name";
+        return label != null ? label : Messages.HierarchyLabelTreeProvider_elementWithoutName;
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/TreeDialectUIServices.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/TreeDialectUIServices.java
index 1df4cbb8b6..353879be85 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/TreeDialectUIServices.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/TreeDialectUIServices.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 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
@@ -45,6 +45,7 @@ import org.eclipse.sirius.tree.description.TreeDescription;
 import org.eclipse.sirius.tree.description.TreeNavigationDescription;
 import org.eclipse.sirius.tree.description.provider.DescriptionItemProviderAdapterFactory;
 import org.eclipse.sirius.tree.provider.TreeItemProviderAdapterFactory;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.tree.ui.provider.TreeUIPlugin;
 import org.eclipse.sirius.tree.ui.tools.internal.editor.DTreeEditor;
 import org.eclipse.sirius.ui.business.api.dialect.DialectEditor;
@@ -73,63 +74,37 @@ import com.google.common.collect.Sets;
  * @author pcdavid
  */
 public class TreeDialectUIServices implements DialectUIServices {
-
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#canHandle(org.eclipse.sirius.viewpoint.DRepresentation)
-     */
     @Override
     public boolean canHandle(DRepresentation representation) {
         return representation instanceof DTree;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#canHandle(org.eclipse.sirius.viewpoint.description.RepresentationDescription)
-     *      )
-     */
     @Override
     public boolean canHandle(final RepresentationDescription representation) {
         return representation instanceof TreeDescription;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#canHandle(org.eclipse.sirius.viewpoint.description.RepresentationExtensionDescription)
-     *      )
-     */
     @Override
     public boolean canHandle(final RepresentationExtensionDescription description) {
         return false;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#canHandleEditor(org.eclipse.ui.IEditorPart)
-     */
     @Override
     public boolean canHandleEditor(IEditorPart editorPart) {
         return editorPart instanceof DTreeEditor;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public IEditorPart openEditor(Session session, DRepresentation dRepresentation, IProgressMonitor monitor) {
         IEditorPart editorPart = null;
         try {
-            monitor.beginTask("tree opening", 10);
+            monitor.beginTask(Messages.TreeDialectUIServices_treeOpening, 10);
             if (dRepresentation instanceof DTree) {
                 DslCommonPlugin.PROFILER.startWork(SiriusTasksKey.OPEN_TREE_KEY);
                 URI uri = EcoreUtil.getURI(dRepresentation);
                 final IEditorInput editorInput = new SessionEditorInput(uri, getEditorName(dRepresentation), session);
                 monitor.worked(2);
-                monitor.subTask("tree opening : " + dRepresentation.getName());
+                monitor.subTask(Messages.TreeDialectUIServices_treeOpening + " : " + dRepresentation.getName()); //$NON-NLS-1$
                 RunnableWithResult<IEditorPart> runnable = new RunnableWithResult.Impl<IEditorPart>() {
                     @Override
                     public void run() {
@@ -137,7 +112,7 @@ public class TreeDialectUIServices implements DialectUIServices {
                         try {
                             setResult(page.openEditor(editorInput, DTreeEditor.ID));
                         } catch (final PartInitException e) {
-                            TreeUIPlugin.getPlugin().log(new Status(IStatus.ERROR, TreeUIPlugin.ID, "tree editor opening error", e));
+                            TreeUIPlugin.getPlugin().log(new Status(IStatus.ERROR, TreeUIPlugin.ID, Messages.TreeDialectUIServices_errorOpeningEditor, e));
                         }
                     }
                 };
@@ -155,23 +130,15 @@ public class TreeDialectUIServices implements DialectUIServices {
         return editorPart;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#getEditorName(org.eclipse.sirius.viewpoint.DRepresentation)
-     */
     @Override
     public String getEditorName(DRepresentation representation) {
         String editorName = representation.getName();
         if (StringUtil.isEmpty(editorName)) {
-            editorName = "New Tree";
+            editorName = Messages.TreeDialectUIServices_newTree;
         }
         return editorName;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean closeEditor(IEditorPart editorPart, boolean save) {
         boolean result = false;
@@ -188,12 +155,6 @@ public class TreeDialectUIServices implements DialectUIServices {
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#isRepresentationManagedByEditor(org.eclipse.sirius.viewpoint.DRepresentation,
-     *      org.eclipse.ui.IEditorPart)
-     */
     @Override
     public boolean isRepresentationManagedByEditor(DRepresentation representation, IEditorPart editorPart) {
         boolean isRepresentationManagedByEditor = false;
@@ -204,12 +165,6 @@ public class TreeDialectUIServices implements DialectUIServices {
         return isRepresentationManagedByEditor;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#isRepresentationDescriptionManagedByEditor(org.eclipse.sirius.viewpoint.description.RepresentationDescription,
-     *      org.eclipse.ui.IEditorPart)
-     */
     @Override
     public boolean isRepresentationDescriptionManagedByEditor(RepresentationDescription representationDescription, IEditorPart editorPart) {
         if (canHandleEditor(editorPart)) {
@@ -220,11 +175,6 @@ public class TreeDialectUIServices implements DialectUIServices {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#createAdapterFactory()
-     */
     @Override
     public AdapterFactory createAdapterFactory() {
         final ComposedAdapterFactory factory = new ComposedAdapterFactory();
@@ -233,35 +183,16 @@ public class TreeDialectUIServices implements DialectUIServices {
         return factory;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#canExport(org.eclipse.sirius.ui.business.api.dialect.ExportFormat)
-     */
     @Override
     public boolean canExport(ExportFormat format) {
         return false;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#export(org.eclipse.sirius.viewpoint.DRepresentation,
-     *      org.eclipse.sirius.business.api.session.Session,
-     *      org.eclipse.core.runtime.IPath,
-     *      org.eclipse.sirius.ui.business.api.dialect.ExportFormat,
-     *      org.eclipse.core.runtime.IProgressMonitor)
-     */
     @Override
     public void export(DRepresentation representation, Session session, IPath path, ExportFormat format, IProgressMonitor monitor) {
         // Nothing to do for trees.
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#provideNewChildDescriptors()
-     */
     @Override
     public Collection<CommandParameter> provideNewChildDescriptors() {
         Collection<CommandParameter> newChilds = Lists.newArrayList();
@@ -270,11 +201,6 @@ public class TreeDialectUIServices implements DialectUIServices {
         return newChilds;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#provideRepresentationCreationToolDescriptors(java.lang.Object)
-     */
     @Override
     public Collection<CommandParameter> provideRepresentationCreationToolDescriptors(Object feature) {
         Collection<CommandParameter> newChilds = Lists.newArrayList();
@@ -284,11 +210,6 @@ public class TreeDialectUIServices implements DialectUIServices {
         return newChilds;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#provideRepresentationNavigationToolDescriptors(java.lang.Object)
-     */
     @Override
     public Collection<CommandParameter> provideRepresentationNavigationToolDescriptors(Object feature) {
         Collection<CommandParameter> newChilds = Lists.newArrayList();
@@ -298,39 +219,21 @@ public class TreeDialectUIServices implements DialectUIServices {
         return newChilds;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#provideTools(org.eclipse.emf.ecore.EObject)
-     */
     @Override
     public Collection<CommandParameter> provideTools(EObject object) {
         return Collections.emptyList();
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#provideAdditionalMappings(org.eclipse.emf.ecore.EObject)
-     */
     @Override
     public Collection<CommandParameter> provideAdditionalMappings(EObject object) {
         return Collections.emptyList();
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#getHierarchyLabelProvider(ILabelProvider)
-     */
     @Override
     public ILabelProvider getHierarchyLabelProvider(ILabelProvider currentLabelProvider) {
         return new HierarchyLabelTreeProvider(currentLabelProvider);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void setSelection(DialectEditor dialectEditor, List<DRepresentationElement> selection) {
         if (dialectEditor instanceof DTreeEditor) {
@@ -347,11 +250,6 @@ public class TreeDialectUIServices implements DialectUIServices {
         setSelection(dialectEditor, selection);
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#getSelection(org.eclipse.sirius.ui.business.api.dialect.DialectEditor)
-     */
     @Override
     public Collection<DSemanticDecorator> getSelection(DialectEditor editor) {
         Collection<DSemanticDecorator> selection = Sets.newLinkedHashSet();
@@ -367,28 +265,11 @@ public class TreeDialectUIServices implements DialectUIServices {
         return selection;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#completeToolTipText(String,
-     *      EObject, EStructuralFeature)
-     */
     @Override
     public String completeToolTipText(String toolTipText, EObject eObject, EStructuralFeature feature) {
         return toolTipText;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.ui.business.api.dialect.DialectUIServices#completeToolTipText(String,
-     *      EObject)
-     * @deprecated this method has not access to the feature of eObject. This is
-     *             supported in
-     *             org.eclipse.sirius.tree.ui.business.internal.dialect
-     *             .TreeDialectUIServices.completeToolTipText(String, EObject,
-     *             EStructuralFeature)
-     */
     @Deprecated
     @Override
     public String completeToolTipText(String toolTipText, EObject eObject) {
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/provider/Messages.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/provider/Messages.java
new file mode 100644
index 0000000000..47d04ce175
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/provider/Messages.java
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.tree.ui.provider;
+
+import org.eclipse.sirius.ext.base.I18N;
+import org.eclipse.sirius.ext.base.I18N.TranslatableMessage;
+
+/**
+ * Helper class to obtain translated strings.
+ * 
+ * @author <a href="mailto:esteban.dugueperoux@obeo.fr">Esteban Dugueperoux</a>
+ */
+public final class Messages {
+
+    static {
+        I18N.initializeMessages(Messages.class, TreeUIPlugin.INSTANCE);
+    }
+
+    // CHECKSTYLE:OFF
+
+    @TranslatableMessage
+    public static String DTreeEditor_treeModelUnsaved;
+
+    @TranslatableMessage
+    public static String DTreeItemDropListener_ambigousDropWarning;
+
+    @TranslatableMessage
+    public static String DTreeItemDropListener_dragAndDropCommand;
+
+    @TranslatableMessage
+    public static String DTreeItemEditingSupport_directEditCommand;
+
+    @TranslatableMessage
+    public static String DTreeItemLabelProvider_iconFileNotFound;
+
+    @TranslatableMessage
+    public static String DTreeMenuListener_new;
+
+    @TranslatableMessage
+    public static String DTreeMenuListener_open;
+
+    @TranslatableMessage
+    public static String DeleteTreeItemsAction_deleteTargetSemanticElement;
+
+    @TranslatableMessage
+    public static String DeleteTreeItemsAction_deleteTargetSemanticElements;
+
+    @TranslatableMessage
+    public static String DeleteTreeItemsAction_deleteTreeItem;
+
+    @TranslatableMessage
+    public static String DeleteTreeItemsAction_deleteTreeItems;
+
+    @TranslatableMessage
+    public static String EditorCreateTreeItemMenuAction_name;
+
+    @TranslatableMessage
+    public static String EditorRefreshAction_error;
+
+    @TranslatableMessage
+    public static String EditorRefreshAction_refreshCancelled;
+
+    @TranslatableMessage
+    public static String EditorRefreshAction_treeRefreshError;
+
+    @TranslatableMessage
+    public static String ExpandDTreeItemRunnableWithProgress_expandTreeItem;
+
+    @TranslatableMessage
+    public static String ExpandDTreeItemRunnableWithProgress_treeItemCollapsing;
+
+    @TranslatableMessage
+    public static String ExpandDTreeItemRunnableWithProgress_treeItemExpanding;
+
+    @TranslatableMessage
+    public static String HierarchyLabelTreeProvider_elementWithoutName;
+
+    @TranslatableMessage
+    public static String RefreshAction_refreshTreeElement;
+
+    @TranslatableMessage
+    public static String TreeDialectUIServices_errorOpeningEditor;
+
+    @TranslatableMessage
+    public static String TreeDialectUIServices_newTree;
+
+    @TranslatableMessage
+    public static String TreeDialectUIServices_treeOpening;
+
+    @TranslatableMessage
+    public static String TreeItemExpansionManager_expandOrCollaseError;
+
+    @TranslatableMessage
+    public static String TreeItemExpansionManager_treeCollapsing;
+
+    @TranslatableMessage
+    public static String TreeItemExpansionManager_treeExpanding;
+
+    @TranslatableMessage
+    public static String TreeItemStyleDescriptionItemProvider_noLabel;
+
+    @TranslatableMessage
+    public static String TreeQuickOutlineHandler_quickOutline;
+
+    // CHECKSTYLE:ON
+
+    private Messages() {
+        // Prevents instanciation.
+    }
+}
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeActionBarContributor.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeActionBarContributor.java
index e344ed1504..901451eb78 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeActionBarContributor.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeActionBarContributor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 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
@@ -12,9 +12,8 @@ package org.eclipse.sirius.tree.ui.tools.internal.editor;
 
 import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
 import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.ui.IWorkbenchActionConstants;
-
 import org.eclipse.sirius.tree.ui.tools.internal.editor.actions.EditorCreateTreeItemMenuAction;
+import org.eclipse.ui.IWorkbenchActionConstants;
 
 /**
  * This is a contributor for a DTree editor.
@@ -22,14 +21,6 @@ import org.eclipse.sirius.tree.ui.tools.internal.editor.actions.EditorCreateTree
  * @author cbrun
  */
 public class DTreeActionBarContributor extends EditingDomainActionBarContributor {
-
-    /**
-     * Constructor.
-     */
-    public DTreeActionBarContributor() {
-
-    }
-
     /**
      * Add the create tree item menu to the toolbar.
      * 
@@ -39,7 +30,7 @@ public class DTreeActionBarContributor extends EditingDomainActionBarContributor
     public void addCreateTreeItemMenu(final EditorCreateTreeItemMenuAction editorCreateLineMenuAction) {
         final IToolBarManager toolBarManager = getActionBars().getToolBarManager();
         toolBarManager.remove(EditorCreateTreeItemMenuAction.ID);
-        toolBarManager.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, editorCreateLineMenuAction); //$NON-NLS-1$
+        toolBarManager.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, editorCreateLineMenuAction);
         toolBarManager.update(true);
     }
 
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeEditor.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeEditor.java
index 471c67fbd8..b6c39357c3 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeEditor.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeEditor.java
@@ -43,6 +43,7 @@ import org.eclipse.sirius.tree.business.api.command.ITreeCommandFactory;
 import org.eclipse.sirius.tree.business.api.command.ITreeCommandFactoryProvider;
 import org.eclipse.sirius.tree.business.api.command.TreeCommandFactoryService;
 import org.eclipse.sirius.tree.business.internal.helper.TreeHelper;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.tree.ui.provider.TreeUIPlugin;
 import org.eclipse.sirius.tree.ui.tools.internal.commands.EMFCommandFactoryUI;
 import org.eclipse.sirius.ui.business.api.descriptor.ComposedImageDescriptor;
@@ -193,7 +194,7 @@ public class DTreeEditor extends AbstractDTreeEditor implements org.eclipse.siri
         if (getTreeModel() == null) {
             /* eclipse was closed with an editor opened and not saved */
             final Label errorLabel = new Label(parent, SWT.CENTER);
-            errorLabel.setText("This tree was not saved. You can close the editor");
+            errorLabel.setText(Messages.DTreeEditor_treeModelUnsaved);
             return;
         }
         treeViewerManager = new DTreeViewerManager(parent, getTreeModel(), getEditingDomain(), accessor, emfCommandFactory, this);
@@ -449,7 +450,7 @@ public class DTreeEditor extends AbstractDTreeEditor implements org.eclipse.siri
         });
 
     }
-    
+
     @Override
     public Image getInitialImage() {
         if (initialTitleImage == null || initialTitleImage.isDisposed()) {
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeMenuListener.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeMenuListener.java
index 4511df4c6a..4e48f9c50c 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeMenuListener.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeMenuListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES and others.
+ * 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
@@ -35,6 +35,7 @@ import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.tree.DTree;
 import org.eclipse.sirius.tree.DTreeItem;
 import org.eclipse.sirius.tree.description.TreeMapping;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.tree.ui.tools.internal.commands.EMFCommandFactoryUI;
 import org.eclipse.sirius.tree.ui.tools.internal.editor.actions.AbstractToolAction;
 import org.eclipse.sirius.tree.ui.tools.internal.editor.actions.AbstractToolItemAction;
@@ -131,11 +132,7 @@ public class DTreeMenuListener implements IMenuListener {
         refreshAction = new RefreshAction((DTreeEditor) treeViewManager.getEditor());
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.action.IMenuListener#menuAboutToShow(org.eclipse.jface.action.IMenuManager)
-     */
+    @Override
     public void menuAboutToShow(final IMenuManager manager) {
         // Refresh the cached actions if needed
         treeViewManager.fillMenu();
@@ -186,7 +183,7 @@ public class DTreeMenuListener implements IMenuListener {
      */
     private void addOpenRepresentationMenu(final IMenuManager manager) {
         // Create a new sub-menu manager
-        final MenuManager openMenuManager = new MenuManager("Open", DTreeMenuListener.MENU_OPEN_REPRESENTATION_ID);
+        final MenuManager openMenuManager = new MenuManager(Messages.DTreeMenuListener_open, DTreeMenuListener.MENU_OPEN_REPRESENTATION_ID);
         // Create the item to add to the main manager
         final SubContributionItem openMenuItem = new SubContributionItem(openMenuManager);
         manager.add(openMenuItem);
@@ -217,7 +214,7 @@ public class DTreeMenuListener implements IMenuListener {
      */
     private void addNewRepresentationMenu(final IMenuManager manager) {
         // Create a new sub-menu manager
-        final MenuManager newMenuManager = new MenuManager("New", DTreeMenuListener.MENU_NEW_REPRESENTATION_ID);
+        final MenuManager newMenuManager = new MenuManager(Messages.DTreeMenuListener_new, DTreeMenuListener.MENU_NEW_REPRESENTATION_ID);
         // Create the item to add to the main manager
         final SubContributionItem newMenuItem = new SubContributionItem(newMenuManager);
         manager.add(newMenuItem);
@@ -235,10 +232,6 @@ public class DTreeMenuListener implements IMenuListener {
         }
     }
 
-    /**
-     * @param openMenuItem
-     * @param semanticElement
-     */
     private void createOpenAction(final SubContributionItem openItem, final DSemanticDecorator decorator) {
         final EObject semanticElement = decorator.getTarget();
         final Session session = SessionManager.INSTANCE.getSession(semanticElement);
@@ -371,8 +364,8 @@ public class DTreeMenuListener implements IMenuListener {
                     }
                     if (append) {
                         newMenuItem.setVisible(true);
-                        ((IMenuManager) newMenuItem.getInnerItem()).appendToGroup(NEW_REPRESENTATION_GROUP_SEPARATOR, new CreateRepresentationFromRepresentationCreationDescription(desc,
-                                currentElement, treeViewManager.getEditingDomain(), treeViewManager.getTreeCommandFactory()));
+                        ((IMenuManager) newMenuItem.getInnerItem()).appendToGroup(NEW_REPRESENTATION_GROUP_SEPARATOR,
+                                new CreateRepresentationFromRepresentationCreationDescription(desc, currentElement, treeViewManager.getEditingDomain(), treeViewManager.getTreeCommandFactory()));
                     }
                 }
             }
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/DeleteTreeItemsAction.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/DeleteTreeItemsAction.java
index 3b39cc5ff6..904476e3e3 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/DeleteTreeItemsAction.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/DeleteTreeItemsAction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2011 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 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
@@ -20,6 +20,7 @@ import org.eclipse.sirius.tree.DTreeItem;
 import org.eclipse.sirius.tree.business.api.command.ITreeCommandFactory;
 import org.eclipse.sirius.tree.business.internal.metamodel.query.DTreeItemInternalQuery;
 import org.eclipse.sirius.tree.description.TreeItemDeletionTool;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.tree.ui.tools.internal.editor.DTreeViewerManager;
 
 import com.google.common.collect.Lists;
@@ -30,14 +31,6 @@ import com.google.common.collect.Lists;
  * @author nlepine
  */
 public class DeleteTreeItemsAction extends Action {
-    private static final String DELETE_ITEM = "Delete tree item";
-
-    private static final String DELETE_ITEMS = DELETE_ITEM + "s";
-
-    private static final String TOOLTIP_ITEM = "Delete the target semantic element";
-
-    private static final String TOOLTIP_ITEMS = TOOLTIP_ITEM + "s";
-
     private final ITreeCommandFactory treeCommandFactory;
 
     private final TransactionalEditingDomain editingDomain;
@@ -56,7 +49,7 @@ public class DeleteTreeItemsAction extends Action {
      * 
      */
     public DeleteTreeItemsAction(final TransactionalEditingDomain editingDomain, final ITreeCommandFactory treeCommandFactory) {
-        super(DELETE_ITEM, DTreeViewerManager.getImageRegistry().getDescriptor(DTreeViewerManager.DELETE_IMG));
+        super(Messages.DeleteTreeItemsAction_deleteTreeItem, DTreeViewerManager.getImageRegistry().getDescriptor(DTreeViewerManager.DELETE_IMG));
         this.editingDomain = editingDomain;
         this.treeCommandFactory = treeCommandFactory;
     }
@@ -99,8 +92,8 @@ public class DeleteTreeItemsAction extends Action {
         }
 
         if (items.size() == 1) {
-            setText(DELETE_ITEM);
-            setToolTipText(TOOLTIP_ITEM);
+            setText(Messages.DeleteTreeItemsAction_deleteTreeItem);
+            setToolTipText(Messages.DeleteTreeItemsAction_deleteTargetSemanticElement);
 
             TreeItemDeletionTool deleteTool = getDeleteTool(items.iterator().next());
             if (deleteTool != null) {
@@ -108,8 +101,8 @@ public class DeleteTreeItemsAction extends Action {
                 setToolTipText(deleteTool.getDocumentation());
             }
         } else if (items.size() > 1) {
-            setText(DELETE_ITEMS);
-            setToolTipText(TOOLTIP_ITEMS);
+            setText(Messages.DeleteTreeItemsAction_deleteTreeItems);
+            setToolTipText(Messages.DeleteTreeItemsAction_deleteTargetSemanticElements);
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/EditorCreateTreeItemMenuAction.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/EditorCreateTreeItemMenuAction.java
index 954bb81627..1c23c8068e 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/EditorCreateTreeItemMenuAction.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/EditorCreateTreeItemMenuAction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 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
@@ -17,6 +17,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IMenuCreator;
 import org.eclipse.jface.action.MenuManager;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.tree.ui.tools.internal.editor.DTreeViewerManager;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MenuAdapter;
@@ -36,12 +37,7 @@ import org.eclipse.swt.widgets.MenuItem;
  */
 public class EditorCreateTreeItemMenuAction extends Action implements IMenuCreator {
     /** The Id of this action. */
-    public static final String ID = "CreateTreeItemMenu";
-
-    /**
-     * The default name of the action menu.
-     */
-    private static final String DEFAULT_NAME = "Create root tree items";
+    public static final String ID = "CreateTreeItemMenu"; //$NON-NLS-1$
 
     /** Menu manager for this action. */
     private final MenuManager menuManager = new MenuManager();
@@ -82,17 +78,12 @@ public class EditorCreateTreeItemMenuAction extends Action implements IMenuCreat
      * {@link #BUNDLE bundle} resources prefixed by &quot;action.save&quot;.
      */
     public EditorCreateTreeItemMenuAction() {
-        super(DEFAULT_NAME, DTreeViewerManager.getImageRegistry().getDescriptor(DTreeViewerManager.CREATE_TREE_ITEM_IMG));
+        super(Messages.EditorCreateTreeItemMenuAction_name, DTreeViewerManager.getImageRegistry().getDescriptor(DTreeViewerManager.CREATE_TREE_ITEM_IMG));
         setId(ID);
         setMenuCreator(this);
         setEnabled(false);
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.action.Action#run()
-     */
     @Override
     public void run() {
         if (lastCreateTreeItemAction != null && lastCreateTreeItemAction.isEnabled()) {
@@ -111,11 +102,6 @@ public class EditorCreateTreeItemMenuAction extends Action implements IMenuCreat
         menuManager.add(contribution);
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.action.IMenuCreator#dispose()
-     */
     @Override
     public void dispose() {
         if (menuManager.getMenu() != null) {
@@ -132,11 +118,6 @@ public class EditorCreateTreeItemMenuAction extends Action implements IMenuCreat
         menuManager.dispose();
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
-     */
     @Override
     public Menu getMenu(final Control parent) {
         // Creates the menu if needed, or removes all elements except for the
@@ -155,11 +136,6 @@ public class EditorCreateTreeItemMenuAction extends Action implements IMenuCreat
         return menuManager.getMenu();
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
-     */
     @Override
     public Menu getMenu(final Menu parent) {
         return null;
@@ -196,7 +172,7 @@ public class EditorCreateTreeItemMenuAction extends Action implements IMenuCreat
         setEnabled(!createTreeItemActionsForTree.isEmpty());
 
         if (createTreeItemActionsForTree.isEmpty()) {
-            this.setText(DEFAULT_NAME);
+            this.setText(Messages.EditorCreateTreeItemMenuAction_name);
         } else {
             // Add all create line tool on the table
             for (final CreateToolItemAction createAction : createTreeItemActionsForTree) {
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/EditorRefreshAction.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/EditorRefreshAction.java
index 7c9d9a54d3..b79b0aea3a 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/EditorRefreshAction.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/EditorRefreshAction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 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
@@ -18,14 +18,15 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.sirius.business.api.dialect.command.RefreshRepresentationsCommand;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.tree.ui.tools.internal.editor.DTreeEditor;
 import org.eclipse.sirius.ui.business.api.action.RefreshActionListenerRegistry;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorActionDelegate;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPart;
 
 /**
  * This action refresh the content of the tree.
@@ -39,24 +40,16 @@ public class EditorRefreshAction implements IEditorActionDelegate {
      */
     protected IWorkbenchPart workbenchPart;
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction,
-     *      org.eclipse.ui.IEditorPart)
-     */
+    @Override
     public void setActiveEditor(final IAction action, final IEditorPart targetEditor) {
         setActiveWorkbenchPart(targetEditor);
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-     */
+    @Override
     public void run(final IAction action) {
         if (workbenchPart instanceof DTreeEditor) {
             final IRunnableWithProgress op = new IRunnableWithProgress() {
+                @Override
                 public void run(final IProgressMonitor monitor) {
                     final DTreeEditor treeEditor = (DTreeEditor) workbenchPart;
                     treeEditor.enablePropertiesUpdate(false);
@@ -70,20 +63,15 @@ public class EditorRefreshAction implements IEditorActionDelegate {
             try {
                 monitorDialog.run(false, false, op);
             } catch (final InvocationTargetException e) {
-                MessageDialog.openError(activeShell, "Error", e.getTargetException().getMessage());
-                SiriusPlugin.getDefault().error("Error while refreshing tree", e);
+                MessageDialog.openError(activeShell, Messages.EditorRefreshAction_error, e.getTargetException().getMessage());
+                SiriusPlugin.getDefault().error(Messages.EditorRefreshAction_treeRefreshError, e);
             } catch (final InterruptedException e) {
-                MessageDialog.openInformation(activeShell, "Cancelled", e.getMessage());
+                MessageDialog.openInformation(activeShell, Messages.EditorRefreshAction_refreshCancelled, e.getMessage());
             }
         }
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
-     *      org.eclipse.jface.viewers.ISelection)
-     */
+    @Override
     public void selectionChanged(final IAction action, final ISelection selection) {
     }
 
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/RefreshAction.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/RefreshAction.java
index 325e145c74..3f4a9d250a 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/RefreshAction.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/actions/RefreshAction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 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
@@ -31,6 +31,7 @@ import org.eclipse.sirius.business.api.session.Session;
 import org.eclipse.sirius.tree.DTreeItem;
 import org.eclipse.sirius.tree.business.api.command.DTreeItemLocalRefreshCommand;
 import org.eclipse.sirius.tree.business.internal.dialect.common.viewpoint.GlobalContext;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.tree.ui.tools.internal.editor.DTreeEditor;
 import org.eclipse.sirius.tree.ui.tools.internal.editor.DTreeViewerManager;
 import org.eclipse.sirius.ui.business.api.action.RefreshActionListenerRegistry;
@@ -52,8 +53,6 @@ import com.google.common.collect.Lists;
  */
 public class RefreshAction extends Action implements IObjectActionDelegate {
 
-    private static final String DEFAULT_NAME = "Refresh Tree Element";
-
     private DTreeEditor treeEditor;
 
     private ISelection selection;
@@ -67,7 +66,7 @@ public class RefreshAction extends Action implements IObjectActionDelegate {
      *            the tree editor
      */
     public RefreshAction(final DTreeEditor treeEditor) {
-        super(DEFAULT_NAME, DTreeViewerManager.getImageRegistry().getDescriptor(DTreeViewerManager.REFRESH_IMG));
+        super(Messages.RefreshAction_refreshTreeElement, DTreeViewerManager.getImageRegistry().getDescriptor(DTreeViewerManager.REFRESH_IMG));
         this.treeEditor = treeEditor;
         minimizedSelection = new LinkedList<Object>();
     }
@@ -96,6 +95,7 @@ public class RefreshAction extends Action implements IObjectActionDelegate {
         IRunnableWithProgress op = null;
         if (minimizedSelection.isEmpty()) {
             op = new IRunnableWithProgress() {
+                @Override
                 public void run(final IProgressMonitor monitor) {
                     TransactionalEditingDomain domain = treeEditor.getEditingDomain();
                     domain.getCommandStack().execute(new RefreshRepresentationsCommand(domain, monitor, treeEditor.getTreeModel()));
@@ -107,6 +107,7 @@ public class RefreshAction extends Action implements IObjectActionDelegate {
             final Collection<DTreeItem> dTreeItems = Lists.newArrayList(elements);
             if (!dTreeItems.isEmpty()) {
                 op = new IRunnableWithProgress() {
+                    @Override
                     public void run(final IProgressMonitor monitor) {
                         Session session = new EObjectQuery(treeEditor.getRepresentation()).getSession();
                         if (session != null) {
@@ -138,10 +139,10 @@ public class RefreshAction extends Action implements IObjectActionDelegate {
             treeEditor.enablePropertiesUpdate(false);
             monitorDialog.run(true, false, op);
         } catch (final InvocationTargetException e) {
-            MessageDialog.openError(activeShell, "Error", e.getTargetException().getMessage());
-            SiriusPlugin.getDefault().error("Error while refreshing tree", e);
+            MessageDialog.openError(activeShell, Messages.EditorRefreshAction_error, e.getTargetException().getMessage());
+            SiriusPlugin.getDefault().error(Messages.EditorRefreshAction_treeRefreshError, e);
         } catch (final InterruptedException e) {
-            MessageDialog.openInformation(activeShell, "Cancelled", e.getMessage());
+            MessageDialog.openInformation(activeShell, Messages.EditorRefreshAction_refreshCancelled, e.getMessage());
         } finally {
             treeEditor.enablePropertiesUpdate(true);
         }
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/listeners/ExpandDTreeItemRunnableWithProgress.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/listeners/ExpandDTreeItemRunnableWithProgress.java
index ea926505e6..f6d8028b62 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/listeners/ExpandDTreeItemRunnableWithProgress.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/listeners/ExpandDTreeItemRunnableWithProgress.java
@@ -11,6 +11,7 @@
 package org.eclipse.sirius.tree.ui.tools.internal.editor.listeners;
 
 import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Platform;
@@ -26,6 +27,7 @@ import org.eclipse.sirius.tree.DTreeItem;
 import org.eclipse.sirius.tree.business.api.command.DTreeItemExpansionChangeCommand;
 import org.eclipse.sirius.tree.business.internal.dialect.common.viewpoint.GlobalContext;
 import org.eclipse.sirius.tree.business.internal.helper.RefreshTreeElementTask;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 
 /**
@@ -67,14 +69,15 @@ public class ExpandDTreeItemRunnableWithProgress implements IRunnableWithProgres
      * @throws InterruptedException
      *             Interrupted Exception
      */
+    @Override
     public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
         try {
             TransactionalEditingDomain domain = session.getTransactionalEditingDomain();
             CommandStack commandStack = domain.getCommandStack();
             GlobalContext globalContext = new GlobalContext(session.getModelAccessor(), session.getInterpreter(), session.getSemanticResources());
             if (expand) {
-                monitor.beginTask("Tree item expanding", 1);
-                CompoundCommand expandDTreeItemCmd = new CompoundCommand("Expand " + dTreeItem.getName() + " tree item");
+                monitor.beginTask(Messages.ExpandDTreeItemRunnableWithProgress_treeItemExpanding, 1);
+                CompoundCommand expandDTreeItemCmd = new CompoundCommand(MessageFormat.format(Messages.ExpandDTreeItemRunnableWithProgress_expandTreeItem, dTreeItem.getName()));
                 expandDTreeItemCmd.append(new DTreeItemExpansionChangeCommand(globalContext, domain, dTreeItem, monitor, true));
                 if (!Platform.getPreferencesService().getBoolean(SiriusPlugin.ID, SiriusPreferencesKeys.PREF_AUTO_REFRESH.name(), false, null)) {
                     SiriusCommand result = new SiriusCommand(domain);
@@ -90,7 +93,7 @@ public class ExpandDTreeItemRunnableWithProgress implements IRunnableWithProgres
                     throw new InterruptedException();
                 }
             } else {
-                monitor.beginTask("Tree item collapsing", 1);
+                monitor.beginTask(Messages.ExpandDTreeItemRunnableWithProgress_treeItemCollapsing, 1);
                 Command collapseDTreeItemCmd = new DTreeItemExpansionChangeCommand(globalContext, domain, dTreeItem, monitor, false);
                 commandStack.execute(collapseDTreeItemCmd);
             }
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/listeners/TreeItemExpansionManager.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/listeners/TreeItemExpansionManager.java
index 38e5542dfb..ad7114cd22 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/listeners/TreeItemExpansionManager.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/listeners/TreeItemExpansionManager.java
@@ -10,6 +10,7 @@
 package org.eclipse.sirius.tree.ui.tools.internal.editor.listeners;
 
 import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -18,6 +19,7 @@ import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
 import org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthority;
 import org.eclipse.sirius.tree.DTreeItem;
 import org.eclipse.sirius.tree.TreePackage;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.tree.ui.provider.TreeUIPlugin;
 import org.eclipse.sirius.ui.tools.internal.editor.ChangeExpandeStateRunnable;
 import org.eclipse.swt.SWT;
@@ -71,6 +73,7 @@ public class TreeItemExpansionManager implements Listener {
      * 
      * {@inheritDoc}
      */
+    @Override
     public void handleEvent(Event event) {
         switch (event.type) {
         case SWT.Collapse:
@@ -99,7 +102,7 @@ public class TreeItemExpansionManager implements Listener {
             if (data instanceof DTreeItem) {
                 DTreeItem dTreeItem = (DTreeItem) data;
                 if (isEventForDTreeItemExpandable(event)) {
-                    treeExpandingCollapsingAction(treeItem, dTreeItem, false, "collapsing the tree.");
+                    treeExpandingCollapsingAction(treeItem, dTreeItem, false, Messages.TreeItemExpansionManager_treeCollapsing);
                 } else {
                     Display.getDefault().asyncExec(new ChangeExpandeStateRunnable(treeItem, true));
                 }
@@ -123,7 +126,7 @@ public class TreeItemExpansionManager implements Listener {
             if (data instanceof DTreeItem) {
                 DTreeItem dTreeItem = (DTreeItem) data;
                 if (isEventForDTreeItemExpandable(event)) {
-                    treeExpandingCollapsingAction(treeItem, dTreeItem, true, "expanding the tree.");
+                    treeExpandingCollapsingAction(treeItem, dTreeItem, true, Messages.TreeItemExpansionManager_treeExpanding);
                 } else {
                     Display.getDefault().asyncExec(new ChangeExpandeStateRunnable(treeItem, false));
                 }
@@ -179,7 +182,7 @@ public class TreeItemExpansionManager implements Listener {
                     try {
                         ps.busyCursorWhile(new ExpandDTreeItemRunnableWithProgress(session, dTreeItem, expand));
                     } catch (InvocationTargetException e) {
-                        TreeUIPlugin.INSTANCE.log(new Status(IStatus.ERROR, TreeUIPlugin.ID, "Error while " + errorMessage, e));
+                        TreeUIPlugin.INSTANCE.log(new Status(IStatus.ERROR, TreeUIPlugin.ID, MessageFormat.format(Messages.TreeItemExpansionManager_expandOrCollaseError, errorMessage), e));
                     } catch (InterruptedException e) {
                         Display.getDefault().asyncExec(new ChangeExpandeStateRunnable(treeItem, !expand));
                     }
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemDropListener.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemDropListener.java
index d0a15b8bd7..aef22fddcc 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemDropListener.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemDropListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2009, 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
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.tree.ui.tools.internal.editor.provider;
 
+import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -41,6 +42,7 @@ import org.eclipse.sirius.tree.DTreeItemContainer;
 import org.eclipse.sirius.tree.business.api.command.ITreeCommandFactory;
 import org.eclipse.sirius.tree.description.TreeDragSource;
 import org.eclipse.sirius.tree.description.TreeItemContainerDropTool;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
@@ -60,12 +62,6 @@ import com.google.common.collect.Sets;
  * @author <a href="mailto:alex.lagarde@obeo.fr">Alex Lagarde</a>
  */
 public class DTreeItemDropListener extends ViewerDropAdapter implements DropTargetListener {
-    /**
-     * Start of the error message when more than one drop description
-     * corresponds to a drop element.
-     */
-    private static final String MORE_THAN_ONE_DROP_DESCRIPTION_ERROR_MSG = "There are more than one drop description that match the dropped element";
-
     private TransactionalEditingDomain domain;
 
     private ModelAccessor accessor;
@@ -366,7 +362,7 @@ public class DTreeItemDropListener extends ViewerDropAdapter implements DropTarg
     }
 
     private CompoundCommand buildCommand() {
-        CompoundCommand dndCommand = new CompoundCommand("Drag And Drop");
+        CompoundCommand dndCommand = new CompoundCommand(Messages.DTreeItemDropListener_dragAndDropCommand);
         if (!droppedData.isEmpty()) {
             for (DSemanticDecorator semDec : droppedData) {
                 EObject droppedElement = semDec.getTarget();
@@ -469,7 +465,8 @@ public class DTreeItemDropListener extends ViewerDropAdapter implements DropTarg
                     bestDropDescription = dropTool;
                 } else {
                     SiriusPlugin.getDefault().warning(
-                            MORE_THAN_ONE_DROP_DESCRIPTION_ERROR_MSG + " : " + droppedElement + " (" + bestDropDescription.getName() + " and " + dropTool.getName() + ").", new RuntimeException());
+                            MessageFormat.format(Messages.DTreeItemDropListener_ambigousDropWarning, droppedElement, bestDropDescription.getName(), dropTool.getName()),
+                            new RuntimeException());
                     break;
                 }
             }
@@ -499,6 +496,7 @@ public class DTreeItemDropListener extends ViewerDropAdapter implements DropTarg
 
     private Iterable<TreeItemContainerDropTool> getDropTools(final TreeDragSource dragSource) {
         Predicate<TreeItemContainerDropTool> checkedDragSource = new Predicate<TreeItemContainerDropTool>() {
+            @Override
             public boolean apply(TreeItemContainerDropTool input) {
                 return input.getDragSource() == TreeDragSource.BOTH || input.getDragSource() == dragSource;
             }
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemEditingSupport.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemEditingSupport.java
index 1bdeafd241..d2add0a895 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemEditingSupport.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemEditingSupport.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2009, 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
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.tree.ui.tools.internal.editor.provider;
 
+import java.text.MessageFormat;
+
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
@@ -17,19 +19,19 @@ import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.widgets.Tree;
-
+import org.eclipse.sirius.business.api.logger.RuntimeLoggerManager;
 import org.eclipse.sirius.common.tools.api.interpreter.EvaluationException;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
-import org.eclipse.sirius.business.api.logger.RuntimeLoggerManager;
+import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
+import org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthority;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
 import org.eclipse.sirius.tree.DTreeItem;
 import org.eclipse.sirius.tree.business.api.command.ITreeCommandFactory;
 import org.eclipse.sirius.tree.description.TreeItemEditionTool;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.ui.tools.internal.editor.AbstractDTreeEditor;
-import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
-import org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthority;
+import org.eclipse.swt.widgets.Tree;
 
 /**
  * Support for editing DTreeItems of a DTree.
@@ -81,11 +83,6 @@ public class DTreeItemEditingSupport extends EditingSupport {
         this.treeEditor = abstractDTreeEditor;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)
-     */
     @Override
     protected boolean canEdit(final Object element) {
 
@@ -117,8 +114,8 @@ public class DTreeItemEditingSupport extends EditingSupport {
                     try {
                         canEdit = interpreter.evaluateBoolean(item.getTarget(), precondition);
                     } catch (final EvaluationException e) {
-                        RuntimeLoggerManager.INSTANCE.error(item.getUpdater().getDirectEdit(), org.eclipse.sirius.viewpoint.description.tool.ToolPackage.eINSTANCE.getAbstractToolDescription_Precondition(),
-                                e);
+                        RuntimeLoggerManager.INSTANCE.error(item.getUpdater().getDirectEdit(),
+                                org.eclipse.sirius.viewpoint.description.tool.ToolPackage.eINSTANCE.getAbstractToolDescription_Precondition(), e);
                     }
 
                 }
@@ -130,11 +127,6 @@ public class DTreeItemEditingSupport extends EditingSupport {
         return false;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)
-     */
     @Override
     protected CellEditor getCellEditor(final Object element) {
         if (element instanceof DTreeItem) {
@@ -145,11 +137,6 @@ public class DTreeItemEditingSupport extends EditingSupport {
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)
-     */
     @Override
     protected Object getValue(final Object element) {
         Object result = null;
@@ -159,12 +146,6 @@ public class DTreeItemEditingSupport extends EditingSupport {
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object,
-     *      java.lang.Object)
-     */
     @Override
     protected void setValue(final Object element, final Object value) {
         if (element instanceof DTreeItem) {
@@ -197,7 +178,8 @@ public class DTreeItemEditingSupport extends EditingSupport {
         // We simply change the name of the given itemToSet
         final DTreeItem treeItem = itemToSet;
         if (value instanceof String) {
-            getEditingDomain().getCommandStack().execute(new StandardSetValueRecordingCommand(getEditingDomain(), "Direct Edit on " + itemToSet.getName(), treeItem, value));
+            getEditingDomain().getCommandStack().execute(
+                    new StandardSetValueRecordingCommand(getEditingDomain(), MessageFormat.format(Messages.DTreeItemEditingSupport_directEditCommand, itemToSet.getName()), treeItem, value));
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemLabelProvider.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemLabelProvider.java
index f5b215ee3b..d7fbddf732 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemLabelProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemLabelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 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
@@ -12,6 +12,7 @@ package org.eclipse.sirius.tree.ui.tools.internal.editor.provider;
 
 import java.io.File;
 import java.net.MalformedURLException;
+import java.text.MessageFormat;
 import java.util.List;
 
 import org.eclipse.core.runtime.Path;
@@ -23,6 +24,7 @@ import org.eclipse.sirius.common.tools.api.resource.FileProvider;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.tree.DTreeItem;
 import org.eclipse.sirius.tree.TreeItemStyle;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.tree.ui.provider.TreeUIPlugin;
 import org.eclipse.sirius.ui.tools.api.color.VisualBindingManager;
 import org.eclipse.sirius.ui.tools.api.provider.DSemanticTargetBasedLabelProvider;
@@ -126,7 +128,7 @@ public class DTreeItemLabelProvider extends DSemanticTargetBasedLabelProvider im
             }
 
             if (descriptor == null) {
-                SiriusPlugin.getDefault().warning("Icon file \"" + iconPath + "\" not found", null);
+                SiriusPlugin.getDefault().warning(MessageFormat.format(Messages.DTreeItemLabelProvider_iconFileNotFound, iconPath), null);
                 descriptor = ImageDescriptor.getMissingImageDescriptor();
             }
 
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/quickoutline/TreeQuickOutlineHandler.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/quickoutline/TreeQuickOutlineHandler.java
index 18ea91979b..efc6fe84d0 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/quickoutline/TreeQuickOutlineHandler.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/quickoutline/TreeQuickOutlineHandler.java
@@ -20,6 +20,7 @@ import org.eclipse.sirius.common.ui.tools.api.dialog.quickoutline.QuickOutlineDe
 import org.eclipse.sirius.common.ui.tools.api.dialog.quickoutline.QuickOutlinePageDescriptor;
 import org.eclipse.sirius.common.ui.tools.api.dialog.quickoutline.SiriusInformationPresenter;
 import org.eclipse.sirius.common.ui.tools.api.dialog.quickoutline.SiriusInformationPresenterFactory;
+import org.eclipse.sirius.tree.ui.provider.Messages;
 import org.eclipse.sirius.tree.ui.tools.api.editor.DTreeEditor;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
@@ -54,7 +55,7 @@ public class TreeQuickOutlineHandler extends AbstractHandler {
         ComposedAdapterFactory caf = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
         QuickOutlineAdapterFactoryLabelProvider labelProvider = new DTreeQuickOutlineLabelProvider(caf);
         TreeOutlineCallback callBack = new TreeOutlineCallback(editor);
-        QuickOutlinePageDescriptor page1 = new QuickOutlinePageDescriptor(callBack, labelProvider, new DTreeQuickOutlineContentProvider(), "Quick Outline");
+        QuickOutlinePageDescriptor page1 = new QuickOutlinePageDescriptor(callBack, labelProvider, new DTreeQuickOutlineContentProvider(), Messages.TreeQuickOutlineHandler_quickOutline);
         QuickOutlineDescriptor descriptor = new QuickOutlineDescriptor();
         descriptor.addPage(page1);
         return descriptor;